forked from upstream-mirrors/quik
Merge branch 'dev/bug/send-sched-reg'
This commit is contained in:
@@ -1,5 +1,13 @@
|
||||
|
||||
[
|
||||
{
|
||||
"versionCode": "2222",
|
||||
"versionName": "4.0.5",
|
||||
"fixed": [
|
||||
],
|
||||
"removed": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"versionCode": "2221",
|
||||
"versionName": "4.0.4",
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -29,5 +29,5 @@ data class BackupState(
|
||||
val selectedBackupDetails: String? = null,
|
||||
val showStopRestoreDialog: Boolean = false,
|
||||
|
||||
val upgraded: Boolean = false
|
||||
val upgraded: Boolean = true
|
||||
)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -441,6 +441,7 @@ class MainViewModel @Inject constructor(
|
||||
}
|
||||
|
||||
is Searching -> {} // Ignore
|
||||
else -> {}
|
||||
}
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
|
||||
@@ -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 = ""
|
||||
|
||||
@@ -23,5 +23,5 @@ import io.realm.RealmResults
|
||||
|
||||
data class ScheduledState(
|
||||
val scheduledMessages: RealmResults<ScheduledMessage>? = null,
|
||||
val upgraded: Boolean = false
|
||||
val upgraded: Boolean = true
|
||||
)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
<!--
|
||||
~ Copyright (C) 2019 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/>.
|
||||
-->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M16.5,12.5L15,12.5v4l3,2 0.75,-1.23 -2.25,-1.52L16.5,12.5zM16,9L2,3v7l9,2 -9,2v7l7.27,-3.11C10.09,20.83 12.79,23 16,23c3.86,0 7,-3.14 7,-7s-3.14,-7 -7,-7zM16,21c-2.75,0 -4.98,-2.22 -5,-4.97v-0.07c0.02,-2.74 2.25,-4.97 5,-4.97 2.76,0 5,2.24 5,5S18.76,21 16,21z"/>
|
||||
</vector>
|
||||
@@ -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" />
|
||||
|
||||
<LinearLayout
|
||||
@@ -127,8 +127,7 @@
|
||||
android:elevation="4dp"
|
||||
android:gravity="center"
|
||||
android:visibility="gone"
|
||||
tools:backgroundTint="@color/tools_theme"
|
||||
tools:visibility="visible">
|
||||
tools:backgroundTint="@color/tools_theme">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/upgradeIcon"
|
||||
|
||||
Reference in New Issue
Block a user