diff --git a/data/src/main/assets/changelog.json b/data/src/main/assets/changelog.json index 8485028b1..a5d71b800 100644 --- a/data/src/main/assets/changelog.json +++ b/data/src/main/assets/changelog.json @@ -1,4 +1,19 @@ + [ + { + "versionCode": "2221", + "versionName": "4.0.0", + "fixed": [ + "Revived!", + "Crash when deleting scheduled messages", + "Crash when searching for only spaces" + ], + "removed": [ + "Most QKSMS branding", + "Donation on sidebar", + "Help on sidebar" + ] + }, { "versionCode": "2220", "versionName": "3.10.1", diff --git a/presentation/build.gradle b/presentation/build.gradle index 7022b7ecd..de2be065c 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -30,8 +30,8 @@ android { applicationId 'dev.octoshrimpy.quik' minSdkVersion 23 targetSdkVersion 33 - versionCode 2220 - versionName "3.10.1" + versionCode 2221 + versionName "4.0.0" setProperty("archivesBaseName", "QKSMS-v${versionName}") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt index a1f8b9c28..5cd931dcd 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt @@ -142,22 +142,22 @@ class Navigator @Inject constructor( } fun showDeveloper() { - val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti")) + val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/octoshrimpy")) startActivityExternal(intent) } fun showSourceCode() { - val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti/qksms")) + val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/octoshrimpy/quik")) startActivityExternal(intent) } fun showChangelog() { - val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti/qksms/releases")) + val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/octoshrimpy/quik/releases")) startActivityExternal(intent) } fun showLicense() { - val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti/qksms/blob/master/LICENSE")) + val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/octoshrimpy/quik/blob/master/LICENSE")) startActivityExternal(intent) } @@ -240,7 +240,7 @@ class Navigator @Inject constructor( analyticsManager.track("Clicked Invite") Intent(Intent.ACTION_SEND) .setType("text/plain") - .putExtra(Intent.EXTRA_TEXT, "http://qklabs.com/download") + .putExtra(Intent.EXTRA_TEXT, "https://github.com/octoshrimpy/quik/releases/latest") .let { Intent.createChooser(it, null) } .let(::startActivityExternal) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index b8e0becfd..6d5410263 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -101,12 +101,12 @@ class MainActivity : QkThemedActivity(), MainView { scheduled.clicks().map { NavItem.SCHEDULED }, blocking.clicks().map { NavItem.BLOCKING }, settings.clicks().map { NavItem.SETTINGS }, - plus.clicks().map { NavItem.PLUS }, - help.clicks().map { NavItem.HELP }, +// plus.clicks().map { NavItem.PLUS }, +// help.clicks().map { NavItem.HELP }, invite.clicks().map { NavItem.INVITE })) } override val optionsItemIntent: Subject = PublishSubject.create() - override val plusBannerIntent by lazy { plusBanner.clicks() } +// override val plusBannerIntent by lazy { plusBanner.clicks() } override val dismissRatingIntent by lazy { rateDismiss.clicks() } override val rateIntent by lazy { rateOkay.clicks() } override val conversationsSelectedIntent by lazy { conversationsAdapter.selectionChanges } @@ -238,7 +238,7 @@ class MainActivity : QkThemedActivity(), MainView { listOf(plusBadge1, plusBadge2).forEach { badge -> badge.isVisible = drawerBadgesExperiment.variant && !state.upgraded } - plus.isVisible = state.upgraded +// plus.isVisible = state.upgraded plusBanner.isVisible = !state.upgraded rateLayout.setVisible(state.showRating) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt index 1f264508a..c23bd7b83 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt @@ -33,7 +33,7 @@ interface MainView : QkView { val homeIntent: Observable<*> val navigationIntent: Observable val optionsItemIntent: Observable - val plusBannerIntent: Observable<*> +// val plusBannerIntent: Observable<*> val dismissRatingIntent: Observable<*> val rateIntent: Observable<*> val conversationsSelectedIntent: Observable> diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index 055a26d3a..c0c15f1ee 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -294,8 +294,8 @@ class MainViewModel @Inject constructor( NavItem.SCHEDULED -> navigator.showScheduled() NavItem.BLOCKING -> navigator.showBlockedConversations() NavItem.SETTINGS -> navigator.showSettings() - NavItem.PLUS -> navigator.showQksmsPlusActivity("main_menu") - NavItem.HELP -> navigator.showSupport() +// NavItem.PLUS -> navigator.showQksmsPlusActivity("main_menu") +// NavItem.HELP -> navigator.showSupport() NavItem.INVITE -> navigator.showInvite() else -> Unit } @@ -399,12 +399,12 @@ class MainViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe() - view.plusBannerIntent - .autoDisposable(view.scope()) - .subscribe { - newState { copy(drawerOpen = false) } - navigator.showQksmsPlusActivity("main_banner") - } +// view.plusBannerIntent +// .autoDisposable(view.scope()) +// .subscribe { +// newState { copy(drawerOpen = false) } +// navigator.showQksmsPlusActivity("main_banner") +// } view.rateIntent .autoDisposable(view.scope()) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt index be1199232..5882cd684 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt @@ -59,9 +59,9 @@ class PlusViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { sku -> view.initiatePurchaseFlow(billingManager, sku) } - view.donateIntent - .autoDisposable(view.scope()) - .subscribe { navigator.showDonation() } +// view.donateIntent +// .autoDisposable(view.scope()) +// .subscribe { navigator.showDonation() } view.themeClicks .autoDisposable(view.scope()) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt index cbc01a005..c38536a28 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt @@ -218,11 +218,11 @@ class SettingsPresenter @Inject constructor( view.nightModeSelected() .withLatestFrom(billingManager.upgradeStatus) { mode, upgraded -> - if (!upgraded && mode == Preferences.NIGHT_MODE_AUTO) { - view.showQksmsPlusSnackbar() - } else { +// if (!upgraded && mode == Preferences.NIGHT_MODE_AUTO) { +// view.showQksmsPlusSnackbar() +// } else { nightModeManager.updateNightMode(mode) - } +// } } .autoDisposable(view.scope()) .subscribe() @@ -245,11 +245,11 @@ class SettingsPresenter @Inject constructor( view.sendDelaySelected() .withLatestFrom(billingManager.upgradeStatus) { duration, upgraded -> - if (!upgraded && duration != 0) { - view.showQksmsPlusSnackbar() - } else { +// if (!upgraded && duration != 0) { +// view.showQksmsPlusSnackbar() +// } else { prefs.sendDelay.set(duration) - } +// } } .autoDisposable(view.scope()) .subscribe() diff --git a/presentation/src/main/res/layout/drawer_view.xml b/presentation/src/main/res/layout/drawer_view.xml index 7a75a60ae..5ab11322e 100644 --- a/presentation/src/main/res/layout/drawer_view.xml +++ b/presentation/src/main/res/layout/drawer_view.xml @@ -161,35 +161,35 @@ - + + + - + + + + - + + + - + - + + + - + + + + - + + + - + Theme Search inbox… Type a name or number - QKSMS+ + QKSMS+ - deprecated Skip Continue @@ -66,9 +66,9 @@ Make QUIK your default SMS app Change Permission required - QKSMS needs permission to send and view SMS messages - QKSMS needs permission to view your contacts - QKSMS needs permission to display notifications + QUIK needs permission to send and view SMS messages + QUIK needs permission to view your contacts + QUIK needs permission to display notifications Allow Inbox @@ -77,10 +77,10 @@ Blocking More Settings - QKSMS+ + QKSMS+ - deprecated Help & feedback Invite friends - QKSMS+ + QKSMS+ - deprecated Unlock amazing new features, and support development Enjoying QUIK? @@ -381,13 +381,13 @@ Open conversation Material - QKSMS+ + QKSMS+ - deprecated HEX Apply - Moez Bhatti - https://github.com/moezbhatti/qksms - https://github.com/moezbhatti/qksms/releases + Marcos Jones + https://github.com/octoshrimpy/quik + https://github.com/octoshrimpy/quik/releases moez@qklabs.com GNU General Public License v3.0 © 2014–2019