add User guidance message

kohseongyeon · Mar 17, 2021 · 5a0ef30 · 5a0ef30
1 parent 7085fb5
commit 5a0ef30
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 8 deletions.
diff --git a/AmongEarth/.idea/gradle.xml b/AmongEarth/.idea/gradle.xml
diff --git a/AmongEarth/app/src/main/java/com/example/amongearth/mypage/MyRecordActivity.java b/AmongEarth/app/src/main/java/com/example/amongearth/mypage/MyRecordActivity.java
@@ -137,7 +137,7 @@ public View getView(int i, View view, ViewGroup viewGroup) {
             ImageView imageView = new ImageView(context);
             imageView.setLayoutParams(new GridView.LayoutParams(300, 300));
             imageView.setScaleType(ImageView.ScaleType.FIT_XY);
-            imageView.setPadding(5,30,5,30);
+            imageView.setPadding(5,25,5,25);
 
             String img_uri = arrayList.get(i).getUpload_file();
             Log.d("img_uri1", img_uri+"");
@@ -184,10 +184,10 @@ public void onClick(View view) {
                     mDatabase.child("user").child(userId).child("profile").addListenerForSingleValueEvent(new ValueEventListener() {
                         @Override
                         public void onDataChange(@NonNull DataSnapshot snapshot) {
-                            Object profile_num = snapshot.getValue();
+                            Object profile_num = snapshot.getValue().toString();
                             Log.d("profile_num", profile_num.toString());
-                            if (profile_num.equals(1)) userProfile.setImageResource(R.drawable.person1);
-                            else if (profile_num.equals(2)) userProfile.setImageResource(R.drawable.person2);
+                            if (profile_num.equals("1")) userProfile.setImageResource(R.drawable.person1);
+                            else if (profile_num.equals("2")) userProfile.setImageResource(R.drawable.person2);
                             else userProfile.setImageResource(R.drawable.person3);
                         }
 

diff --git a/AmongEarth/app/src/main/res/drawable/close.png b/AmongEarth/app/src/main/res/drawable/close.png
diff --git a/AmongEarth/app/src/main/res/layout/activity_myrecord.xml b/AmongEarth/app/src/main/res/layout/activity_myrecord.xml
@@ -23,17 +23,33 @@
 
     </androidx.appcompat.widget.Toolbar>
 
+    <TextView
+        android:id="@+id/guide_text1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Shows all waste records you've recorded."
+        android:layout_marginTop="15dp"
+        android:textSize="17sp"
+        android:textColor="@color/mediumGray"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/gridView"
+        />
+
     <GridView
         android:id="@+id/gridView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:gravity="center"
         android:numColumns="3"
+        android:verticalSpacing="1dp"
+        android:horizontalSpacing="1dp"
+        app:layout_constraintTop_toBottomOf="@id/guide_text1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.9"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="1.0">
 
     </GridView>

diff --git a/AmongEarth/app/src/main/res/layout/community_zerowaste_main.xml b/AmongEarth/app/src/main/res/layout/community_zerowaste_main.xml
@@ -27,12 +27,23 @@
             android:layout_gravity="center"/>
 
     </androidx.appcompat.widget.Toolbar>
+
+    <TextView
+        android:id="@+id/guide_text2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Shows all records that participated in the challenge."
+        android:layout_marginTop="60dp"
+        android:textSize="17sp"
+        android:textColor="@color/mediumGray"
+        android:layout_centerHorizontal="true"/>
+
     <ListView
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="7dp"
         android:id="@+id/zero_waste_list"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/guide_text2"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:divider="@android:color/transparent"

diff --git a/AmongEarth/app/src/main/res/layout/dialog.xml b/AmongEarth/app/src/main/res/layout/dialog.xml
@@ -18,7 +18,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.03"
-        app:srcCompat="@drawable/close_white" />
+        app:srcCompat="@drawable/close" />
 
     <ImageButton
         android:id="@+id/btnDelete"