diff --git a/app/build.gradle b/app/build.gradle index c36830deb..158c36f36 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -99,6 +99,11 @@ android { app { dimension "mode" manifestPlaceholders.put("APP_CHANNEL_VALUE", "app") + if ('.release' == '.releaseA') { + manifestPlaceholders.put("app_name", "@string/app_name_a") + }else { + manifestPlaceholders.put("app_name", "@string/app_name") + } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 39a076d1d..e98e48898 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,7 +25,7 @@ android:name=".App" android:allowBackup="true" android:icon="@mipmap/ic_launcher" - android:label="@string/app_name" + android:label="${app_name}" android:networkSecurityConfig="@xml/network_security_config" android:requestLegacyExternalStorage="true" android:supportsRtl="true" diff --git a/app/src/main/java/io/legado/app/data/dao/RssArticleDao.kt b/app/src/main/java/io/legado/app/data/dao/RssArticleDao.kt index 89f2d53ca..93b813f35 100644 --- a/app/src/main/java/io/legado/app/data/dao/RssArticleDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/RssArticleDao.kt @@ -32,6 +32,9 @@ interface RssArticleDao { @Update fun update(vararg rssArticle: RssArticle) + @Query("update rssArticles set origin = :origin where origin = :oldOrigin") + fun updateOrigin(origin: String, oldOrigin: String) + @Query("delete from rssArticles where origin = :origin") fun delete(origin: String) diff --git a/app/src/main/java/io/legado/app/data/dao/RssStarDao.kt b/app/src/main/java/io/legado/app/data/dao/RssStarDao.kt index 28d31d45d..8a46b0f3e 100644 --- a/app/src/main/java/io/legado/app/data/dao/RssStarDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/RssStarDao.kt @@ -28,6 +28,9 @@ interface RssStarDao { @Update fun update(vararg rssStar: RssStar) + @Query("update rssStars set origin = :origin where origin = :oldOrigin") + fun updateOrigin(origin: String, oldOrigin: String) + @Query("delete from rssStars where origin = :origin") fun delete(origin: String) diff --git a/app/src/main/java/io/legado/app/ui/main/rss/RssViewModel.kt b/app/src/main/java/io/legado/app/ui/main/rss/RssViewModel.kt index d134a82bc..486ee99bc 100644 --- a/app/src/main/java/io/legado/app/ui/main/rss/RssViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/main/rss/RssViewModel.kt @@ -31,7 +31,12 @@ class RssViewModel(application: Application) : BaseViewModel(application) { } fun del(vararg rssSource: RssSource) { - execute { appDb.rssSourceDao.delete(*rssSource) } + execute { + appDb.rssSourceDao.delete(*rssSource) + rssSource.forEach { + appDb.rssArticleDao.delete(it.sourceUrl) + } + } } fun disable(rssSource: RssSource) { diff --git a/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesDialog.kt b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesDialog.kt index 9752f912a..b085ac6d8 100644 --- a/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesDialog.kt +++ b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesDialog.kt @@ -34,8 +34,8 @@ class RssFavoritesDialog() : BaseDialogFragment(R.layout.dialog_rss_favorite_con return } - var title = arguments.getString("title") ?: "默认名称" - var group = arguments.getString("group") ?: "默认分组" + var title = arguments.getString("title") + var group = arguments.getString("group") binding.run { editTitle.setText(title) editGroup.setText(group) @@ -65,7 +65,7 @@ class RssFavoritesDialog() : BaseDialogFragment(R.layout.dialog_rss_favorite_con interface Callback { - fun updateFavorite(title: String, group: String) + fun updateFavorite(title: String?, group: String?) fun deleteFavorite() diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt index 94c1a3651..76a7ebb74 100644 --- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt @@ -183,9 +183,15 @@ class ReadRssActivity : VMBaseActivity return super.onCompatOptionsItemSelected(item) } - override fun updateFavorite(title: String, group: String) { - viewModel.rssArticle?.title = title - viewModel.rssArticle?.group = group + override fun updateFavorite(title: String?, group: String?) { + viewModel.rssArticle?.let{ + if (title != null) { + it.title = title + } + if (group != null) { + it.group = group + } + } viewModel.updateFavorite() } diff --git a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditViewModel.kt index 98632b9b1..4c21c7a62 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditViewModel.kt @@ -38,6 +38,11 @@ class RssSourceEditViewModel(application: Application) : BaseViewModel(applicati } rssSource?.let { appDb.rssSourceDao.delete(it) + //更新收藏的源地址 + if (it.sourceUrl != source.sourceUrl){ + appDb.rssStarDao.updateOrigin(source.sourceUrl, it.sourceUrl) + appDb.rssArticleDao.updateOrigin(source.sourceUrl, it.sourceUrl) + } } appDb.rssSourceDao.insert(source) rssSource = source diff --git a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt index 869dbd312..d47c25c85 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt @@ -38,7 +38,12 @@ class RssSourceViewModel(application: Application) : BaseViewModel(application) } fun del(vararg rssSource: RssSource) { - execute { appDb.rssSourceDao.delete(*rssSource) } + execute { + appDb.rssSourceDao.delete(*rssSource) + rssSource.forEach { + appDb.rssArticleDao.delete(it.sourceUrl) + } + } } fun update(vararg rssSource: RssSource) { diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index df4d78184..d54270221 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -2,6 +2,7 @@ Legado + Legado·A Legado·buscador Legado necesita de acceso de almacenamineto para buscar y leer libros. Por favor, diríjase a los "Ajustes de la aplicación" para conceder el "Permiso de almacenamineto". diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 508a1adf9..0de5d951a 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -2,6 +2,7 @@ Legado + Legado·A Legado·search Legado needs storage access to find and read books. please go "App Settings" to allow "Storage permission". diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 476cdf771..752e1dc31 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -2,6 +2,7 @@ Legado + Legado·A Legado·pesquisa Legado precisa de acesso ao armazenamento para encontrar e ler livros. Por favor, vá às "Configurações do App" para conceder "Permissão de armazenamento". diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index e68fff1da..21a4c4ac0 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1,6 +1,7 @@ Legado + Legado·A Legado·tìm kiếm Legado cần quyền truy cập bộ nhớ để tìm và đọc sách. vui lòng vào "Cài đặt ứng dụng" để cho phép "Quyền lưu trữ". diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 24cfe8a87..9741f0434 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1,6 +1,7 @@ 閲讀 + 閲讀·A 閲讀·搜尋 閲讀需要訪問存儲卡權限,請前往「設定」—「應用程式權限」—開啟所需要的權限 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 51c387bc2..6c38bd84c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1,6 +1,7 @@ 閱讀 + 閱讀·A 閱讀·搜尋 閱讀需要存取記憶卡權限,請前往「設定」—「應用程式權限」—打開所需權限 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 65a9d10cb..13016360d 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1,6 +1,7 @@ 阅读 + 阅读·A 阅读·搜索 阅读需要访问存储卡权限,请前往“设置”—“应用权限”,打开所需权限 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index df4787b09..d68f26169 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,6 +2,7 @@ Legado + Legado·A Legado·search Legado needs storage access to find and read books. please go "App Settings" to allow "Storage permission".