Style : Update UI Background

medhabalani · Mar 13, 2021 · fd13b8b · fd13b8b
1 parent 9ed0178
commit fd13b8b
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 21 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -35,5 +35,4 @@
             </intent-filter>
         </activity>
     </application>
-
 </manifest>
diff --git a/app/src/main/res/layout/activity_angry.xml b/app/src/main/res/layout/activity_angry.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#c6a9a3"
+    android:background="@drawable/appbackground"
     tools:context=".MainActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout

diff --git a/app/src/main/res/layout/activity_bored.xml b/app/src/main/res/layout/activity_bored.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#c6a9a3"
+    android:background="@drawable/appbackground"
     tools:context=".sadcrysuggestions">
 
     <androidx.constraintlayout.widget.ConstraintLayout

diff --git a/app/src/main/res/layout/activity_connect.xml b/app/src/main/res/layout/activity_connect.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#9CC4D6"
+    android:background="@drawable/appbackground"
     tools:context=".Connect">
 
 
@@ -45,9 +45,12 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.072" />
 
+
+
     <Button
         android:id="@+id/meditatebtn"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_margin="50dp"
         android:layout_height="wrap_content"
         android:text="@string/talk_to_a_friend"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -58,7 +61,8 @@
 
     <Button
         android:id="@+id/button3"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_margin="50dp"
         android:layout_height="wrap_content"
         android:text="@string/contact_a_psychologist"
         app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/layout/activity_dashboard.xml b/app/src/main/res/layout/activity_dashboard.xml
@@ -96,7 +96,7 @@
                         android:layout_height="75dp"
                         android:layout_centerHorizontal="true"
                         android:layout_marginTop="15dp"
-                        android:src="@drawable/emojis"
+                        android:src="@drawable/normal"
                         android:contentDescription="@string/mood_check" />
                 </RelativeLayout>
             </androidx.cardview.widget.CardView>
@@ -120,7 +120,7 @@
                         android:layout_height="75dp"
                         android:layout_centerHorizontal="true"
                         android:layout_marginTop="15dp"
-                        android:src="@drawable/pulse"
+                        android:src="@drawable/quote2"
                         android:contentDescription="@string/quote_vibe" />
 
                     <TextView
@@ -184,7 +184,7 @@
                         android:layout_height="75dp"
                         android:layout_centerHorizontal="true"
                         android:layout_marginTop="15dp"
-                        android:src="@drawable/plus3"
+                        android:src="@drawable/advice"
                         android:contentDescription="@string/add_contacts" />
                 </RelativeLayout>
             </androidx.cardview.widget.CardView>
@@ -208,7 +208,7 @@
                         android:layout_height="75dp"
                         android:layout_centerHorizontal="true"
                         android:layout_marginTop="15dp"
-                        android:src="@drawable/book2"
+                        android:src="@drawable/diary"
                         android:contentDescription="@string/mood_records" />
 
                     <TextView
@@ -271,7 +271,7 @@
                         android:layout_height="75dp"
                         android:layout_centerHorizontal="true"
                         android:layout_marginTop="15dp"
-                        android:src="@drawable/images1"
+                        android:src="@drawable/calm"
                         android:contentDescription="@string/check_others" />
                 </RelativeLayout>
             </androidx.cardview.widget.CardView>

diff --git a/app/src/main/res/layout/activity_login_register.xml b/app/src/main/res/layout/activity_login_register.xml
@@ -32,7 +32,7 @@
                 android:layout_height="80dp"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="128dp"
-                tools:srcCompat="@tools:sample/avatars" />
+                android:src="@drawable/user" />
 
 
 
@@ -41,7 +41,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:text="TEXT1"
+                android:text="WELCOME TO PEACIFY"
                 android:textAlignment="center"
                 android:textSize="14sp"
                 android:gravity="center_horizontal" />

diff --git a/app/src/main/res/layout/activity_moodrecords.xml b/app/src/main/res/layout/activity_moodrecords.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/ctr_bg"
+    android:background="@drawable/appbackground"
     tools:context=".moodrecords">
 
     <androidx.recyclerview.widget.RecyclerView

diff --git a/app/src/main/res/layout/activity_moodtracer.xml b/app/src/main/res/layout/activity_moodtracer.xml
@@ -30,8 +30,8 @@
 
         <Button
             android:id="@+id/buttonx"
-            android:layout_width="99dp"
-            android:layout_height="42dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:text="@string/logout"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -515,6 +515,7 @@
             </androidx.cardview.widget.CardView>
         </LinearLayout>
 
+
         <com.lb.auto_fit_textview.AutoResizeTextView
             android:id="@+id/description"
             android:cursorVisible="true"

diff --git a/app/src/main/res/layout/activity_sadcrysuggestions.xml b/app/src/main/res/layout/activity_sadcrysuggestions.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#c6a9a3"
+    android:background="@drawable/appbackground"
     tools:context=".sadcrysuggestions">
 
     <androidx.constraintlayout.widget.ConstraintLayout

diff --git a/app/src/main/res/layout/activity_sick.xml b/app/src/main/res/layout/activity_sick.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#c6a9a3"
+    android:background="@drawable/appbackground"
     tools:context=".MainActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
 <resources>
 
-
     <string name="app_name">PEACIFY</string>
     <string name="create_new_account">Create new account</string>
     <string name="full_name">Full Name</string>
@@ -34,17 +33,18 @@
     <string name="sick">sick</string>
     <string name="select_your_mood_from_emogis_and_describe_it_below">Select your mood from emojis and describe it below</string>
     <string name="save">save</string>
-    <string name="describe_your_mood">Describe your mood!</string>
+    <string name="describe_your_mood">How do you feel ?</string>
     <string name="talk_to_a_friend">Talk to a friend</string>
     <string name="contact_a_psychologist">Contact a psychologist</string>
     <string name="if_you_need_assistance_the_choose_among_the_following_options">If you need assistance then choose among the following options</string>
     <string name="logout">LOGOUT</string>
     <string name="peace">peace</string>
     <string name="connect">Connect</string>
-    <string name="mood_records">Mood Records</string>
+    <string name="mood_records">Journal</string>
     <string name="login">Login</string>
     <string name="register">Register</string>
     <string name="title_activity_meditate">meditate</string>
+
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label">First Fragment</string>
     <string name="second_fragment_label">Second Fragment</string>
@@ -56,4 +56,5 @@
     <string name="breathe_and_let_go">Breathe and let go !!</string>
     <string name="xyz">xyz</string>
     <string name="date_and_time">Date and Time :</string>
+
 </resources>