[Design/#4] QuestActivity 전체 뷰 구현

Team-Umbba · Jul 4, 2023 · faf814f · faf814f
1 parent 2d3cec1
commit faf814f
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 3 deletions.
diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt
@@ -0,0 +1,4 @@
+package com.sopt.umbba_android.presentation.onboarding
+
+class QuestActivity {
+}
diff --git a/app/src/main/res/drawable/progress_qeust.xml b/app/src/main/res/drawable/progress_qeust.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <corners android:radius="18dp" />
+            <solid android:color="@color/grey_D2D2D2" />
+        </shape>
+    </item>
+
+    <item android:id="@android:id/progress"
+        android:top="1dp"
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp">
+
+        <scale android:scaleWidth="100%">
+            <shape>
+                <corners android:radius="18dp"/>
+                <solid android:color="@color/grey_666666"/>
+            </shape>
+        </scale>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/layout/activity_invite_code.xml b/app/src/main/res/layout/activity_invite_code.xml
@@ -65,7 +65,7 @@
             android:layout_marginVertical="24dp"
             android:background="@drawable/sel_invite_code_btn_next"
             android:enabled="false"
-            android:text="@string/invite_code_next"
+            android:text="@string/btn_next"
             android:textColor="@color/white"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent" />

diff --git a/app/src/main/res/layout/activity_quest.xml b/app/src/main/res/layout/activity_quest.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="titleText"
+            type="String" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include
+            android:id="@+id/layout_appbar"
+            layout="@layout/basic_appbar" />
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="18dp"
+            android:text="간단한 질문에\n답해줘"
+            android:textColor="@color/black"
+            android:textSize="24sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/layout_appbar" />
+
+        <TextView
+            android:id="@+id/tv_progress_sub"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title"
+            android:text="거의 다 왔어! 조금만 힘내줘!"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="12dp"
+            android:textColor="@color/grey_999999"/>
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="match_parent"
+            android:layout_height="5dp"
+            android:layout_marginTop="12dp"
+            app:layout_constraintTop_toBottomOf="@id/tv_progress_sub"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:progressDrawable="@drawable/progress_qeust"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginHorizontal="24dp"/>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="335dp"
+            android:layout_marginHorizontal="24dp"
+            android:layout_marginTop="24dp"
+            app:layout_constraintTop_toBottomOf="@id/progress_bar"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:enabled="false"
+            android:layout_margin="24dp"
+            android:textColor="@color/white"
+            android:text="@string/btn_next"
+            android:background="@drawable/sel_invite_code_btn_next"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
diff --git a/app/src/main/res/layout/basic_appbar.xml b/app/src/main/res/layout/basic_appbar.xml
@@ -36,7 +36,7 @@
                     android:id="@+id/tv_appbar_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@{titleText == null ? `Title` : titleText}"
+                    android:text="@{titleText == null ? ` ` : titleText}"
                     android:textColor="@color/black"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -7,7 +7,15 @@
     <color name="grey_400">#F0EBE8</color>
     <color name="grey_500">#E7E0DC</color>
 
+    <color name="grey_D2D2D2">#D2D2D2</color>
+    <color name="grey_666666">#666666</color>
+    <color name="grey_999999">#999999</color>
+    <color name="grey_CFCFCF">#CFCFCF</color>
+    <color name="grey_EAEAEA">#EAEAEA</color>
+    <color name="grey_D4D4D4">#D4D4D4</color>
     <color name="grey_btn">#E5E5E5</color>
+
+
     <color name="error_red">#FF3A1F</color>
     <color name="success">#419277</color>
     <color name="umbba_black">#32211B</color>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -2,8 +2,9 @@
     <string name="app_name">umbba-android</string>
     <string name="binding_error">바인딩 에러</string>
 
+    <string name="btn_next">다음으로</string>
+
     <!--invite code activity-->
-    <string name="invite_code_next">다음으로</string>
     <string name="invite_code_hint">초대 코드를 입력해주세요.</string>
     <string name="invite_code_title">초대코드를\n입력해주세요.</string>
 </resources>