diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ff7f649f..baa5d3db 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,6 +42,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://tally.so/r/n9oq91")
+ 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..a123461c
--- /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 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
+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() = Unit
+
+ override fun initAfterBinding() = Unit
+
+ 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)
+ flags = FLAG_ACTIVITY_SINGLE_TOP
+ }
+ }
+ }
+}
\ 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_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" />
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file