[CHORE] #104 : UI 다듬기

Team-HealthC · Nov 18, 2023 · a4b5e20 · a4b5e20
1 parent 70b17b3
commit a4b5e20
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 45 deletions.
diff --git a/client/app/src/main/res/layout/fragment_camera.xml b/client/app/src/main/res/layout/fragment_camera.xml
@@ -3,7 +3,7 @@
  xmlns:android="http:https://schemas.android.com/apk/res/android"
  xmlns:app="http:https://schemas.android.com/apk/res-auto"
  xmlns:tools="http:https://schemas.android.com/tools"
- tools:context=".presentation.home.camera.CameraFragment">
+ tools:context=".presentation.camera.CameraFragment">
 
  <androidx.constraintlayout.widget.ConstraintLayout
  android:layout_width="match_parent"
@@ -22,43 +22,21 @@
  <androidx.constraintlayout.widget.ConstraintLayout
  android:layout_width="match_parent"
  android:layout_height="match_parent"
- android:paddingHorizontal="32dp"
- android:paddingVertical="8dp">
+ android:padding="16dp">
 
- <androidx.appcompat.widget.AppCompatImageButton
- android:id="@+id/goToProfileButton"
+ <Button
+ android:id="@+id/bt_camera_cancel"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:src="@drawable/ic_baseline_person"
- app:backgroundTint="@android:color/transparent"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:tint="@color/white" />
-
- <androidx.appcompat.widget.AppCompatImageButton
- android:id="@+id/goToSearchButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_baseline_search_24"
+ android:text="@string/cancel"
+ android:fontFamily="@font/sc_dream_nor"
+ android:textSize="16sp"
  app:backgroundTint="@android:color/transparent"
  app:layout_constraintBottom_toBottomOf="parent"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintTop_toTopOf="parent"
  app:tint="@color/white" />
 
- <ImageButton
- android:id="@+id/flash_button"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:src="@drawable/baseline_flash_on_24"
- android:background="@color/black"
- app:tint="@color/white"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/goToSearchButton"
- app:layout_constraintStart_toEndOf="@+id/goToProfileButton"
- app:layout_constraintTop_toTopOf="parent" />
-
  </androidx.constraintlayout.widget.ConstraintLayout>
  </androidx.cardview.widget.CardView>
 

diff --git a/client/app/src/main/res/layout/fragment_profile.xml b/client/app/src/main/res/layout/fragment_profile.xml
@@ -11,18 +11,57 @@
 
  <androidx.constraintlayout.widget.ConstraintLayout
  android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:padding="16dp">
+ android:layout_height="match_parent">
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cv_profile_top"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="16dp">
+
+ <TextView
+ android:id="@+id/tv_profile_top_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="4dp"
+ android:text="@string/profile"
+ android:textSize="16sp"
+ android:textColor="@color/black"
+ android:fontFamily="@font/sc_dream_nor"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/back_to_camera_button"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <ImageButton
+ android:id="@+id/back_to_camera_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@color/white"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/ic_baseline_arrow_back_ios_new_24" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.cardview.widget.CardView>
 
  <androidx.cardview.widget.CardView
  android:id="@+id/profile_allergy_cardView"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
- android:layout_marginTop="32dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="16dp"
  app:cardCornerRadius="10dp"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/goToEditProfile">
+ app:layout_constraintTop_toBottomOf="@+id/Capture_image_view">
 
  <androidx.constraintlayout.widget.ConstraintLayout
  android:layout_width="match_parent"
@@ -72,47 +111,45 @@
  android:layout_width="100dp"
  android:layout_height="100dp"
  android:scaleType="fitXY"
+ android:layout_marginTop="12dp"
  android:src="@drawable/health_c"
  app:layout_constraintEnd_toEndOf="@+id/profile_allergy_cardView"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toBottomOf="@+id/cv_profile_top" />
 
  <TextView
  android:id="@+id/profileTitleTextView"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
  android:layout_marginTop="16dp"
  android:fontFamily="@font/sc_dream_nor"
  android:text="@{@string/profile_title(viewModel.userUiState.name)}"
  android:textColor="@color/black"
  android:textSize="18sp"
  app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/back_to_camera_button"
+ app:layout_constraintTop_toBottomOf="@+id/cv_profile_top"
  tools:text="안녕하세요. 222번님 헬로 월드!" />
 
  <TextView
  android:id="@+id/goToEditProfile"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
  android:layout_marginTop="8dp"
  android:text="@string/profile_username_edit"
  android:textColor="@color/green"
  android:textSize="12sp"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toBottomOf="@+id/profileTitleTextView" />
 
- <ImageButton
- android:id="@+id/back_to_camera_button"
- android:layout_width="20dp"
- android:layout_height="18dp"
- android:background="@color/white"
- app:layout_constraintStart_toStartOf="@+id/profileTitleTextView"
- app:layout_constraintTop_toTopOf="parent"
- app:srcCompat="@drawable/ic_baseline_arrow_back_ios_new_24" />
-
  <androidx.cardview.widget.CardView
+ android:id="@+id/cv_profile_account"
  android:layout_width="0dp"
  android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
  android:layout_marginTop="16dp"
+ android:layout_marginEnd="16dp"
+ app:cardCornerRadius="10dp"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toBottomOf="@+id/profile_allergy_cardView">
@@ -131,9 +168,10 @@
  android:layout_marginBottom="16dp"
  android:backgroundTint="@color/white"
  android:drawableEnd="@drawable/baseline_arrow_forward_ios_24"
+ android:outlineProvider="none"
  android:text="@string/account"
  android:textColor="@color/black"
- android:outlineProvider="none" app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toBottomOf="@+id/bt_profile_terms" />