Button text UI Fix

easyhooon · Jun 20, 2021 · 83f8bea · 83f8bea
1 parent d296e10
commit 83f8bea
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 58 deletions.
diff --git a/app/src/main/java/kr/ac/konkuk/koogle/Fragment/CommunityFragment.kt b/app/src/main/java/kr/ac/konkuk/koogle/Fragment/CommunityFragment.kt
@@ -54,7 +54,7 @@ class CommunityFragment : Fragment(R.layout.fragment_community) {
  val articleModel = snapshot.getValue(ArticleModel::class.java)
  articleModel ?: return
 
- articleList.add(articleModel)
+ articleList.add(0, articleModel) //최신글이 위로 올라오도록
  communityAdapter.submitList(articleList)
  communityAdapter.notifyDataSetChanged()
  }

diff --git a/app/src/main/java/kr/ac/konkuk/koogle/Fragment/GroupFragment.kt b/app/src/main/java/kr/ac/konkuk/koogle/Fragment/GroupFragment.kt
@@ -70,7 +70,7 @@ class GroupFragment : Fragment(R.layout.fragment_group) {
  for (groupId in userGroupList) {
  if (groupId == groupModel.groupId) {
  Log.i("GroupFragment", "유저가 속한 그룹의 아이디 : ${groupModel.groupId}")
- groupList.add(groupModel)
+ groupList.add(0, groupModel) //최신 그룹이 위로 올라오도록
  }
  }
 // if (userGroupList.contains(groupModel.groupId)){

diff --git a/app/src/main/res/layout/activity_account_info.xml b/app/src/main/res/layout/activity_account_info.xml
@@ -120,6 +120,7 @@
  android:background="#78D2BE"
  android:ems="8"
  android:text="@string/logout"
+ android:fontFamily="@font/font"
  android:textAllCaps="false"
  android:textColor="#FFFFFF"
  app:layout_constraintEnd_toStartOf="@+id/btn_deleteAccount"
@@ -129,6 +130,7 @@
  <Button
  android:id="@+id/btn_deleteAccount"
  android:layout_width="wrap_content"
+ android:fontFamily="@font/font"
  android:layout_height="wrap_content"
  android:layout_marginTop="32dp"
  android:background="#AFABAB"

diff --git a/app/src/main/res/layout/activity_add_article.xml b/app/src/main/res/layout/activity_add_article.xml
@@ -49,6 +49,7 @@
  android:layout_height="wrap_content"
  android:layout_gravity="end|center"
  android:layout_marginEnd="15dp"
+ android:fontFamily="@font/font"
  android:text="완료" />
 
  </LinearLayout>

diff --git a/app/src/main/res/layout/activity_add_comment.xml b/app/src/main/res/layout/activity_add_comment.xml
@@ -43,6 +43,7 @@
  android:layout_height="wrap_content"
  android:layout_gravity="end|center"
  android:layout_marginEnd="15dp"
+ android:fontFamily="@font/font"
  android:text="완료" />
 
  </LinearLayout>

diff --git a/app/src/main/res/layout/activity_article.xml b/app/src/main/res/layout/activity_article.xml
@@ -169,7 +169,8 @@
  android:layout_weight="2"
  android:layout_gravity="center"
  android:layout_margin="6dp"
- android:text="지도로 보기"/>
+ android:fontFamily="@font/font"
+ android:text="지도 보기"/>
 
  </LinearLayout>
 
@@ -207,6 +208,7 @@
  android:ems="10"
  android:layout_weight="1.2"
  android:layout_margin="10dp"
+ android:fontFamily="@font/font"
  android:text="@string/contact" />
 
  </LinearLayout>

diff --git a/app/src/main/res/layout/activity_check_profile.xml b/app/src/main/res/layout/activity_check_profile.xml
@@ -119,6 +119,7 @@
  android:layout_width="wrap_content"
  android:ems="10"
  android:layout_height="wrap_content"
+ android:fontFamily="@font/font"
  android:text="확인"
  android:layout_marginBottom="8dp"
  app:layout_constraintEnd_toEndOf="parent"/>

diff --git a/app/src/main/res/layout/activity_edit_article.xml b/app/src/main/res/layout/activity_edit_article.xml
@@ -45,6 +45,7 @@
 
  <Button
  android:id="@+id/submitButton"
+ android:fontFamily="@font/font"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:layout_gravity="end|center"

diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml
@@ -104,7 +104,7 @@
  android:ems="8"
  android:layout_height="wrap_content"
  android:layout_marginHorizontal="36dp"
-
+ android:fontFamily="@font/font"
  android:text="이름 변경"/>
 
  <Button
@@ -122,6 +122,7 @@
  android:ems="8"
  android:layout_height="wrap_content"
  android:layout_marginHorizontal="36dp"
+ android:fontFamily="@font/font"
  android:text="프로필 변경"/>
  </LinearLayout>
 
@@ -134,6 +135,7 @@
  android:layout_width="0dp"
  android:layout_marginHorizontal="36dp"
  android:layout_height="wrap_content"
+ android:fontFamily="@font/font"
  android:text="@string/cancel"
  android:layout_marginBottom="8dp"
  app:layout_constraintEnd_toStartOf="@id/profileEditButton"/>
@@ -142,6 +144,7 @@
  android:id="@+id/profileEditButton"
  android:layout_width="0dp"
  android:layout_height="wrap_content"
+ android:fontFamily="@font/font"
  android:text="@string/check"
  android:layout_marginHorizontal="36dp"
  app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/layout/activity_location_search.xml b/app/src/main/res/layout/activity_location_search.xml
@@ -22,6 +22,7 @@
  android:layout_marginTop="12dp"
  android:id="@+id/searchButton"
  android:layout_marginEnd="12dp"
+ android:fontFamily="@font/font"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/activity_log_in.xml b/app/src/main/res/layout/activity_log_in.xml
@@ -84,6 +84,7 @@
 
  <Button
  android:id="@+id/signUpButton"
+ android:fontFamily="@font/font"
  android:layout_width="0dp"
  android:layout_height="match_parent"
  android:layout_weight="1"
@@ -96,6 +97,7 @@
  android:layout_height="match_parent"
  android:layout_weight="1"
  android:layout_marginStart="8dp"
+ android:fontFamily="@font/font"
  android:layout_marginEnd="14dp"
  android:text="@string/log_in"
  android:textStyle="bold" />

diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
@@ -25,6 +25,7 @@
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintBottom_toBottomOf="parent"
  android:layout_marginBottom="12dp"
+ android:fontFamily="@font/font"
  android:text="취소"
  app:layout_constraintStart_toEndOf="@id/checkButton"/>
 
@@ -36,6 +37,7 @@
  app:layout_constraintBottom_toBottomOf="parent"
  app:layout_constraintEnd_toStartOf="@id/cancelButton"
  android:layout_marginBottom="12dp"
+ android:fontFamily="@font/font"
  android:text="확인"
  app:layout_constraintStart_toStartOf="parent" />
 

diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
@@ -92,6 +92,7 @@
  android:layout_width="0dp"
  android:layout_marginHorizontal="12dp"
  android:layout_height="wrap_content"
+ android:fontFamily="@font/font"
  android:text="계정 정보"
  android:layout_marginBottom="8dp"
  app:layout_constraintEnd_toStartOf="@id/profileEditButton"/>
@@ -100,6 +101,7 @@
  android:id="@+id/profileEditButton"
  android:layout_width="0dp"
  android:layout_height="wrap_content"
+ android:fontFamily="@font/font"
  android:text="프로필 수정"
  android:layout_marginHorizontal="12dp"
  app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
@@ -11,6 +11,7 @@
  android:layout_marginEnd="24dp"
  android:text="@string/sign_up"
  app:layout_constraintEnd_toEndOf="parent"
+ android:fontFamily="@font/font"
  app:layout_constraintTop_toBottomOf="@id/passwordEditTextLayout" />
 
  <com.google.android.material.textfield.TextInputLayout
@@ -27,6 +28,7 @@
  android:id="@+id/emailEditText"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
+ android:fontFamily="@font/font"
  android:hint="@string/email" />
  </com.google.android.material.textfield.TextInputLayout>
 
@@ -47,6 +49,7 @@
  android:id="@+id/passwordEditText"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
+ android:fontFamily="@font/font"
  android:hint="@string/password"
  android:inputType="textPassword" />
  </com.google.android.material.textfield.TextInputLayout>
@@ -65,6 +68,7 @@
  android:id="@+id/nameEditText"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
+ android:fontFamily="@font/font"
  android:hint="Name" />
  </com.google.android.material.textfield.TextInputLayout>
 

diff --git a/app/src/main/res/layout/fragment_card.xml b/app/src/main/res/layout/fragment_card.xml
@@ -10,7 +10,7 @@
  android:layout_height="wrap_content"
  android:text="모든 글을 열람하셨습니다."
  android:textSize="20sp"
- android:textColor="@color/black"
+ android:textColor="@color/white"
  app:layout_constraintBottom_toBottomOf="parent"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml
@@ -169,6 +169,7 @@
  <de.hdodenhof.circleimageview.CircleImageView
  android:id="@+id/cancelImageView"
  android:layout_width="0dp"
+ android:backgroundTint="@color/black"
  android:layout_height="match_parent"
  android:layout_weight="1"
  android:layout_gravity="center"
@@ -179,6 +180,7 @@
  android:id="@+id/checkImageView"
  android:layout_width="0dp"
  android:layout_height="match_parent"
+ android:backgroundTint="@color/black"
  android:layout_weight="1"
  android:layout_gravity="center"
  android:padding="10dp"

diff --git a/app/src/main/res/layout/option_dialog.xml b/app/src/main/res/layout/option_dialog.xml