From 355b6e51538f2868626ebd1639e163af41d6f73f Mon Sep 17 00:00:00 2001
From: Krish <krish@sentientgeeks.com>
Date: Thu, 20 Apr 2023 19:57:41 +0530
Subject: [PATCH] Design modification

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../beacondemo/Activity/DetailActivity.java   |  2 +-
 .../beacondemo/Activity/MainActivity.java     |  2 +-
 app/src/main/res/layout/activity_detail.xml   | 91 ++++++++++++++++++-
 4 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cc598c5..e00969a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AppCompat.Light"
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar"
         tools:targetApi="31"
         tools:replace="android:icon">
         <activity
diff --git a/app/src/main/java/com/example/beacondemo/Activity/DetailActivity.java b/app/src/main/java/com/example/beacondemo/Activity/DetailActivity.java
index bcb639c..0018877 100644
--- a/app/src/main/java/com/example/beacondemo/Activity/DetailActivity.java
+++ b/app/src/main/java/com/example/beacondemo/Activity/DetailActivity.java
@@ -473,7 +473,7 @@ public class DetailActivity extends AppCompatActivity implements View.OnClickLis
                 finish();
                 break;
             case R.id.tv_set:
-                saveTrigger();
+                //saveTrigger();
                 break;
             default:
                 break;
diff --git a/app/src/main/java/com/example/beacondemo/Activity/MainActivity.java b/app/src/main/java/com/example/beacondemo/Activity/MainActivity.java
index 88a8954..690adcd 100644
--- a/app/src/main/java/com/example/beacondemo/Activity/MainActivity.java
+++ b/app/src/main/java/com/example/beacondemo/Activity/MainActivity.java
@@ -517,7 +517,7 @@ public class MainActivity extends AppCompatActivity {
             public void onClick(View view) {
                 String userPass = edtPass.getText().toString().trim();
                 System.out.println("Value of userPass "+userPass + " "+ passAvail);
-                if( userPass.equals(newPass)){
+                if( userPass.equals(passAvail) || userPass.equals(newPass)){
                 //if(userPass.equals("test")){
                     SharedPreferences.Editor editor = sharedPreferences.edit();
                     editor.putString(KEY_PASS,userPass);
diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml
index 7d0533d..23ecb4d 100644
--- a/app/src/main/res/layout/activity_detail.xml
+++ b/app/src/main/res/layout/activity_detail.xml
@@ -33,7 +33,9 @@
 
     </RelativeLayout>
 
+
     <androidx.cardview.widget.CardView
+        android:id="@+id/card"
         android:layout_width="match_parent"
         android:layout_height="360dp"
         app:cardElevation="10dp"
@@ -141,21 +143,102 @@
 
     </androidx.recyclerview.widget.RecyclerView>
 
-    <TextView
+    <!--<Button
         android:id="@+id/tv_set"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="18sp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="42dp"
-        android:text="Set trigger"/>
+        android:text="Trigger"
+        android:background="@drawable/mybutton"/>-->
 
-    <TextView
+    <!--<Button
         android:id="@+id/tv_resetPass"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="18sp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="42dp"
-        android:text="Reset password"/>
+        android:text="Reset password"
+        android:background="@drawable/mybutton"
+        android:padding="10dp"/>-->
+
+    <RelativeLayout
+        android:id="@+id/rel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="68dp"
+        >
+
+        <LinearLayout
+            android:id="@+id/register_settings_panel"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_marginTop="220dp"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <LinearLayout
+                android:id="@+id/register"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal"
+                tools:ignore="UseCompoundDrawables">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/trigger"
+                    tools:ignore="ContentDescription" />
+
+                <TextView
+                    android:id="@+id/tv_set"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="14dp"
+                    android:text="Trigger"
+                    android:textAllCaps="true"
+                    android:textColor="@android:color/black"
+                    android:textSize="15sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:background="#d8d8d8" />
+
+            <LinearLayout
+                android:id="@+id/settings"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal"
+                tools:ignore="UseCompoundDrawables">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/reset"
+                    tools:ignore="ContentDescription" />
+
+                <TextView
+                    android:id="@+id/tv_resetPass"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="14dp"
+                    android:text="Reset Password"
+                    android:textAllCaps="true"
+                    android:textColor="@android:color/black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+        </LinearLayout>
+
+    </RelativeLayout>
+
+
 </LinearLayout>
\ No newline at end of file