Merge pull request #864 from TeamHavit/refactor/share

TeamHavit · May 17, 2023 · e039d4c · e039d4c
2 parents b552364 + 1624ab8
commit e039d4c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 45 deletions.
diff --git a/app/src/main/java/org/sopt/havit/ui/contents/more/ContentsMoreFragment.kt b/app/src/main/java/org/sopt/havit/ui/contents/more/ContentsMoreFragment.kt
@@ -88,7 +88,7 @@ class ContentsMoreFragment : BottomSheetDialogFragment() {
         binding.clEditShare.setOnSingleClickListener {
             val intent = Intent(Intent.ACTION_SEND).apply {
                 putExtra(Intent.EXTRA_TEXT, contentsData.url)
-                type = "text/html"
+                type = "text/plain"
             }
             startActivity(Intent.createChooser(intent, null))
             dismiss()

diff --git a/app/src/main/java/org/sopt/havit/ui/share/ShareActivity.kt b/app/src/main/java/org/sopt/havit/ui/share/ShareActivity.kt
@@ -7,29 +7,22 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
-import androidx.appcompat.app.AppCompatActivity
 import dagger.hilt.android.AndroidEntryPoint
+import org.sopt.havit.R
 import org.sopt.havit.databinding.ActivityShareBinding
+import org.sopt.havit.ui.base.BaseBindingActivity
 import org.sopt.havit.ui.sign.SignInViewModel.Companion.SPLASH_FROM_SHARE
 import org.sopt.havit.ui.sign.SplashWithSignActivity
-import org.sopt.havit.util.HavitSharedPreference
 import java.io.Serializable
-import javax.inject.Inject
 
 @AndroidEntryPoint
-class ShareActivity : AppCompatActivity() {
-
-    @Inject
-    lateinit var preference: HavitSharedPreference
+class ShareActivity : BaseBindingActivity<ActivityShareBinding>(R.layout.activity_share) {
 
     private val viewModel: ShareViewModel by viewModels()
     private lateinit var splashWithSignActivityLauncher: ActivityResultLauncher<Intent>
-    private lateinit var binding: ActivityShareBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityShareBinding.inflate(layoutInflater)
-        setContentView(binding.root)
 
         initActivityLauncher()
         makeSignIn()
@@ -95,11 +88,6 @@ class ShareActivity : AppCompatActivity() {
         viewModel.setUrl(url)
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        preference.clearTitle()
-    }
-
     companion object {
         const val WHERE_SPLASH_COME_FROM = "WHERE_SPLASH_COME_FROM"
         const val ON_NETWORK_ERROR_DISMISS = "ON_NETWORK_ERROR_DISMISS"

diff --git a/app/src/main/java/org/sopt/havit/ui/share/contents_summery/ContentsSummeryFragment.kt b/app/src/main/java/org/sopt/havit/ui/share/contents_summery/ContentsSummeryFragment.kt
@@ -11,9 +11,15 @@ import org.sopt.havit.databinding.FragmentContentsSummeryBinding
 import org.sopt.havit.domain.model.NetworkStatus
 import org.sopt.havit.ui.base.BaseBindingFragment
 import org.sopt.havit.ui.share.ShareViewModel
-import org.sopt.havit.util.*
+import org.sopt.havit.util.ADD_CONTENT_TYPE
+import org.sopt.havit.util.DialogUtil
+import org.sopt.havit.util.GoogleAnalyticsUtil
 import org.sopt.havit.util.GoogleAnalyticsUtil.CLICK_COMPLETE_SAVE_CONTENT
 import org.sopt.havit.util.GoogleAnalyticsUtil.CONTENT_CUSTOM
+import org.sopt.havit.util.HavitSharedPreference
+import org.sopt.havit.util.ToastUtil
+import org.sopt.havit.util.setOnSingleClickListener
+import org.sopt.havit.util.setOnSinglePostClickListener
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -69,6 +75,7 @@ class ContentsSummeryFragment :
                         setCustomToast()
                         requireActivity().finish()
                     }
+
                     else -> return@observe
                 }
             }
@@ -92,7 +99,6 @@ class ContentsSummeryFragment :
     }
 
     private fun finishSavingContents() {
-        preference.clearTitle()
         requireActivity().finish()
     }
 

diff --git a/app/src/main/java/org/sopt/havit/util/HavitSharedPreference.kt b/app/src/main/java/org/sopt/havit/util/HavitSharedPreference.kt
@@ -8,31 +8,8 @@ import javax.inject.Inject
 class HavitSharedPreference @Inject constructor(@ApplicationContext private val context: Context) {
 
     companion object {
-        private const val STORAGE_KEY = "HAVIT"
         private const val X_AUTH_TOKEN_1 = "TOKEN" // 정아
-        private const val CONTENTS_TITLE = "TITLE"
         private const val FIRST_USER = "FIRST_USER"
-        private const val NOTI_TIME = "notification_time"
-    }
-
-    fun setTitle(title: String) {
-        val prefs: SharedPreferences =
-            context.getSharedPreferences(CONTENTS_TITLE, Context.MODE_PRIVATE)
-        val editor: SharedPreferences.Editor = prefs.edit()
-        editor.putString(CONTENTS_TITLE, title)
-        editor.apply()
-    }
-
-    fun getTitle(): String {
-        val pref: SharedPreferences =
-            context.getSharedPreferences(CONTENTS_TITLE, Context.MODE_PRIVATE)
-        return pref.getString(CONTENTS_TITLE, "").toString()
-    }
-
-    fun clearTitle() {
-        val pref: SharedPreferences =
-            context.getSharedPreferences(CONTENTS_TITLE, Context.MODE_PRIVATE)
-        pref.edit().clear().apply()
     }
 
     fun setXAuthToken(xAuthToken: String) {

diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/transparent" />
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/transparent" />
+</layout>