From 938be67cd37dd9c97b51e8f940928a09888a3839 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Wed, 12 Apr 2023 19:20:58 +0300 Subject: [PATCH] Update about settings --- .../settings/about/AboutSettingsFragment.kt | 1 + .../settings/utils/AboutLinksPreference.kt | 10 +++--- .../kotatsu/shelf/ui/ShelfFragment.kt | 19 ++--------- app/src/main/res/drawable/ic_reddit.xml | 11 ------ app/src/main/res/drawable/ic_telegram.xml | 10 ++++++ app/src/main/res/drawable/ic_twitter.xml | 11 ------ .../res/layout/preference_about_links.xml | 34 +++++++------------ app/src/main/res/values/constants.xml | 3 +- 8 files changed, 30 insertions(+), 69 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_reddit.xml create mode 100644 app/src/main/res/drawable/ic_telegram.xml delete mode 100644 app/src/main/res/drawable/ic_twitter.xml diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/about/AboutSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/about/AboutSettingsFragment.kt index c53fcfdce..cfede729c 100644 --- a/app/src/main/java/org/koitharu/kotatsu/settings/about/AboutSettingsFragment.kt +++ b/app/src/main/java/org/koitharu/kotatsu/settings/about/AboutSettingsFragment.kt @@ -36,6 +36,7 @@ class AboutSettingsFragment : BasePreferenceFragment(R.string.about) { } findPreference(AppSettings.KEY_UPDATES_UNSTABLE)?.run { isEnabled = VersionId(BuildConfig.VERSION_NAME).isStable + if (!isEnabled) isChecked = true } } diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/utils/AboutLinksPreference.kt b/app/src/main/java/org/koitharu/kotatsu/settings/utils/AboutLinksPreference.kt index 42d7b70c9..2102b3788 100644 --- a/app/src/main/java/org/koitharu/kotatsu/settings/utils/AboutLinksPreference.kt +++ b/app/src/main/java/org/koitharu/kotatsu/settings/utils/AboutLinksPreference.kt @@ -31,8 +31,7 @@ class AboutLinksPreference @JvmOverloads constructor( binding.btn4pda, binding.btnDiscord, binding.btnGithub, - binding.btnReddit, - binding.btnTwitter, + binding.btnTelegram, ).forEach { button -> TooltipCompat.setTooltipText(button, button.contentDescription) button.setOnClickListener(this) @@ -43,8 +42,7 @@ class AboutLinksPreference @JvmOverloads constructor( val urlResId = when (v.id) { R.id.btn_4pda -> R.string.url_forpda R.id.btn_discord -> R.string.url_discord - R.id.btn_twitter -> R.string.url_twitter - R.id.btn_reddit -> R.string.url_reddit + R.id.btn_telegram -> R.string.url_telegram R.id.btn_github -> R.string.url_github else -> return } @@ -59,9 +57,9 @@ class AboutLinksPreference @JvmOverloads constructor( Intent.createChooser(intent, title) } else { intent - } + }, ) } catch (_: ActivityNotFoundException) { } } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfFragment.kt b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfFragment.kt index d9821cff0..a275957ac 100644 --- a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfFragment.kt +++ b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfFragment.kt @@ -12,14 +12,11 @@ import androidx.core.view.updatePadding import androidx.fragment.app.viewModels import androidx.recyclerview.widget.RecyclerView import coil.ImageLoader -import com.google.android.material.snackbar.Snackbar import dagger.hilt.android.AndroidEntryPoint -import org.koitharu.kotatsu.R -import org.koitharu.kotatsu.base.domain.reverseAsync import org.koitharu.kotatsu.base.ui.BaseFragment import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner -import org.koitharu.kotatsu.base.ui.util.ReversibleAction +import org.koitharu.kotatsu.base.ui.util.ReversibleActionObserver import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.databinding.FragmentShelfBinding @@ -28,7 +25,6 @@ import org.koitharu.kotatsu.favourites.ui.FavouritesActivity import org.koitharu.kotatsu.history.ui.HistoryActivity import org.koitharu.kotatsu.list.ui.ItemSizeResolver import org.koitharu.kotatsu.list.ui.model.ListModel -import org.koitharu.kotatsu.main.ui.owners.BottomNavOwner import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.search.ui.MangaListActivity @@ -83,7 +79,7 @@ class ShelfFragment : viewModel.content.observe(viewLifecycleOwner, ::onListChanged) viewModel.onError.observe(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this)) - viewModel.onActionDone.observe(viewLifecycleOwner, ::onActionDone) + viewModel.onActionDone.observe(viewLifecycleOwner, ReversibleActionObserver(binding.recyclerView)) } override fun onDestroyView() { @@ -135,17 +131,6 @@ class ShelfFragment : adapter?.items = list } - private fun onActionDone(action: ReversibleAction) { - val handle = action.handle - val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG - val snackbar = Snackbar.make(binding.recyclerView, action.stringResId, length) - if (handle != null) { - snackbar.setAction(R.string.undo) { handle.reverseAsync() } - } - snackbar.anchorView = (activity as? BottomNavOwner)?.bottomNav - snackbar.show() - } - companion object { fun newInstance() = ShelfFragment() diff --git a/app/src/main/res/drawable/ic_reddit.xml b/app/src/main/res/drawable/ic_reddit.xml deleted file mode 100644 index 047683dbc..000000000 --- a/app/src/main/res/drawable/ic_reddit.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_telegram.xml b/app/src/main/res/drawable/ic_telegram.xml new file mode 100644 index 000000000..c18d3a442 --- /dev/null +++ b/app/src/main/res/drawable/ic_telegram.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_twitter.xml b/app/src/main/res/drawable/ic_twitter.xml deleted file mode 100644 index 3e51fdce1..000000000 --- a/app/src/main/res/drawable/ic_twitter.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/layout/preference_about_links.xml b/app/src/main/res/layout/preference_about_links.xml index 475b02f65..975925184 100644 --- a/app/src/main/res/layout/preference_about_links.xml +++ b/app/src/main/res/layout/preference_about_links.xml @@ -1,5 +1,6 @@ - @@ -29,36 +30,25 @@ tools:ignore="HardcodedText" /> - - - \ No newline at end of file + diff --git a/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml index 452850321..cf8daf367 100644 --- a/app/src/main/res/values/constants.xml +++ b/app/src/main/res/values/constants.xml @@ -3,8 +3,7 @@ https://github.com/KotatsuApp/Kotatsu https://discord.gg/NNJ5RgVBC5 https://4pda.to/forum/index.php?showtopic=697669 - https://twitter.com/kotatsuapp - https://reddit.com/user/kotatsuapp + https://t.me/kotatsuapp https://hosted.weblate.org/engage/kotatsu https://acra.kotatsu.app/report org.kotatsu.sync