refactor: 버튼 디자인 일관성 있도록 변경 (#417)

* refactor: 버튼 drawable 추가 * refactor: 버튼 background 변경 * refactor: 버튼 background 변경 * refactor: 버튼 background 변경 * refactor: 버튼 background 변경 * refactor: 게임 시작 뷰 디자인 변경 (#408) * chore: 전체 gitignore 지정 * feat: 버튼 이미지 추가 * feat: BeginActivity에서 자주 쓰이는 Text style 생성 * feat: BeginActivity 뷰 구현 중 * feat: button drawable을 png에서 vector asset으로 변경 및 네이밍 변경 * feat: BeginAdventureActivity 뷰 레이아웃 변경 - setting 버튼 추가 - 빌딩 이미지 화면 사이즈에 맞춤 - 기타 마진 및 패딩 변경 * feat: BeginAdventureActivity 변경된 뷰에 따라 클릭리스너 연결 코드 변경 * feat: 다이얼로그 버튼 배경 변경 * feat: 임시로 설정해놓은 visibility 원상복구 * feat: 사용하지 않는 resource 삭제 * feat: bg_yellow_button drawable 변경 * feat: 사용하지 않는 파일 삭제 * feat: 버튼 백그라운드 적용 * feat: 버튼 백그라운드 적용 * feat: 업로드 화면에서 뒤로가기 기능 구현 (#413) * feat: 게임 입장 시 사진이 먼저 뜨는 기능 구현 (#407) * refactor: 불필요한 속성 제거 * refactor: 불필요한 속성 제거 * refactor: guideline 추가해 뷰 배치 --------- Co-authored-by: k_dragonm <[email protected]> Co-authored-by: krrong <[email protected]>
woowacourse-teams · Oct 5, 2023 · afddfa8 · afddfa8
1 parent 270f61f
commit afddfa8
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/android/app/src/main/java/com/now/naaga/presentation/mypage/MyPageActivity.kt b/android/app/src/main/java/com/now/naaga/presentation/mypage/MyPageActivity.kt
@@ -42,7 +42,7 @@ class MyPageActivity : AppCompatActivity(), AnalyticsDelegate by DefaultAnalytic
         binding.ivMypageBack.setOnClickListener {
             finish()
         }
-        binding.btnMypageAdventureResults.setOnClickListener {
+        binding.btnMypageAdventureHistory.setOnClickListener {
             logClickEvent(getViewEntryName(it), MYPAGE_GO_RESULTS)
             val intent = AdventureHistoryActivity.getIntent(this)
             startActivity(intent)

diff --git a/android/app/src/main/res/layout/activity_adventure_history.xml b/android/app/src/main/res/layout/activity_adventure_history.xml
@@ -26,7 +26,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/history_title"
-            android:textColor="@color/white"
             android:textSize="30sp"
             app:layout_constraintBottom_toBottomOf="@+id/iv_adventureHistory_back"
             app:layout_constraintStart_toEndOf="@id/iv_adventureHistory_back"

diff --git a/android/app/src/main/res/layout/activity_adventure_result.xml b/android/app/src/main/res/layout/activity_adventure_result.xml
@@ -33,7 +33,6 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="44dp"
             android:text="@string/adventureResult_destination_description"
-            android:textColor="@color/white"
             android:textSize="32sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -44,7 +43,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:textColor="@color/white"
             android:textSize="30sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -231,7 +229,6 @@
             android:background="@drawable/bg_yellow_button"
             android:paddingVertical="@dimen/space_default_medium"
             android:text="@string/adventureResult_return_main"
-            android:textColor="@color/white"
             android:textSize="20sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

diff --git a/android/app/src/main/res/layout/activity_my_page.xml b/android/app/src/main/res/layout/activity_my_page.xml
@@ -44,27 +44,23 @@
                 android:textColor="@color/white"
                 android:textSize="52sp"
                 app:layout_constraintBottom_toTopOf="@id/rv_mypage_statistics"
-                app:layout_constraintEnd_toStartOf="@id/btn_mypage_adventure_results"
+                app:layout_constraintEnd_toEndOf="@id/g_mypage"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/iv_mypage_back"
                 tools:text="krrrrrrrrrrrrrrrrrong" />
 
             <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/btn_mypage_adventure_results"
-                android:layout_width="wrap_content"
+                android:id="@+id/btn_mypage_adventure_history"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="20dp"
-                android:background="@drawable/rect_radius_small"
-                android:backgroundTint="@color/main_yellow"
-                android:minWidth="0dp"
-                android:minHeight="0dp"
-                android:paddingHorizontal="@dimen/space_default_large"
+                android:background="@drawable/bg_yellow_button"
                 android:paddingVertical="16dp"
                 android:text="@string/mypage_adventure_record"
-                android:textColor="@color/white"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="@id/tv_mypage_nickname"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="@id/g_mypage"
                 app:layout_constraintTop_toTopOf="@id/tv_mypage_nickname" />
 
             <androidx.recyclerview.widget.RecyclerView
@@ -92,6 +88,18 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/rv_mypage_statistics" />
 
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/g_mypage"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="245dp"
+                android:layout_marginEnd="166dp"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintGuide_begin="245dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 </layout>
diff --git a/android/app/src/main/res/layout/activity_upload.xml b/android/app/src/main/res/layout/activity_upload.xml
@@ -127,8 +127,9 @@
             android:layout_marginTop="@dimen/space_default_large"
             android:layout_marginBottom="@dimen/space_default_large"
             android:background="@drawable/bg_yellow_button"
+            android:paddingVertical="@dimen/space_default_medium"
             android:text="@string/upload_submit"
-            android:textSize="28sp"
+            android:textSize="24sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />

diff --git a/android/app/src/main/res/layout/dialog_camera_permission.xml b/android/app/src/main/res/layout/dialog_camera_permission.xml
@@ -41,11 +41,8 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="40dp"
             android:layout_marginBottom="28dp"
-            android:background="@drawable/rect_radius_small"
-            android:backgroundTint="@color/main_purple"
-            android:fontFamily="@font/pretendard_bold"
+            android:background="@drawable/bg_yellow_button"
             android:text="@string/locationDialog_setting"
-            android:textColor="@color/white"
             android:textSize="16sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"