forked from upstream-mirrors/quik
Merge pull request #25 from octoshrimpy/dev/bug/send-sched-reg
cleanup - v4.0, remove qk+ and help in sidebar
This commit is contained in:
@@ -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",
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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<Int> = 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)
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ interface MainView : QkView<MainState> {
|
||||
val homeIntent: Observable<*>
|
||||
val navigationIntent: Observable<NavItem>
|
||||
val optionsItemIntent: Observable<Int>
|
||||
val plusBannerIntent: Observable<*>
|
||||
// val plusBannerIntent: Observable<*>
|
||||
val dismissRatingIntent: Observable<*>
|
||||
val rateIntent: Observable<*>
|
||||
val conversationsSelectedIntent: Observable<List<Long>>
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -161,35 +161,35 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/plus"
|
||||
style="@style/DrawerRow">
|
||||
<!-- <LinearLayout-->
|
||||
<!-- android:id="@+id/plus"-->
|
||||
<!-- style="@style/DrawerRow">-->
|
||||
|
||||
<ImageView
|
||||
style="@style/DrawerIcon"
|
||||
android:src="@drawable/ic_star_black_24dp"
|
||||
android:tint="?android:attr/textColorSecondary" />
|
||||
<!-- <ImageView-->
|
||||
<!-- style="@style/DrawerIcon"-->
|
||||
<!-- android:src="@drawable/ic_star_black_24dp"-->
|
||||
<!-- android:tint="?android:attr/textColorSecondary" />-->
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.QkTextView
|
||||
style="@style/DrawerText"
|
||||
android:text="@string/drawer_plus" />
|
||||
<!-- <dev.octoshrimpy.quik.common.widget.QkTextView-->
|
||||
<!-- style="@style/DrawerText"-->
|
||||
<!-- android:text="@string/drawer_plus" />-->
|
||||
|
||||
</LinearLayout>
|
||||
<!-- </LinearLayout>-->
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/help"
|
||||
style="@style/DrawerRow">
|
||||
<!-- <LinearLayout-->
|
||||
<!-- android:id="@+id/help"-->
|
||||
<!-- style="@style/DrawerRow">-->
|
||||
|
||||
<ImageView
|
||||
style="@style/DrawerIcon"
|
||||
android:src="@drawable/ic_help_black_24dp"
|
||||
android:tint="?android:attr/textColorSecondary" />
|
||||
<!-- <ImageView-->
|
||||
<!-- style="@style/DrawerIcon"-->
|
||||
<!-- android:src="@drawable/ic_help_black_24dp"-->
|
||||
<!-- android:tint="?android:attr/textColorSecondary" />-->
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.QkTextView
|
||||
style="@style/DrawerText"
|
||||
android:text="@string/drawer_help" />
|
||||
<!-- <dev.octoshrimpy.quik.common.widget.QkTextView-->
|
||||
<!-- style="@style/DrawerText"-->
|
||||
<!-- android:text="@string/drawer_help" />-->
|
||||
|
||||
</LinearLayout>
|
||||
<!-- </LinearLayout>-->
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/invite"
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
<string name="title_theme">Theme</string>
|
||||
<string name="title_conversations">Search inbox…</string>
|
||||
<string name="title_compose">Type a name or number</string>
|
||||
<string name="title_qksms_plus" translatable="false">QKSMS+</string>
|
||||
<string name="title_qksms_plus" translatable="false">QKSMS+ - deprecated</string>
|
||||
|
||||
<string name="setup_skip">Skip</string>
|
||||
<string name="setup_next">Continue</string>
|
||||
@@ -66,9 +66,9 @@
|
||||
<string name="main_default_sms_message">Make QUIK your default SMS app</string>
|
||||
<string name="main_default_sms_change">Change</string>
|
||||
<string name="main_permission_required">Permission required</string>
|
||||
<string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
|
||||
<string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
|
||||
<string name="main_permission_notifications">QKSMS needs permission to display notifications</string>
|
||||
<string name="main_permission_sms">QUIK needs permission to send and view SMS messages</string>
|
||||
<string name="main_permission_contacts">QUIK needs permission to view your contacts</string>
|
||||
<string name="main_permission_notifications">QUIK needs permission to display notifications</string>
|
||||
<string name="main_permission_allow">Allow</string>
|
||||
|
||||
<string name="drawer_inbox">Inbox</string>
|
||||
@@ -77,10 +77,10 @@
|
||||
<string name="drawer_blocking">Blocking</string>
|
||||
<string name="drawer_more">More</string>
|
||||
<string name="drawer_settings">Settings</string>
|
||||
<string name="drawer_plus" translatable="false">QKSMS+</string>
|
||||
<string name="drawer_plus" translatable="false">QKSMS+ - deprecated</string>
|
||||
<string name="drawer_help">Help & feedback</string>
|
||||
<string name="drawer_invite">Invite friends</string>
|
||||
<string name="drawer_plus_banner_title" translatable="false">QKSMS+</string>
|
||||
<string name="drawer_plus_banner_title" translatable="false">QKSMS+ - deprecated</string>
|
||||
<string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
|
||||
|
||||
<string name="rate_title">Enjoying QUIK?</string>
|
||||
@@ -381,13 +381,13 @@
|
||||
<string name="qkreply_menu_view">Open conversation</string>
|
||||
|
||||
<string name="theme_material">Material</string>
|
||||
<string name="theme_plus" translatable="false">QKSMS+</string>
|
||||
<string name="theme_plus" translatable="false">QKSMS+ - deprecated</string>
|
||||
<string name="theme_hex">HEX</string>
|
||||
<string name="theme_apply">Apply</string>
|
||||
|
||||
<string name="about_developer" translatable="false">Moez Bhatti</string>
|
||||
<string name="about_source" translatable="false">https://github.com/moezbhatti/qksms</string>
|
||||
<string name="about_changelog" translatable="false">https://github.com/moezbhatti/qksms/releases</string>
|
||||
<string name="about_developer" translatable="false">Marcos Jones</string>
|
||||
<string name="about_source" translatable="false">https://github.com/octoshrimpy/quik</string>
|
||||
<string name="about_changelog" translatable="false">https://github.com/octoshrimpy/quik/releases</string>
|
||||
<string name="about_contact" translatable="false">moez@qklabs.com</string>
|
||||
<string name="about_license" translatable="false">GNU General Public License v3.0</string>
|
||||
<string name="about_copyright" translatable="false">© 2014–2019</string>
|
||||
|
||||
Reference in New Issue
Block a user