03.13 challenge45 delete

kohseongyeon · Mar 13, 2021 · c682d22 · c682d22
2 parents 89a996e + 0a1d510
commit c682d22
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 2 deletions.
diff --git a/AmongEarth/app/src/main/java/com/example/amongearth/MainActivity.java b/AmongEarth/app/src/main/java/com/example/amongearth/MainActivity.java
@@ -214,9 +214,9 @@ public void onDataChange(@NonNull DataSnapshot snapshot) {
                             badge4 = (ImageView) navHeader.findViewById(R.id.badge4);
                             badge4.setImageResource(R.drawable.challenge30);
                         }
-                        if(dataSnapshot.getKey().equals("Challenge45")){
+                        if(dataSnapshot.getKey().equals("Challenge60")){
                             badge5 = (ImageView) navHeader.findViewById(R.id.badge5);
-                            badge5.setImageResource(R.drawable.challenge45);
+                            badge5.setImageResource(R.drawable.challenge60);
                         }
                     }
                 }

diff --git a/AmongEarth/app/src/main/res/drawable-v24/challenge45.png b/AmongEarth/app/src/main/res/drawable-v24/challenge45.png
diff --git a/.../src/main/res/drawable-v24/activeuser.png → .../app/src/main/res/drawable/activeuser.png b/.../src/main/res/drawable-v24/activeuser.png → .../app/src/main/res/drawable/activeuser.png
diff --git a/...app/src/main/res/drawable-v24/barmenu.png → ...rth/app/src/main/res/drawable/barmenu.png b/...app/src/main/res/drawable-v24/barmenu.png → ...rth/app/src/main/res/drawable/barmenu.png
diff --git a/...src/main/res/drawable-v24/challenge15.png → ...app/src/main/res/drawable/challenge15.png b/...src/main/res/drawable-v24/challenge15.png → ...app/src/main/res/drawable/challenge15.png
diff --git a/...src/main/res/drawable-v24/challenge30.png → ...app/src/main/res/drawable/challenge30.png b/...src/main/res/drawable-v24/challenge30.png → ...app/src/main/res/drawable/challenge30.png
diff --git a/...src/main/res/drawable-v24/challenge60.png → ...app/src/main/res/drawable/challenge60.png b/...src/main/res/drawable-v24/challenge60.png → ...app/src/main/res/drawable/challenge60.png
diff --git a/...src/main/res/drawable-v24/challenge90.png → ...app/src/main/res/drawable/challenge90.png b/...src/main/res/drawable-v24/challenge90.png → ...app/src/main/res/drawable/challenge90.png
diff --git a/.../src/main/res/drawable-v24/first_join.png → .../app/src/main/res/drawable/first_join.png b/.../src/main/res/drawable-v24/first_join.png → .../app/src/main/res/drawable/first_join.png
diff --git a/.../main/res/drawable-v24/startchallenge.png → .../src/main/res/drawable/startchallenge.png b/.../main/res/drawable-v24/startchallenge.png → .../src/main/res/drawable/startchallenge.png
diff --git a/AmongEarth/app/src/main/res/layout/main_navheader.xml b/AmongEarth/app/src/main/res/layout/main_navheader.xml
@@ -109,12 +109,15 @@
         <ImageView
             android:id="@+id/badge4"
             android:layout_width="60dp"
+            android:layout_margin="8dp"
             android:layout_height="60dp"
             android:layout_weight="1"/>
 
         <ImageView
             android:id="@+id/badge5"
             android:layout_width="60dp"
+            android:layout_margin="8dp"
+
             android:layout_height="60dp"
             android:layout_weight="1"/>
     </LinearLayout>