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 71f8b7ef..cd01fc80 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 @@ -27,6 +27,7 @@ import android.view.Gravity import android.view.Menu import android.view.MenuItem import android.view.View +import android.view.ViewStub import androidx.appcompat.app.ActionBarDrawerToggle import androidx.core.app.ActivityCompat import androidx.core.view.GravityCompat @@ -62,6 +63,8 @@ import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.drawer_view.* import kotlinx.android.synthetic.main.main_activity.* +import kotlinx.android.synthetic.main.main_permission_hint.* +import kotlinx.android.synthetic.main.main_syncing.* import javax.inject.Inject class MainActivity : QkThemedActivity(), MainView { @@ -103,7 +106,7 @@ class MainActivity : QkThemedActivity(), MainView { override val confirmDeleteIntent: Subject> = PublishSubject.create() override val swipeConversationIntent by lazy { itemTouchCallback.swipes } override val undoArchiveIntent: Subject = PublishSubject.create() - override val snackbarButtonIntent by lazy { snackbarButton.clicks() } + override val snackbarButtonIntent: Subject = PublishSubject.create() override val backPressedIntent: Subject = PublishSubject.create() private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[MainViewModel::class.java] } @@ -115,6 +118,8 @@ class MainActivity : QkThemedActivity(), MainView { setAction(R.string.button_undo) { undoArchiveIntent.onNext(Unit) } } } + private val snackbar by lazy { findViewById(R.id.snackbar) } + private val syncing by lazy { findViewById(R.id.syncing) } override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) @@ -122,6 +127,15 @@ class MainActivity : QkThemedActivity(), MainView { setContentView(R.layout.main_activity) viewModel.bindView(this) + (snackbar as? ViewStub)?.setOnInflateListener { _, _ -> + snackbarButton.clicks().subscribe(snackbarButtonIntent) + } + + (syncing as? ViewStub)?.setOnInflateListener { _, _ -> + syncingProgress?.progressTintList = ColorStateList.valueOf(theme.blockingFirst().theme) + syncingProgress?.indeterminateTintList = ColorStateList.valueOf(theme.blockingFirst().theme) + } + toggle.syncState() toolbar.setNavigationOnClickListener { dismissKeyboard() @@ -135,7 +149,7 @@ class MainActivity : QkThemedActivity(), MainView { drawer.clicks().subscribe() // Set the theme color tint to the recyclerView, progressbar, and FAB - colors.themeObservable() + theme .doOnNext { recyclerView.scrapViews() } .autoDisposable(scope()) .subscribe { theme -> @@ -153,7 +167,8 @@ class MainActivity : QkThemedActivity(), MainView { badge.setBackgroundTint(theme.theme) badge.setTextColor(theme.textPrimary) } - syncingProgress.indeterminateTintList = ColorStateList.valueOf(theme.theme) + syncingProgress?.progressTintList = ColorStateList.valueOf(theme.theme) + syncingProgress?.indeterminateTintList = ColorStateList.valueOf(theme.theme) plusIcon.setTint(theme.theme) rateIcon.setTint(theme.theme) compose.setBackgroundTint(theme.theme) @@ -269,21 +284,21 @@ class MainActivity : QkThemedActivity(), MainView { when { !state.smsPermission -> { - snackbarTitle.setText(R.string.main_permission_required) - snackbarMessage.setText(R.string.main_permission_sms) - snackbarButton.setText(R.string.main_permission_allow) + snackbarTitle?.setText(R.string.main_permission_required) + snackbarMessage?.setText(R.string.main_permission_sms) + snackbarButton?.setText(R.string.main_permission_allow) } !state.defaultSms -> { - snackbarTitle.setText(R.string.main_default_sms_title) - snackbarMessage.setText(R.string.main_default_sms_message) - snackbarButton.setText(R.string.main_default_sms_change) + snackbarTitle?.setText(R.string.main_default_sms_title) + snackbarMessage?.setText(R.string.main_default_sms_message) + snackbarButton?.setText(R.string.main_default_sms_change) } !state.contactPermission -> { - snackbarTitle.setText(R.string.main_permission_required) - snackbarMessage.setText(R.string.main_permission_contacts) - snackbarButton.setText(R.string.main_permission_allow) + snackbarTitle?.setText(R.string.main_permission_required) + snackbarMessage?.setText(R.string.main_permission_contacts) + snackbarButton?.setText(R.string.main_permission_allow) } } } 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 49f48ac2..0fa1de70 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 @@ -30,9 +30,9 @@ data class MainState( val upgraded: Boolean = true, val showRating: Boolean = false, val syncing: SyncRepository.SyncProgress = SyncRepository.SyncProgress.Idle(), - val defaultSms: Boolean = false, - val smsPermission: Boolean = false, - val contactPermission: Boolean = false + val defaultSms: Boolean = true, + val smsPermission: Boolean = true, + val contactPermission: Boolean = true ) sealed class MainPage diff --git a/presentation/src/main/res/layout/main_activity.xml b/presentation/src/main/res/layout/main_activity.xml index c5803f6c..283861f0 100644 --- a/presentation/src/main/res/layout/main_activity.xml +++ b/presentation/src/main/res/layout/main_activity.xml @@ -107,99 +107,22 @@ android:layout_width="match_parent" android:layout_height="1dp" android:background="?android:attr/divider" - app:layout_constraintBottom_toTopOf="@id/bottomDivider" /> + app:layout_constraintBottom_toTopOf="@id/snackbar" /> - - - + android:inflatedId="@id/snackbar" + android:layout="@layout/main_permission_hint" + app:layout_constraintBottom_toTopOf="@id/syncing" /> - - - - - - - - - - - diff --git a/presentation/src/main/res/layout/main_permission_hint.xml b/presentation/src/main/res/layout/main_permission_hint.xml new file mode 100644 index 00000000..c9d92d79 --- /dev/null +++ b/presentation/src/main/res/layout/main_permission_hint.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/main_syncing.xml b/presentation/src/main/res/layout/main_syncing.xml new file mode 100644 index 00000000..74b64091 --- /dev/null +++ b/presentation/src/main/res/layout/main_syncing.xml @@ -0,0 +1,46 @@ + + + + + + + + + \ No newline at end of file