From 536314b81675d3ccf21c1ce0798abfb52cc3bbbf Mon Sep 17 00:00:00 2001 From: m6z1 Date: Sat, 15 Feb 2025 20:01:44 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=EB=8B=AB=EA=B8=B0=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=9A=B0=EC=B8=A1=EC=9C=BC=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_detail.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml index 33a064b4..80b1d85c 100644 --- a/app/src/main/res/layout/activity_detail.xml +++ b/app/src/main/res/layout/activity_detail.xml @@ -20,14 +20,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="4dp" - android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:clickable="true" android:contentDescription="@null" android:focusable="true" android:padding="8dp" android:src="@drawable/ic_close" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> Date: Sat, 15 Feb 2025 20:15:04 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=EA=B0=9C=EC=9D=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=B2=98=EB=A6=AC=EB=B0=A9=EC=B9=A8=20=EB=B0=8F=20?= =?UTF-8?q?=EB=AC=B8=EC=9D=98=ED=95=98=EA=B8=B0=20=EC=9B=B9=20=EB=B7=B0?= =?UTF-8?q?=EB=A1=9C=20=EC=B6=9C=EB=A0=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 3 ++ .../ui/view/setting/SettingFragment.kt | 15 +++---- .../youdongknowme/ui/view/web/WebActivity.kt | 38 ++++++++++++++++ .../youdongknowme/ui/view/web/WebViewModel.kt | 6 +++ app/src/main/res/layout/activity_web.xml | 43 +++++++++++++++++++ 5 files changed, 97 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebActivity.kt create mode 100644 app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebViewModel.kt create mode 100644 app/src/main/res/layout/activity_web.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a5336c53..78cd8061 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,6 +43,9 @@ + () } override fun initDataBinding() { - viewModel.myDepartment.observe(viewLifecycleOwner) { myDepartment -> binding.tvSettingDepartment.text = myDepartment } @@ -102,17 +101,17 @@ class SettingFragment : BaseFragment() } binding.btnSettingAppHelp.setOnClickListener { - val intent = Intent( - Intent.ACTION_VIEW, - Uri.parse("https://docs.google.com/forms/d/e/1FAIpQLSeRTKalenelmffTbCZeK4mqmQg0palobghkXSoie1FlmV22ZQ/viewform") + val intent = WebActivity.newIntent( + requireContext(), + "https://tally.so/r/n9oq91" ) startActivity(intent) } binding.btnSettingAppPersonalPolicy.setOnClickListener { - val intent = Intent( - Intent.ACTION_VIEW, - Uri.parse("https://sites.google.com/view/dmforu-privacy-policy/%ED%99%88") + val intent = WebActivity.newIntent( + requireContext(), + "https://sites.google.com/view/dmforu-privacy-policy/%ED%99%88" ) startActivity(intent) } diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebActivity.kt new file mode 100644 index 00000000..3cb59089 --- /dev/null +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebActivity.kt @@ -0,0 +1,38 @@ +package com.dongyang.android.youdongknowme.ui.view.web + +import android.content.Context +import android.content.Intent +import com.dongyang.android.youdongknowme.R +import com.dongyang.android.youdongknowme.databinding.ActivityWebBinding +import com.dongyang.android.youdongknowme.standard.base.BaseActivity +import org.koin.androidx.viewmodel.ext.android.viewModel + +class WebActivity : BaseActivity() { + + override val layoutResourceId: Int = R.layout.activity_web + override val viewModel: WebViewModel by viewModel() + + override fun initStartView() { + val url = intent.getStringExtra(KEY_URL) + binding.wvWeb.loadUrl(url.toString()) + binding.btnWebClose.setOnClickListener { + finish() + } + } + + override fun initDataBinding() { + } + + override fun initAfterBinding() { + } + + companion object { + private const val KEY_URL = "url" + + fun newIntent(context: Context, url: String): Intent { + return Intent(context, WebActivity::class.java).apply { + putExtra(KEY_URL, url) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebViewModel.kt new file mode 100644 index 00000000..e0cd7ba9 --- /dev/null +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebViewModel.kt @@ -0,0 +1,6 @@ +package com.dongyang.android.youdongknowme.ui.view.web + +import com.dongyang.android.youdongknowme.standard.base.BaseViewModel + +class WebViewModel : BaseViewModel() { +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml new file mode 100644 index 00000000..d8eb45ba --- /dev/null +++ b/app/src/main/res/layout/activity_web.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + \ No newline at end of file From c4ec1e3f54382e5e4aef8485e66410de87ba6f55 Mon Sep 17 00:00:00 2001 From: m6z1 Date: Mon, 17 Feb 2025 17:34:27 +0900 Subject: [PATCH 3/5] =?UTF-8?q?chore:=20=EC=BD=94=EB=93=9C=20=EC=BB=A8?= =?UTF-8?q?=EB=B2=A4=EC=85=98=20(Unit=20=EB=B0=98=ED=99=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/youdongknowme/ui/view/web/WebActivity.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebActivity.kt index 3cb59089..80a6ab1e 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebActivity.kt @@ -20,11 +20,9 @@ class WebActivity : BaseActivity() { } } - override fun initDataBinding() { - } + override fun initDataBinding() = Unit - override fun initAfterBinding() { - } + override fun initAfterBinding() = Unit companion object { private const val KEY_URL = "url" From c2eb2c56fe7aee140156475f0e66852000e2bcae Mon Sep 17 00:00:00 2001 From: m6z1 Date: Mon, 17 Feb 2025 17:35:01 +0900 Subject: [PATCH 4/5] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EB=B7=B0=20=EB=8E=81=EC=8A=A4=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_web.xml | 35 ++++++++---------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml index d8eb45ba..e1a558be 100644 --- a/app/src/main/res/layout/activity_web.xml +++ b/app/src/main/res/layout/activity_web.xml @@ -5,30 +5,19 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/btn_web_close" /> \ No newline at end of file From 89f4a43d52adf69b20b27ed1c389346fc65dd973 Mon Sep 17 00:00:00 2001 From: m6z1 Date: Mon, 17 Feb 2025 17:46:01 +0900 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=EC=95=A1=ED=8B=B0=EB=B9=84?= =?UTF-8?q?=ED=8B=B0=20=EC=A4=91=EB=B3=B5=20=EC=83=9D=EC=84=B1=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dongyang/android/youdongknowme/ui/view/web/WebActivity.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebActivity.kt index 80a6ab1e..a123461c 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/web/WebActivity.kt @@ -2,6 +2,7 @@ package com.dongyang.android.youdongknowme.ui.view.web import android.content.Context import android.content.Intent +import android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP import com.dongyang.android.youdongknowme.R import com.dongyang.android.youdongknowme.databinding.ActivityWebBinding import com.dongyang.android.youdongknowme.standard.base.BaseActivity @@ -30,6 +31,7 @@ class WebActivity : BaseActivity() { fun newIntent(context: Context, url: String): Intent { return Intent(context, WebActivity::class.java).apply { putExtra(KEY_URL, url) + flags = FLAG_ACTIVITY_SINGLE_TOP } } }