From a08ed3ecf4e3b66a8bd358f56b211f4973bc83e3 Mon Sep 17 00:00:00 2001
From: ss99x2002 <ss99x200211@gmail.com>
Date: Tue, 4 Jul 2023 17:22:00 +0900
Subject: [PATCH] =?UTF-8?q?[Design/#4]=20=EC=84=B8=EB=B6=80=20=EC=A7=88?=
 =?UTF-8?q?=EB=AC=B8=20fragment=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  3 +
 app/src/main/AndroidManifest.xml              |  4 ++
 .../com/sopt/umbba_android/MainActivity.kt    |  3 +-
 .../presentation/onboarding/QuestActivity.kt  | 17 ++++-
 .../onboarding/QuestSubFragment.kt            | 21 ++++++
 .../res/drawable/sel_quest_btn_answer.xml     | 18 +++++
 .../drawable/sel_quest_btn_text_answer.xml    |  7 ++
 .../res/drawable/shape_g300_fill_r50_rect.xml |  1 +
 .../res/drawable/shape_gd4d4_line_r8_rect.xml |  7 ++
 app/src/main/res/layout/activity_quest.xml    |  2 +
 .../main/res/layout/fragment_quest_one.xml    | 66 +++++++++++++++++++
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/styles.xml            |  3 +-
 13 files changed, 150 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestSubFragment.kt
 create mode 100644 app/src/main/res/drawable/sel_quest_btn_answer.xml
 create mode 100644 app/src/main/res/drawable/sel_quest_btn_text_answer.xml
 create mode 100644 app/src/main/res/drawable/shape_gd4d4_line_r8_rect.xml
 create mode 100644 app/src/main/res/layout/fragment_quest_one.xml

diff --git a/app/build.gradle b/app/build.gradle
index c5ea7487..44d8514a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -99,4 +99,7 @@ dependencies {
     def hilt_version = "2.42"
     implementation "com.google.dagger:hilt-android:$hilt_version"
     kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
+
+    //viewpager2
+    implementation "androidx.viewpager2:viewpager2:1.0.0"
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 07cf552c..c5950dfc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,6 +28,10 @@
             android:exported="false"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name=".presentation.onboarding.QuestActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/umbba_android/MainActivity.kt b/app/src/main/java/com/sopt/umbba_android/MainActivity.kt
index 4f78ed69..c6eb0a75 100644
--- a/app/src/main/java/com/sopt/umbba_android/MainActivity.kt
+++ b/app/src/main/java/com/sopt/umbba_android/MainActivity.kt
@@ -4,11 +4,12 @@ import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import com.sopt.umbba_android.presentation.onboarding.InviteCodeActivity
+import com.sopt.umbba_android.presentation.onboarding.QuestActivity
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        startActivity(Intent(this, InviteCodeActivity::class.java))
+        startActivity(Intent(this, QuestActivity::class.java))
     }
 }
\ No newline at end of file
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
index 6d204ffc..11499786 100644
--- 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
@@ -1,4 +1,19 @@
 package com.sopt.umbba_android.presentation.onboarding
 
-class QuestActivity {
+import android.os.Bundle
+import com.sopt.umbba_android.R
+import androidx.fragment.app.Fragment
+import com.sopt.umbba_android.databinding.ActivityQuestBinding
+import com.sopt.umbba_android.util.binding.BindingActivity
+
+class QuestActivity : BindingActivity<ActivityQuestBinding>(R.layout.activity_quest) {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        changeFragment(QuestSubFragment())
+    }
+    private fun changeFragment(fragment:Fragment){
+        supportFragmentManager.beginTransaction()
+            .add(R.id.fragment_question,fragment)
+            .commit()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestSubFragment.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestSubFragment.kt
new file mode 100644
index 00000000..8efbf63d
--- /dev/null
+++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestSubFragment.kt
@@ -0,0 +1,21 @@
+package com.sopt.umbba_android.presentation.onboarding
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.sopt.umbba_android.R
+import com.sopt.umbba_android.databinding.FragmentQuestOneBinding
+import com.sopt.umbba_android.util.binding.BindingFragment
+
+class QuestSubFragment : BindingFragment<FragmentQuestOneBinding> (R.layout.fragment_quest_one) {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sel_quest_btn_answer.xml b/app/src/main/res/drawable/sel_quest_btn_answer.xml
new file mode 100644
index 00000000..0fb596a8
--- /dev/null
+++ b/app/src/main/res/drawable/sel_quest_btn_answer.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="false">
+        <shape android:shape="rectangle">
+            <corners android:radius="50dp" />
+            <stroke android:width="1dp" android:color="@color/grey_CFCFCF" />
+            <solid android:color="@color/grey_EAEAEA" />
+        </shape>
+    </item>
+    <item android:state_checked="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="50dp" />
+            <stroke android:color="@color/grey_CFCFCF"
+                android:width="1dp"/>
+            <solid android:color="@color/grey_747474"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sel_quest_btn_text_answer.xml b/app/src/main/res/drawable/sel_quest_btn_text_answer.xml
new file mode 100644
index 00000000..bc8948d8
--- /dev/null
+++ b/app/src/main/res/drawable/sel_quest_btn_text_answer.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="@color/white">
+    </item>
+    <item android:state_checked="false" android:color="@color/black">
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_g300_fill_r50_rect.xml b/app/src/main/res/drawable/shape_g300_fill_r50_rect.xml
index 0e0b51fa..b7b8886c 100644
--- a/app/src/main/res/drawable/shape_g300_fill_r50_rect.xml
+++ b/app/src/main/res/drawable/shape_g300_fill_r50_rect.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="50dp" />
diff --git a/app/src/main/res/drawable/shape_gd4d4_line_r8_rect.xml b/app/src/main/res/drawable/shape_gd4d4_line_r8_rect.xml
new file mode 100644
index 00000000..75596d43
--- /dev/null
+++ b/app/src/main/res/drawable/shape_gd4d4_line_r8_rect.xml
@@ -0,0 +1,7 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="8dp" />
+    <stroke android:color="@color/grey_D4D4D4"
+        android:width="1dp"/>
+    <solid android:color="@color/white"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_quest.xml b/app/src/main/res/layout/activity_quest.xml
index d4ccf907..73a29f9f 100644
--- a/app/src/main/res/layout/activity_quest.xml
+++ b/app/src/main/res/layout/activity_quest.xml
@@ -50,6 +50,7 @@
             android:layout_marginHorizontal="24dp"/>
 
         <FrameLayout
+            android:id="@+id/fragment_question"
             android:layout_width="match_parent"
             android:layout_height="335dp"
             android:layout_marginHorizontal="24dp"
@@ -67,6 +68,7 @@
             android:textColor="@color/white"
             android:text="@string/btn_next"
             android:background="@drawable/sel_invite_code_btn_next"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_quest_one.xml b/app/src/main/res/layout/fragment_quest_one.xml
new file mode 100644
index 00000000..260a33a6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_quest_one.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="335dp"
+    android:background="@drawable/shape_gd4d4_line_r8_rect">
+
+    <TextView
+        android:id="@+id/tv_question"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="18dp"
+        android:layout_marginTop="18dp"
+        android:text="어머니와 지금 같이 살고 있어?"
+        android:textColor="@color/black"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <RadioGroup
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_question"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <RadioButton
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginBottom="12dp"
+            android:text="응!"
+            android:textSize="16sp"
+            android:textAlignment="center"
+            android:background="@drawable/sel_quest_btn_answer"
+            android:button="@null"
+            android:textColor="@drawable/sel_quest_btn_text_answer" />
+
+        <RadioButton
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginBottom="12dp"
+            android:text="아니"
+            android:textSize="16sp"
+            android:textAlignment="center"
+            android:background="@drawable/sel_quest_btn_answer"
+            android:button="@null"
+            android:textColor="@drawable/sel_quest_btn_text_answer" />
+
+        <RadioButton
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:text="애매해"
+            android:textSize="16sp"
+            android:textAlignment="center"
+            android:background="@drawable/sel_quest_btn_answer"
+            android:button="@null"
+            android:textColor="@drawable/sel_quest_btn_text_answer" />
+    </RadioGroup>
+</androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 112ad257..8f75aa89 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,6 +13,7 @@
     <color name="grey_CFCFCF">#CFCFCF</color>
     <color name="grey_EAEAEA">#EAEAEA</color>
     <color name="grey_D4D4D4">#D4D4D4</color>
+    <color name="grey_747474">#747474</color>
     <color name="grey_btn">#E5E5E5</color>
 
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 798d93ca..634bcfc9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,7 +9,6 @@
     </style>
 
     <style name="TextInputLayoutStyle" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-
         <!--FilledBox일 경우 밑줄 색상, OutlinedBox일 경우 테두리 색상-->
         <item name="boxStrokeColor">@color/sel_invite_code_input_layout</item>
         <!--Error-->
@@ -30,4 +29,6 @@
         <item name="android:includeFontPadding">false</item>
         <item name="android:textSize">16sp</item>
     </style>
+
+    
 </resources>
\ No newline at end of file