Loading domain/src/main/java/com/moez/QKSMS/util/Preferences.kt +2 −20 Original line number Diff line number Diff line Loading @@ -24,6 +24,7 @@ import android.os.Build import android.provider.Settings import android.util.TypedValue import android.view.ContextThemeWrapper import androidx.core.content.res.ResourcesCompat import com.f2prateek.rx.preferences2.Preference import com.f2prateek.rx.preferences2.RxSharedPreferences import com.moez.QKSMS.common.util.extensions.versionCode Loading Loading @@ -76,6 +77,7 @@ class Preferences @Inject constructor(private val context: Context, private val val canUseSubId = rxPrefs.getBoolean("canUseSubId", true) val version = rxPrefs.getInteger("version", context.versionCode) val changelogVersion = rxPrefs.getInteger("changelogVersion", context.versionCode) @Deprecated("This should only be accessed when migrating to @blockingManager") val sia = rxPrefs.getBoolean("sia", false) Loading Loading @@ -121,26 +123,6 @@ class Preferences @Inject constructor(private val context: Context, private val } } fun systemColor(): Int { val typedValue = TypedValue() val contextThemeWrapper = ContextThemeWrapper(context, R.style.Theme_DeviceDefault) contextThemeWrapper.theme.resolveAttribute(android.R.attr.colorAccent, typedValue, true) return typedValue.data } fun theme( recipientId: Long = 0, default: Int = rxPrefs.getInteger("theme", 0xFF7bb6ff.toInt()).get() ): Preference<Int> { return when (recipientId) { 0L -> rxPrefs.getInteger("theme", systemColor()) // 0L -> rxPrefs.getInteger("theme", 0xFF0097A7.toInt()) else -> rxPrefs.getInteger("theme_$recipientId", default) } } fun notifications(threadId: Long = 0): Preference<Boolean> { val default = rxPrefs.getBoolean("notifications", true) Loading e-ui-sdk.jar 0 → 100644 +116 KiB File added.No diff preview for this file type. View file presentation/build.gradle +18 −3 Original line number Diff line number Diff line Loading @@ -36,6 +36,12 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } aaptOptions { additionalParameters '-I', 'e-ui-sdk.jar' } /* signingConfigs { release }*/ Loading @@ -47,6 +53,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' //signingConfig signingConfigs.release } debug{ applicationIdSuffix ".debug" } } compileOptions { Loading Loading @@ -95,7 +106,11 @@ configurations { withAnalyticsRelease } dependencies { // e-ui sdk compileOnly files("../e-ui-sdk.jar") // lifecycle implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" Loading presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt +1 −1 Original line number Diff line number Diff line Loading @@ -71,7 +71,7 @@ class MenuItemAdapter @Inject constructor(private val context: Context, private intArrayOf(-android.R.attr.state_activated)) val text = parent.context.resolveThemeColor(android.R.attr.textColorTertiary) view.check.imageTintList = ColorStateList(states, intArrayOf(colors.theme().theme, text)) view.check.imageTintList = ColorStateList(states, intArrayOf(context.getColor(R.color.tools_theme), text)) return QkViewHolder(view).apply { view.setOnClickListener { Loading presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt +15 −6 Original line number Diff line number Diff line Loading @@ -29,6 +29,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.util.CrashlyticsTree import com.moez.QKSMS.common.util.FileLoggingTree import com.moez.QKSMS.injection.AppComponentManager import com.moez.QKSMS.injection.AppModule_ProvideRxPreferencesFactory import com.moez.QKSMS.injection.appComponent import com.moez.QKSMS.manager.AnalyticsManager import com.moez.QKSMS.migration.QkMigration Loading @@ -52,16 +53,24 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn * Inject these so that they are forced to initialize */ @Suppress("unused") @Inject lateinit var analyticsManager: AnalyticsManager @Inject lateinit var analyticsManager: AnalyticsManager @Suppress("unused") @Inject lateinit var qkMigration: QkMigration @Inject lateinit var qkMigration: QkMigration @Inject lateinit var dispatchingActivityInjector: DispatchingAndroidInjector<Activity> @Inject lateinit var dispatchingBroadcastReceiverInjector: DispatchingAndroidInjector<BroadcastReceiver> @Inject lateinit var dispatchingServiceInjector: DispatchingAndroidInjector<Service> @Inject lateinit var dispatchingActivityInjector: DispatchingAndroidInjector<Activity> @Inject lateinit var dispatchingBroadcastReceiverInjector: DispatchingAndroidInjector<BroadcastReceiver> @Inject lateinit var dispatchingServiceInjector: DispatchingAndroidInjector<Service> @Inject lateinit var fileLoggingTree: FileLoggingTree @Inject lateinit var nightModeManager: NightModeManager @Inject lateinit var nightModeManager: NightModeManager override fun onCreate() { super.onCreate() Loading Loading
domain/src/main/java/com/moez/QKSMS/util/Preferences.kt +2 −20 Original line number Diff line number Diff line Loading @@ -24,6 +24,7 @@ import android.os.Build import android.provider.Settings import android.util.TypedValue import android.view.ContextThemeWrapper import androidx.core.content.res.ResourcesCompat import com.f2prateek.rx.preferences2.Preference import com.f2prateek.rx.preferences2.RxSharedPreferences import com.moez.QKSMS.common.util.extensions.versionCode Loading Loading @@ -76,6 +77,7 @@ class Preferences @Inject constructor(private val context: Context, private val val canUseSubId = rxPrefs.getBoolean("canUseSubId", true) val version = rxPrefs.getInteger("version", context.versionCode) val changelogVersion = rxPrefs.getInteger("changelogVersion", context.versionCode) @Deprecated("This should only be accessed when migrating to @blockingManager") val sia = rxPrefs.getBoolean("sia", false) Loading Loading @@ -121,26 +123,6 @@ class Preferences @Inject constructor(private val context: Context, private val } } fun systemColor(): Int { val typedValue = TypedValue() val contextThemeWrapper = ContextThemeWrapper(context, R.style.Theme_DeviceDefault) contextThemeWrapper.theme.resolveAttribute(android.R.attr.colorAccent, typedValue, true) return typedValue.data } fun theme( recipientId: Long = 0, default: Int = rxPrefs.getInteger("theme", 0xFF7bb6ff.toInt()).get() ): Preference<Int> { return when (recipientId) { 0L -> rxPrefs.getInteger("theme", systemColor()) // 0L -> rxPrefs.getInteger("theme", 0xFF0097A7.toInt()) else -> rxPrefs.getInteger("theme_$recipientId", default) } } fun notifications(threadId: Long = 0): Preference<Boolean> { val default = rxPrefs.getBoolean("notifications", true) Loading
presentation/build.gradle +18 −3 Original line number Diff line number Diff line Loading @@ -36,6 +36,12 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } aaptOptions { additionalParameters '-I', 'e-ui-sdk.jar' } /* signingConfigs { release }*/ Loading @@ -47,6 +53,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' //signingConfig signingConfigs.release } debug{ applicationIdSuffix ".debug" } } compileOptions { Loading Loading @@ -95,7 +106,11 @@ configurations { withAnalyticsRelease } dependencies { // e-ui sdk compileOnly files("../e-ui-sdk.jar") // lifecycle implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" Loading
presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt +1 −1 Original line number Diff line number Diff line Loading @@ -71,7 +71,7 @@ class MenuItemAdapter @Inject constructor(private val context: Context, private intArrayOf(-android.R.attr.state_activated)) val text = parent.context.resolveThemeColor(android.R.attr.textColorTertiary) view.check.imageTintList = ColorStateList(states, intArrayOf(colors.theme().theme, text)) view.check.imageTintList = ColorStateList(states, intArrayOf(context.getColor(R.color.tools_theme), text)) return QkViewHolder(view).apply { view.setOnClickListener { Loading
presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt +15 −6 Original line number Diff line number Diff line Loading @@ -29,6 +29,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.util.CrashlyticsTree import com.moez.QKSMS.common.util.FileLoggingTree import com.moez.QKSMS.injection.AppComponentManager import com.moez.QKSMS.injection.AppModule_ProvideRxPreferencesFactory import com.moez.QKSMS.injection.appComponent import com.moez.QKSMS.manager.AnalyticsManager import com.moez.QKSMS.migration.QkMigration Loading @@ -52,16 +53,24 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn * Inject these so that they are forced to initialize */ @Suppress("unused") @Inject lateinit var analyticsManager: AnalyticsManager @Inject lateinit var analyticsManager: AnalyticsManager @Suppress("unused") @Inject lateinit var qkMigration: QkMigration @Inject lateinit var qkMigration: QkMigration @Inject lateinit var dispatchingActivityInjector: DispatchingAndroidInjector<Activity> @Inject lateinit var dispatchingBroadcastReceiverInjector: DispatchingAndroidInjector<BroadcastReceiver> @Inject lateinit var dispatchingServiceInjector: DispatchingAndroidInjector<Service> @Inject lateinit var dispatchingActivityInjector: DispatchingAndroidInjector<Activity> @Inject lateinit var dispatchingBroadcastReceiverInjector: DispatchingAndroidInjector<BroadcastReceiver> @Inject lateinit var dispatchingServiceInjector: DispatchingAndroidInjector<Service> @Inject lateinit var fileLoggingTree: FileLoggingTree @Inject lateinit var nightModeManager: NightModeManager @Inject lateinit var nightModeManager: NightModeManager override fun onCreate() { super.onCreate() Loading