display toast instead of dialog

sangcomz · Dec 7, 2022 · b77dfa4 · b77dfa4
1 parent a8d49bc
commit b77dfa4
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 68 deletions.
diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/ui/album/AlbumContract.kt b/FishBun/src/main/java/com/sangcomz/fishbun/ui/album/AlbumContract.kt
@@ -22,8 +22,8 @@ interface AlbumContract {
         fun changeToolbarTitle(selectedImageCount: Int, albumViewData: AlbumViewData)
         fun finishActivityWithResult(selectedImages: List<Uri>)
 
-        /* show dialog and finish the Activity as dismiss performed */
-        fun showErrorDialogAndFinish(@StringRes resId: Int, code: Int)
+        /* show toast and finish the Activity */
+        fun showToastAndFinish(@StringRes resId: Int, code: Int)
         fun refreshAlbumItem(position: Int, imagePath: ArrayList<Uri>)
         fun scanAndRefresh()
         fun showNothingSelectedMessage(nothingSelectedMessage: String)

diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/ui/album/mvp/AlbumPresenter.kt b/FishBun/src/main/java/com/sangcomz/fishbun/ui/album/mvp/AlbumPresenter.kt
@@ -101,7 +101,7 @@ class AlbumPresenter(
         val adapter = albumRepository.getImageAdapter()
         // imageAdapter is null, so we can not proceed anymore
         if (adapter == null) {
-            albumView.showErrorDialogAndFinish(
+            albumView.showToastAndFinish(
                 resId = R.string.msg_error,
                 code = Activity.RESULT_CANCELED,
             )

diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/ui/album/ui/AlbumActivity.kt b/FishBun/src/main/java/com/sangcomz/fishbun/ui/album/ui/AlbumActivity.kt
@@ -13,6 +13,7 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.Toolbar
 import androidx.constraintlayout.widget.Group
@@ -34,7 +35,6 @@ import com.sangcomz.fishbun.ui.album.model.Album
 import com.sangcomz.fishbun.ui.album.model.AlbumViewData
 import com.sangcomz.fishbun.ui.album.model.repository.AlbumRepositoryImpl
 import com.sangcomz.fishbun.ui.album.mvp.AlbumPresenter
-import com.sangcomz.fishbun.ui.common.SimpleDialog
 import com.sangcomz.fishbun.ui.picker.PickerActivity
 import com.sangcomz.fishbun.util.MainUiHandler
 import com.sangcomz.fishbun.util.SingleMediaScanner
@@ -290,11 +290,12 @@ class AlbumActivity : BaseActivity(),
         finish()
     }
 
-    override fun showErrorDialogAndFinish(@StringRes resId: Int, code: Int) {
-        SimpleDialog.show(fm = supportFragmentManager, mesId = resId) {
-            setResult(code, Intent())
-            finish()
+    override fun showToastAndFinish(@StringRes resId: Int, code: Int) {
+        runOnUiThread {
+            Toast.makeText(this, resId, Toast.LENGTH_SHORT).show()
         }
+        setResult(code, Intent())
+        finish()
     }
 
     private fun checkPermission(): Boolean {

diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/ui/common/SimpleDialog.kt b/FishBun/src/main/java/com/sangcomz/fishbun/ui/common/SimpleDialog.kt
diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/DetailImageContract.kt b/FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/DetailImageContract.kt
@@ -19,8 +19,8 @@ interface DetailImageContract {
         fun finishActivity()
         fun finishAndShowErrorToast()
 
-        /* show dialog and finish the Activity as dismiss performed */
-        fun showErrorDialogAndFinish(@StringRes resId: Int, code: Int)
+        /* show toast and finish the Activity */
+        fun showToastAndFinish(@StringRes resId: Int, code: Int)
         fun initViewPagerAdapter(imageAdapter: ImageAdapter)
         fun showImages(initPosition: Int, pickerImages: List<Uri>)
         fun showSnackbar(message: String)

diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/mvp/DetailImagePresenter.kt b/FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/mvp/DetailImagePresenter.kt
@@ -70,7 +70,7 @@ class DetailImagePresenter(
         val adapter = detailImageRepository.getImageAdapter()
         // we can not proceed any more if imageAdapter is null
         if (adapter == null) {
-            detailView.showErrorDialogAndFinish(
+            detailView.showToastAndFinish(
                 resId = R.string.msg_error,
                 code = Activity.RESULT_CANCELED,
             )

diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/ui/DetailImageActivity.kt b/FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/ui/DetailImageActivity.kt
@@ -20,7 +20,6 @@ import com.sangcomz.fishbun.Fishton
 import com.sangcomz.fishbun.R
 import com.sangcomz.fishbun.adapter.image.ImageAdapter
 import com.sangcomz.fishbun.datasource.FishBunDataSourceImpl
-import com.sangcomz.fishbun.ui.common.SimpleDialog
 import com.sangcomz.fishbun.ui.detail.DetailImageContract
 import com.sangcomz.fishbun.ui.detail.adapter.DetailViewPagerAdapter
 import com.sangcomz.fishbun.ui.detail.model.DetailImageRepositoryImpl
@@ -130,11 +129,12 @@ class DetailImageActivity : BaseActivity(), DetailImageContract.View, OnPageChan
         finish()
     }
 
-    override fun showErrorDialogAndFinish(@StringRes resId: Int, code: Int) {
-        SimpleDialog.show(fm = supportFragmentManager, mesId = resId) {
-            setResult(code, Intent())
-            finish()
+    override fun showToastAndFinish(@StringRes resId: Int, code: Int) {
+        runOnUiThread {
+            Toast.makeText(this, resId, Toast.LENGTH_SHORT).show()
         }
+        setResult(code, Intent())
+        finish()
     }
 
     override fun initViewPagerAdapter(imageAdapter: ImageAdapter) {

diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerActivity.kt b/FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerActivity.kt
@@ -13,6 +13,7 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.Toolbar
 import androidx.recyclerview.widget.GridLayoutManager
@@ -28,7 +29,6 @@ import com.sangcomz.fishbun.datasource.FishBunDataSourceImpl
 import com.sangcomz.fishbun.datasource.ImageDataSourceImpl
 import com.sangcomz.fishbun.datasource.PickerIntentDataSourceImpl
 import com.sangcomz.fishbun.permission.PermissionCheck
-import com.sangcomz.fishbun.ui.common.SimpleDialog
 import com.sangcomz.fishbun.ui.detail.ui.DetailImageActivity.Companion.getDetailImageActivity
 import com.sangcomz.fishbun.ui.picker.listener.OnPickerActionListener
 import com.sangcomz.fishbun.ui.picker.model.PickerListItem
@@ -389,11 +389,12 @@ class PickerActivity : BaseActivity(),
         finish()
     }
 
-    override fun showErrorDialogAndFinish(@StringRes resId: Int, code: Int) {
-        SimpleDialog.show(fm = supportFragmentManager, mesId = resId) {
-            setResult(code, Intent())
-            finish()
+    override fun showToastAndFinish(@StringRes resId: Int, code: Int) {
+        runOnUiThread {
+            Toast.makeText(this, resId, Toast.LENGTH_SHORT).show()
         }
+        setResult(code, Intent())
+        finish()
     }
 
     private fun setImageList(

diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerContract.kt b/FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerContract.kt
@@ -31,8 +31,8 @@ interface PickerContract {
         fun showDetailView(position: Int)
         fun finishActivity()
 
-        /* show dialog and finish the Activity as dismiss performed */
-        fun showErrorDialogAndFinish(@StringRes resId: Int, code: Int)
+        /* show toast and finish the Activity */
+        fun showToastAndFinish(@StringRes resId: Int, code: Int)
         fun finishActivityWithResult(selectedImages: List<Uri>)
         fun takeANewPictureWithFinish(position: Int, addedImageList: List<Uri>)
         fun addImage(pickerListImage: PickerListItem.Image)

diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerPresenter.kt b/FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerPresenter.kt
@@ -274,7 +274,7 @@ class PickerPresenter internal constructor(
             onSuccessAllMediaThumbnailsPath(result)
         } else {
             // imageAdapter is null, so we can not proceed anymore
-            pickerView.showErrorDialogAndFinish(
+            pickerView.showToastAndFinish(
                 resId = R.string.msg_error,
                 code = Activity.RESULT_CANCELED,
             )