[feat] #299 최저가 비교 웹 사이트 연결 시 기존에 있던 BaseWebView로 연결되도록 수정

Scents-Note · Feb 21, 2024 · dee8265 · dee8265
1 parent 2d7698e
commit dee8265
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 137 deletions.
diff --git a/app/src/main/java/com/scentsnote/android/ui/detail/LowestPriceFragment.kt b/app/src/main/java/com/scentsnote/android/ui/detail/LowestPriceFragment.kt
diff --git a/app/src/main/java/com/scentsnote/android/ui/detail/PerfumeDetailActivity.kt b/app/src/main/java/com/scentsnote/android/ui/detail/PerfumeDetailActivity.kt
@@ -18,6 +18,7 @@ import com.scentsnote.android.ScentsNoteApplication.Companion.firebaseAnalytics
 import com.scentsnote.android.viewmodel.detail.PerfumeDetailViewModel
 import com.scentsnote.android.utils.adapter.BindingAdapter.setNoteBtnText
 import com.scentsnote.android.utils.base.BaseActivity
+import com.scentsnote.android.utils.base.BaseWebViewActivity
 import com.scentsnote.android.utils.extension.*
 import com.scentsnote.android.utils.listener.TabSelectedListener
 
@@ -155,15 +156,12 @@ class PerfumeDetailActivity :
         }
 
         binding.btnLowestPrice.setOnSafeClickListener {
-            supportFragmentManager.beginTransaction()
-                .setCustomAnimations(
-                    R.anim.slide_up,
-                    R.anim.slide_down,
-                    R.anim.slide_up,
-                    R.anim.slide_down
-                )
-                .add(R.id.fc_detail, LowestPriceFragment.newInstance())
-                .commitAllowingStateLoss()
+            val intent = Intent(this, BaseWebViewActivity::class.java)
+            intent.apply {
+                putExtra("type", "lowestPrice")
+                putExtra("url","https://www.naver.com")
+            }
+            startActivity(intent)
         }
     }
 

diff --git a/app/src/main/java/com/scentsnote/android/ui/detail/info/DetailInfoFragment.kt b/app/src/main/java/com/scentsnote/android/ui/detail/info/DetailInfoFragment.kt
@@ -422,7 +422,7 @@ class DetailInfoFragment(val perfumeIdx: Int) : Fragment() {
     /** 정보 수정 제안 버튼 - 현재(2023.05) 구글폼으로 연결 */
     fun onClickInfoReportBtn(view: View){
         val intent = Intent(activity, BaseWebViewActivity::class.java)
-        intent.putExtra("url", "infoReport")
+        intent.putExtra("type", "infoReport")
         startActivity(intent)
     }
 }
diff --git a/app/src/main/java/com/scentsnote/android/ui/filter/brand/FilterBrandFragment.kt b/app/src/main/java/com/scentsnote/android/ui/filter/brand/FilterBrandFragment.kt
@@ -97,7 +97,7 @@ class FilterBrandFragment : Fragment() {
 
     fun onClickWithdrawalBtn(view: View) {
         val intent = Intent(requireContext(), BaseWebViewActivity::class.java)
-        intent.putExtra("url", "tipOff")
+        intent.putExtra("type", "tipOff")
         startActivity(intent)
     }
 

diff --git a/app/src/main/java/com/scentsnote/android/ui/home/MoreNewPerfumeActivity.kt b/app/src/main/java/com/scentsnote/android/ui/home/MoreNewPerfumeActivity.kt
@@ -71,7 +71,7 @@ class MoreNewPerfumeActivity : AppCompatActivity() {
 
     fun onClickWithdrawalBtn(view: View) {
         val intent = Intent(this, BaseWebViewActivity::class.java)
-        intent.putExtra("url", "tipOff")
+        intent.putExtra("type", "tipOff")
         startActivity(intent)
     }
 }
diff --git a/app/src/main/java/com/scentsnote/android/ui/my/MyFragment.kt b/app/src/main/java/com/scentsnote/android/ui/my/MyFragment.kt
@@ -160,9 +160,9 @@ class MyFragment : Fragment() {
                 else->{
                     val intent = Intent(requireContext(), BaseWebViewActivity::class.java)
                     if(menuItem.itemId == R.id.feedback){
-                        intent.putExtra("url", "feedback")
+                        intent.putExtra("type", "feedback")
                     }else{
-                        intent.putExtra("url", "tipOff")
+                        intent.putExtra("type", "tipOff")
                     }
                     startActivity(intent)
                 }

diff --git a/app/src/main/java/com/scentsnote/android/ui/search/SearchFragment.kt b/app/src/main/java/com/scentsnote/android/ui/search/SearchFragment.kt
@@ -226,7 +226,7 @@ class SearchFragment : Fragment() {
 
     fun onClickTipOffBtn(view: View) {
         val intent = Intent(requireContext(), BaseWebViewActivity::class.java)
-        intent.putExtra("url", "tipOff")
+        intent.putExtra("type", "tipOff")
         startActivity(intent)
     }
 }
diff --git a/app/src/main/java/com/scentsnote/android/ui/setting/EditMyInfoActivity.kt b/app/src/main/java/com/scentsnote/android/ui/setting/EditMyInfoActivity.kt
@@ -62,7 +62,7 @@ class EditMyInfoActivity : AppCompatActivity() {
 
     fun onClickWithdrawalBtn(view: View) {
         val intent = Intent(this, BaseWebViewActivity::class.java)
-        intent.putExtra("url", "withdrawal")
+        intent.putExtra("type", "withdrawal")
         startActivity(intent)
     }
 

diff --git a/app/src/main/java/com/scentsnote/android/utils/base/BaseWebViewActivity.kt b/app/src/main/java/com/scentsnote/android/utils/base/BaseWebViewActivity.kt
@@ -2,19 +2,29 @@ package com.scentsnote.android.utils.base
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.view.View
 import android.webkit.WebViewClient
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import com.scentsnote.android.R
-import com.scentsnote.android.databinding.ActivityWebGoogleFormBinding
+import com.scentsnote.android.databinding.ActivityBaseWebViewBinding
+import com.scentsnote.android.utils.extension.setOnSafeClickListener
 
 class BaseWebViewActivity : AppCompatActivity() {
-    lateinit var binding: ActivityWebGoogleFormBinding
+    lateinit var binding: ActivityBaseWebViewBinding
+
+    private val callback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            if (binding.wvMyInquiry.canGoBack()) binding.wvMyInquiry.goBack()
+            else finish()
+        }
+    }
 
     @SuppressLint("SetJavaScriptEnabled")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = DataBindingUtil.setContentView(this,R.layout.activity_web_google_form)
+        binding = DataBindingUtil.setContentView(this,R.layout.activity_base_web_view)
 
         val url = getUrl()
 
@@ -23,21 +33,12 @@ class BaseWebViewActivity : AppCompatActivity() {
             settings.javaScriptEnabled = true
             loadUrl(url)
         }
-    }
 
-    override fun onBackPressed() {
-        if (binding.wvMyInquiry.canGoBack())
-        {
-            binding.wvMyInquiry.goBack()
-        }
-        else
-        {
-            finish()
-        }
+        this.onBackPressedDispatcher.addCallback(this, callback)
     }
 
     private fun getUrl() : String{
-        return when (intent.getStringExtra("url")) {
+        return when (intent.getStringExtra("type")) {
             "feedback" -> "https://docs.google.com/forms/d/e/1FAIpQLSfnvvc2O3_1X59lL243vsVXAjy-PIcq6-cgDgrhPph9mCAI1g/viewform"
 
             "withdrawal" -> "https://docs.google.com/forms/d/e/1FAIpQLSeZL-aslJd_YDgX2kLx31Gra1CXjG6ivaHqyAlko_iDQEVzYg/viewform"
@@ -46,7 +47,25 @@ class BaseWebViewActivity : AppCompatActivity() {
 
             "infoReport" -> "https://docs.google.com/forms/d/e/1FAIpQLSfMs2BF3y7urW5u4drHde2C1dOOXCY4SMczjSBeQ0zQF_xotw/viewform"
 
-            else -> ""
+            "lowestPrice" -> {
+                showToolbar()
+                intent.getStringExtra("url") ?: "https://www.naver.com"
+            }
+
+            else -> "https://www.naver.com"
+        }
+    }
+
+    private fun showToolbar() {
+        binding.tbWebView.apply {
+            root.visibility = View.VISIBLE
+
+            toolbar = R.drawable.icon_btn_cancel
+            toolbartxt = "가격 비교"
+
+            toolbarBtn.setOnSafeClickListener {
+                finish()
+            }
         }
     }
 }
diff --git a/...main/res/layout/fragment_lowest_price.xml → ...ain/res/layout/activity_base_web_view.xml b/...main/res/layout/fragment_lowest_price.xml → ...ain/res/layout/activity_base_web_view.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/frameLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".ui.detail.LowestPriceFragment">
+        tools:context=".utils.base.BaseWebViewActivity">
 
         <include
-            android:id="@+id/toolbar_lowest_price"
+            android:id="@+id/tb_web_view"
             layout="@layout/toolbar_txt_with_btn"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            android:visibility="gone" />
 
         <WebView
-            android:id="@+id/wv_lowest_price"
+            android:id="@+id/wv_my_inquiry"
             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/toolbar_lowest_price" />
-
+            app:layout_constraintTop_toBottomOf="@+id/tb_web_view" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/activity_web_google_form.xml b/app/src/main/res/layout/activity_web_google_form.xml