caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

move PersistentNotification

Browse source
This commit is contained in:
Milos Kozak 2022-11-28 14:46:53 +01:00
parent 59c10d04b5
commit b4e3f6da82
15 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/AndroidManifest.xml
View file

@ -69,10 +69,6 @@
android:name=".activities.PreferencesActivity"
android:exported="false"
android:theme="@style/AppTheme"/>
<activity
android:name="info.nightscout.configuration.maintenance.activities.PrefImportListActivity"
android:exported="false"
android:theme="@style/AppTheme" />
<activity
android:name=".activities.HistoryBrowseActivity"
android:exported="false"
@ -138,13 +134,6 @@
android:name="info.nightscout.core.services.AlarmSoundService"
android:enabled="true"
android:exported="true" />
<service android:name=".plugins.general.persistentNotification.DummyService" />
<activity
android:name="info.nightscout.configuration.maintenance.activities.LogSettingActivity"
android:exported="false"
android:theme="@style/AppTheme.NoActionBar" />
<uses-library
android:name="org.apache.http.legacy"
android:required="false" />

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

@ -8,7 +8,7 @@ import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
import info.nightscout.androidaps.danar.DanaRPlugin
import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploaderPlugin
import info.nightscout.androidaps.plugins.general.persistentNotification.PersistentNotificationPlugin
import info.nightscout.plugins.general.persistentNotification.PersistentNotificationPlugin
import info.nightscout.androidaps.plugins.pump.eopatch.EopatchPumpPlugin
import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin

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

@ -2,7 +2,7 @@ package info.nightscout.androidaps.di
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.androidaps.plugins.general.persistentNotification.DummyService
import info.nightscout.plugins.general.persistentNotification.DummyService
import info.nightscout.core.services.AlarmSoundService
import info.nightscout.automation.services.LocationService

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

@ -3,7 +3,7 @@ package info.nightscout.androidaps.receivers
import android.content.Context
import android.content.Intent
import dagger.android.DaggerBroadcastReceiver
import info.nightscout.androidaps.plugins.general.persistentNotification.DummyServiceHelper
import info.nightscout.plugins.general.persistentNotification.DummyServiceHelper
import javax.inject.Inject
class AutoStartReceiver : DaggerBroadcastReceiver() {

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

@ -34,7 +34,6 @@
<string name="nav_preferences_plugin">%1$s Preferences</string>
<string name="nav_refreshtreatments">Refresh treatments from NS</string>
<string name="nav_exit">Exit</string>
<string name="description_persistent_notification">Shows an ongoing notification with a short overview of what your loop is doing</string>
<string name="delta">Delta</string>
<string name="profile_label">Profile</string>
<string name="language" translatable="false">Language</string>
@ -44,8 +43,6 @@
<string name="ns_upload_only">(DANGEROUS TO DISABLE) NS upload only</string>
<string name="ns_upload_only_summary">NS upload only (disabled sync). Not effective on SGV unless a local source like xDrip+ is selected. Not effective on Profiles while NS-Profiles is used.\n!!! WARNING !!! Disabling this option may cause malfunctions and insulin overdose if any of your component (AAPS, NS, xDrip+) is wrong configured. Carefully watch if data displayed by AAPS match the pump state!</string>
<string name="wear">Wear</string>
<string name="ongoingnotificaction">Ongoing Notification</string>
<string name="old_data">OLD DATA</string>
<string name="nav_about">About</string>
<string name="smscommunicator_missingphonestatepermission">Missing phone state permission</string>
<string name="ns_alarm_options">Alarm options</string>

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

@ -40,6 +40,8 @@
<string name="ue_export_to_csv">Export User Entries to Excel (csv)</string>
<string name="confirm">Confirm</string>
<string name="pump">Pump</string>
<string name="missed_bg_readings">Missed BG readings</string>
<string name="treatments_iob_label_string">IOB:</string>
<!-- Protection-->

1
implementation/src/main/res/values/strings.xml
View file

@ -4,7 +4,6 @@
<string name="calibration_sent">Calibration sent to xDrip+</string>
<string name="bg_label">BG</string>
<string name="missed_bg_readings">Missed BG readings</string>
<string name="time_to_eat">Time to eat</string>
<string name="time_to_bolus">Time to bolus!\nRun Bolus wizard and do calculation again.</string>

8
plugins/configuration/src/main/AndroidManifest.xml
View file

@ -10,6 +10,14 @@
android:exported="false"
android:label="@string/title_activity_setup_wizard"
android:theme="@style/AppTheme" />
<activity
android:name=".maintenance.activities.LogSettingActivity"
android:exported="false"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".maintenance.activities.PrefImportListActivity"
android:exported="false"
android:theme="@style/AppTheme" />
</application>
</manifest>

2
plugins/main/build.gradle
View file

@ -36,7 +36,7 @@ dependencies {
//SmsCommunicator
api 'com.eatthepath:java-otp:0.4.0'
api 'com.github.kenglxn.QRGen:android:3.0.0'
api 'com.github.kenglxn.QRGen:android:2.7.0'
// Overview
api 'com.google.android.flexbox:flexbox:3.0.0'

5
plugins/main/src/main/AndroidManifest.xml
View file

@ -34,10 +34,7 @@
</intent-filter>
</activity>
<service
android:name=".sync.nsclient.services.NSClientService"
android:enabled="true"
android:exported="true" />
<service android:name="info.nightscout.plugins.general.persistentNotification.DummyService" />
<service
android:name="info.nightscout.plugins.general.overview.notifications.DismissNotificationService"

2
app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt → plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/DummyService.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.plugins.general.persistentNotification
package info.nightscout.plugins.general.persistentNotification
import android.app.Notification
import android.app.Service

2
app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyServiceHelper.kt → plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/DummyServiceHelper.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.plugins.general.persistentNotification
package info.nightscout.plugins.general.persistentNotification
import android.content.ComponentName
import android.content.Context

4
app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt → plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.plugins.general.persistentNotification
package info.nightscout.plugins.general.persistentNotification
import android.app.NotificationManager
import android.app.PendingIntent
@ -7,7 +7,6 @@ import android.content.Intent
import androidx.core.app.NotificationCompat
import androidx.core.app.RemoteInput
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.R
import info.nightscout.core.extensions.toStringShort
import info.nightscout.core.extensions.valueToUnitsString
import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
@ -25,6 +24,7 @@ import info.nightscout.interfaces.profile.Profile
import info.nightscout.interfaces.profile.ProfileFunction
import info.nightscout.interfaces.ui.IconsProvider
import info.nightscout.interfaces.utils.DecimalFormatter
import info.nightscout.plugins.R
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventAutosensCalculationFinished

5
plugins/main/src/main/res/values/strings.xml
View file

@ -532,4 +532,9 @@
<string name="resend_all_data">Resend All Data</string>
<string name="open_settings_on_wear">Open Settings on Wear</string>
<!-- PersistentNotification-->
<string name="ongoingnotificaction" translatable="false">Ongoing Notification</string>
<string name="description_persistent_notification">Shows an ongoing notification with a short overview of what your loop is doing</string>
<string name="old_data">OLD DATA</string>
</resources>

5
plugins/sync/src/main/AndroidManifest.xml
View file

@ -1,4 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<service
android:name=".sync.nsclient.services.NSClientService"
android:enabled="true"
android:exported="true" />
</manifest>