From eb5976a7965201335fce6fae5f66f99dcada8cd0 Mon Sep 17 00:00:00 2001 From: Zakhar Timoshenko Date: Tue, 3 Aug 2021 20:11:18 +0300 Subject: [PATCH] Some changes in about section, fix links --- .../kotatsu/core/prefs/AppSettings.kt | 1 + .../settings/about/AboutSettingsFragment.kt | 12 ++++-- .../settings/about/GratitudesFragment.kt | 42 ------------------- ...opyrightFragment.kt => LicenseFragment.kt} | 5 +-- app/src/main/res/drawable/ic_copyleft.xml | 16 +++++++ app/src/main/res/drawable/ic_copyright.xml | 10 ----- app/src/main/res/raw-ru/gratitudes | 5 --- app/src/main/res/raw/gratitudes | 5 --- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/xml/pref_about.xml | 9 ++-- 11 files changed, 34 insertions(+), 75 deletions(-) delete mode 100644 app/src/main/java/org/koitharu/kotatsu/settings/about/GratitudesFragment.kt rename app/src/main/java/org/koitharu/kotatsu/settings/about/{CopyrightFragment.kt => LicenseFragment.kt} (88%) create mode 100644 app/src/main/res/drawable/ic_copyleft.xml delete mode 100644 app/src/main/res/drawable/ic_copyright.xml delete mode 100644 app/src/main/res/raw-ru/gratitudes delete mode 100644 app/src/main/res/raw/gratitudes diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt index 057e7913c..a2f2fbc59 100644 --- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt +++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt @@ -187,6 +187,7 @@ class AppSettings private constructor(private val prefs: SharedPreferences) : const val KEY_APP_UPDATE = "app_update" const val KEY_APP_UPDATE_AUTO = "app_update_auto" const val KEY_APP_TRANSLATION = "about_app_translation" + const val KEY_APP_GRATITUDES = "about_gratitudes" const val KEY_FEEDBACK_4PDA = "about_feedback_4pda" const val KEY_FEEDBACK_GITHUB = "about_feedback_github" const val KEY_SUPPORT_DEVELOPER = "about_support_developer" 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 193a7d282..19107be54 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 @@ -50,16 +50,22 @@ class AboutSettingsFragment : BasePreferenceFragment(R.string.about) { } AppSettings.KEY_FEEDBACK_GITHUB -> { startActivity(context?.let { BrowserActivity.newIntent(it, - "https://4pda.to/forum/index.php?showtopic=697669", - resources.getString(R.string.about_feedback_4pda)) }) + "https://github.com/nv95/Kotatsu/issues", + "GitHub") }) true } AppSettings.KEY_SUPPORT_DEVELOPER -> { startActivity(context?.let { BrowserActivity.newIntent(it, - "https://4pda.to/forum/index.php?showtopic=697669", + "https://yoomoney.ru/to/410012543938752", resources.getString(R.string.about_support_developer)) }) true } + AppSettings.KEY_APP_GRATITUDES -> { + startActivity(context?.let { BrowserActivity.newIntent(it, + "https://github.com/nv95/Kotatsu/graphs/contributors", + resources.getString(R.string.about_gratitudes)) }) + true + } else -> super.onPreferenceTreeClick(preference) } } diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/about/GratitudesFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/about/GratitudesFragment.kt deleted file mode 100644 index 3a1a0ddd8..000000000 --- a/app/src/main/java/org/koitharu/kotatsu/settings/about/GratitudesFragment.kt +++ /dev/null @@ -1,42 +0,0 @@ -package org.koitharu.kotatsu.settings.about - -import android.os.Bundle -import android.text.SpannableStringBuilder -import android.text.method.LinkMovementMethod -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.core.graphics.Insets -import androidx.core.text.HtmlCompat -import androidx.core.text.parseAsHtml -import androidx.core.view.updatePadding -import org.koitharu.kotatsu.R -import org.koitharu.kotatsu.base.ui.BaseFragment -import org.koitharu.kotatsu.databinding.FragmentGratitudesBinding - -class GratitudesFragment : BaseFragment() { - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - binding.textView.apply { - text = - SpannableStringBuilder(resources.openRawResource(R.raw.gratitudes).bufferedReader() - .readText() - .parseAsHtml(HtmlCompat.FROM_HTML_SEPARATOR_LINE_BREAK_LIST)) - movementMethod = LinkMovementMethod.getInstance() - } - } - - override fun onInflateView( - inflater: LayoutInflater, - container: ViewGroup? - ) = FragmentGratitudesBinding.inflate(inflater, container, false) - - override fun onResume() { - super.onResume() - activity?.setTitle(R.string.about_gratitudes) - } - - override fun onWindowInsetsChanged(insets: Insets) = Unit - -} \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/about/CopyrightFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/about/LicenseFragment.kt similarity index 88% rename from app/src/main/java/org/koitharu/kotatsu/settings/about/CopyrightFragment.kt rename to app/src/main/java/org/koitharu/kotatsu/settings/about/LicenseFragment.kt index 3f134492d..8d25e3ca9 100644 --- a/app/src/main/java/org/koitharu/kotatsu/settings/about/CopyrightFragment.kt +++ b/app/src/main/java/org/koitharu/kotatsu/settings/about/LicenseFragment.kt @@ -9,12 +9,11 @@ import android.view.ViewGroup import androidx.core.graphics.Insets import androidx.core.text.HtmlCompat import androidx.core.text.parseAsHtml -import androidx.core.view.updatePadding import org.koitharu.kotatsu.R import org.koitharu.kotatsu.base.ui.BaseFragment import org.koitharu.kotatsu.databinding.FragmentCopyrightBinding -class CopyrightFragment : BaseFragment() { +class LicenseFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) @@ -34,7 +33,7 @@ class CopyrightFragment : BaseFragment() { override fun onResume() { super.onResume() - activity?.setTitle(R.string.about_copyright) + activity?.setTitle(R.string.about_license) } override fun onWindowInsetsChanged(insets: Insets) = Unit diff --git a/app/src/main/res/drawable/ic_copyleft.xml b/app/src/main/res/drawable/ic_copyleft.xml new file mode 100644 index 000000000..0227f2d77 --- /dev/null +++ b/app/src/main/res/drawable/ic_copyleft.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/drawable/ic_copyright.xml b/app/src/main/res/drawable/ic_copyright.xml deleted file mode 100644 index 7cb1adcdc..000000000 --- a/app/src/main/res/drawable/ic_copyright.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/raw-ru/gratitudes b/app/src/main/res/raw-ru/gratitudes deleted file mode 100644 index 4d74c4cac..000000000 --- a/app/src/main/res/raw-ru/gratitudes +++ /dev/null @@ -1,5 +0,0 @@ -Благодарности:
-

Zakhar Timoshenko (Xtimms) - активная помощь в разработке в плане пользовательского интерфейса и перевод на белорусский язык

-

Allan Nordhøy (comradekingu) - перевод на норвежский букмол

-

sguinetti - перевод на испанский

-

J. Lavoie - перевод на французский, итальянский и немецкий

\ No newline at end of file diff --git a/app/src/main/res/raw/gratitudes b/app/src/main/res/raw/gratitudes deleted file mode 100644 index fbf8de215..000000000 --- a/app/src/main/res/raw/gratitudes +++ /dev/null @@ -1,5 +0,0 @@ -Thanks:
-

Zakhar Timoshenko (Xtimms) - active assistance in the development from the point of view of the UI and translation into the Belarusian language

-

Allan Nordhøy (comradekingu) - Norwegian Bokmål translation

-

sguinetti - Spanish translation

-

J. Lavoie - French, German and Italian translation

\ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index cd1c8d28f..8ffe11b84 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -232,5 +232,5 @@ Благодарности Эти люди помогают Kotatsu стать лучше! Авторские права и лицензии - Авторские права + Лицензия \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a8bd88197..6566b5749 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -235,5 +235,5 @@ Gratitudes These people make Kotatsu become better! Copyright & Licenses - Copyright + License \ No newline at end of file diff --git a/app/src/main/res/xml/pref_about.xml b/app/src/main/res/xml/pref_about.xml index dcc47a0cc..fd82426ce 100644 --- a/app/src/main/res/xml/pref_about.xml +++ b/app/src/main/res/xml/pref_about.xml @@ -37,7 +37,6 @@ app:title="@string/about_support_developer" /> + app:key="about_license" + app:title="@string/about_license" />