Remove "enjoying QKSMS?" box (803b307e) · Commits · e / os / Message

presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt

+7 −7

Original line number	Diff line number	Diff line
		@@ -110,9 +110,12 @@ class MainActivity : QkThemedActivity(), MainView {
		invite.clicks().map { NavItem.INVITE }))
		}
		override val optionsItemIntent: Subject<Int> = 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 plusBannerIntent: Observable<*>
		// get() = TODO("Not yet implemented")
		// override val dismissRatingIntent: Observable<*>
		// get() = TODO("Not yet implemented")
		// override val rateIntent: Observable<*>
		// get() = TODO("Not yet implemented")
		override val conversationsSelectedIntent by lazy { conversationsAdapter.selectionChanges }
		override val confirmDeleteIntent: Subject<List<Long>> = PublishSubject.create()
		override val swipeConversationIntent by lazy { itemTouchCallback.swipes }
		@@ -186,8 +189,6 @@ class MainActivity : QkThemedActivity(), MainView {
		}
		syncingProgress?.progressTintList = ColorStateList.valueOf(theme.theme)
		syncingProgress?.indeterminateTintList = ColorStateList.valueOf(theme.theme)
		plusIcon.setTint(theme.theme)
		rateIcon.setTint(theme.theme)
		// Set the FAB compose icon color
		compose.setTint(ContextCompat.getColor(this, R.color.colorPrimaryDark))
		//set the FAB background color
		@@ -253,8 +254,7 @@ class MainActivity : QkThemedActivity(), MainView {
		badge.isVisible = drawerBadgesExperiment.variant && !state.upgraded
		}
		plus.isVisible = state.upgraded
		plusBanner.isVisible = !state.upgraded
		rateLayout.setVisible(state.showRating)


		compose.setVisible(state.page is Inbox \|\| state.page is Archived)
		conversationsAdapter.emptyView = empty.takeIf { state.page is Inbox \|\| state.page is Archived }

presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -33,9 +33,9 @@ interface MainView : QkView<MainState> {
		val homeIntent: Observable<*>
		val navigationIntent: Observable<NavItem>
		val optionsItemIntent: Observable<Int>
		val plusBannerIntent: Observable<*>
		val dismissRatingIntent: Observable<*>
		val rateIntent: Observable<*>
		// val plusBannerIntent: Observable<*>
		// val dismissRatingIntent: Observable<*>
		// val rateIntent: Observable<*>
		val conversationsSelectedIntent: Observable<List<Long>>
		val confirmDeleteIntent: Observable<List<Long>>
		val swipeConversationIntent: Observable<Pair<Long, Int>>

presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt

+17 −17

Original line number	Diff line number	Diff line
		@@ -368,23 +368,23 @@ 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 {
		navigator.showRating()
		ratingManager.rate()
		}

		view.dismissRatingIntent
		.autoDisposable(view.scope())
		.subscribe { ratingManager.dismiss() }
		// view.plusBannerIntent
		// .autoDisposable(view.scope())
		// .subscribe {
		// newState { copy(drawerOpen = false) }
		// navigator.showQksmsPlusActivity("main_banner")
		// }
		//
		// view.rateIntent
		// .autoDisposable(view.scope())
		// .subscribe {
		// navigator.showRating()
		// ratingManager.rate()
		// }
		//
		// view.dismissRatingIntent
		// .autoDisposable(view.scope())
		// .subscribe { ratingManager.dismiss() }

		view.conversationsSelectedIntent
		.withLatestFrom(state) { selection, state ->

presentation/src/main/res/layout/drawer_view.xml

+0 −139

Original line number	Diff line number	Diff line
		@@ -211,148 +211,9 @@

		</LinearLayout>

		<androidx.constraintlayout.widget.ConstraintLayout

		android:id="@+id/plusBanner"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="8dp"
		android:layout_marginTop="8dp"
		android:layout_marginEnd="8dp"
		android:background="@drawable/rounded_rectangle_outline_2dp"
		android:backgroundTint="?android:attr/divider"
		android:foreground="?attr/selectableItemBackground"
		android:padding="16dp">

		<ImageView
		android:id="@+id/plusIcon"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:src="@drawable/ic_star_black_24dp"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toTopOf="parent"
		tools:tint="@color/tools_theme" />

		<com.moez.QKSMS.common.widget.QkTextView
		android:id="@+id/plusTitle"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dp"
		android:layout_marginEnd="16dp"
		android:text="@string/drawer_plus_banner_title"
		android:textColor="?android:attr/textColorPrimary"
		android:textStyle="bold"
		app:layout_constraintEnd_toStartOf="@id/plusNext"
		app:layout_constraintStart_toEndOf="@id/plusIcon"
		app:layout_constraintTop_toTopOf="parent"
		app:textSize="primary" />

		<com.moez.QKSMS.common.widget.QkTextView
		android:id="@+id/plusSummary"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginTop="2dp"
		android:text="@string/drawer_plus_banner_summary"
		android:textColor="?android:attr/textColorSecondary"
		app:layout_constraintEnd_toEndOf="@id/plusTitle"
		app:layout_constraintStart_toStartOf="@id/plusTitle"
		app:layout_constraintTop_toBottomOf="@id/plusTitle"
		app:textSize="secondary" />

		<ImageView
		android:id="@+id/plusNext"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:src="@drawable/ic_chevron_right_black_24dp"
		android:tint="?android:attr/textColorTertiary"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintTop_toTopOf="parent" />

		</androidx.constraintlayout.widget.ConstraintLayout>

		<androidx.constraintlayout.widget.ConstraintLayout
		android:id="@+id/rateLayout"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="8dp"
		android:layout_marginTop="8dp"
		android:layout_marginEnd="8dp"
		android:background="@drawable/rounded_rectangle_outline_2dp"
		android:backgroundTint="?android:attr/divider">

		<ImageView
		android:id="@+id/rateIcon"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_marginStart="16dp"
		android:src="@drawable/ic_favorite_black_24dp"
		app:layout_constraintBottom_toBottomOf="@id/rateSummary"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toTopOf="@id/rateTitle"
		tools:tint="@color/tools_theme" />

		<com.moez.QKSMS.common.widget.QkTextView
		android:id="@+id/rateTitle"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dp"
		android:layout_marginTop="16dp"
		android:layout_marginEnd="16dp"
		android:text="@string/rate_title"
		android:textColor="?android:attr/textColorPrimary"
		android:textStyle="bold"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toEndOf="@id/rateIcon"
		app:layout_constraintTop_toTopOf="parent"
		app:textSize="primary" />

		<com.moez.QKSMS.common.widget.QkTextView
		android:id="@+id/rateSummary"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginTop="2dp"
		android:layout_marginEnd="16dp"
		android:text="@string/rate_summary"
		android:textColor="?android:attr/textColorSecondary"
		app:layout_constraintEnd_toEndOf="@id/rateTitle"
		app:layout_constraintStart_toStartOf="@id/rateTitle"
		app:layout_constraintTop_toBottomOf="@id/rateTitle"
		app:textSize="secondary" />

		<com.moez.QKSMS.common.widget.QkTextView
		android:id="@+id/rateDismiss"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dp"
		android:layout_marginTop="8dp"
		android:paddingStart="16dp"
		android:paddingTop="16dp"
		android:paddingBottom="16dp"
		android:text="@string/rate_dismiss"
		android:textColor="?android:attr/textColorTertiary"
		android:textStyle="bold"
		app:layout_constraintEnd_toStartOf="@id/rateOkay"
		app:layout_constraintTop_toBottomOf="@id/rateSummary"
		app:textSize="secondary" />

		<com.moez.QKSMS.common.widget.QkTextView
		android:id="@+id/rateOkay"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dp"
		android:layout_marginEnd="8dp"
		android:background="?attr/selectableItemBackground"
		android:padding="16dp"
		android:text="@string/rate_okay"
		android:textColor="?android:attr/textColorSecondary"
		android:textStyle="bold"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintTop_toBottomOf="@id/rateSummary"
		app:textSize="secondary" />

		</androidx.constraintlayout.widget.ConstraintLayout>

		</LinearLayout>