UI updates and bugfixes

SCCapstone · Apr 3, 2023 · b643c99 · b643c99
1 parent 2534bda
commit b643c99
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 25 deletions.
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter2.kt b/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter2.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/1/23, 10:04 PM
+ *  Created by Team Symphony on 4/2/23, 8:15 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/1/23, 10:04 PM
+ *  Last modified 4/2/23, 8:04 PM
  */
 
 package com.symphony.mrfit.data.exercise
@@ -38,10 +38,7 @@ class WorkoutAdapter2 (val context: Context, val data: ArrayList<Workout>): Recy
     override fun onBindViewHolder(holder: ViewHolder, i: Int) {
 
         holder.workoutTitle.text = data[i].workoutName
-        holder.workoutReps.text =
-            "${data[i].numberOfSets} Sets of " +
-                    "${data[i].numberOfReps} Reps for " +
-                    "${data[i].duration} Minutes"
+        holder.workoutReps.text = buildString(i)
         Glide.with(context)
             .load(
                 storage.reference
@@ -75,4 +72,40 @@ class WorkoutAdapter2 (val context: Context, val data: ArrayList<Workout>): Recy
             checkbox = workoutView.findViewById(R.id.checkBox6)
         }
     }
+
+    private fun buildString(i: Int): String {
+        var myString = ""
+        val reps = data[i].numberOfReps
+        val sets = data[i].numberOfSets
+        val distance = data[i].distance
+        val duration = data[i].duration
+
+        if (sets != null) {
+            myString += if (sets == 1) {
+                "$sets set "
+            } else {
+                "$sets sets "
+            }
+        }
+        if (reps != null && sets != null) {
+            myString += "of "
+        }
+        if (reps != null) {
+            myString += if (reps == 1) {
+                "$reps rep "
+            } else {
+                "$reps reps "
+            }
+        }
+        if (myString != "" && (duration != null || distance != null)) {
+            myString += "for "
+        }
+        if (duration != null) {
+            myString += "$duration "
+        }
+        if (distance != null) {
+            myString += "$distance "
+        }
+        return myString
+    }
 }
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/1/23, 4:23 AM
+  ~  Created by Team Symphony on 4/2/23, 8:15 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/1/23, 4:23 AM
+  ~  Last modified 4/2/23, 8:11 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -40,7 +40,7 @@
                     android:id="@+id/homeProfilePicture"
                     android:layout_width="120dp"
                     android:layout_height="120dp"
-                    android:layout_margin="3dp"
+                    android:layout_margin="6dp"
                     android:layout_weight="0"
                     android:contentDescription="@string/profile_picture"
                     app:srcCompat="@drawable/cactuar" />

diff --git a/app/src/main/res/layout/activity_post_workout.xml b/app/src/main/res/layout/activity_post_workout.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/2/23, 12:52 AM
+  ~  Created by Team Symphony on 4/2/23, 8:15 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 12:11 AM
+  ~  Last modified 4/2/23, 8:15 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -30,7 +30,7 @@
             android:layout_marginBottom="10dp"
             android:contentDescription="@string/app_name"
             android:padding="5dp"
-            android:src="@drawable/cactuar" />
+            android:src="@drawable/mip_logo" />
 
         <TextView
             android:id="@+id/postWorkoutTitle"
@@ -67,14 +67,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
-                android:text="Update my\ngoals" />
+                android:text="@string/button_update_goals" />
 
             <Button
                 android:id="@+id/returnHomeButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
-                android:text="Return\nHome" />
+                android:text="@string/button_return_home" />
         </LinearLayout>
     </LinearLayout>
 

diff --git a/app/src/main/res/layout/activity_user_profile.xml b/app/src/main/res/layout/activity_user_profile.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/2/23, 2:50 PM
+  ~  Created by Team Symphony on 4/2/23, 8:15 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 2:10 PM
+  ~  Last modified 4/2/23, 8:10 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -26,14 +26,15 @@
                 android:id="@+id/linearLayout3"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@drawable/dropshadow_background"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
                 <ImageView
                     android:id="@+id/profilePicture"
                     android:layout_width="120dp"
                     android:layout_height="120dp"
-                    android:layout_margin="3dp"
+                    android:layout_margin="6dp"
                     android:contentDescription="@string/profile_picture"
                     app:srcCompat="@drawable/cactuar"
                     tools:ignore="ImageContrastCheck" />
@@ -74,7 +75,7 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="5dp"
                         android:layout_weight="1"
-                        android:background="#EEEEEE"
+                        android:background="@drawable/dropshadow_background"
                         android:gravity="center"
                         android:orientation="vertical"
                         android:padding="5dp">
@@ -99,7 +100,7 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="5dp"
                         android:layout_weight="1"
-                        android:background="#EEEEEE"
+                        android:background="@drawable/dropshadow_background"
                         android:gravity="center"
                         android:orientation="vertical"
                         android:padding="5dp">
@@ -124,7 +125,7 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="5dp"
                         android:layout_weight="1"
-                        android:background="#EEEEEE"
+                        android:background="@drawable/dropshadow_background"
                         android:gravity="center"
                         android:orientation="vertical"
                         android:padding="5dp">
@@ -145,13 +146,14 @@
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/stuffLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginLeft="5dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginRight="5dp"
                     android:layout_marginBottom="10dp"
-                    android:background="#EEEEEE"
+                    android:background="@drawable/dropshadow_background"
                     android:orientation="vertical"
                     android:padding="5dp">
 
@@ -188,12 +190,14 @@
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/settingLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginLeft="5dp"
                     android:layout_marginRight="5dp"
-                    android:background="#EEEEEE"
-                    android:orientation="vertical">
+                    android:background="@drawable/dropshadow_background"
+                    android:orientation="vertical"
+                    android:padding="5dp">
 
                     <TextView
                         android:id="@+id/settingsLabelTextView"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <!--
-  ~  Created by Team Symphony on 4/2/23, 2:50 PM
+  ~  Created by Team Symphony on 4/2/23, 8:15 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 12:42 PM
+  ~  Last modified 4/2/23, 8:15 PM
   -->
 
 <resources>
@@ -142,4 +142,6 @@
     <string name="hello_first_fragment">Hello first fragment</string>
     <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
     <string name="exercises_title">Your Exercises</string>
+    <string name="button_update_goals">Update my\ngoals</string>
+    <string name="button_return_home">Return\nHome</string>
 </resources>