From f55ffc8b2eefa06bab48b26ed20fbdd4ea5c46d1 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Sun, 31 Dec 2023 19:33:58 +0900 Subject: [PATCH 01/17] =?UTF-8?q?[ADD/#9]=20=EC=B7=A8=ED=96=A5=20=ED=83=9C?= =?UTF-8?q?=EA=B7=B8=20=EB=B7=B0=20=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 1 + presentation/build.gradle.kts | 3 ++ presentation/src/main/AndroidManifest.xml | 6 ++++ .../preference/PreferenceTagActivity.kt | 19 +++++++++++ .../preference/PreferenceTagViewModel.kt | 6 ++++ .../src/main/res/layout/activity_login.xml | 4 +-- .../res/layout/activity_preference_tag.xml | 32 +++++++++++++++++++ presentation/src/main/res/values/strings.xml | 2 ++ 8 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 presentation/src/main/java/com/going/presentation/preference/PreferenceTagActivity.kt create mode 100644 presentation/src/main/java/com/going/presentation/preference/PreferenceTagViewModel.kt create mode 100644 presentation/src/main/res/layout/activity_preference_tag.xml diff --git a/build.gradle.kts b/build.gradle.kts index 42b23205..eaa4d8c5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,6 +9,7 @@ buildscript { classpath(ClassPathPlugins.kotlinGradle) classpath(ClassPathPlugins.hilt) classpath(ClassPathPlugins.oss) + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20") } } diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts index fa4be555..addec6c3 100644 --- a/presentation/build.gradle.kts +++ b/presentation/build.gradle.kts @@ -67,6 +67,9 @@ dependencies { } implementation(MaterialDesignDependencies.materialDesign) + implementation("androidx.appcompat:appcompat:1.6.1") + implementation("com.google.android.material:material:1.5.0") + implementation("androidx.constraintlayout:constraintlayout:2.1.4") TestDependencies.run { testImplementation(jUnit) diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index a5918e68..07b8ff5d 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -1,4 +1,10 @@ + + + + \ No newline at end of file diff --git a/presentation/src/main/java/com/going/presentation/preference/PreferenceTagActivity.kt b/presentation/src/main/java/com/going/presentation/preference/PreferenceTagActivity.kt new file mode 100644 index 00000000..2b3e0587 --- /dev/null +++ b/presentation/src/main/java/com/going/presentation/preference/PreferenceTagActivity.kt @@ -0,0 +1,19 @@ +package com.going.presentation.preference + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import com.going.presentation.R +import com.going.presentation.databinding.ActivityPreferenceTagBinding +import com.going.ui.base.BaseActivity + +class PreferenceTagActivity : + BaseActivity(R.layout.activity_preference_tag) { + + private val viewModel by viewModels() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + } +} \ No newline at end of file diff --git a/presentation/src/main/java/com/going/presentation/preference/PreferenceTagViewModel.kt b/presentation/src/main/java/com/going/presentation/preference/PreferenceTagViewModel.kt new file mode 100644 index 00000000..70b1d753 --- /dev/null +++ b/presentation/src/main/java/com/going/presentation/preference/PreferenceTagViewModel.kt @@ -0,0 +1,6 @@ +package com.going.presentation.preference + +import androidx.lifecycle.ViewModel + +class PreferenceTagViewModel : ViewModel(){ +} \ No newline at end of file diff --git a/presentation/src/main/res/layout/activity_login.xml b/presentation/src/main/res/layout/activity_login.xml index 090f1f13..44eb7e06 100644 --- a/presentation/src/main/res/layout/activity_login.xml +++ b/presentation/src/main/res/layout/activity_login.xml @@ -19,7 +19,7 @@ android:gravity="center" android:lineHeight="42dp" android:text="@string/sign_in_tv_title" - android:textColor="@color/white" + android:textColor="@color/white_000" app:layout_constraintBottom_toTopOf="@id/iv_sign_in" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -58,7 +58,7 @@ android:gravity="center" android:lineHeight="42dp" android:text="@string/sign_in_tv_terms" - android:textColor="@color/white" + android:textColor="@color/white_000" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/btn_sign_in" /> diff --git a/presentation/src/main/res/layout/activity_preference_tag.xml b/presentation/src/main/res/layout/activity_preference_tag.xml new file mode 100644 index 00000000..d8210159 --- /dev/null +++ b/presentation/src/main/res/layout/activity_preference_tag.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 4aa2c76e..6f611bfd 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -11,4 +11,6 @@ 여행을 시작해보세요 개인정보처리방침 + 이번 여행은 어땠으면 좋겠나요? + From 3ced80c4fa6de1805c6980cc2d2d4a2cf4ad4851 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 2 Jan 2024 14:34:12 +0900 Subject: [PATCH 02/17] =?UTF-8?q?[UI/#9]=20=EC=95=84=EC=9D=B4=ED=85=9C=20U?= =?UTF-8?q?I=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/item_preference_tag.xml | 85 ++++++++++++++++++- 1 file changed, 83 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/res/layout/item_preference_tag.xml b/presentation/src/main/res/layout/item_preference_tag.xml index 013bca34..bc77408c 100644 --- a/presentation/src/main/res/layout/item_preference_tag.xml +++ b/presentation/src/main/res/layout/item_preference_tag.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="345dp" - android:layout_height="157dp" + android:layout_height="127dp" android:background="@color/white_000"> + + + + +