caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

move DialogAppCompatActivity

Browse source
This commit is contained in:
Milos Kozak 2022-11-23 16:13:39 +01:00
parent d444979603
commit 32bf2e592a
19 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/MainActivity.kt
View file

@ -50,7 +50,7 @@ import info.nightscout.interfaces.AndroidPermission
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.aps.Loop
import info.nightscout.interfaces.constraints.Constraints
import info.nightscout.interfaces.locale.LocaleHelper
import info.nightscout.core.ui.locale.LocaleHelper
import info.nightscout.interfaces.maintenance.PrefFileListProvider
import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.interfaces.plugin.PluginBase

2
app/src/main/java/info/nightscout/androidaps/MainApp.kt
View file

@ -35,7 +35,7 @@ import info.nightscout.implementation.db.CompatDBHelper
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.ConfigBuilder
import info.nightscout.interfaces.LocalAlertUtils
import info.nightscout.interfaces.locale.LocaleHelper
import info.nightscout.core.ui.locale.LocaleHelper
import info.nightscout.interfaces.notifications.Notification
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.plugins.general.overview.notifications.NotificationStore

2
app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt
View file

@ -10,7 +10,7 @@ import androidx.preference.PreferenceScreen
import info.nightscout.androidaps.R
import info.nightscout.androidaps.databinding.ActivityPreferencesBinding
import info.nightscout.core.activities.NoSplashAppCompatActivity
import info.nightscout.interfaces.locale.LocaleHelper
import info.nightscout.core.ui.locale.LocaleHelper
class PreferencesActivity : NoSplashAppCompatActivity(), PreferenceFragmentCompat.OnPreferenceStartScreenCallback {

2
app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt
View file

@ -8,7 +8,7 @@ import android.view.MenuItem
import info.nightscout.androidaps.R
import info.nightscout.androidaps.plugins.configBuilder.PluginStore
import info.nightscout.core.activities.DaggerAppCompatActivityWithResult
import info.nightscout.interfaces.locale.LocaleHelper
import info.nightscout.core.ui.locale.LocaleHelper
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.protection.ProtectionCheck
import javax.inject.Inject

2
core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt
View file

@ -15,7 +15,7 @@ import info.nightscout.androidaps.plugins.general.maintenance.PrefsFileContract
import info.nightscout.core.main.R
import info.nightscout.core.main.databinding.MaintenanceImportListActivityBinding
import info.nightscout.core.main.databinding.MaintenanceImportListItemBinding
import info.nightscout.interfaces.locale.LocaleHelper
import info.nightscout.core.ui.locale.LocaleHelper
import info.nightscout.interfaces.maintenance.PrefFileListProvider
import info.nightscout.interfaces.maintenance.PrefsFile
import info.nightscout.interfaces.maintenance.PrefsMetadataKey

2
core/core-main/src/main/java/info/nightscout/core/activities/NoSplashAppCompatActivity.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.core.activities
import android.content.Context
import android.os.Bundle
import info.nightscout.core.main.R
import info.nightscout.interfaces.locale.LocaleHelper
import info.nightscout.core.ui.locale.LocaleHelper
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventThemeSwitch
import io.reactivex.rxjava3.disposables.CompositeDisposable

3
core/ui/build.gradle
View file

@ -20,4 +20,7 @@ dependencies {
api "androidx.preference:preference-ktx:$preferencektx_version"
api "com.google.android.material:material:$material_version"
api "com.google.dagger:dagger-android:$dagger_version"
api "com.google.dagger:dagger-android-support:$dagger_version"
}

4
core/core-main/src/main/java/info/nightscout/core/activities/DialogAppCompatActivity.kt → core/ui/src/main/java/info/nightscout/core/ui/activities/DialogAppCompatActivity.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.core.activities
package info.nightscout.core.ui.activities
import android.content.Context
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.interfaces.locale.LocaleHelper
import info.nightscout.core.ui.locale.LocaleHelper
open class DialogAppCompatActivity : DaggerAppCompatActivity() {
override fun attachBaseContext(newBase: Context) {

4
interfaces/src/main/java/info/nightscout/interfaces/locale/LocaleHelper.kt → core/ui/src/main/java/info/nightscout/core/ui/locale/LocaleHelper.kt
View file

@ -1,10 +1,10 @@
package info.nightscout.interfaces.locale
package info.nightscout.core.ui.locale
import android.content.Context
import android.content.ContextWrapper
import android.os.LocaleList
import androidx.preference.PreferenceManager
import info.nightscout.interfaces.R
import info.nightscout.core.ui.R
import java.util.Locale
object LocaleHelper {

3
core/ui/src/main/res/values/strings.xml
View file

@ -6,6 +6,9 @@
<string name="invalid_input">Invalid input data</string>
<string name="bolus_delivering">Delivering %1$.2f U</string>
<!-- Locale -->
<string name="key_language" translatable="false">language</string>
<!-- Dialogs-->
<string name="confirmation">Confirmation</string>
<string name="message">Message</string>

3
interfaces/src/main/res/values/strings.xml
View file

@ -12,9 +12,6 @@
<string name="metadata_format_debug">New debug format (unencrypted)</string>
<string name="metadata_format_other">Unknown export format</string>
<!-- Locale -->
<string name="key_language" translatable="false">language</string>
<!-- PumpType-->
<string name="def_extended_note">* Only discrete values no ranges are supported as granularity for basal/bolus in virtual pump.</string>

2
plugins/configuration/src/main/java/info/nightscout/configuration/setupwizard/SetupWizardActivity.kt
View file

@ -11,7 +11,7 @@ import info.nightscout.configuration.setupwizard.elements.SWItem
import info.nightscout.core.activities.NoSplashAppCompatActivity
import info.nightscout.core.ui.dialogs.OKDialog
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.interfaces.locale.LocaleHelper.update
import info.nightscout.core.ui.locale.LocaleHelper.update
import info.nightscout.interfaces.ui.ActivityNames
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.events.EventProfileStoreChanged

2
plugins/main/src/main/java/info/nightscout/plugins/source/activities/RequestDexcomPermissionActivity.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.plugins.source.activities
import android.os.Bundle
import info.nightscout.core.activities.DialogAppCompatActivity
import info.nightscout.core.ui.activities.DialogAppCompatActivity
import info.nightscout.plugins.source.DexcomPlugin
class RequestDexcomPermissionActivity : DialogAppCompatActivity() {

2
pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/AlarmHelperActivity.kt
View file

@ -7,7 +7,7 @@ import info.nightscout.androidaps.plugins.pump.eopatch.event.EventDialog
import info.nightscout.androidaps.plugins.pump.eopatch.event.EventProgressDialog
import info.nightscout.androidaps.plugins.pump.eopatch.ui.dialogs.AlarmDialog
import info.nightscout.androidaps.plugins.pump.eopatch.ui.dialogs.ProgressDialogHelper
import info.nightscout.core.activities.DialogAppCompatActivity
import info.nightscout.core.ui.activities.DialogAppCompatActivity
import info.nightscout.core.main.R
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus

2
pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/DialogHelperActivity.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ui
import android.os.Bundle
import info.nightscout.androidaps.plugins.pump.eopatch.ui.dialogs.ActivationNotCompleteDialog
import info.nightscout.core.activities.DialogAppCompatActivity
import info.nightscout.core.ui.activities.DialogAppCompatActivity
import info.nightscout.core.main.R
class DialogHelperActivity : DialogAppCompatActivity() {

2
ui/src/main/java/info/nightscout/ui/activities/BolusProgressHelperActivity.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.ui.activities
import android.os.Bundle
import info.nightscout.core.activities.DialogAppCompatActivity
import info.nightscout.core.ui.activities.DialogAppCompatActivity
import info.nightscout.ui.dialogs.BolusProgressDialog
class BolusProgressHelperActivity : DialogAppCompatActivity() {

2
ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.ui.activities
import android.os.Bundle
import info.nightscout.androidaps.services.AlarmSoundService
import info.nightscout.core.activities.DialogAppCompatActivity
import info.nightscout.core.ui.activities.DialogAppCompatActivity
import info.nightscout.core.main.R
import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction

2
ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt
View file

@ -13,7 +13,7 @@ import android.view.WindowManager
import dagger.android.support.DaggerDialogFragment
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.androidaps.services.AlarmSoundServiceHelper
import info.nightscout.core.activities.DialogAppCompatActivity
import info.nightscout.core.ui.activities.DialogAppCompatActivity
import info.nightscout.core.main.R
import info.nightscout.database.entities.UserEntry.Action
import info.nightscout.database.entities.UserEntry.Sources

2
ui/src/main/java/info/nightscout/ui/dialogs/BolusProgressDialog.kt
View file

@ -9,7 +9,7 @@ import android.view.Window
import android.view.WindowManager
import dagger.android.support.DaggerDialogFragment
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.core.activities.DialogAppCompatActivity
import info.nightscout.core.ui.activities.DialogAppCompatActivity
import info.nightscout.core.main.R
import info.nightscout.database.entities.UserEntry.Action
import info.nightscout.database.entities.UserEntry.Sources