From ab4c8cba5156a248c4dd6bd4ba4fef107a4ef91d Mon Sep 17 00:00:00 2001 From: yubinquitous Date: Wed, 15 Feb 2023 15:43:24 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[UI]=20=EC=A0=9C=EC=9E=91=EC=9E=90=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=ED=99=98=EA=B2=BD=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EB=B7=B0=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20(#817)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-hdpi/text_logo_small_gray2.png | Bin 0 -> 522 bytes .../drawable-mdpi/text_logo_small_gray2.png | Bin 0 -> 380 bytes .../drawable-xhdpi/text_logo_small_gray2.png | Bin 0 -> 631 bytes .../drawable-xxhdpi/text_logo_small_gray2.png | Bin 0 -> 841 bytes .../text_logo_small_gray2.png | Bin 0 -> 1043 bytes app/src/main/res/layout/activity_setting.xml | 328 +++++++++++++++++- app/src/main/res/layout/fragment_home.xml | 316 +---------------- 7 files changed, 344 insertions(+), 300 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/text_logo_small_gray2.png create mode 100644 app/src/main/res/drawable-mdpi/text_logo_small_gray2.png create mode 100644 app/src/main/res/drawable-xhdpi/text_logo_small_gray2.png create mode 100644 app/src/main/res/drawable-xxhdpi/text_logo_small_gray2.png create mode 100644 app/src/main/res/drawable-xxxhdpi/text_logo_small_gray2.png diff --git a/app/src/main/res/drawable-hdpi/text_logo_small_gray2.png b/app/src/main/res/drawable-hdpi/text_logo_small_gray2.png new file mode 100644 index 0000000000000000000000000000000000000000..75428762e523efbef40dabae3308a72aaf2f4601 GIT binary patch literal 522 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index 4d5045fed..0b53f7ec0 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -353,8 +353,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:layout_marginBottom="61dp" - app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_logout"> @@ -380,6 +378,332 @@ app:layout_constraintTop_toBottomOf="@id/tv_unregister" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 783df3793..3a89560e2 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -591,13 +591,12 @@ tools:listitem="@layout/item_home_recommend_list" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + app:layout_constraintStart_toEndOf="@id/iv_logo_box" + app:layout_constraintTop_toTopOf="parent" /> - - + From f52570dee4b298ba909a19a4f08be0f6e1d84b87 Mon Sep 17 00:00:00 2001 From: kxxhyorim Date: Wed, 1 Mar 2023 18:07:28 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[FIX]=20=ED=9A=8C=EC=9B=90=ED=83=88?= =?UTF-8?q?=ED=87=B4=EC=99=84=EB=A3=8C=20Dialog=20onDestroyView=20->=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=99=94=EB=A9=B4=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=97=B0=EA=B2=B0=20(#818)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/org/sopt/havit/util/DialogOkUtil.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/org/sopt/havit/util/DialogOkUtil.kt b/app/src/main/java/org/sopt/havit/util/DialogOkUtil.kt index 36e437cc0..ec0769d72 100644 --- a/app/src/main/java/org/sopt/havit/util/DialogOkUtil.kt +++ b/app/src/main/java/org/sopt/havit/util/DialogOkUtil.kt @@ -80,6 +80,9 @@ class DialogOkUtil(private val dialogMode: Int, private val doAfterConfirm: () - } override fun onDestroyView() { + if (dialogMode == UNREGISTER) { + doAfterConfirm() + } super.onDestroyView() _binding = null } From 940a38c1a99aef83bd58941c055c57834b36fb4c Mon Sep 17 00:00:00 2001 From: kxxhyorim Date: Wed, 1 Mar 2023 18:16:36 +0900 Subject: [PATCH 3/3] [CHORE] version code, name v1.0.2 -> v1.0.3 (#820) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d997472bc..a99e22b7a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { applicationId "org.sopt.havit" minSdk 23 targetSdk 31 - versionCode 102 - versionName "1.0.1" + versionCode 103 + versionName "1.0.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" buildConfigField("String", "HAVIT_BASE_URL_DEV", properties["HAVIT_BASE_URL_DEV"]) buildConfigField("String", "HAVIT_BASE_URL_PROD", properties["HAVIT_BASE_URL_PROD"])