diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 492b12dd3ed738ec4afd875c62b35f8c9dfd2f91..b986b50863b528baa358c8ed9925e052d19f868f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
<application
android:allowBackup="true"
- android:icon="@mipmap/ic_launcher"
+ android:icon="@drawable/eco"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
diff --git a/app/src/main/java/com/example/srinivasan/database2/DatabaseHelperTwo.java b/app/src/main/java/com/example/srinivasan/database2/DatabaseHelperTwo.java
index 1f0378ecea34996f6b552ffe1aa39d0610bbd1cf..b5125c3402341c66f220d0f60dafaf37203ff783 100644
--- a/app/src/main/java/com/example/srinivasan/database2/DatabaseHelperTwo.java
+++ b/app/src/main/java/com/example/srinivasan/database2/DatabaseHelperTwo.java
@@ -28,7 +28,7 @@ public class DatabaseHelperTwo extends SQLiteOpenHelper {
private static final String KEY_IMAGE = "image_data";
private static final String COLOUMMN_LOC = "LOCATION";
SQLiteDatabase db;
-
+int j=0;
private static final String CREATE_TABLE_IMAGE = "CREATE TABLE " +TABLE_NAME +"(ID INTEGER PRIMARY KEY AUTOINCREMENT,"+
"DATE TEXT," + " TIME TEXT," + " CONTENT TEXT," + "LOCATION TEXT,"+ KEY_IMAGE + " BLOB);";
public DatabaseHelperTwo(Context context) {
@@ -49,6 +49,8 @@ public class DatabaseHelperTwo extends SQLiteOpenHelper {
cv.put(COLOUMN_CONTENT, content);
cv.put(COLOUMMN_LOC,location);
cv.put(KEY_IMAGE, image);
+
+
long result = db.insert(TABLE_NAME, null, cv);
if (result == -1){
@@ -97,8 +99,10 @@ public class DatabaseHelperTwo extends SQLiteOpenHelper {
date = cursor.getString(1);
try {
+
a[i]=date;
i++;
+ j=i;
}catch (ArrayIndexOutOfBoundsException e){
break;
}
@@ -167,6 +171,9 @@ public class DatabaseHelperTwo extends SQLiteOpenHelper {
}
return a;
}
+ public int ii(){
+ return j;
+ }
}
diff --git a/app/src/main/java/com/example/srinivasan/database2/Float.java b/app/src/main/java/com/example/srinivasan/database2/Float.java
index 91abf7ca2131c809c34352b0d8ba77feeff89295..33fa5acd204bd60c27e486b1ae6f3e0de44b2fde 100644
--- a/app/src/main/java/com/example/srinivasan/database2/Float.java
+++ b/app/src/main/java/com/example/srinivasan/database2/Float.java
@@ -17,7 +17,7 @@ import android.widget.GridView;
public class Float extends AppCompatActivity {
Session s;
DatabaseHelperTwo databaseHelperTwo;
- Button button;
+ Button button,button2;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -38,6 +38,7 @@ public class Float extends AppCompatActivity {
});
*/
+ button2= (Button)findViewById(R.id.button2);
RecyclerView recyclerView;
RecyclerView.LayoutManager layoutManager;
RecyclerView.Adapter adapter;
@@ -57,7 +58,13 @@ public class Float extends AppCompatActivity {
if (!s.loggedIn()){
logout();
}
-
+ button2.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent i = new Intent(Float.this,Navmenu.class);
+ startActivity(i);
+ }
+ });
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/app/src/main/java/com/example/srinivasan/database2/Loggedin.java b/app/src/main/java/com/example/srinivasan/database2/Loggedin.java
index 12ed1e8d2fe016e2d8be4ddefe0b75b7e723990f..535b9320bc5eeaa36ee5e413807c7e23854c55e0 100644
--- a/app/src/main/java/com/example/srinivasan/database2/Loggedin.java
+++ b/app/src/main/java/com/example/srinivasan/database2/Loggedin.java
@@ -313,6 +313,7 @@ default:
add.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+
boolean inserted = myDb.addEntry(date.getText().toString(), time.getText().toString(), query.getText().toString(),address1.getText().toString(), a);
if (inserted == true) {
Intent intent = new Intent(Loggedin.this, Float.class);
diff --git a/app/src/main/java/com/example/srinivasan/database2/Navmenu.java b/app/src/main/java/com/example/srinivasan/database2/Navmenu.java
index 6d1345829cb36626d50361eaa66c7c85cd0284c9..fdbe177ef269200ca46aff91bc1ff953c5fa7e3b 100644
--- a/app/src/main/java/com/example/srinivasan/database2/Navmenu.java
+++ b/app/src/main/java/com/example/srinivasan/database2/Navmenu.java
@@ -31,7 +31,7 @@ public class Navmenu extends AppCompatActivity implements NavigationView.OnNavig
TextView name, name2;
ViewPager viewPager;
SwipeAdapter adapter;
-
+Session s;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -39,7 +39,7 @@ public class Navmenu extends AppCompatActivity implements NavigationView.OnNavig
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
name2 = (TextView) findViewById(R.id.name2);
-
+ s=new Session(this);
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
@@ -167,6 +167,8 @@ public class Navmenu extends AppCompatActivity implements NavigationView.OnNavig
}
}
if(id == R.id.logout){
+ s.setLoggedIn(false);
+ finish();
Intent i = new Intent(Navmenu.this,Login.class);
Toast.makeText(getApplicationContext(),"Logged Out",Toast.LENGTH_SHORT).show();
startActivity(i);
diff --git a/app/src/main/java/com/example/srinivasan/database2/RecyclerAdapter.java b/app/src/main/java/com/example/srinivasan/database2/RecyclerAdapter.java
index d44e9ee68c12adf78c6ad6cb16fd9767dfae0bcd..de5ae835e0acadadf87139b4e6c49282319113f2 100644
--- a/app/src/main/java/com/example/srinivasan/database2/RecyclerAdapter.java
+++ b/app/src/main/java/com/example/srinivasan/database2/RecyclerAdapter.java
@@ -20,35 +20,13 @@ import java.util.ArrayList;
public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ViewHolder> {
-
- private String[] titles = {"Chapter One",
- "Chapter Two",
- "Chapter Three",
- "Chapter Four",
- "Chapter Five",
- "Chapter Six",
- "Chapter Seven",
- "Chapter Eight"};
-
- private String[] details = {"Item one details",
- "Item two details", "Item three details",
- "Item four details", "Item file details",
- "Item six details", "Item seven details",
- "Item eight details"};
-
- private int[] images = { R.drawable.babysmile,
- R.drawable.bmwz,
- R.drawable.calvin,
- R.drawable.clean,
- R.drawable.cutebunny,
- R.drawable.doggy
- };
private Context mContext;
DatabaseHelperTwo db2;
ArrayList<Bitmap> bitmapArray = new ArrayList<Bitmap>();
// Constructor
-String[] a,b,c;
+ String[] a,b,c;
public RecyclerAdapter(Context context) {
+
mContext = context;
db2=new DatabaseHelperTwo(mContext);
bitmapArray=db2.searchpass();
@@ -111,7 +89,8 @@ String[] a,b,c;
@Override
public int getItemCount() {
- return a.length;
+
+ return db2.ii();
}
}
diff --git a/app/src/main/java/com/example/srinivasan/database2/SingleView.java b/app/src/main/java/com/example/srinivasan/database2/SingleView.java
index 0d7fa3059a1886848a992c781332a222c95bf3a0..acd772511afda28618917af67765c6827333b638 100644
--- a/app/src/main/java/com/example/srinivasan/database2/SingleView.java
+++ b/app/src/main/java/com/example/srinivasan/database2/SingleView.java
@@ -140,6 +140,7 @@ public class SingleView extends AppCompatActivity implements View.OnClickListene
SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putString("text",comments.getText().toString());
editor.commit();
+ typecom.setText("");
}
}
diff --git a/app/src/main/java/com/example/srinivasan/database2/SwipeAdapter.java b/app/src/main/java/com/example/srinivasan/database2/SwipeAdapter.java
index 1bf60dc4d9b65a2b201f40906fcefd0963301b43..955696be9213c8b4d173dd470f770e5cb97c2221 100644
--- a/app/src/main/java/com/example/srinivasan/database2/SwipeAdapter.java
+++ b/app/src/main/java/com/example/srinivasan/database2/SwipeAdapter.java
@@ -14,8 +14,8 @@ import android.widget.LinearLayout;
public class SwipeAdapter extends PagerAdapter {
- private int[] image_resources = { R.drawable.imag,R.drawable.pic2,R.drawable.pic3,
- R.drawable.pic4,R.drawable.cutebunny, R.drawable.doggy };
+ private int[] image_resources = { R.drawable.pic8,R.drawable.imag,R.drawable.pic2,R.drawable.logo
+ ,R.drawable.pic3, R.drawable.pic4};
private Context context;
private LayoutInflater layoutInflater;
public SwipeAdapter(Context context) {
diff --git a/app/src/main/res/drawable-v21/eco.jpeg b/app/src/main/res/drawable-v21/eco.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..f46806e4225db82b2f6747dc550194d6f2b3aa7b
Binary files /dev/null and b/app/src/main/res/drawable-v21/eco.jpeg differ
diff --git a/app/src/main/res/drawable-v21/logo.png b/app/src/main/res/drawable-v21/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddd6dec57b8f6c34a2bd83767ec45b1fc50596f5
Binary files /dev/null and b/app/src/main/res/drawable-v21/logo.png differ
diff --git a/app/src/main/res/drawable-v21/pic8.jpg b/app/src/main/res/drawable-v21/pic8.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..885a14d0e3db9ed8313b867ecf79892a06e66a99
Binary files /dev/null and b/app/src/main/res/drawable-v21/pic8.jpg differ
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index fc1c1dbec78a2c235e75646341b17c2e3fadc18b..4f3be8e9cd6ca4c7c13591ff42ed39effab2199a 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -20,17 +20,6 @@
</android.support.design.widget.AppBarLayout>
- <android.support.design.widget.FloatingActionButton
- android:id="@+id/fab"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="top|left"
- android:layout_margin="@dimen/fab_margin"
- app:backgroundTint="@android:color/holo_blue_bright"
- app:layout_anchor="@+id/include2"
- app:layout_anchorGravity="bottom|right"
- app:srcCompat="@android:drawable/ic_dialog_email" />
-
<include
android:id="@+id/include2"
layout="@layout/content_login" />
diff --git a/app/src/main/res/layout/activity_single_view.xml b/app/src/main/res/layout/activity_single_view.xml
index 92b6a18fe4f58292d713ece85767e8edb204ec03..2de8965cca0140663d0829af836249a08b1492d1 100644
--- a/app/src/main/res/layout/activity_single_view.xml
+++ b/app/src/main/res/layout/activity_single_view.xml
@@ -20,15 +20,6 @@
</android.support.design.widget.AppBarLayout>
- <android.support.design.widget.FloatingActionButton
- android:id="@+id/fab"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|end"
- android:layout_margin="@dimen/fab_margin"
- android:onClick="pro"
- app:srcCompat="@android:drawable/ic_dialog_email" />
-
<include layout="@layout/content_single_view" />
</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_start.xml b/app/src/main/res/layout/activity_start.xml
index b181d75dcc9c5631d20a7dd3979d527baf0aa288..f8ad848fb292741984b4dc81ecb573288d33e00d 100644
--- a/app/src/main/res/layout/activity_start.xml
+++ b/app/src/main/res/layout/activity_start.xml
@@ -22,12 +22,4 @@
<include layout="@layout/content_start" />
- <android.support.design.widget.FloatingActionButton
- android:id="@+id/fab"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|end"
- android:layout_margin="@dimen/fab_margin"
- app:srcCompat="@android:drawable/ic_dialog_email" />
-
</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/app_bar_navmenu.xml b/app/src/main/res/layout/app_bar_navmenu.xml
index 12ffea6ed68a8a3d0a28e40bf305e6a6e28412d4..505ab423c99de936f012594c93d91aa9b859c1fd 100644
--- a/app/src/main/res/layout/app_bar_navmenu.xml
+++ b/app/src/main/res/layout/app_bar_navmenu.xml
@@ -9,10 +9,11 @@
android:background="@drawable/images">
<android.support.design.widget.AppBarLayout
+ android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:theme="@style/AppTheme.AppBarOverlay"
- android:id="@+id/appBarLayout">
+ android:background="@android:color/black"
+ android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
@@ -28,16 +29,16 @@
android:id="@+id/textView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="29dp"
+ android:layout_marginTop="31dp"
android:text="Welcome , "
android:textColor="@android:color/holo_green_light"
android:textColorLink="@android:color/holo_blue_bright"
- android:textSize="30sp"
+ android:textSize="18sp"
android:layout_below="@+id/appBarLayout"
- android:layout_toLeftOf="@+id/name2"
- android:layout_toStartOf="@+id/name2"
- android:layout_marginRight="34dp"
- android:layout_marginEnd="34dp" />
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_marginLeft="57dp"
+ android:layout_marginStart="57dp" />
<TextView
android:id="@+id/textView8"
@@ -56,22 +57,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView"
+ android:textAllCaps="true"
android:textColor="@android:color/holo_blue_bright"
- android:textSize="30sp"
- android:layout_marginRight="53dp"
- android:layout_marginEnd="53dp"
+ android:textSize="18sp"
android:layout_above="@+id/textView8"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true" />
+ android:layout_toRightOf="@+id/textView7"
+ android:layout_toEndOf="@+id/textView7"
+ android:layout_marginLeft="61dp"
+ android:layout_marginStart="61dp" />
<android.support.v4.view.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="300dp"
+ android:layout_marginTop="25dp"
android:layout_below="@+id/textView8"
android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_marginTop="23dp">
+ android:layout_alignParentStart="true">
</android.support.v4.view.ViewPager>
diff --git a/app/src/main/res/layout/content_float.xml b/app/src/main/res/layout/content_float.xml
index 9ebcf89028e20828aa81f767b4401ba0621ad006..f204e576351fe9a7857a1ec733007029db901d10 100644
--- a/app/src/main/res/layout/content_float.xml
+++ b/app/src/main/res/layout/content_float.xml
@@ -4,23 +4,27 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@android:color/background_dark"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="com.example.srinivasan.database2.Float"
tools:showIn="@layout/activity_float">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/rel"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentTop="true"
+ android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
- android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="com.example.srinivasan.database2.Float">
- <android.support.design.widget.CoordinatorLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
+ <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@@ -31,25 +35,42 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="420dp"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/appBarLayout3"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<android.support.design.widget.AppBarLayout
- android:layout_height="wrap_content"
+ android:id="@+id/appBarLayout3"
android:layout_width="match_parent"
- />
+ android:layout_height="wrap_content" />
</RelativeLayout>
+
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_marginBottom="64dp"
+ android:layout_marginBottom="66dp"
android:layout_marginLeft="17dp"
android:layout_marginStart="17dp"
android:text="logout"
tools:layout_editor_absoluteX="16dp"
- tools:layout_editor_absoluteY="448dp" />
+ tools:layout_editor_absoluteY="448dp"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true" />
+
+ <Button
+ android:id="@+id/button2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBaseline="@+id/button"
+ android:layout_alignBottom="@+id/button"
+ android:layout_marginLeft="15dp"
+ android:layout_marginStart="15dp"
+ android:layout_toEndOf="@+id/button"
+ android:layout_toRightOf="@+id/button"
+ android:text="Go Home" />
+
</RelativeLayout>
diff --git a/app/src/main/res/layout/content_login.xml b/app/src/main/res/layout/content_login.xml
index 088179358c3597d15f1df304b66f2ebc680555bc..2b5de844b948a6ddfd015174f6fa7474fdcd0dce 100644
--- a/app/src/main/res/layout/content_login.xml
+++ b/app/src/main/res/layout/content_login.xml
@@ -25,12 +25,13 @@
android:id="@+id/logname"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_below="@+id/te"
- android:layout_marginTop="22dp"
+ android:layout_marginTop="26dp"
+ android:fadeScrollbars="false"
android:hint="Name"
- android:textColor="@color/cardview_light_background" />
+ android:textColor="@color/cardview_light_background"
+ android:layout_below="@+id/te"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true" />
<TextView
android:id="@+id/textView4"
@@ -48,12 +49,12 @@
android:id="@+id/logpass"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_below="@+id/textView4"
- android:layout_marginTop="27dp"
+ android:layout_marginTop="29dp"
android:hint="Password"
- android:textColor="@color/cardview_light_background" />
+ android:textColor="@color/cardview_light_background"
+ android:layout_below="@+id/textView4"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true" />
<Button
android:id="@+id/signin"
diff --git a/app/src/main/res/layout/content_navmenu.xml b/app/src/main/res/layout/content_navmenu.xml
index b09efeca50f815d714aeabfd43f5d3fca6fbba00..c7af8c9b2befc9c3641fd3cf10f2454bd99a33d0 100644
--- a/app/src/main/res/layout/content_navmenu.xml
+++ b/app/src/main/res/layout/content_navmenu.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
- xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:id="@+id/card_view"
android:layout_margin="5dp"
- card_view:cardBackgroundColor="#81C784"
+ android:background="@color/cardview_dark_background"
+ android:clickable="true"
+ android:foreground="?selectableItemBackground"
+ card_view:cardBackgroundColor="@android:color/holo_orange_light"
card_view:cardCornerRadius="12dp"
card_view:cardElevation="3dp"
- card_view:contentPadding="4dp"
- android:foreground="?selectableItemBackground"
- android:clickable="true" >
+ card_view:contentPadding="4dp">
<RelativeLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/content_scrolling.xml b/app/src/main/res/layout/content_scrolling.xml
index 5f65042341cedbc5d401d22e49426bd78c97a64b..2199f69a470dce9af9a11874e89088bf4740762a 100644
--- a/app/src/main/res/layout/content_scrolling.xml
+++ b/app/src/main/res/layout/content_scrolling.xml
@@ -157,11 +157,12 @@
android:layout_height="wrap_content"
android:text="@string/r43" />
</RadioGroup>
- <Button
- android:id="@+id/feedsub"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="Button" />
+
+ <Button
+ android:id="@+id/feedsub"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Submit" />
diff --git a/app/src/main/res/layout/content_single_view.xml b/app/src/main/res/layout/content_single_view.xml
index 26f1fd63d416ca81ab2a60349b9d6d8f6092d216..d6fd4237e4758bea67f9c4151514156442a2f51c 100644
--- a/app/src/main/res/layout/content_single_view.xml
+++ b/app/src/main/res/layout/content_single_view.xml
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView
- xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@android:color/background_dark"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="com.example.srinivasan.database2.SingleView"
tools:showIn="@layout/activity_single_view">
+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@@ -22,10 +23,10 @@
android:id="@+id/LinearLayout01"
android:layout_width="match_parent"
android:layout_height="fill_parent"
- android:orientation="horizontal"
- android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
+ android:layout_alignParentStart="true"
+ android:layout_alignParentTop="true"
+ android:orientation="horizontal">
<TextView
android:id="@+id/textView11"
@@ -34,7 +35,8 @@
android:paddingLeft="40dp"
android:text="Date : "
android:textColor="@android:color/holo_orange_light"
- android:textSize="18sp" />
+ android:textSize="18sp"
+ android:textStyle="bold" />
<TextView
android:id="@+id/textdate"
@@ -43,15 +45,17 @@
android:paddingLeft="100dp"
android:text="TextView"
android:textColor="@android:color/holo_orange_dark"
- android:textSize="18sp" />
+ android:textSize="18sp"
+ android:textStyle="bold|italic" />
</LinearLayout>
+
<LinearLayout
android:id="@+id/LinearLayout02"
android:layout_width="match_parent"
android:layout_height="fill_parent"
- android:orientation="horizontal"
- android:layout_below="@+id/LinearLayout01">
+ android:layout_below="@+id/LinearLayout01"
+ android:orientation="horizontal">
<TextView
@@ -61,7 +65,8 @@
android:paddingLeft="40dp"
android:text="Time : "
android:textColor="@android:color/holo_orange_light"
- android:textSize="18sp" />
+ android:textSize="18sp"
+ android:textStyle="bold" />
<TextView
android:id="@+id/texttime"
@@ -70,14 +75,16 @@
android:paddingLeft="100dp"
android:text="TextView"
android:textColor="@android:color/holo_orange_dark"
- android:textSize="18sp" />
+ android:textSize="18sp"
+ android:textStyle="bold|italic" />
</LinearLayout>
+
<LinearLayout
android:id="@+id/LinearLayout03"
android:layout_width="match_parent"
android:layout_height="fill_parent"
- android:orientation="horizontal"
android:layout_below="@+id/LinearLayout02"
+ android:orientation="horizontal"
android:weightSum="1">
<ImageView
@@ -92,8 +99,9 @@
android:id="@+id/LinearLayout04"
android:layout_width="match_parent"
android:layout_height="fill_parent"
- android:orientation="horizontal"
- android:layout_below="@+id/LinearLayout03">
+ android:layout_below="@+id/LinearLayout03"
+ android:gravity="center"
+ android:orientation="vertical">
<TextView
android:id="@+id/textView3"
@@ -101,6 +109,7 @@
android:layout_height="wrap_content"
android:paddingLeft="40dp"
android:text="Query : "
+ android:textColor="@android:color/holo_green_light"
android:textSize="24sp" />
<TextView
@@ -108,9 +117,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/SingleView"
- android:paddingLeft="100dp"
+ android:paddingLeft="40dp"
android:text="TextView"
- android:textColor="@android:color/holo_red_light"
+ android:textColor="@android:color/holo_green_light"
android:textSize="24sp" />
</LinearLayout>
@@ -131,7 +140,8 @@
android:id="@+id/textView9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Location"
+ android:text="Location :"
+ android:textColor="@android:color/holo_blue_bright"
android:textSize="24sp" />
<TextView
@@ -141,7 +151,7 @@
android:text="Loc"
android:textColor="@android:color/holo_blue_bright"
android:textSize="24sp" />
- </LinearLayout>
+ </LinearLayout>
<LinearLayout
android:id="@+id/LinearLayout06"
@@ -149,6 +159,7 @@
android:layout_height="match_parent"
android:layout_below="@+id/LinearLayout05"
android:orientation="vertical"
+ android:gravity="center"
android:paddingTop="30dp">
@@ -157,13 +168,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Comments :"
- android:textSize="30sp" />
+ android:textColor="@android:color/holo_red_dark"
+ android:textSize="30sp"
+ android:textStyle="bold|italic" />
<TextView
android:id="@+id/comments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
+ android:textColor="@android:color/darker_gray"
android:textSize="24sp" />
<EditText
@@ -173,7 +187,9 @@
android:ems="10"
android:hint="Comment here"
android:inputType="textPersonName"
- android:singleLine="false" />
+ android:singleLine="false"
+ android:textColor="@color/cardview_light_background"
+ android:textColorHint="@android:color/background_light" />
<Button
android:id="@+id/butcom"
diff --git a/app/src/main/res/layout/content_start.xml b/app/src/main/res/layout/content_start.xml
index 7cd83ce64c85008b811ad1576afad98b5211cb13..10a8e25b02c3743a6a7c54aa79e52229673ed806 100644
--- a/app/src/main/res/layout/content_start.xml
+++ b/app/src/main/res/layout/content_start.xml
@@ -12,10 +12,10 @@
<ImageView
android:id="@+id/imageView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ app:srcCompat="@drawable/eco"
android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="125dp"
- app:srcCompat="@drawable/clean" />
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/nav_header_navmenu.xml b/app/src/main/res/layout/nav_header_navmenu.xml
index f822a03e5d5e1ee7ca1d785d5eb45324be68c1bc..7e5a4b263ddb2d561add529251751d4ab28d1aea 100644
--- a/app/src/main/res/layout/nav_header_navmenu.xml
+++ b/app/src/main/res/layout/nav_header_navmenu.xml
@@ -25,7 +25,7 @@
android:text="Welcome ,"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@android:color/holo_blue_bright"
- android:textSize="24sp"
+ android:textSize="18sp"
android:textStyle="italic" />
<TextView
@@ -36,7 +36,7 @@
android:layout_toEndOf="@+id/textView5"
android:layout_toRightOf="@+id/textView5"
android:textAllCaps="true"
- android:textSize="24sp"
+ android:textSize="18sp"
android:textStyle="italic" />
<TextView
diff --git a/app/src/main/res/menu/activity_navmenu_drawer.xml b/app/src/main/res/menu/activity_navmenu_drawer.xml
index b0a81878bb4cf4e0812dbda04de1c51e6fd7e7f1..5dbe9639e93685e19f186ae23e4784b91a377b3f 100644
--- a/app/src/main/res/menu/activity_navmenu_drawer.xml
+++ b/app/src/main/res/menu/activity_navmenu_drawer.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:android="http://schemas.android.com/apk/res/android">
<group android:checkableBehavior="single">
<item
@@ -8,24 +9,26 @@
android:title="Register Complaint" />
<item
android:id="@+id/feedback"
- android:icon="@drawable/ic_menu_gallery"
+ android:icon="@android:drawable/btn_star_big_on"
android:title="Give Feedback" />
<item
android:id="@+id/view"
- android:title="View all">
- </item>
+ android:icon="@android:drawable/ic_menu_view"
+ android:title="View all"></item>
</group>
<group
- android:checkableBehavior="single">
+ android:checkableBehavior="single"
+ android:enabled="true"
+ android:visible="true">
<item
android:id="@+id/contact"
- android:icon="@drawable/ic_menu_slideshow"
+ android:icon="@android:drawable/stat_sys_phone_call"
android:title="Contact Number" />
<item
- android:id="@+id/email"
- android:icon="@drawable/ic_menu_slideshow"
- android:title="Email us" />
+ android:id="@+id/email"
+ android:icon="@android:drawable/ic_dialog_email"
+ android:title="Email us" />
<item
android:id="@+id/logout"
android:title="Logout"></item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f9c61de8bb7807c83d7acb04a5c3eabf208e0078..d9702a3d486b8e402c6398381227a7975376fc7c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
<resources>
- <string name="app_name">Database2</string>
+ <string name="app_name">SaveCity</string>
<string name="action_settings">Settings</string>
<string name="title_activity_login">Login</string>
<string name="title_activity_loggedin">Loggedin</string>