Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4993e9fc authored by Amit Kumar's avatar Amit Kumar
Browse files

Fixes #14 - Remove "Do you like QKSMS?"

parent 4638c70f

data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt

deleted100644 → 0
+0 −62
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>

 *

 * This file is part of QKSMS.

 *

 * QKSMS is free software: you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation, either version 3 of the License, or

 * (at your option) any later version.

 *

 * QKSMS is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.

 */

package com.moez.QKSMS.mapper



import com.f2prateek.rx.preferences2.RxSharedPreferences

import com.moez.QKSMS.manager.AnalyticsManager

import com.moez.QKSMS.manager.RatingManager

import io.reactivex.rxkotlin.Observables

import javax.inject.Inject



class RatingManagerImpl @Inject constructor(

    rxPrefs: RxSharedPreferences,

    private val analyticsManager: AnalyticsManager

) : RatingManager {



    companion object {

        private const val RATING_THRESHOLD = 10

    }



    private val sessions = rxPrefs.getInteger("sessions", 0)

    private val rated = rxPrefs.getBoolean("rated", false)

    private val dismissed = rxPrefs.getBoolean("dismissed", false)



    override val shouldShowRating = Observables.combineLatest(

            sessions.asObservable(),

            rated.asObservable(),

            dismissed.asObservable()

    ) { sessions, rated, dismissed ->

        sessions > RATING_THRESHOLD && !rated && !dismissed

    }



    override fun addSession() {

        sessions.set(sessions.get() + 1)

    }



    override fun rate() {

        analyticsManager.track("Clicked Rate")

        rated.set(true)

    }



    override fun dismiss() {

        analyticsManager.track("Clicked Rate (Dismiss)")

        dismissed.set(true)

    }



}

domain/src/main/java/com/moez/QKSMS/manager/RatingManager.kt

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>

 *

 * This file is part of QKSMS.

 *

 * QKSMS is free software: you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation, either version 3 of the License, or

 * (at your option) any later version.

 *

 * QKSMS is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.

 */

package com.moez.QKSMS.manager



import io.reactivex.Observable



interface RatingManager {



    val shouldShowRating: Observable<Boolean>



    /**

     * Whether or not we should show the rating UI should depend on the number of sessions

     */

    fun addSession()



    fun rate()



    fun dismiss()



}
 
 No newline at end of file

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

+0 −4
Original line number Diff line number Diff line
@@ -96,8 +96,6 @@ class MainActivity : QkThemedActivity(), MainView { 
                settings.clicks().map { DrawerItem.SETTINGS }))

    }

    override val optionsItemIntent: Subject<Int> = PublishSubject.create()

    override val dismissRatingIntent by lazy { rateDismiss.clicks() }

    override val rateIntent by lazy { rateOkay.clicks() }

    override val conversationsSelectedIntent by lazy { conversationsAdapter.selectionChanges }

    override val confirmDeleteIntent: Subject<List<Long>> = PublishSubject.create()

    override val swipeConversationIntent by lazy { itemTouchCallback.swipes }
@@ -166,7 +164,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)

                    compose.setBackgroundTint(theme.theme)



                    // Set the FAB compose icon color
@@ -217,7 +214,6 @@ class MainActivity : QkThemedActivity(), MainView { 
            badge.isVisible = drawerBadgesExperiment.variant && !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

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ interface MainView : QkView<MainState> { 
    val homeIntent: Observable<*>

    val drawerItemIntent: Observable<DrawerItem>

    val optionsItemIntent: Observable<Int>

    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

+0 −19
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import com.moez.QKSMS.interactor.MarkUnread 
import com.moez.QKSMS.interactor.MigratePreferences

import com.moez.QKSMS.interactor.SyncMessages

import com.moez.QKSMS.manager.PermissionManager

import com.moez.QKSMS.manager.RatingManager

import com.moez.QKSMS.model.SyncLog

import com.moez.QKSMS.repository.ConversationRepository

import com.moez.QKSMS.repository.SyncRepository
@@ -69,7 +68,6 @@ class MainViewModel @Inject constructor( 
    private val navigator: Navigator,

    private val permissionManager: PermissionManager,

    private val prefs: Preferences,

    private val ratingManager: RatingManager,

    private val syncMessages: SyncMessages

) : QkViewModel<MainView, MainState>(MainState(page = Inbox(data = conversationRepo.getConversations()))) {
@@ -91,11 +89,6 @@ class MainViewModel @Inject constructor( 
        disposables += billingManager.upgradeStatus

                .subscribe { upgraded -> newState { copy(upgraded = upgraded) } }



        // Show the rating UI

        disposables += ratingManager.shouldShowRating

                .subscribe { show -> newState { copy(showRating = show) } }





        // Migrate the preferences from 2.7.3

        migratePreferences.execute(Unit)
@@ -107,7 +100,6 @@ class MainViewModel @Inject constructor( 
            syncMessages.execute(Unit)

        }



        ratingManager.addSession()

        markAllSeen.execute(Unit)

    }
@@ -246,17 +238,6 @@ class MainViewModel @Inject constructor( 
                .autoDisposable(view.scope())

                .subscribe()



        view.rateIntent

                .autoDisposable(view.scope())

                .subscribe {

                    navigator.showRating()

                    ratingManager.rate()

                }



        view.dismissRatingIntent

                .autoDisposable(view.scope())

                .subscribe { ratingManager.dismiss() }



        view.conversationsSelectedIntent

                .withLatestFrom(state) { selection, state ->

                    val pin = selection