diff --git a/data/src/main/assets/changelog.json b/data/src/main/assets/changelog.json index a66f5821..9395fb8b 100644 --- a/data/src/main/assets/changelog.json +++ b/data/src/main/assets/changelog.json @@ -1,5 +1,13 @@ [ + { + "versionCode": "2222", + "versionName": "4.0.5", + "fixed": [ + ], + "removed": [ + ] + }, { "versionCode": "2221", "versionName": "4.0.4", diff --git a/presentation/build.gradle b/presentation/build.gradle index c7a5eb26..06daf842 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -30,8 +30,8 @@ android { applicationId 'dev.octoshrimpy.quik' minSdkVersion 23 targetSdkVersion 33 - versionCode 2221 - versionName "4.0.4" + versionCode 2222 + versionName "4.0.5" setProperty("archivesBaseName", "QKSMS-v${versionName}") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt index b78c1d48..fe5347c4 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt @@ -29,5 +29,5 @@ data class BackupState( val selectedBackupDetails: String? = null, val showStopRestoreDialog: Boolean = false, - val upgraded: Boolean = false + val upgraded: Boolean = true ) 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 6d541026..972b9f3c 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 @@ -275,6 +275,8 @@ class MainActivity : QkThemedActivity(), MainView { itemTouchHelper.attachToRecyclerView(null) empty.setText(R.string.archived_empty_text) } + + else -> {} } inbox.isActivated = state.page is Inbox 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 c0c15f1e..68e42deb 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 @@ -441,6 +441,7 @@ class MainViewModel @Inject constructor( } is Searching -> {} // Ignore + else -> {} } } .autoDisposable(view.scope()) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusState.kt index 1bd4bcaf..42cd8aaf 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusState.kt @@ -19,7 +19,7 @@ package dev.octoshrimpy.quik.feature.plus data class PlusState( - val upgraded: Boolean = false, + val upgraded: Boolean = true, val upgradePrice: String = "", val upgradeDonatePrice: String = "", val currency: String = "" diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt index 1690dca1..987d7f54 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt @@ -23,5 +23,5 @@ import io.realm.RealmResults data class ScheduledState( val scheduledMessages: RealmResults? = null, - val upgraded: Boolean = false + val upgraded: Boolean = true ) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt index 9a930d89..4a9cd08b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt @@ -28,6 +28,7 @@ import android.content.Intent import android.net.Uri import android.os.Bundle import android.widget.RemoteViews +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.extensions.getColorCompat @@ -35,7 +36,6 @@ import dev.octoshrimpy.quik.feature.compose.ComposeActivity import dev.octoshrimpy.quik.feature.main.MainActivity import dev.octoshrimpy.quik.manager.WidgetManager import dev.octoshrimpy.quik.util.Preferences -import dagger.android.AndroidInjection import timber.log.Timber import javax.inject.Inject diff --git a/presentation/src/main/res/drawable/ic_schedule_send_black_24dp.xml b/presentation/src/main/res/drawable/ic_schedule_send_black_24dp.xml new file mode 100644 index 00000000..15fa2535 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_schedule_send_black_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/presentation/src/main/res/layout/scheduled_activity.xml b/presentation/src/main/res/layout/scheduled_activity.xml index 301f7ef0..7b598f1c 100644 --- a/presentation/src/main/res/layout/scheduled_activity.xml +++ b/presentation/src/main/res/layout/scheduled_activity.xml @@ -112,9 +112,9 @@ android:layout_gravity="bottom|end" android:layout_margin="16dp" android:contentDescription="@string/scheduled_compose_cd" - android:src="@drawable/ic_add_black_24dp" + android:src="@drawable/ic_schedule_send_black_24dp" android:tint="@color/white" - android:visibility="gone" + android:visibility="visible" tools:backgroundTint="@color/tools_theme" /> + tools:backgroundTint="@color/tools_theme">