Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
<activity
android:name=".ui.view.depart.OnboardingDepartActivity"
android:exported="false" />
<activity
android:name=".ui.view.web.WebActivity"
android:exported="false" />
<activity
android:name=".ui.view.splash.SplashActivity"
android:exported="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.dongyang.android.youdongknowme.ui.view.setting
import android.Manifest
import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri
import android.os.Build
import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
import androidx.core.content.ContextCompat
Expand All @@ -13,6 +12,7 @@ import com.dongyang.android.youdongknowme.standard.base.BaseFragment
import com.dongyang.android.youdongknowme.ui.view.depart.DepartActivity
import com.dongyang.android.youdongknowme.ui.view.keyword.KeywordActivity
import com.dongyang.android.youdongknowme.ui.view.license.LicenseActivity
import com.dongyang.android.youdongknowme.ui.view.web.WebActivity
import org.koin.androidx.viewmodel.ext.android.viewModel

/* 설정 화면 */
Expand All @@ -33,7 +33,6 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
}

override fun initDataBinding() {

viewModel.myDepartment.observe(viewLifecycleOwner) { myDepartment ->
binding.tvSettingDepartment.text = myDepartment
}
Expand Down Expand Up @@ -102,17 +101,17 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
}

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)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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<ActivityWebBinding, WebViewModel>() {

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
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.dongyang.android.youdongknowme.ui.view.web

import com.dongyang.android.youdongknowme.standard.base.BaseViewModel

class WebViewModel : BaseViewModel() {
}
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

<TextView
Expand Down
32 changes: 32 additions & 0 deletions app/src/main/res/layout/activity_web.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">

<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">

<ImageView
android:id="@+id/btn_web_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginVertical="4dp"
android:layout_marginEnd="16dp"
android:clickable="true"
android:contentDescription="@null"
android:focusable="true"
android:padding="8dp"
android:src="@drawable/ic_close"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<WebView
android:id="@+id/wv_web"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btn_web_close" />

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
Loading