From f8b4ff36a1814e7e83380fcb17bae52b8959b834 Mon Sep 17 00:00:00 2001 From: tgyuuAn Date: Thu, 14 Nov 2024 02:27:23 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[IDLE-000]=20=EB=A6=B4=EB=A6=AC=EC=A6=88=20?= =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a29b45c5..f218a49e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,8 +11,8 @@ android { namespace = "com.idle.care" defaultConfig { - versionCode = 15 - versionName = "1.2.0" + versionCode = 16 + versionName = "1.2.1" targetSdk = 34 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" From c40b1853beb0f7410791b87a7ed4352526ac9c1a Mon Sep 17 00:00:00 2001 From: tgyuuAn Date: Thu, 14 Nov 2024 11:24:15 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[IDLE-000]=20=EC=A0=84=ED=99=94=EB=A1=9C=20?= =?UTF-8?q?=EB=AC=B8=EC=9D=98=ED=95=98=EA=B8=B0=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EC=95=A0=EC=85=8B=20=EB=B0=94=EB=80=8C=EC=97=88?= =?UTF-8?q?=EB=8D=98=EA=B1=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/ic_call_inquiry.xml | 9 +++++++++ .../detail/worker/screen/WorkerJobPostingDetailScreen.kt | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 core/designresource/src/main/res/drawable/ic_call_inquiry.xml diff --git a/core/designresource/src/main/res/drawable/ic_call_inquiry.xml b/core/designresource/src/main/res/drawable/ic_call_inquiry.xml new file mode 100644 index 00000000..e9940485 --- /dev/null +++ b/core/designresource/src/main/res/drawable/ic_call_inquiry.xml @@ -0,0 +1,9 @@ + + + diff --git a/feature/job-posting-detail/src/main/java/com/idle/worker/job/posting/detail/worker/screen/WorkerJobPostingDetailScreen.kt b/feature/job-posting-detail/src/main/java/com/idle/worker/job/posting/detail/worker/screen/WorkerJobPostingDetailScreen.kt index 9a5c80f4..88343743 100644 --- a/feature/job-posting-detail/src/main/java/com/idle/worker/job/posting/detail/worker/screen/WorkerJobPostingDetailScreen.kt +++ b/feature/job-posting-detail/src/main/java/com/idle/worker/job/posting/detail/worker/screen/WorkerJobPostingDetailScreen.kt @@ -137,7 +137,7 @@ internal fun WorkerJobPostingDetailScreen( description = "${jobPostingDetail.centerName} | ${jobPostingDetail.centerOfficeNumber}", titleLeftComponent = { Image( - painter = painterResource(R.drawable.ic_call), + painter = painterResource(R.drawable.ic_call_inquiry), contentDescription = null, ) }, From 4be090477acb1958ce3e9e125ce1def0ae4d9b90 Mon Sep 17 00:00:00 2001 From: tgyuuAn Date: Thu, 14 Nov 2024 11:57:01 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[IDLE-000]=20fontScale=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=9D=BC=20=EA=B0=95=EC=A0=9C=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=EB=86=92=EC=9D=B4=EA=B0=80=20=EB=B0=94=EB=80=8C=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/idle/presentation/MainActivity.kt | 13 ++- .../forceupdate/ForceUpdateFragment.kt | 3 +- .../main/res/layout/fragment_force_update.xml | 108 ++++++++++-------- 3 files changed, 71 insertions(+), 53 deletions(-) diff --git a/presentation/src/main/java/com/idle/presentation/MainActivity.kt b/presentation/src/main/java/com/idle/presentation/MainActivity.kt index 6a72a3f8..ce8ef93a 100644 --- a/presentation/src/main/java/com/idle/presentation/MainActivity.kt +++ b/presentation/src/main/java/com/idle/presentation/MainActivity.kt @@ -29,6 +29,7 @@ import com.idle.analytics.businessmetric.AnalyticsHelper import com.idle.auth.AuthFragmentDirections import com.idle.binding.MainEvent import com.idle.binding.ShareJobPostingInfo +import com.idle.binding.ToastType import com.idle.binding.repeatOnStarted import com.idle.designsystem.binding.component.dismissToast import com.idle.designsystem.binding.component.showToast @@ -205,7 +206,7 @@ class MainActivity : AppCompatActivity() { private fun showForceUpdateDialog(info: ForceUpdate) { val currentVersion = packageManager.getPackageInfo(packageName, 0).versionName - if (checkShouldUpdate(currentVersion, info.minVersion)) { + if (!checkShouldUpdate(currentVersion, info.minVersion)) { forceUpdateFragment = ForceUpdateFragment(info).apply { isCancelable = false } forceUpdateFragment.show(supportFragmentManager, forceUpdateFragment.tag) } @@ -254,8 +255,16 @@ class MainActivity : AppCompatActivity() { private fun handleDeepLink(deepLink: DeepLink) { try { - val sharedJobPostingId = deepLink.getStringValue("deep_link_value") + val sharedJobPostingId = deepLink.deepLinkValue val sharedJobPostingType = deepLink.getStringValue("deep_link_sub1") + + showToast( + this, + "sharedJobPostingId: $sharedJobPostingId, sharedJobPostingTpye : $sharedJobPostingType", + toastType = ToastType.SUCCESS, + paddingBottom = 50 + ) + viewModel.setSharedJobPostingInfo( SharedJobPostingInfo( jobPostingId = sharedJobPostingId ?: return, diff --git a/presentation/src/main/java/com/idle/presentation/forceupdate/ForceUpdateFragment.kt b/presentation/src/main/java/com/idle/presentation/forceupdate/ForceUpdateFragment.kt index f7b51f44..7aa6a8f7 100644 --- a/presentation/src/main/java/com/idle/presentation/forceupdate/ForceUpdateFragment.kt +++ b/presentation/src/main/java/com/idle/presentation/forceupdate/ForceUpdateFragment.kt @@ -64,7 +64,8 @@ class ForceUpdateFragment(private val forceUpdate: ForceUpdate) : DialogFragment override fun onStart() { super.onStart() - resizeDialog(1f, 0.25f) + val fontScale = resources.configuration.fontScale + resizeDialog(1f, 0.4f * fontScale) } private fun resizeDialog(width: Float, height: Float) { diff --git a/presentation/src/main/res/layout/fragment_force_update.xml b/presentation/src/main/res/layout/fragment_force_update.xml index bbaf2272..16106cb4 100644 --- a/presentation/src/main/res/layout/fragment_force_update.xml +++ b/presentation/src/main/res/layout/fragment_force_update.xml @@ -8,62 +8,70 @@ type="com.idle.presentation.forceupdate.ForceUpdateViewModel" /> - - - - - + android:layout_height="wrap_content"> + android:background="@drawable/shape_dialog" + android:gravity="center" + android:orientation="vertical" + android:paddingHorizontal="12dp" + android:paddingTop="20dp" + android:paddingBottom="12dp"> + + + + + + -