From d98e4e838b044859c2db63c1f51a01d2f1980637 Mon Sep 17 00:00:00 2001 From: kkosang Date: Thu, 24 Oct 2024 00:44:17 +0900 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=EB=B0=94=EC=9D=B4=EC=98=B4=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EA=B0=80=EB=A1=9C=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../poke/rogue/helper/presentation/biome/BiomeActivity.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/poke/rogue/helper/presentation/biome/BiomeActivity.kt b/android/app/src/main/java/poke/rogue/helper/presentation/biome/BiomeActivity.kt index fff0d9ab..d3cd8a52 100644 --- a/android/app/src/main/java/poke/rogue/helper/presentation/biome/BiomeActivity.kt +++ b/android/app/src/main/java/poke/rogue/helper/presentation/biome/BiomeActivity.kt @@ -1,9 +1,11 @@ package poke.rogue.helper.presentation.biome +import android.content.res.Configuration import android.os.Bundle import androidx.activity.viewModels import androidx.appcompat.widget.Toolbar import androidx.core.view.isVisible +import androidx.recyclerview.widget.GridLayoutManager import poke.rogue.helper.R import poke.rogue.helper.data.repository.DefaultBiomeRepository import poke.rogue.helper.databinding.ActivityBiomeBinding @@ -54,10 +56,13 @@ class BiomeActivity : ErrorHandleActivity(R.layout.activit private fun initAdapter() { binding.rvBiomeList.apply { + val spanCount = + if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) 3 else 2 adapter = biomeAdapter + layoutManager = GridLayoutManager(context, spanCount) addItemDecoration( GridSpacingItemDecoration( - 2, + spanCount, 9.dp, false, ), From ddd95fd8965bea921ef0b02f601268bfea0f523d Mon Sep 17 00:00:00 2001 From: kkosang Date: Thu, 24 Oct 2024 10:58:46 +0900 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=EB=B0=94=EC=9D=B4=EC=98=B4=20?= =?UTF-8?q?=EB=94=94=ED=85=8C=EC=9D=BC=20=EA=B0=80=EB=A1=9C=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout-land/activity_biome_detail.xml | 118 ++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 android/app/src/main/res/layout-land/activity_biome_detail.xml diff --git a/android/app/src/main/res/layout-land/activity_biome_detail.xml b/android/app/src/main/res/layout-land/activity_biome_detail.xml new file mode 100644 index 00000000..df551be1 --- /dev/null +++ b/android/app/src/main/res/layout-land/activity_biome_detail.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 0b9f5afc099417d6a8811f1cfa034c380eb874e5 Mon Sep 17 00:00:00 2001 From: kkosang Date: Thu, 24 Oct 2024 11:15:52 +0900 Subject: [PATCH 3/7] =?UTF-8?q?feat:=20=EB=B0=94=EC=9D=B4=EC=98=B4=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=ED=85=9C=20dimens=20600=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/src/main/res/layout/item_biome.xml | 5 +++-- android/app/src/main/res/values-sw600dp/dimens.xml | 5 ++++- android/app/src/main/res/values/dimens.xml | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/res/layout/item_biome.xml b/android/app/src/main/res/layout/item_biome.xml index 2d8bdcd0..ec72bc3a 100644 --- a/android/app/src/main/res/layout/item_biome.xml +++ b/android/app/src/main/res/layout/item_biome.xml @@ -27,6 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{biome.name}" + android:textSize="@dimen/biome_item_tv_size" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:text="화산" /> @@ -43,8 +44,8 @@ 24sp 100dp - + + 20sp + 300dp + 150dp diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml index 0d4a5c35..189c9636 100644 --- a/android/app/src/main/res/values/dimens.xml +++ b/android/app/src/main/res/values/dimens.xml @@ -10,5 +10,8 @@ 15sp 20dp - + + 16sp + 200dp + 100dp From 97c53e5f07b1e2ed8329d7d0ab22d3f836ff30b3 Mon Sep 17 00:00:00 2001 From: kkosang Date: Thu, 24 Oct 2024 13:13:33 +0900 Subject: [PATCH 4/7] =?UTF-8?q?style:=20tablayout=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/src/main/res/values-sw600dp/dimens.xml | 3 +++ android/app/src/main/res/values/dimens.xml | 3 +++ android/app/src/main/res/values/style.xml | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/android/app/src/main/res/values-sw600dp/dimens.xml b/android/app/src/main/res/values-sw600dp/dimens.xml index 969e0818..985de53b 100644 --- a/android/app/src/main/res/values-sw600dp/dimens.xml +++ b/android/app/src/main/res/values-sw600dp/dimens.xml @@ -14,4 +14,7 @@ 20sp 300dp 150dp + + + 20sp diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml index 189c9636..46d25e5d 100644 --- a/android/app/src/main/res/values/dimens.xml +++ b/android/app/src/main/res/values/dimens.xml @@ -14,4 +14,7 @@ 16sp 200dp 100dp + + + 12sp diff --git a/android/app/src/main/res/values/style.xml b/android/app/src/main/res/values/style.xml index f040ad64..f54ab88a 100644 --- a/android/app/src/main/res/values/style.xml +++ b/android/app/src/main/res/values/style.xml @@ -48,10 +48,16 @@ + +