03.13 fix MyBadgeActivity

kohseongyeon · Mar 13, 2021 · 3122827 · 3122827
1 parent 00f7dc8
commit 3122827
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/AmongEarth/.idea/gradle.xml b/AmongEarth/.idea/gradle.xml
diff --git a/AmongEarth/.idea/misc.xml b/AmongEarth/.idea/misc.xml
diff --git a/AmongEarth/app/src/main/java/com/example/amongearth/mypage/MyBadgeActivity.java b/AmongEarth/app/src/main/java/com/example/amongearth/mypage/MyBadgeActivity.java
@@ -77,7 +77,7 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                     arrayList.clear(); // 기존 배열리스트 초기화
                     long numChildren = dataSnapshot.getChildrenCount();
                     gotBadge = (TextView) findViewById(R.id.BadgeNumber);
-                    gotBadge.setText("You've received " + numChildren + " badges");
+                    gotBadge.setText("You've received " + numChildren + "badges");
 
                     for (DataSnapshot snapshot : dataSnapshot.getChildren()) {
                         //databaseReference.orderBy("getDate");
@@ -105,7 +105,7 @@ public void onDataChange(@NonNull DataSnapshot snapshot) {
                         if (dataSnapshot.getKey().equals("nickname")) {
                             String nickname = dataSnapshot.getValue().toString();
                             nickName = (TextView) findViewById(R.id.NickName);
-                            nickName.setText(nickname);
+                            nickName.setText(nickname+",");
                         }
                         if (dataSnapshot.getKey().equals("profile")) {
                         String num = dataSnapshot.getValue().toString();

diff --git a/AmongEarth/app/src/main/res/layout/activity_mybadge.xml b/AmongEarth/app/src/main/res/layout/activity_mybadge.xml
@@ -60,17 +60,17 @@
                 android:fontFamily="@font/rixyeoljungdo"
                 android:text="JIAH,"
                 android:textColor="#000000"
-                android:textSize="18sp" />
+                android:textSize="16sp" />
 
             <TextView
                 android:id="@+id/BadgeNumber"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
+                android:layout_marginLeft="20dp"
                 android:fontFamily="@font/rixyeoljungdo"
                 android:text="you got 1 badges"
                 android:textColor="#000000"
-                android:textSize="16sp" />
+                android:textSize="14sp" />
 
         </LinearLayout>
     </LinearLayout>