Merge pull request #183 from rosuH/dev

rosuH · web-flow · commit 093fbd6dea3e · 2022-06-09T23:24:04.000+08:00
🐛
diff --git a/app/src/main/java/me/rosuh/easywatermark/data/repo/TemplateRepository.kt b/app/src/main/java/me/rosuh/easywatermark/data/repo/TemplateRepository.kt
@@ -2,28 +2,35 @@ package me.rosuh.easywatermark.data.repo
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.withContext
 import me.rosuh.easywatermark.data.db.dao.TemplateDao
 import me.rosuh.easywatermark.data.model.entity.Template
 import javax.inject.Inject
 
 class TemplateRepository @Inject constructor(
-    private val templateDao: TemplateDao
+    private val templateDao: TemplateDao?
 ) {
 
+    fun checkIfIsDaoNull(): Boolean {
+        return templateDao == null
+    }
+
     fun getAllTemplate(): Flow<List<Template>> {
-        return templateDao.getAllTemplate()
+        return templateDao?.getAllTemplate() ?: flow {
+            emit(listOf())
+        }
     }
 
     suspend fun insertTemplate(template: Template) = withContext(Dispatchers.IO) {
-        templateDao.insertTemplate(template)
+        templateDao?.insertTemplate(template)
     }
 
     suspend fun deleteTemplate(template: Template) = withContext(Dispatchers.IO) {
-        templateDao.deleteTemplate(template)
+        templateDao?.deleteTemplate(template)
     }
 
     suspend fun updateTemplate(template: Template) = withContext(Dispatchers.IO) {
-        templateDao.updateTemplate(template)
+        templateDao?.updateTemplate(template)
     }
 }
diff --git a/app/src/main/java/me/rosuh/easywatermark/di/AppModule.kt b/app/src/main/java/me/rosuh/easywatermark/di/AppModule.kt
@@ -19,18 +19,23 @@ object AppModule {
     @Provides
     fun provideYourDatabase(
         @ApplicationContext app: Context
-    ): AppDatabase {
+    ): AppDatabase? {
         val builder = Room.databaseBuilder(
             app,
             AppDatabase::class.java,
             "ewm-db"
         )
         val isCh = Locale.getDefault().language.contains("zh")
         builder.createFromAsset(if (isCh) "ewm-db-ch.db" else "ewm-db-eng.db")
-        return builder.build()
+        try {
+            return builder.build()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+        return null
     }
 
     @Singleton
     @Provides
-    fun provideTemplateDao(db: AppDatabase) = db.templateDao()
+    fun provideTemplateDao(db: AppDatabase?) = db?.templateDao()
 }
diff --git a/app/src/main/java/me/rosuh/easywatermark/di/RepositoryModule.kt b/app/src/main/java/me/rosuh/easywatermark/di/RepositoryModule.kt
@@ -40,7 +40,7 @@ object RepositoryModule {
     }
 
     @Provides
-    fun provideTemplateRepository(dao: TemplateDao): TemplateRepository {
+    fun provideTemplateRepository(dao: TemplateDao?): TemplateRepository {
         return TemplateRepository(dao)
     }
 }
diff --git a/app/src/main/java/me/rosuh/easywatermark/ui/MainViewModel.kt b/app/src/main/java/me/rosuh/easywatermark/ui/MainViewModel.kt
@@ -114,6 +114,12 @@ class MainViewModel @Inject constructor(
     )
 
     fun addTemplate(content: String) {
+        if (templateRepo.checkIfIsDaoNull()) {
+            launch {
+                uiState.emit(UiState.DatabaseError)
+            }
+            return
+        }
         viewModelScope.launch {
             val template = Template(
                 0,
diff --git a/app/src/main/java/me/rosuh/easywatermark/ui/UiState.kt b/app/src/main/java/me/rosuh/easywatermark/ui/UiState.kt
@@ -8,4 +8,5 @@ sealed class UiState {
     object GoEdit : UiState()
     object GoEditDialog : UiState()
     object None : UiState()
+    object DatabaseError : UiState()
 }
diff --git a/app/src/main/java/me/rosuh/easywatermark/ui/dialog/EditTemplateContentFragment.kt b/app/src/main/java/me/rosuh/easywatermark/ui/dialog/EditTemplateContentFragment.kt
@@ -38,36 +38,14 @@ class EditTemplateContentFragment : BaseBindBSDFragment<DialogEditTemplateBindin
         binding.tvTitle.text = if (isEdit) "编辑模板" else "添加模板"
         binding.etWaterText.apply {
             setText(template?.content)
-            addTextChangedListener(object : TextWatcher {
-                override fun afterTextChanged(s: Editable?) {
-                }
-
-                override fun beforeTextChanged(
-                    s: CharSequence?,
-                    start: Int,
-                    count: Int,
-                    after: Int
-                ) {
-                }
-
-                override fun onTextChanged(
-                    s: CharSequence?,
-                    start: Int,
-                    before: Int,
-                    count: Int
-                ) {
-                    template?.let { shareViewModel.updateTemplate(it) }
-                }
-            })
-
             post {
                 setSelection(text?.length ?: 0)
                 requestFocus()
             }
         }
         binding.btnConfirm.apply {
             setOnClickListener {
-                val msg = binding.etWaterText.text.toString()
+                val msg = binding.etWaterText.text.toString().trim()
                 if (msg.isBlank()) {
                     Toast.makeText(requireContext(), "不能为空", Toast.LENGTH_LONG).show()
                     return@setOnClickListener
diff --git a/app/src/main/java/me/rosuh/easywatermark/ui/dialog/TextContentTemplateListFragment.kt b/app/src/main/java/me/rosuh/easywatermark/ui/dialog/TextContentTemplateListFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
@@ -14,6 +15,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.launch
 import me.rosuh.easywatermark.R
 import me.rosuh.easywatermark.databinding.DialogEditTextTemplateListBinding
+import me.rosuh.easywatermark.ui.UiState
 import me.rosuh.easywatermark.ui.adapter.TextContentTemplateListAdapter
 import me.rosuh.easywatermark.ui.base.BaseBindFragment
 import me.rosuh.easywatermark.utils.ktx.commitWithAnimation
@@ -90,6 +92,21 @@ class TextContentTemplateListFragment : BaseBindFragment<DialogEditTextTemplateL
                 binding?.tvEmpty?.visibility = if (it.isEmpty()) View.VISIBLE else View.GONE
             }
         }
+
+        lifecycleScope.launch {
+            shareViewModel.uiStateFlow.flowWithLifecycle(
+                viewLifecycleOwner.lifecycle,
+                Lifecycle.State.STARTED
+            ).collect {
+                if (it is UiState.DatabaseError) {
+                    Toast.makeText(
+                        requireContext(),
+                        getString(R.string.tips_database_init_error),
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+            }
+        }
     }
 
 
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
@@ -120,5 +120,6 @@
     <string name="recovery_mode_tips">Ups, Sie scheinen mehrere Abstürze erlebt zu haben. Sie sind nun automatisch in den Wiederherstellungsmodus versetzt worden. Nachstehend finden Sie Ihre Geräte- und Absturzinformationen. Es wäre sehr hilfreich, wenn Sie diese kopieren und uns über die folgenden Methoden kontaktieren könnten. Ich danke Ihnen!</string>
     <string name="tips_use_this_template">Sind Sie sicher, dass Sie diese Vorlage verwenden möchten?</string>
     <string name="tips_delete_template">Sind Sie sicher, dass Sie diesen Eintrag löschen wollen?</string>
+    <string name="tips_database_init_error">Datenbankinitialisierung misslungen</string>
 
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -120,5 +120,6 @@
     <string name="recovery_mode_tips">Oops, parece que has experimentado múltiples caídas. Ahora se ha puesto automáticamente en modo de recuperación. A continuación encontrará la información de su dispositivo y la información de la colisión, sería muy útil si pudiera copiarla y ponerse en contacto con nosotros a través de los siguientes métodos. Gracias.</string>
     <string name="tips_use_this_template">¿Seguro que quieres usar esta plantilla?</string>
     <string name="tips_delete_template">¿Estás seguro de que quieres eliminar esta entrada?</string>
+    <string name="tips_database_init_error">Fallo en la inicialización de la base de datos</string>
 
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -109,5 +109,6 @@
     <string name="recovery_mode_tips">Ops, sembra che si siano verificati più arresti anomali. A questo punto è stata attivata automaticamente la modalità di ripristino. Di seguito sono riportati i dati del dispositivo e le informazioni sull\'incidente; sarebbe molto utile se poteste copiarli e contattarci tramite i seguenti metodi. Grazie!</string>
     <string name="tips_use_this_template">Siete sicuri di voler utilizzare questo modello?</string>
     <string name="tips_delete_template">È sicuro di voler cancellare questa voce?</string>
+    <string name="tips_database_init_error">Inizializzazione del database fallita</string>
 
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -122,6 +122,7 @@
     <string name="recovery_mode_tips">おっと、複数回のクラッシュを経験しているようですね。 これで自動的にリカバリーモードになりました。 以下、お客様の端末情報、クラッシュ情報を記載しますので、コピーしていただき、以下の方法でご連絡いただければ幸いです。 ありがとうございました。</string>
     <string name="tips_use_this_template">本当にこのテンプレートを使用しますか？</string>
     <string name="tips_delete_template">本当にこのエントリーを削除しますか？</string>
+    <string name="tips_database_init_error">データベースの初期化に失敗しました</string>
 
 
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -120,5 +120,6 @@
     <string name="recovery_mode_tips">Oops, parece ter sofrido múltiplas colisões. Foi agora automaticamente colocado em modo de recuperação. Abaixo encontra-se a informação do seu dispositivo e a informação sobre o crash, seria muito útil se pudesse copiá-la e contactar-nos através dos seguintes métodos. Obrigado!</string>
     <string name="tips_use_this_template">Tem a certeza de que quer usar este modelo?</string>
     <string name="tips_delete_template">Tem a certeza de que quer apagar esta entrada?</string>
+    <string name="tips_database_init_error">Inicialização da base de dados falhou</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -124,5 +124,6 @@
     <string name="back">返回</string>
     <string name="tips_use_this_template">确定使用该模板吗？</string>
     <string name="tips_delete_template">确定删除该条目吗？</string>
+    <string name="tips_database_init_error">数据库初始化失败</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -120,4 +120,5 @@
     <string name="recovery_mode_tips">糟糕，您似乎遇到了多次崩潰。現在已經自動進入恢復模式。以下是您的設備信息以及崩潰信息，辛苦您將其複制以後通過下列方式聯繫我們，將對解決問題非常有幫助。謝謝您！</string>
     <string name="tips_use_this_template">確定使用該模板嗎？</string>
     <string name="tips_delete_template">確定刪除該條目嗎？</string>
+    <string name="tips_database_init_error">數據庫初始化失敗</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -131,6 +131,6 @@
     <string name="dialog_button_add_template">Add</string>
     <string name="tips_use_this_template">Sure you want to use this template?</string>
     <string name="tips_delete_template">Are you sure you want to delete the entry?</string>
-
+    <string name="tips_database_init_error">Database init failed.</string>
 
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ object RepositoryModule {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Provides`
`43`		`- fun provideTemplateRepository(dao: TemplateDao): TemplateRepository {`
	`43`	`+ fun provideTemplateRepository(dao: TemplateDao?): TemplateRepository {`
`44`	`44`	`return TemplateRepository(dao)`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,5 @@ sealed class UiState {`
`8`	`8`	`object GoEdit : UiState()`
`9`	`9`	`object GoEditDialog : UiState()`
`10`	`10`	`object None : UiState()`
	`11`	`+ object DatabaseError : UiState()`
`11`	`12`	`}`