From 08dbd7d72a98ab4af6c9bd3924111acaac1538dc Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 18 Jul 2018 14:41:06 -0400 Subject: [PATCH] Make nav drawer scrollable, improve banner for QKSMS+ --- .../moez/QKSMS/feature/main/MainActivity.kt | 5 + .../com/moez/QKSMS/feature/main/MainState.kt | 1 + .../com/moez/QKSMS/feature/main/MainView.kt | 1 + .../moez/QKSMS/feature/main/MainViewModel.kt | 20 +- .../drawable/ic_chevron_right_black_24dp.xml | 27 ++ .../src/main/res/layout/drawer_view.xml | 457 ++++++++++-------- presentation/src/main/res/values/strings.xml | 2 + 7 files changed, 313 insertions(+), 200 deletions(-) create mode 100644 presentation/src/main/res/drawable/ic_chevron_right_black_24dp.xml 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 486a1f24..ec50f04d 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 @@ -28,6 +28,7 @@ import android.view.MenuItem import android.view.View import androidx.appcompat.app.ActionBarDrawerToggle import androidx.core.app.ActivityCompat +import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.ItemTouchHelper @@ -87,6 +88,7 @@ class MainActivity : QkThemedActivity(), MainView { help.clicks().map { DrawerItem.HELP })) } override val optionsItemIntent: Subject = PublishSubject.create() + 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 } @@ -140,6 +142,7 @@ class MainActivity : QkThemedActivity(), MainView { // Miscellaneous views syncingProgress.indeterminateTintList = ColorStateList.valueOf(theme.theme) itemTouchCallback.color = theme.theme + plusIcon.setTint(theme.theme) rateIcon.setTint(theme.theme) compose.setBackgroundTint(theme.theme) } @@ -185,6 +188,8 @@ class MainActivity : QkThemedActivity(), MainView { toolbar.menu.findItem(R.id.block)?.isVisible = selectedConversations != 0 toolbar.menu.findItem(R.id.delete)?.isVisible = selectedConversations != 0 + plus.isVisible = state.upgraded + plusBanner.isVisible = !state.upgraded rateLayout.setVisible(state.showRating) compose.setVisible(state.page is Inbox || state.page is Archived) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt index 5dec0f5b..b40ba895 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt @@ -27,6 +27,7 @@ data class MainState( val hasError: Boolean = false, val page: MainPage = Inbox(), val drawerOpen: Boolean = false, + val upgraded: Boolean = true, val showRating: Boolean = false, val syncing: SyncRepository.SyncProgress = SyncRepository.SyncProgress.Idle(), val defaultSms: Boolean = false, 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 01ebb3c3..38171d7d 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 @@ -30,6 +30,7 @@ interface MainView : QkView { val homeIntent: Observable<*> val drawerItemIntent: Observable val optionsItemIntent: 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 62e90807..5e378019 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 @@ -22,6 +22,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.androidxcompat.scope import com.moez.QKSMS.common.base.QkViewModel +import com.moez.QKSMS.common.util.BillingManager import com.moez.QKSMS.extensions.removeAccents import com.moez.QKSMS.interactor.DeleteConversations import com.moez.QKSMS.interactor.MarkAllSeen @@ -49,7 +50,10 @@ import java.util.concurrent.TimeUnit import javax.inject.Inject class MainViewModel @Inject constructor( - private val markAllSeen: MarkAllSeen, + billingManager: BillingManager, + markAllSeen: MarkAllSeen, + migratePreferences: MigratePreferences, + syncRepository: SyncRepository, private val conversationRepo: ConversationRepository, private val deleteConversations: DeleteConversations, private val markRead: MarkRead, @@ -57,12 +61,10 @@ class MainViewModel @Inject constructor( private val markArchived: MarkArchived, private val markUnarchived: MarkUnarchived, private val markBlocked: MarkBlocked, - private val migratePreferences: MigratePreferences, private val navigator: Navigator, private val permissionManager: PermissionManager, private val ratingManager: RatingManager, - private val syncMessages: SyncMessages, - private val syncRepository: SyncRepository + private val syncMessages: SyncMessages ) : QkViewModel(MainState(page = Inbox(data = conversationRepo.getConversations()))) { init { @@ -78,6 +80,9 @@ class MainViewModel @Inject constructor( .distinctUntilChanged() .subscribe { syncing -> newState { copy(syncing = syncing) } } + // Update the upgraded status + disposables += billingManager.upgradeStatus + .subscribe { upgraded -> newState { copy(upgraded = upgraded) } } // Show the rating UI disposables += ratingManager.shouldShowRating @@ -231,6 +236,13 @@ class MainViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe() + view.plusBannerIntent + .autoDisposable(view.scope()) + .subscribe { + newState { copy(drawerOpen = false) } + navigator.showQksmsPlusActivity("main_banner") + } + view.rateIntent .autoDisposable(view.scope()) .subscribe { diff --git a/presentation/src/main/res/drawable/ic_chevron_right_black_24dp.xml b/presentation/src/main/res/drawable/ic_chevron_right_black_24dp.xml new file mode 100644 index 00000000..d01ba104 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_chevron_right_black_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/presentation/src/main/res/layout/drawer_view.xml b/presentation/src/main/res/layout/drawer_view.xml index 44556dc6..ec70d0f4 100644 --- a/presentation/src/main/res/layout/drawer_view.xml +++ b/presentation/src/main/res/layout/drawer_view.xml @@ -17,218 +17,283 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - + android:background="?android:attr/windowBackground"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:orientation="vertical" + android:paddingBottom="8dp" + android:paddingTop="8dp"> - + - + - + - + + + + + + + + + + + android:background="?android:attr/divider" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:background="@drawable/rounded_rectangle_outline_2dp" + android:backgroundTint="?android:attr/divider" + android:foreground="?attr/selectableItemBackground" + android:padding="16dp"> - + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 643f6c06..ea064c02 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -68,6 +68,8 @@ Settings QKSMS+ Help & feedback + QKSMS+ + Unlock amazing new features, and support development Enjoying QKSMS? Share some love and rate us on Google Play!