From 0904f2cbaa4e2f9d1e48cbd3a7743b49869c5f19 Mon Sep 17 00:00:00 2001
From: vivek1826 <vivek_96@rocketmail.com>
Date: Mon, 24 Apr 2017 00:11:13 +0530
Subject: [PATCH] updated
---
.../database2/ScrollingActivity.java | 36 +++++++++++++++-
app/src/main/res/layout/activity_float.xml | 2 +-
app/src/main/res/layout/activity_login.xml | 13 ++++--
app/src/main/res/layout/app_bar_navmenu.xml | 32 ++++++--------
app/src/main/res/layout/content_login.xml | 42 +++++++++++++------
app/src/main/res/layout/content_scrolling.xml | 8 +++-
.../main/res/layout/content_single_view.xml | 6 ++-
.../main/res/layout/nav_header_navmenu.xml | 18 +++++++-
8 files changed, 113 insertions(+), 44 deletions(-)
diff --git a/app/src/main/java/com/example/srinivasan/database2/ScrollingActivity.java b/app/src/main/java/com/example/srinivasan/database2/ScrollingActivity.java
index 0731ef0..515b008 100644
--- a/app/src/main/java/com/example/srinivasan/database2/ScrollingActivity.java
+++ b/app/src/main/java/com/example/srinivasan/database2/ScrollingActivity.java
@@ -1,25 +1,59 @@
package com.example.srinivasan.database2;
+import android.Manifest;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
import android.location.Address;
import android.location.Geocoder;
+import android.net.Uri;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
+import android.support.v4.app.ActivityCompat;
+import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.widget.Button;
+import android.widget.Toast;
import java.io.IOException;
import java.util.List;
import java.util.Locale;
public class ScrollingActivity extends AppCompatActivity {
-
+ Button sub;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_scrolling);
+ sub= (Button)findViewById(R.id.feedsub);
+ sub.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ new AlertDialog.Builder(ScrollingActivity.this)
+ .setTitle(" Feedback")
+ .setMessage("Your Response is recorded \n Thank You")
+ .setCancelable(false)
+ .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ // Whatever...
+ Intent i = new Intent(ScrollingActivity.this,Navmenu.class);
+ startActivity(i);
+ }
+ })
+ .setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+
+ @Override
+ public void onClick(DialogInterface dialog, int whichButton) {
+ dialog.dismiss();
+ }
+ }).show();
+ }
+ });
}
diff --git a/app/src/main/res/layout/activity_float.xml b/app/src/main/res/layout/activity_float.xml
index 6ffeb0c..9068f15 100644
--- a/app/src/main/res/layout/activity_float.xml
+++ b/app/src/main/res/layout/activity_float.xml
@@ -16,7 +16,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
- app:popupTheme="@style/AppTheme.PopupOverlay" />
+ app:popupTheme="@style/Animation.AppCompat.DropDownUp" />
</android.support.design.widget.AppBarLayout>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 77afa21..fc1c1db 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -9,7 +9,7 @@
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:theme="@style/AppTheme.AppBarOverlay">
+ android:theme="@android:style/TextAppearance.DeviceDefault.Small.Inverse">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
@@ -20,14 +20,19 @@
</android.support.design.widget.AppBarLayout>
- <include layout="@layout/content_login" />
-
<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_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" />
+
</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 2425bb5..12ffea6 100644
--- a/app/src/main/res/layout/app_bar_navmenu.xml
+++ b/app/src/main/res/layout/app_bar_navmenu.xml
@@ -24,18 +24,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_alignParentBottom="true"
- android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
- android:layout_gravity="bottom|end"
- android:layout_marginBottom="21dp"
- app:rippleColor="@android:color/holo_blue_bright"
- app:srcCompat="@android:drawable/ic_dialog_email" />
-
<TextView
android:id="@+id/textView7"
android:layout_width="wrap_content"
@@ -47,7 +35,9 @@
android:textSize="30sp"
android:layout_below="@+id/appBarLayout"
android:layout_toLeftOf="@+id/name2"
- android:layout_toStartOf="@+id/name2" />
+ android:layout_toStartOf="@+id/name2"
+ android:layout_marginRight="34dp"
+ android:layout_marginEnd="34dp" />
<TextView
android:id="@+id/textView8"
@@ -65,21 +55,23 @@
android:id="@+id/name2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/textView7"
- android:layout_alignBottom="@+id/textView7"
- android:layout_toLeftOf="@+id/fab"
- android:layout_toStartOf="@+id/fab"
android:text="TextView"
android:textColor="@android:color/holo_blue_bright"
- android:textSize="30sp" />
+ android:textSize="30sp"
+ android:layout_marginRight="53dp"
+ android:layout_marginEnd="53dp"
+ android:layout_above="@+id/textView8"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true" />
<android.support.v4.view.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="300dp"
- android:layout_above="@+id/fab"
+ android:layout_below="@+id/textView8"
android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
+ android:layout_alignParentStart="true"
+ android:layout_marginTop="23dp">
</android.support.v4.view.ViewPager>
diff --git a/app/src/main/res/layout/content_login.xml b/app/src/main/res/layout/content_login.xml
index 1159821..0881793 100644
--- a/app/src/main/res/layout/content_login.xml
+++ b/app/src/main/res/layout/content_login.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@android:color/darker_gray"
+ android:background="@color/cardview_dark_background"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="com.example.srinivasan.database2.Login"
tools:showIn="@layout/activity_login">
@@ -15,16 +15,22 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
+ android:layout_marginTop="10dp"
+ android:paddingTop="20dp"
android:text="Name"
- android:textAppearance="?android:attr/textAppearanceLarge" />
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textColor="?android:attr/colorPressedHighlight" />
<EditText
android:id="@+id/logname"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/te" />
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/te"
+ android:layout_marginTop="22dp"
+ android:hint="Name"
+ android:textColor="@color/cardview_light_background" />
<TextView
android:id="@+id/textView4"
@@ -32,31 +38,41 @@
android:layout_height="wrap_content"
android:layout_below="@+id/logname"
android:layout_centerHorizontal="true"
+ android:layout_marginTop="52dp"
android:text="Password"
- android:textAppearance="?android:attr/textAppearanceLarge" />
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textColor="@android:color/holo_orange_light"
+ android:textColorLink="@color/cardview_light_background" />
<EditText
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_centerHorizontal="true" />
+ android:layout_marginTop="27dp"
+ android:hint="Password"
+ android:textColor="@color/cardview_light_background" />
<Button
android:id="@+id/signin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:layout_centerVertical="true"
- android:text="Login" />
+ android:text="Login"
+ android:layout_marginTop="61dp"
+ android:layout_below="@+id/logpass"
+ android:layout_alignLeft="@+id/textView4"
+ android:layout_alignStart="@+id/textView4" />
<Button
android:id="@+id/logreg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="51dp"
+ android:text="Register"
android:layout_below="@+id/signin"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="47dp"
- android:text="Register" />
+ android:layout_alignLeft="@+id/signin"
+ android:layout_alignStart="@+id/signin" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/content_scrolling.xml b/app/src/main/res/layout/content_scrolling.xml
index fba97be..5f65042 100644
--- a/app/src/main/res/layout/content_scrolling.xml
+++ b/app/src/main/res/layout/content_scrolling.xml
@@ -156,7 +156,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/r43" />
- </RadioGroup>
+ </RadioGroup>
+ <Button
+ android:id="@+id/feedsub"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Button" />
+
</LinearLayout>
diff --git a/app/src/main/res/layout/content_single_view.xml b/app/src/main/res/layout/content_single_view.xml
index 4e3c952..26f1fd6 100644
--- a/app/src/main/res/layout/content_single_view.xml
+++ b/app/src/main/res/layout/content_single_view.xml
@@ -164,14 +164,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
- android:textSize="30sp" />
+ android:textSize="24sp" />
<EditText
android:id="@+id/typecom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
- android:inputType="textPersonName" />
+ android:hint="Comment here"
+ android:inputType="textPersonName"
+ android:singleLine="false" />
<Button
android:id="@+id/butcom"
diff --git a/app/src/main/res/layout/nav_header_navmenu.xml b/app/src/main/res/layout/nav_header_navmenu.xml
index 4b96b74..f822a03 100644
--- a/app/src/main/res/layout/nav_header_navmenu.xml
+++ b/app/src/main/res/layout/nav_header_navmenu.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<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"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_header_height"
android:background="@android:color/holo_green_dark"
@@ -19,11 +20,11 @@
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_marginBottom="16dp"
+ android:layout_marginBottom="17dp"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="Welcome ,"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
- android:textColor="?android:attr/colorActivatedHighlight"
+ android:textColor="@android:color/holo_blue_bright"
android:textSize="24sp"
android:textStyle="italic" />
@@ -34,7 +35,20 @@
android:layout_alignBottom="@+id/textView5"
android:layout_toEndOf="@+id/textView5"
android:layout_toRightOf="@+id/textView5"
+ android:textAllCaps="true"
android:textSize="24sp"
android:textStyle="italic" />
+ <TextView
+ android:id="@+id/textView13"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="12dp"
+ android:text="Go Green for a better tomorrow"
+ android:textColor="@android:color/holo_green_light"
+ android:textSize="12sp"
+ android:textStyle="bold" />
+
</RelativeLayout>
--
GitLab