Merge pull request #22 from batshalregmi/UI

UI
batshalregmi · Apr 4, 2024 · 49f2a03 · 49f2a03
2 parents bca10ff + acca607
commit 49f2a03
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 29 deletions.
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
             android:name=".SummaryView.SummaryActivity"
             android:exported="true" />
         <activity
-            android:name=".LoginActivity"
+            android:name=".settingsActivity"
             android:exported="true">
             <intent-filter>
                 <data

diff --git a/app/src/main/res/drawable/circlebackground.xml b/app/src/main/res/drawable/circlebackground.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
-<stroke android:width="2dp" android:color="@color/black"/>
+<stroke android:width="2dp" android:color="@color/green"/>
 </shape>
diff --git a/app/src/main/res/drawable/pink_background.png b/app/src/main/res/drawable/pink_background.png
diff --git a/app/src/main/res/drawable/settings_background.png b/app/src/main/res/drawable/settings_background.png
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -24,6 +24,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
+            android:background="@drawable/settings_background"
             android:orientation="vertical"
             android:padding="20dp">
             <TextView

diff --git a/app/src/main/res/layout/activity_summary.xml b/app/src/main/res/layout/activity_summary.xml
@@ -2,14 +2,38 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     tools:context=".SummaryView.SummaryActivity">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
+    <ScrollView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+    </ScrollView>
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextView"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/custompopup.xml b/app/src/main/res/layout/custompopup.xml
@@ -1,41 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="350dp"
-    android:layout_height="475dp"
+    android:layout_height="400dp"
+    app:cardCornerRadius="30dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="#FFFFFF"
+    android:backgroundTint="#D9EDE9"
     android:orientation="vertical"
-    android:padding="5dp"
     android:layout_gravity="center">
 
-    <TextView
-        android:id="@+id/txtclose"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_gravity="end"
-        android:background="@drawable/circlebackground"
-        android:gravity="center"
-        android:text="X"
-        android:textColor="@color/black"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:orientation="vertical"
         android:padding="24dp"
+
+        android:gravity="center"
+
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
+        <TextView
+            android:id="@+id/txtclose"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_gravity="end"
+            android:layout_marginEnd="5dp"
+            android:background="@drawable/circlebackground"
+            android:gravity="center"
+            android:text="X"
+            android:textColor="@color/green"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/loginText"
-            android:layout_width="match_parent"
+            android:layout_width="300dp"
             android:layout_height="wrap_content"
             android:text="Change Password"
             android:textAlignment="center"
@@ -47,7 +51,7 @@
             android:id="@+id/passwordParent"
             android:layout_width="350dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="30dp"
             android:textColor="@color/black"
             app:cursorColor="@color/purple"
             app:hintEnabled="false"
@@ -56,11 +60,39 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/newPassword"
-                android:layout_width="290dp"
+                android:layout_width="280dp"
                 android:layout_height="50dp"
+                android:layout_gravity="center"
                 android:background="@drawable/custom_edittext"
                 android:defaultFocusHighlightEnabled="false"
                 android:hint="New Password"
+                android:textColorHint="#7DD5BF"
+                android:inputType="textPassword"
+                android:padding="8dp"
+                app:hintAnimationEnabled="false" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/confirm_passwordParent"
+            android:layout_width="350dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:textColor="@color/black"
+            app:cursorColor="@color/purple"
+            app:hintEnabled="false"
+            app:passwordToggleEnabled="true"
+            app:passwordToggleTint="@color/green">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/confirm_newPassword"
+                android:layout_width="280dp"
+                android:layout_height="50dp"
+                android:background="@drawable/custom_edittext"
+                android:defaultFocusHighlightEnabled="false"
+                android:layout_gravity="center"
+                android:hint="Confirm Password"
+                android:textColorHint="#7DD5BF"
+
                 android:inputType="textPassword"
                 android:padding="8dp"
                 app:hintAnimationEnabled="false" />
@@ -69,11 +101,12 @@
         <Button
             android:id="@+id/loginButton"
             android:layout_width="match_parent"
+            android:layout_gravity="center"
             android:layout_height="60dp"
             android:layout_marginTop="30dp"
             android:backgroundTint="@color/green"
             android:text="Submit"
             android:textSize="18sp"
             app:cornerRadius="20dp" />
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.cardview.widget.CardView>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.3.0"
+agp = "8.3.1"
 junit = "4.13.2"
 junitVersion = "1.1.5"
 espressoCore = "3.5.1"