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

Commit d84cd8ce authored by narinder Rana's avatar narinder Rana
Browse files

Merge branch '39_Remove_okSMS+' into 'okSMS_v3.9.4' 

Remove QKSMS+

See merge request !46
parents 51cbc498 970f0712

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

+3 −3
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 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 },

                invite.clicks().map { NavItem.INVITE }))

    }
@@ -243,7 +243,7 @@ class MainActivity : QkThemedActivity(), MainView { 
        listOf(plusBadge1, plusBadge2).forEach { badge ->

            badge.isVisible = drawerBadgesExperiment.variant && !state.upgraded

        }

        plus.isVisible = state.upgraded



        plusBanner.isVisible = !state.upgraded

        rateLayout.setVisible(state.showRating)

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

+1 −1
Original line number Diff line number Diff line
@@ -55,4 +55,4 @@ interface MainView : QkView<MainState> { 


}



enum class NavItem { BACK, INBOX, ARCHIVED, BACKUP, SCHEDULED, BLOCKING, SETTINGS, PLUS, HELP, INVITE }
 
 No newline at end of file
 
enum class NavItem { BACK, INBOX, ARCHIVED, BACKUP, SCHEDULED, BLOCKING, SETTINGS,  HELP, INVITE }
 
 No newline at end of file

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

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ 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.INVITE -> navigator.showInvite()

                        else -> Unit

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

+0 −14
Original line number Diff line number Diff line
@@ -165,20 +165,6 @@ 


        </LinearLayout>



        <LinearLayout

            android:id="@+id/plus"

            style="@style/DrawerRow">



            <ImageView

                style="@style/DrawerIcon"

                android:src="@drawable/ic_star_black_24dp"

                android:tint="?android:attr/textColorSecondary" />



            <com.moez.QKSMS.common.widget.QkTextView

                style="@style/DrawerText"

                android:text="@string/drawer_plus" />



        </LinearLayout>



        <LinearLayout

            android:id="@+id/help"