diff --git a/app/build.gradle b/app/build.gradle index 81f3c4c7..fb8f767a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 21 targetSdkVersion 33 versionCode 48 - versionName "4.1.3" + versionName "4.2.0" multiDexEnabled true vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/at/shockbytes/dante/announcement/SharedPrefsAnnouncementProvider.kt b/app/src/main/java/at/shockbytes/dante/announcement/SharedPrefsAnnouncementProvider.kt index bb5b4965..453e216f 100644 --- a/app/src/main/java/at/shockbytes/dante/announcement/SharedPrefsAnnouncementProvider.kt +++ b/app/src/main/java/at/shockbytes/dante/announcement/SharedPrefsAnnouncementProvider.kt @@ -8,11 +8,14 @@ class SharedPrefsAnnouncementProvider( ) : AnnouncementProvider { private val activeAnnouncement: Announcement = Announcement( - key = "suggestions_announcement", + key = "danteX", titleRes = R.string.announcement_suggestion_title, descriptionRes = R.string.announcement_suggestion_description, - illustration = Announcement.Illustration.ImageIllustration(R.drawable.ic_suggestions), - action = null + illustration = Announcement.Illustration.LottieIllustration(R.raw.in_development), + action = Announcement.Action.OpenUrl( + actionLabel = R.string.open_github, + url = "https://github.com/shockbytes/DanteX" + ) ) override fun getActiveAnnouncement(): Announcement? { diff --git a/app/src/main/java/at/shockbytes/dante/ui/fragment/SettingsFragment.kt b/app/src/main/java/at/shockbytes/dante/ui/fragment/SettingsFragment.kt index fe17d930..9cbd0dc1 100644 --- a/app/src/main/java/at/shockbytes/dante/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/at/shockbytes/dante/ui/fragment/SettingsFragment.kt @@ -114,14 +114,6 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChan } } - findPreference(getString(R.string.prefs_ad_free_medium_article_key))?.apply { - this.setOnPreferenceClickListener { - tracker.track(DanteTrackingEvent.OpenAdFreeMediumArticle) - UrlLauncher.openAdFreeMediumArticle(requireContext()) - true - } - } - findPreference(getString(R.string.prefs_feedback_key))?.apply { this.setOnPreferenceClickListener { MailLauncher.sendMail( @@ -156,7 +148,7 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChan featureFlagPreference?.isVisible = true featureFlagPreference?.setOnPreferenceClickListener { DanteUtils.addFragmentToActivity( - parentFragmentManager, + fragmentManager!!, FeatureFlagConfigFragment.newInstance(), android.R.id.content, addToBackStack = true diff --git a/app/src/main/java/at/shockbytes/dante/util/UrlLauncher.kt b/app/src/main/java/at/shockbytes/dante/util/UrlLauncher.kt index 42935236..701653b9 100644 --- a/app/src/main/java/at/shockbytes/dante/util/UrlLauncher.kt +++ b/app/src/main/java/at/shockbytes/dante/util/UrlLauncher.kt @@ -12,14 +12,9 @@ object UrlLauncher { private const val DANTE_GITHUB_URL = "https://github.com/shockbytes/Dante" private const val DISCORD_PAGE_URL = "https://discord.gg/EujYrCHjkm" - private const val AD_FREE_MEDIUM_URL = "https://mescht93.medium.com/why-my-apps-remain-ad-free-26d29217bdec" private const val TOS_URL = "https://dantebooks.com/#/terms" private const val PRIVACY_URL = "https://dantebooks.com/#/privacy" - fun openAdFreeMediumArticle(context: Context) { - launchUrl(context, AD_FREE_MEDIUM_URL) - } - fun openDanteGithubPage(context: Context) { launchUrl(context, DANTE_GITHUB_URL) } diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml index 9ae7bf5b..ed76276e 100644 --- a/app/src/main/res/xml/settings.xml +++ b/app/src/main/res/xml/settings.xml @@ -89,12 +89,6 @@ - - Dante BETA - 4.1.3 + 4.2 \ No newline at end of file diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml index 9e45c874..d101f650 100644 --- a/core/src/main/res/values-de/strings.xml +++ b/core/src/main/res/values-de/strings.xml @@ -198,8 +198,9 @@ Willst du wirklich das Buch %s von deiner Bibliothek entfernen? Mail senden - Büchervorschläge - Mit dem letzten Update ist es nun möglich anderen Benutzern Bücher vorzuschlagen. Wenn du ein Buch hast, dass du unbedingt mit Lesern auf der ganzen Welt teilen willst, dann kannst du das ganz einfach über das Buchmenü in der Übersicht machen. + Github öffnen + Weitere Entwicklung + Es gab nicht viele App-Updates in letzter Zeit. Als einziger Entwickler fehlen schlichtweg die Ressourcen. Der Fokus geht nun weg von einer reinen Android App in Richtung Cross-Plattform Support für iOS und Web: Codename DanteX. Das bedeutet auch, dass Bugs nicht sofort behoben werden. Das ist aber einiges an Arbeit und jede Hilfe ist hier willkommen. Werft gerne einen Blick auf das Github Repository. Eine neue Version von Dante wird voraussichtlich frühestens Mitte 2024 erscheinen. Bis dahin, viel Spaß beim Lesen.\n\nP.S.: Extra Dank für Lockie Richter, der schon bereits bei einigen Features von DanteX geholfen hat. Ich will übersetzen helfen Mitwirken diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 5dfca7dc..0ba8984f 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ Dante - 4.1.3 + 4.2 https://github.com/shockbytes/Dante @@ -72,7 +72,7 @@ About App version Developer - Shockbytes Studio © 2016-2021 + Shockbytes Studio © 2016-2023 Icons www.icons8.com\nwww.flaticon.com @@ -379,8 +379,9 @@ Delete book? Do you want to remove %s from your library? - Suggest books - With the latest update it is now possible to suggest books. If you have a book that you want to share with other readers then simply do that by clicking on the book menu in the overview screen. + Open Github + Further Development + There have not been much updates recently. As a single developer, there is just not enough time. The focus shifts now from a pure Android application to a cross-platform approach to support iOS and Web too: Codename DanteX. This also means that some bugs will not be addressed immediately. However, this is quite some work, so I appreciate every help on this topic. Please checkout the Github Repository. A new version of Dante will presumably arrive earliest in the mid of 2024. Until then, happy reading.\n\nP.S.: Special thanks to Lockie Richter who already helped with some features on DanteX. I want to help you translate Drop mail