Merge pull request #1445 from osodebailar/Preparation-of-day-night-theme-switching-part-2
set night mode as default and all color in xml fragments by attribute…
This commit is contained in:
commit
74f0d8cb88
109 changed files with 1065 additions and 456 deletions
|
@ -55,6 +55,7 @@
|
|||
android:resource="@xml/automotive_app_desc" />
|
||||
|
||||
<activity android:name=".MainActivity"
|
||||
android:theme="@style/AppTheme"
|
||||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
|
@ -62,7 +63,8 @@
|
|||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity android:name=".activities.PreferencesActivity" />
|
||||
<activity android:name=".activities.PreferencesActivity"
|
||||
android:theme="@style/AppTheme" />
|
||||
<activity android:name=".plugins.general.overview.activities.QuickWizardListActivity"
|
||||
android:theme="@style/AppTheme"
|
||||
android:exported="false">
|
||||
|
@ -72,12 +74,18 @@
|
|||
<category android:name="android.intent.category.DEFAULT" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity android:name=".plugins.general.maintenance.activities.PrefImportListActivity" />
|
||||
<activity android:name=".activities.HistoryBrowseActivity" />
|
||||
<activity android:name=".activities.TreatmentsActivity" />
|
||||
<activity android:name=".activities.SurveyActivity" />
|
||||
<activity android:name=".activities.ProfileHelperActivity" />
|
||||
<activity android:name=".activities.StatsActivity" />
|
||||
<activity android:name=".plugins.general.maintenance.activities.PrefImportListActivity"
|
||||
android:theme="@style/AppTheme" />
|
||||
<activity android:name=".activities.HistoryBrowseActivity"
|
||||
android:theme="@style/AppTheme" />
|
||||
<activity android:name=".activities.TreatmentsActivity"
|
||||
android:theme="@style/AppTheme" />
|
||||
<activity android:name=".activities.SurveyActivity"
|
||||
android:theme="@style/AppTheme" />
|
||||
<activity android:name=".activities.ProfileHelperActivity"
|
||||
android:theme="@style/AppTheme" />
|
||||
<activity android:name=".activities.StatsActivity"
|
||||
android:theme="@style/AppTheme" />
|
||||
<activity
|
||||
android:name="com.google.firebase.auth.internal.FederatedSignInActivity"
|
||||
android:excludeFromRecents="true"
|
||||
|
@ -229,6 +237,7 @@
|
|||
<activity
|
||||
android:name=".setupwizard.SetupWizardActivity"
|
||||
android:configChanges="orientation|keyboardHidden|screenSize"
|
||||
android:theme="@style/AppTheme"
|
||||
android:label="@string/title_activity_setup_wizard" />
|
||||
|
||||
<activity
|
||||
|
|
|
@ -20,6 +20,7 @@ import android.widget.LinearLayout
|
|||
import android.widget.TextView
|
||||
import androidx.appcompat.app.ActionBarDrawerToggle
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.appcompat.app.AppCompatDelegate
|
||||
import androidx.appcompat.widget.Toolbar
|
||||
import androidx.core.view.GravityCompat
|
||||
import androidx.viewpager2.widget.ViewPager2
|
||||
|
@ -94,6 +95,8 @@ class MainActivity : NoSplashAppCompatActivity() {
|
|||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
// temp while switch is not public
|
||||
setTheme(R.style.AppTheme)
|
||||
Iconify.with(FontAwesomeModule())
|
||||
LocaleHelper.update(applicationContext)
|
||||
binding = ActivityMainBinding.inflate(layoutInflater)
|
||||
|
|
|
@ -7,6 +7,7 @@ import android.net.ConnectivityManager
|
|||
import android.net.wifi.WifiManager
|
||||
import android.os.Build
|
||||
import androidx.lifecycle.ProcessLifecycleOwner
|
||||
import androidx.appcompat.app.AppCompatDelegate
|
||||
import com.uber.rxdogtag.RxDogTag
|
||||
import dagger.android.AndroidInjector
|
||||
import dagger.android.DaggerApplication
|
||||
|
@ -28,6 +29,7 @@ import info.nightscout.androidaps.plugins.configBuilder.PluginStore
|
|||
import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils
|
||||
import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
|
||||
import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationStore
|
||||
import info.nightscout.androidaps.plugins.general.themes.ThemeSwitcherPlugin
|
||||
import info.nightscout.androidaps.receivers.BTReceiver
|
||||
import info.nightscout.androidaps.receivers.ChargingStateReceiver
|
||||
import info.nightscout.androidaps.receivers.KeepAliveReceiver.KeepAliveManager
|
||||
|
@ -73,6 +75,7 @@ class MainApp : DaggerApplication() {
|
|||
@Inject lateinit var alarmSoundServiceHelper: AlarmSoundServiceHelper
|
||||
@Inject lateinit var notificationStore: NotificationStore
|
||||
@Inject lateinit var processLifecycleListener: ProcessLifecycleListener
|
||||
@Inject lateinit var profileSwitchPlugin: ThemeSwitcherPlugin
|
||||
|
||||
override fun onCreate() {
|
||||
super.onCreate()
|
||||
|
@ -103,6 +106,7 @@ class MainApp : DaggerApplication() {
|
|||
disposable += compatDBHelper.dbChangeDisposable()
|
||||
registerActivityLifecycleCallbacks(activityMonitor)
|
||||
JodaTimeAndroid.init(this)
|
||||
profileSwitchPlugin.setThemeMode()
|
||||
aapsLogger.debug("Version: " + BuildConfig.VERSION_NAME)
|
||||
aapsLogger.debug("BuildVersion: " + BuildConfig.BUILDVERSION)
|
||||
aapsLogger.debug("Remote: " + BuildConfig.REMOTE)
|
||||
|
|
|
@ -32,6 +32,7 @@ import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
|
|||
import info.nightscout.androidaps.plugins.general.overview.OverviewPlugin
|
||||
import info.nightscout.androidaps.plugins.general.persistentNotification.PersistentNotificationPlugin
|
||||
import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
|
||||
import info.nightscout.androidaps.plugins.general.themes.ThemeSwitcherPlugin
|
||||
import info.nightscout.androidaps.plugins.general.wear.WearPlugin
|
||||
import info.nightscout.androidaps.plugins.general.xdripStatusline.StatusLinePlugin
|
||||
import info.nightscout.androidaps.plugins.insulin.InsulinLyumjevPlugin
|
||||
|
@ -387,6 +388,12 @@ abstract class PluginsModule {
|
|||
@IntKey(490)
|
||||
abstract fun bindConfigBuilderPlugin(plugin: ConfigBuilderPlugin): PluginBase
|
||||
|
||||
@Binds
|
||||
@AllConfigs
|
||||
@IntoMap
|
||||
@IntKey(500)
|
||||
abstract fun bindThemeSwitcherPlugin(plugin: ThemeSwitcherPlugin): PluginBase
|
||||
|
||||
@Qualifier
|
||||
annotation class AllConfigs
|
||||
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
package info.nightscout.androidaps.events
|
||||
|
||||
class EventThemeSwitch : Event()
|
|
@ -0,0 +1,61 @@
|
|||
package info.nightscout.androidaps.plugins.general.themes
|
||||
|
||||
import androidx.appcompat.app.AppCompatDelegate
|
||||
import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
|
||||
import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
|
||||
import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
|
||||
import dagger.android.HasAndroidInjector
|
||||
import info.nightscout.androidaps.R
|
||||
import info.nightscout.androidaps.events.EventPreferenceChange
|
||||
import info.nightscout.androidaps.events.EventThemeSwitch
|
||||
import info.nightscout.androidaps.interfaces.PluginBase
|
||||
import info.nightscout.androidaps.interfaces.PluginDescription
|
||||
import info.nightscout.androidaps.interfaces.PluginType
|
||||
import info.nightscout.shared.logging.AAPSLogger
|
||||
import info.nightscout.androidaps.plugins.bus.RxBus
|
||||
import info.nightscout.androidaps.utils.resources.ResourceHelper
|
||||
import info.nightscout.shared.sharedPreferences.SP
|
||||
import io.reactivex.rxjava3.disposables.CompositeDisposable
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
@Singleton
|
||||
class ThemeSwitcherPlugin @Inject constructor(
|
||||
injector: HasAndroidInjector,
|
||||
aapsLogger: AAPSLogger,
|
||||
rh: ResourceHelper,
|
||||
private val sp: SP,
|
||||
private val rxBus: RxBus,
|
||||
) : PluginBase(PluginDescription()
|
||||
.mainType(PluginType.GENERAL)
|
||||
.neverVisible(true)
|
||||
.alwaysEnabled(true)
|
||||
.showInList(false)
|
||||
.pluginName(R.string.dst_plugin_name),
|
||||
aapsLogger, rh, injector
|
||||
) {
|
||||
|
||||
private val compositeDisposable = CompositeDisposable()
|
||||
|
||||
override fun onStart() {
|
||||
compositeDisposable.add(rxBus.toObservable(EventPreferenceChange::class.java).subscribe {
|
||||
if (it.isChanged(rh, id = R.string.key_use_dark_mode)) {
|
||||
setThemeMode()
|
||||
rxBus.send(EventThemeSwitch())
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fun setThemeMode() {
|
||||
val mode = when (sp.getString(R.string.key_use_dark_mode, "dark")) {
|
||||
sp.getString(R.string.value_dark_theme, "dark") -> MODE_NIGHT_YES
|
||||
sp.getString(R.string.value_light_theme, "light") -> MODE_NIGHT_NO
|
||||
else -> MODE_NIGHT_FOLLOW_SYSTEM
|
||||
}
|
||||
AppCompatDelegate.setDefaultNightMode(mode)
|
||||
}
|
||||
|
||||
override fun onStop() {
|
||||
compositeDisposable.dispose()
|
||||
}
|
||||
}
|
|
@ -50,6 +50,8 @@ class SetupWizardActivity : NoSplashAppCompatActivity() {
|
|||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
// temp while switch is not public
|
||||
setTheme(R.style.AppTheme)
|
||||
update(applicationContext)
|
||||
binding = ActivitySetupwizardBinding.inflate(layoutInflater)
|
||||
setContentView(binding.root)
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="?attr/fragmentbackground"
|
||||
tools:context=".plugins.general.actions.ActionsFragment">
|
||||
|
||||
<LinearLayout
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:gravity="center_horizontal"
|
||||
android:text="@string/noprofileset"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:textColor="@android:color/holo_red_light"
|
||||
android:textColor="?attr/alarmColor"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone" />
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/activity_title_background"
|
||||
android:background="?attr/activity_title_backgroundColor"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:background="@color/colorPrimary"
|
||||
android:background="?attr/colorPrimary"
|
||||
app:contentInsetEndWithActions="48dp"
|
||||
app:contentInsetStartWithNavigation="48dp"
|
||||
android:elevation="4dp">
|
||||
|
@ -21,9 +21,9 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@android:color/transparent"
|
||||
app:tabIndicatorColor="@color/tabSelectedTextColor"
|
||||
app:tabTextColor="@color/tabTextColor"
|
||||
app:tabSelectedTextColor="@color/tabSelectedTextColor"
|
||||
app:tabIndicatorColor="?attr/tabSelectedTextColor"
|
||||
app:tabTextColor="?attr/tabTextColor"
|
||||
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
|
||||
app:tabMode="scrollable" />
|
||||
|
||||
<com.google.android.material.tabs.TabLayout
|
||||
|
@ -33,9 +33,9 @@
|
|||
android:background="@android:color/transparent"
|
||||
app:tabMinWidth="0dp"
|
||||
app:tabPadding="0dp"
|
||||
app:tabIndicatorColor="@color/tabSelectedTextColor"
|
||||
app:tabTextColor="@color/tabTextColor"
|
||||
app:tabSelectedTextColor="@color/tabSelectedTextColor"
|
||||
app:tabIndicatorColor="?attr/tabSelectedTextColor"
|
||||
app:tabTextColor="?attr/tabTextColor"
|
||||
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
|
||||
app:tabMode="scrollable" />
|
||||
|
||||
</androidx.appcompat.widget.Toolbar>
|
||||
|
@ -58,8 +58,8 @@
|
|||
app:itemBackground="?attr/selectableItemBackground"
|
||||
android:fitsSystemWindows="true"
|
||||
android:layout_gravity="start"
|
||||
app:itemIconTint="@android:color/white"
|
||||
app:itemTextColor="@android:color/white"/>
|
||||
app:itemIconTint="?android:textColorPrimary"
|
||||
app:itemTextColor="?android:textColorPrimary"/>
|
||||
</androidx.drawerlayout.widget.DrawerLayout>
|
||||
|
||||
</LinearLayout>
|
|
@ -9,6 +9,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/filter"
|
||||
android:textColorHint="?attr/colorOnPrimary"
|
||||
app:endIconMode="clear_text">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
|
@ -22,7 +23,8 @@
|
|||
android:autofillHints="@string/filter"
|
||||
android:gravity="start"
|
||||
android:textStyle="bold"
|
||||
android:inputType="text" />
|
||||
android:inputType="text"
|
||||
android:background="@color/transparent"/>
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:background="@color/defaultbackground"
|
||||
android:background="?attr/defaultbackground"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
|
@ -47,8 +47,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/profiletype"
|
||||
android:textColorHint="@color/tabBgColorSelected"
|
||||
app:boxStrokeColor="@color/tabBgColorSelected">
|
||||
android:textColorHint="?attr/tabBgColorSelected"
|
||||
app:boxStrokeColor="?attr/tabBgColorSelected">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/profiletype"
|
||||
|
@ -90,6 +90,7 @@
|
|||
android:id="@+id/age"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/age" />
|
||||
|
||||
</TableRow>
|
||||
|
@ -112,6 +113,7 @@
|
|||
android:id="@+id/tdd"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/tdd_total" />
|
||||
|
||||
</TableRow>
|
||||
|
@ -134,6 +136,7 @@
|
|||
android:id="@+id/weight"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/weight_label" />
|
||||
|
||||
</TableRow>
|
||||
|
@ -205,8 +208,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/selected_profile"
|
||||
android:textColorHint="@color/white"
|
||||
app:boxStrokeColor="@color/white">
|
||||
app:boxStrokeColor="?attr/boxStrokeColor">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/available_profile_list"
|
||||
|
@ -234,8 +236,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/careportal_profileswitch"
|
||||
android:textColorHint="@color/white"
|
||||
app:boxStrokeColor="@color/white">
|
||||
app:boxStrokeColor="?attr/boxStrokeColor">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/profileswitch_list"
|
||||
|
|
|
@ -41,7 +41,6 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:keepScreenOn="true"
|
||||
android:textAlignment="center"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="32sp"
|
||||
tools:text="Title" />
|
||||
|
||||
|
@ -74,8 +73,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:background="@android:color/transparent"
|
||||
android:onClick="showPreviousPage"
|
||||
android:text="@string/previous_button"
|
||||
android:textColor="#FFFFFF" />
|
||||
android:text="@string/previous_button" />
|
||||
|
||||
<View
|
||||
android:layout_width="0dp"
|
||||
|
@ -88,8 +86,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:background="@android:color/transparent"
|
||||
android:onClick="showNextPage"
|
||||
android:text="@string/next_button"
|
||||
android:textColor="#FFFFFF" />
|
||||
android:text="@string/next_button" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/finish_button"
|
||||
|
@ -97,8 +94,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:background="@android:color/transparent"
|
||||
android:onClick="finishSetupWizard"
|
||||
android:text="@string/setupwizard_finish"
|
||||
android:textColor="#FFFFFF" />
|
||||
android:text="@string/setupwizard_finish" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
@ -105,7 +105,7 @@
|
|||
android:layout_marginRight="10dp"
|
||||
android:layout_marginBottom="3dp"
|
||||
android:text="@string/smscommunicator_otp_reset_btn"
|
||||
android:textColor="@color/colorTreatmentButton" />
|
||||
android:textColor="?attr/treatmentButton" />
|
||||
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/activity_title_background"
|
||||
android:background="?attr/activity_title_backgroundColor"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
card_view:cardBackgroundColor="@color/cardColorBackground"
|
||||
card_view:cardBackgroundColor="?attr/cardItemBackgroundColor"
|
||||
card_view:cardUseCompatPadding="true">
|
||||
|
||||
<LinearLayout
|
||||
|
@ -58,7 +58,7 @@
|
|||
android:paddingStart="10dp"
|
||||
android:text="NS"
|
||||
android:textAlignment="viewEnd"
|
||||
android:textColor="@color/colorSetTempButton" />
|
||||
android:textColor="?attr/setTempButton" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/invalid"
|
||||
|
@ -66,8 +66,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:paddingStart="10dp"
|
||||
android:text="@string/invalid"
|
||||
android:textColor="@android:color/holo_red_light" />
|
||||
|
||||
android:textColor="?attr/alarmColor" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
@ -38,7 +38,6 @@
|
|||
android:gravity="center_vertical"
|
||||
android:paddingLeft="2dp"
|
||||
android:paddingRight="2dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
|
@ -58,7 +57,6 @@
|
|||
android:layout_marginEnd="20dp"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="2dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -112,7 +110,6 @@
|
|||
android:gravity="center_vertical"
|
||||
android:paddingLeft="2dp"
|
||||
android:paddingRight="2dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
|
||||
|
@ -133,7 +130,6 @@
|
|||
android:layout_marginEnd="20dp"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="2dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -188,7 +184,6 @@
|
|||
android:gravity="center_vertical"
|
||||
android:paddingLeft="2dp"
|
||||
android:paddingRight="2dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
|
@ -207,7 +202,6 @@
|
|||
android:gravity="center_vertical"
|
||||
android:paddingStart="2dp"
|
||||
android:text=""
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -263,7 +257,6 @@
|
|||
android:gravity="center_vertical"
|
||||
android:paddingLeft="2dp"
|
||||
android:paddingRight="2dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
|
@ -283,7 +276,6 @@
|
|||
android:layout_marginEnd="20dp"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="2dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
android:gravity="center_vertical"
|
||||
android:paddingLeft="2dp"
|
||||
android:paddingRight="2dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
|
||||
|
@ -40,7 +39,6 @@
|
|||
android:layout_marginEnd="20dp"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="2dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -85,7 +83,6 @@
|
|||
android:gravity="center_vertical"
|
||||
android:paddingLeft="2dp"
|
||||
android:paddingRight="2dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
|
||||
|
@ -96,7 +93,6 @@
|
|||
android:layout_marginEnd="20dp"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="2dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -141,7 +137,6 @@
|
|||
android:gravity="center_vertical"
|
||||
android:paddingLeft="2dp"
|
||||
android:paddingRight="2dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
|
@ -151,7 +146,6 @@
|
|||
android:gravity="center_vertical"
|
||||
android:paddingStart="2dp"
|
||||
android:text=""
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -197,7 +191,6 @@
|
|||
android:gravity="center_vertical"
|
||||
android:paddingLeft="2dp"
|
||||
android:paddingRight="2dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
|
@ -207,7 +200,6 @@
|
|||
android:layout_marginEnd="20dp"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="2dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
android:layout_marginEnd="10dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:text="@string/check_preferences_details_btn"
|
||||
android:textColor="@color/colorTreatmentButton"
|
||||
android:textColor="?attr/treatmentButton"
|
||||
android:visibility="gone" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
@ -14,6 +14,6 @@
|
|||
android:paddingEnd="5dp"
|
||||
android:text="@string/password_preferences_decrypt_prompt"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="@color/colorAccent" />
|
||||
android:textColor="?android:colorAccent" />
|
||||
|
||||
</LinearLayout>
|
|
@ -19,7 +19,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
@ -109,7 +109,7 @@
|
|||
<CheckBox
|
||||
android:id="@+id/alarmCheckBox"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="40dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:checked="false"
|
||||
android:padding="2dp"
|
||||
|
@ -119,21 +119,22 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
<info.nightscout.androidaps.utils.ui.MinutesNumberPicker
|
||||
android:id="@+id/time"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
app:customContentDescription="@string/time_offset" />
|
||||
<info.nightscout.androidaps.utils.ui.MinutesNumberPicker
|
||||
android:id="@+id/time"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/time_offset" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:paddingEnd="5dp"
|
||||
android:text="@string/unit_minute_short"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:paddingEnd="5dp"
|
||||
android:text="@string/unit_minute_short"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||
|
||||
</TableRow>
|
||||
|
||||
|
@ -158,6 +159,7 @@
|
|||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/careportal_newnstreatment_duration_label" />
|
||||
|
||||
<TextView
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
@ -100,6 +100,7 @@
|
|||
android:id="@+id/bg"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/treatments_wizard_bg_label" />
|
||||
|
||||
<TextView
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
@ -67,6 +67,7 @@
|
|||
android:id="@+id/insulin"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/overview_insulin_label" />
|
||||
|
||||
<TextView
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
@ -90,7 +90,8 @@
|
|||
android:id="@+id/time"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
app:customContentDescription="@string/time_offset"/>
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/time_offset" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
@ -111,7 +111,8 @@
|
|||
android:id="@+id/duration"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
app:customContentDescription="@string/careportal_newnstreatment_duration_label"/>
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/careportal_newnstreatment_duration_label" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -147,7 +148,8 @@
|
|||
android:id="@+id/percentage"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
app:customContentDescription="@string/careportal_newnstreatment_percentage_label"/>
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/careportal_newnstreatment_percentage_label" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
@ -68,6 +68,7 @@
|
|||
android:id="@+id/basal_percent_input"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/basal_rate" />
|
||||
|
||||
<TextView
|
||||
|
@ -104,6 +105,7 @@
|
|||
android:id="@+id/basal_absolute_input"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/basal_rate" />
|
||||
|
||||
<TextView
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
@ -68,7 +68,7 @@
|
|||
android:id="@+id/temptarget"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/target_label" />
|
||||
|
||||
<TextView
|
||||
|
@ -163,7 +163,7 @@
|
|||
android:paddingRight="5dp"
|
||||
android:text="@string/cancel"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
||||
android:textColor="@color/tempTargetConfirmation"
|
||||
android:textColor="?attr/tempTargetConfirmation"
|
||||
android:textSize="11sp" />
|
||||
|
||||
<info.nightscout.androidaps.utils.ui.SingleClickButton
|
||||
|
@ -178,7 +178,7 @@
|
|||
android:paddingRight="5dp"
|
||||
android:text="@string/eatingsoon"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
||||
android:textColor="@color/carbs"
|
||||
android:textColor="?attr/carbsColor"
|
||||
android:textSize="11sp" />
|
||||
|
||||
<info.nightscout.androidaps.utils.ui.SingleClickButton
|
||||
|
@ -193,7 +193,7 @@
|
|||
android:paddingRight="5dp"
|
||||
android:text="@string/activity"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
||||
android:textColor="@color/exercise"
|
||||
android:textColor="?attr/exerciseColor"
|
||||
android:textSize="11sp" />
|
||||
|
||||
<info.nightscout.androidaps.utils.ui.SingleClickButton
|
||||
|
@ -207,7 +207,7 @@
|
|||
android:paddingRight="5dp"
|
||||
android:text="@string/hypo"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
||||
android:textColor="@color/low"
|
||||
android:textColor="?attr/lowColor"
|
||||
android:textSize="11sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
@ -18,9 +18,10 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
android:padding="5dp"
|
||||
android:layout_marginBottom="5dp">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -53,7 +54,8 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:text="@string/do_not_bolus_record_only" />
|
||||
android:text="@string/do_not_bolus_record_only"
|
||||
tools:visibility="gone"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
@ -77,6 +79,7 @@
|
|||
android:id="@+id/insulin"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/overview_insulin_label" />
|
||||
|
||||
<TextView
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
@ -72,6 +72,7 @@
|
|||
android:id="@+id/bg_input"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/a11y_current_bg" />
|
||||
|
||||
<TextView
|
||||
|
@ -106,6 +107,7 @@
|
|||
android:layout_width="130dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginBottom="2dp"
|
||||
app:customContentDescription="@string/treatments_wizard_carbs_label" />
|
||||
|
||||
<TextView
|
||||
|
@ -182,7 +184,7 @@
|
|||
android:layout_marginStart="10dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="horizontal"
|
||||
android:paddingTop="5dp"
|
||||
|
@ -207,7 +209,7 @@
|
|||
android:paddingRight="10dp"
|
||||
android:text="50%"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:textColor="@color/bolus"
|
||||
android:textColor="?attr/bolusColor"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
card_view:cardBackgroundColor="@color/cardColorBackground">
|
||||
card_view:cardBackgroundColor="?attr/cardItemBackgroundColor">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/food_item"
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
android:layout_marginStart="5dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:hint="@string/select_profile"
|
||||
android:textColorHint="@color/white"
|
||||
app:boxStrokeColor="@color/list_delimiter">
|
||||
|
||||
<androidx.appcompat.widget.AppCompatAutoCompleteTextView
|
||||
|
@ -193,7 +192,6 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:gravity="center_horizontal"
|
||||
android:text="@string/dia_long_label"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="20sp" />
|
||||
|
||||
<LinearLayout
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
android:id="@+id/logsettings_description"
|
||||
android:layout_width="150dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="12sp"
|
||||
tools:text="TYPE" />
|
||||
|
||||
|
|
|
@ -49,7 +49,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -96,7 +95,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -142,7 +140,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -188,7 +185,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -234,7 +230,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -280,7 +275,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -326,7 +320,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -372,7 +365,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -418,7 +410,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -464,7 +455,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -510,7 +500,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
android:layout_marginBottom="3dp"
|
||||
android:layout_weight="0.5"
|
||||
android:text="@string/nav_logsettings"
|
||||
android:textColor="@color/colorTreatmentButton" />
|
||||
android:textColor="?attr/treatmentButton" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/log_send"
|
||||
|
@ -43,7 +43,7 @@
|
|||
android:layout_marginBottom="3dp"
|
||||
android:layout_weight="0.5"
|
||||
android:text="@string/send_all_logs"
|
||||
android:textColor="@color/colorTreatmentButton" />
|
||||
android:textColor="?attr/treatmentButton" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/log_delete"
|
||||
|
@ -56,7 +56,7 @@
|
|||
android:layout_marginBottom="3dp"
|
||||
android:layout_weight="0.5"
|
||||
android:text="@string/delete_logs"
|
||||
android:textColor="@color/colorTreatmentButton" />
|
||||
android:textColor="?attr/treatmentButton" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/nav_export"
|
||||
|
@ -69,7 +69,7 @@
|
|||
android:layout_marginBottom="3dp"
|
||||
android:layout_weight="0.5"
|
||||
android:text="@string/nav_export"
|
||||
android:textColor="@color/colorTreatmentButton" />
|
||||
android:textColor="?attr/treatmentButton" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/nav_import"
|
||||
|
@ -82,7 +82,7 @@
|
|||
android:layout_marginBottom="3dp"
|
||||
android:layout_weight="0.5"
|
||||
android:text="@string/nav_import"
|
||||
android:textColor="@color/colorTreatmentButton" />
|
||||
android:textColor="?attr/treatmentButton" />
|
||||
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
|
@ -96,7 +96,7 @@
|
|||
android:layout_marginBottom="3dp"
|
||||
android:layout_weight="0.5"
|
||||
android:text="@string/ue_export_to_csv"
|
||||
android:textColor="@color/colorTreatmentButton" />
|
||||
android:textColor="?attr/treatmentButton" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/nav_resetdb"
|
||||
|
@ -109,7 +109,7 @@
|
|||
android:layout_marginBottom="3dp"
|
||||
android:layout_weight="0.5"
|
||||
android:text="@string/nav_resetdb"
|
||||
android:textColor="@color/colorTreatmentButton" />
|
||||
android:textColor="?attr/treatmentButton" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
@ -111,7 +111,7 @@
|
|||
android:layout_weight="1"
|
||||
android:text="@string/clearlog"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@android:color/holo_orange_light"
|
||||
android:textColor="?attr/actionButton"
|
||||
android:textStyle="normal|bold" />
|
||||
|
||||
<TextView
|
||||
|
@ -121,7 +121,7 @@
|
|||
android:layout_weight="1"
|
||||
android:text="@string/restart"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@android:color/holo_orange_light"
|
||||
android:textColor="?attr/actionButton"
|
||||
android:textStyle="normal|bold" />
|
||||
|
||||
<TextView
|
||||
|
@ -131,7 +131,7 @@
|
|||
android:layout_weight="1"
|
||||
android:text="@string/deliver_now"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@android:color/holo_orange_light"
|
||||
android:textColor="?attr/actionButton"
|
||||
android:textStyle="normal|bold" />
|
||||
|
||||
<TextView
|
||||
|
@ -141,7 +141,7 @@
|
|||
android:layout_weight="1"
|
||||
android:text="@string/full_sync"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@android:color/holo_orange_light"
|
||||
android:textColor="?attr/actionButton"
|
||||
android:textStyle="normal|bold" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
@ -3,19 +3,17 @@
|
|||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="60dp"
|
||||
android:layout_height="100dp"
|
||||
android:background="@drawable/background_darkgray"
|
||||
android:background="@drawable/background_total"
|
||||
android:orientation="vertical">
|
||||
|
||||
<Button
|
||||
android:id="@+id/increment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="30dp"
|
||||
android:background="@null"
|
||||
android:background="@color/transparent"
|
||||
android:padding="0dp"
|
||||
android:text="+"
|
||||
android:textColor="@color/mdtp_white"
|
||||
android:textSize="25sp"
|
||||
tools:ignore="HardcodedText" />
|
||||
android:textSize="20sp" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/display"
|
||||
|
@ -25,19 +23,16 @@
|
|||
android:gravity="center"
|
||||
android:imeOptions="actionDone"
|
||||
android:inputType="number"
|
||||
android:text="1"
|
||||
android:textColor="@android:color/black"
|
||||
tools:ignore="HardcodedText" />
|
||||
android:textColor="?attr/numPickerText"
|
||||
android:text="1" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/decrement"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="30dp"
|
||||
android:background="@null"
|
||||
android:background="@color/transparent"
|
||||
android:padding="0dp"
|
||||
android:text="-"
|
||||
android:textColor="@color/mdtp_white"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="HardcodedText" />
|
||||
android:text="—"
|
||||
android:textStyle="bold" />
|
||||
|
||||
</LinearLayout>
|
|
@ -37,7 +37,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:background="#3C3C3C"
|
||||
android:background="?attr/objectivesBackgroundColor"
|
||||
android:orientation="horizontal"
|
||||
android:padding="4dp"
|
||||
app:layout_constraintTop_toBottomOf="@+id/exam_disabledto">
|
||||
|
@ -106,7 +106,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:text="Disabled until:"
|
||||
android:textColor="#FF5722"
|
||||
android:textColor="?attr/objectivesDisabledTextColor"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/exam_hints" />
|
||||
|
@ -116,7 +116,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="2dp"
|
||||
android:background="#3C3C3C"
|
||||
android:background="?attr/objectivesBackgroundColor"
|
||||
android:orientation="horizontal"
|
||||
android:padding="4dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
android:layout_marginLeft="16dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginRight="16dp"
|
||||
app:cardBackgroundColor="@color/cardColorBackground"
|
||||
app:cardBackgroundColor="?attr/cardItemBackgroundColor"
|
||||
app:cardCornerRadius="2dp"
|
||||
app:cardUseCompatPadding="true"
|
||||
app:contentPadding="16dp">
|
||||
|
@ -23,7 +23,6 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="sans-serif-medium"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="20sp"
|
||||
tools:text="1. Title" />
|
||||
|
||||
|
@ -32,7 +31,6 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:textColor="#FFFFFF"
|
||||
tools:text="Objective" />
|
||||
|
||||
<TextView
|
||||
|
@ -40,7 +38,6 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textStyle="bold"
|
||||
tools:text="Gate" />
|
||||
|
||||
|
@ -125,7 +122,6 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:textColor="#FFFFFF"
|
||||
tools:text="Accomplished" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
@ -56,7 +56,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -82,7 +81,6 @@
|
|||
android:gravity="center_horizontal"
|
||||
android:paddingEnd="5dp"
|
||||
android:text="@string/openapsma_inputparameters_label"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -128,7 +126,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -174,7 +171,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -220,7 +216,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -266,7 +261,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -312,7 +306,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -358,7 +351,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -404,7 +396,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -430,7 +421,6 @@
|
|||
android:gravity="center_horizontal"
|
||||
android:paddingEnd="5dp"
|
||||
android:text="@string/result"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -485,7 +475,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -531,7 +520,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -577,7 +565,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
android:paddingStart="5dp"
|
||||
android:paddingEnd="5dp"
|
||||
android:text="@string/setbasalquestion"
|
||||
android:textColor="@color/colorAcceptTempButton"
|
||||
android:textColor="?attr/acceptTempButtonColor"
|
||||
android:visibility="gone" />
|
||||
|
||||
<LinearLayout
|
||||
|
@ -45,7 +45,7 @@
|
|||
android:layout_weight="0.5"
|
||||
android:drawableTop="@drawable/icon_insulin_carbs"
|
||||
android:text="@string/overview_treatment_label"
|
||||
android:textColor="@color/colorTreatmentButton"
|
||||
android:textColor="?attr/treatmentButtonColor"
|
||||
android:textSize="10sp"
|
||||
android:visibility="gone"
|
||||
tools:ignore="SmallSp" />
|
||||
|
@ -59,7 +59,7 @@
|
|||
android:layout_weight="0.5"
|
||||
android:drawableTop="@drawable/ic_bolus"
|
||||
android:text="@string/overview_insulin_label"
|
||||
android:textColor="@color/colorInsulinButton"
|
||||
android:textColor="?attr/insulinButtonColor"
|
||||
android:textSize="10sp"
|
||||
tools:ignore="SmallSp" />
|
||||
|
||||
|
@ -72,7 +72,7 @@
|
|||
android:layout_weight="0.5"
|
||||
android:drawableTop="@drawable/ic_cp_bolus_carbs"
|
||||
android:text="@string/treatments_wizard_carbs_label"
|
||||
android:textColor="@color/colorCarbsButton"
|
||||
android:textColor="?attr/carbsButtonColor"
|
||||
android:textSize="10sp"
|
||||
tools:ignore="SmallSp" />
|
||||
|
||||
|
@ -85,7 +85,7 @@
|
|||
android:layout_weight="0.5"
|
||||
android:drawableTop="@drawable/ic_calculator"
|
||||
android:text="@string/overview_calculator_label"
|
||||
android:textColor="@color/colorCalculatorButton"
|
||||
android:textColor="?attr/calculatorButtonColor"
|
||||
android:textSize="10sp"
|
||||
tools:ignore="SmallSp" />
|
||||
|
||||
|
@ -98,7 +98,7 @@
|
|||
android:layout_weight="0.5"
|
||||
android:drawableTop="@drawable/ic_calibration"
|
||||
android:text="@string/overview_calibration"
|
||||
android:textColor="@color/colorCalibrationButton"
|
||||
android:textColor="?attr/calibrationButtonColor"
|
||||
android:textSize="10sp"
|
||||
android:visibility="gone"
|
||||
tools:ignore="SmallSp" />
|
||||
|
@ -112,7 +112,7 @@
|
|||
android:layout_weight="0.5"
|
||||
android:drawableTop="@drawable/ic_xdrip"
|
||||
android:text="@string/overview_cgm"
|
||||
android:textColor="@color/colorCalibrationButton"
|
||||
android:textColor="?attr/calibrationButtonColor"
|
||||
android:textSize="10sp"
|
||||
android:visibility="gone"
|
||||
tools:ignore="SmallSp" />
|
||||
|
@ -127,7 +127,7 @@
|
|||
android:drawableTop="@drawable/ic_quick_wizard"
|
||||
android:text="@string/quickwizard"
|
||||
android:hint="@string/quickwizard"
|
||||
android:textColor="@color/colorQuickWizardButton"
|
||||
android:textColor="?attr/quickWizardButtonColor"
|
||||
android:textSize="10sp"
|
||||
tools:ignore="SmallSp" />
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -56,7 +56,6 @@
|
|||
android:hint="temp target"
|
||||
android:text="@string/notavailable"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="@color/mdtp_white"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -88,7 +87,6 @@
|
|||
android:paddingStart="4sp"
|
||||
android:paddingEnd="4sp"
|
||||
android:text="Pump: running"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="16sp"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
|
@ -100,7 +98,6 @@
|
|||
android:paddingStart="4sp"
|
||||
android:paddingEnd="4sp"
|
||||
android:text="OpenAPS: 3 min ago"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="16sp"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
|
@ -112,7 +109,6 @@
|
|||
android:paddingStart="4sp"
|
||||
android:paddingEnd="4sp"
|
||||
android:text="Uploader: 84%"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="16sp"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_margin="1dp"
|
||||
card_view:cardBackgroundColor="@color/notificationUrgent"
|
||||
card_view:cardBackgroundColor="?attr/notificationUrgent"
|
||||
card_view:cardCornerRadius="6dp">
|
||||
|
||||
<LinearLayout
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
card_view:cardBackgroundColor="@color/cardColorBackground"
|
||||
card_view:cardBackgroundColor="?attr/cardItemBackgroundColor"
|
||||
card_view:cardCornerRadius="6dp"
|
||||
card_view:cardUseCompatPadding="true"
|
||||
card_view:contentPadding="6dp">
|
||||
|
@ -53,7 +53,7 @@
|
|||
android:paddingStart="10dp"
|
||||
android:text="Sample button text"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
||||
android:textColor="@color/cardObjectiveText"
|
||||
android:textColor="?attr/cardObjectiveText"
|
||||
android:textStyle="normal|bold"
|
||||
tools:ignore="HardcodedText,RtlSymmetry" />
|
||||
|
||||
|
@ -64,7 +64,7 @@
|
|||
android:paddingStart="10dp"
|
||||
android:text="36g"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
||||
android:textColor="@color/cardObjectiveText"
|
||||
android:textColor="?attr/cardObjectiveText"
|
||||
android:textStyle="normal|bold"
|
||||
tools:ignore="HardcodedText,RtlSymmetry" />
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
card_view:cardBackgroundColor="@color/cardColorBackground">
|
||||
card_view:cardBackgroundColor="?attr/cardItemBackgroundColor">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
@ -141,7 +141,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="NS"
|
||||
android:textColor="@color/colorSetTempButton"
|
||||
android:textColor="?attr/setTempButton"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
<TextView
|
||||
|
@ -150,7 +150,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="PH"
|
||||
android:textColor="@color/colorSetTempButton"
|
||||
android:textColor="?attr/setTempButton"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
<TextView
|
||||
|
@ -233,7 +233,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="NS"
|
||||
android:textColor="@color/colorSetTempButton"
|
||||
android:textColor="?attr/setTempButton"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
<TextView
|
||||
|
@ -242,7 +242,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="PH"
|
||||
android:textColor="@color/colorSetTempButton"
|
||||
android:textColor="?attr/setTempButton"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
<TextView
|
||||
|
|
|
@ -74,7 +74,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="NS"
|
||||
android:textColor="@color/colorSetTempButton"
|
||||
android:textColor="?attr/setTempButton"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
<TextView
|
||||
|
@ -84,7 +84,7 @@
|
|||
android:paddingStart="10dp"
|
||||
android:paddingEnd="10dp"
|
||||
android:text="@string/invalid"
|
||||
android:textColor="@android:color/holo_red_light" />
|
||||
android:textColor="?attr/alarmColor" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
@ -81,7 +81,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="PH"
|
||||
android:textColor="@color/colorSetTempButton"
|
||||
android:textColor="?attr/setTempButton"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
<TextView
|
||||
|
@ -90,7 +90,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="NS"
|
||||
android:textColor="@color/colorSetTempButton"
|
||||
android:textColor="?attr/setTempButton"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -151,7 +151,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="@string/invalid"
|
||||
android:textColor="@android:color/holo_red_light" />
|
||||
android:textColor="?attr/alarmColor" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_remove"
|
||||
|
|
|
@ -11,13 +11,12 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?attr/colorPrimary"
|
||||
android:minHeight="?attr/actionBarSize"
|
||||
app:titleTextColor="@android:color/white" />
|
||||
android:minHeight="?attr/actionBarSize" />
|
||||
|
||||
<com.google.android.flexbox.FlexboxLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/defaultbackground"
|
||||
android:background="?attr/defaultbackground"
|
||||
app:alignContent="stretch"
|
||||
app:alignItems="stretch"
|
||||
app:flexDirection="row"
|
||||
|
|
|
@ -68,7 +68,7 @@
|
|||
android:paddingEnd="10dp"
|
||||
android:text="PH"
|
||||
android:textAlignment="viewEnd"
|
||||
android:textColor="@color/colorSetTempButton"
|
||||
android:textColor="?attr/setTempButton"
|
||||
tools:ignore="HardcodedText,RtlSymmetry" />
|
||||
|
||||
<TextView
|
||||
|
@ -77,7 +77,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:paddingEnd="10dp"
|
||||
android:text="NS"
|
||||
android:textColor="@color/colorSetTempButton"
|
||||
android:textColor="?attr/setTempButton"
|
||||
tools:ignore="HardcodedText,RtlSymmetry" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
@ -79,7 +79,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="E"
|
||||
android:textColor="@color/colorSetExtendedButton"
|
||||
android:textColor="?attr/setExtendedButtonColor"
|
||||
tools:ignore="HardcodedText,RtlSymmetry" />
|
||||
|
||||
<TextView
|
||||
|
@ -88,7 +88,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="S"
|
||||
android:textColor="@color/colorSetExtendedButton"
|
||||
android:textColor="?attr/setExtendedButtonColor"
|
||||
tools:ignore="HardcodedText,RtlSymmetry" />
|
||||
|
||||
<TextView
|
||||
|
@ -97,7 +97,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="ES"
|
||||
android:textColor="@color/colorSetExtendedButton"
|
||||
android:textColor="?attr/setExtendedButtonColor"
|
||||
tools:ignore="HardcodedText,RtlSymmetry" />
|
||||
|
||||
<TextView
|
||||
|
@ -106,7 +106,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="SB"
|
||||
android:textColor="@color/colorSetExtendedButton"
|
||||
android:textColor="?attr/setExtendedButtonColor"
|
||||
tools:ignore="HardcodedText,RtlSymmetry" />
|
||||
|
||||
<TextView
|
||||
|
@ -115,7 +115,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="PH"
|
||||
android:textColor="@color/colorSetTempButton"
|
||||
android:textColor="?attr/setTempButton"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
<TextView
|
||||
|
@ -124,7 +124,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="NS"
|
||||
android:textColor="@color/colorSetTempButton"
|
||||
android:textColor="?attr/setTempButton"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
<TextView
|
||||
|
@ -170,7 +170,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="@string/invalid"
|
||||
android:textColor="@android:color/holo_red_light" />
|
||||
android:textColor="?attr/alarmColor" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_remove"
|
||||
|
|
|
@ -99,7 +99,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="NS"
|
||||
android:textColor="@color/colorSetTempButton"
|
||||
android:textColor="?attr/setTempButton"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -145,7 +145,7 @@
|
|||
android:paddingStart="10dp"
|
||||
android:paddingEnd="10dp"
|
||||
android:text="@string/invalid"
|
||||
android:textColor="@android:color/holo_red_light" />
|
||||
android:textColor="?attr/alarmColor" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_remove"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
android:layout_marginTop="3dp"
|
||||
android:layout_weight="0.5"
|
||||
android:text="@string/resend_all_data"
|
||||
android:textColor="@color/colorTreatmentButton" />
|
||||
android:textColor="?attr/treatmentButton" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
style="@style/GrayButton"
|
||||
|
@ -34,7 +34,7 @@
|
|||
android:layout_marginTop="3dp"
|
||||
android:layout_weight="0.5"
|
||||
android:text="@string/open_settings_on_wear"
|
||||
android:textColor="@color/colorTreatmentButton" />
|
||||
android:textColor="?attr/treatmentButton" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<item
|
||||
android:id="@+id/remove_selected"
|
||||
android:icon="@drawable/ic_trash"
|
||||
android:iconTint="@color/white"
|
||||
android:iconTint="?attr/trashBinTintColor"
|
||||
android:title="@string/remove_selected_items"
|
||||
app:showAsAction="always" />
|
||||
|
||||
|
|
|
@ -147,4 +147,16 @@
|
|||
<item>4</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="darkMode">
|
||||
<item>@string/dark_theme</item>
|
||||
<item>@string/light_theme</item>
|
||||
<item>@string/follow_system_theme</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="darkModeValues">
|
||||
<item>@string/value_dark_theme</item>
|
||||
<item>@string/value_light_theme</item>
|
||||
<item>@string/value_system_theme</item>
|
||||
</string-array>
|
||||
|
||||
</resources>
|
||||
|
|
|
@ -1,50 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="prediction">#ff00ff</color>
|
||||
<color name="iobPred">#00d2d2</color>
|
||||
<color name="bolus">#1ea3e5</color>
|
||||
<color name="ratio">#FFFFFF</color>
|
||||
<color name="activity">#d3f166</color>
|
||||
<color name="bgi">#00EEEE</color>
|
||||
<color name="devslopepos">#FFFFFF00</color>
|
||||
<color name="devslopeneg">#FFFF00FF</color>
|
||||
<color name="actionsConfirm">#FFFF00</color>
|
||||
<color name="tabBgColorSelected">#FF666666</color>
|
||||
<color name="deviations">#FF0000</color>
|
||||
<color name="cobAlert">#7484E2</color>
|
||||
<color name="inrangebackground">#2800FF00</color>
|
||||
<color name="basebasal">#C83F51B5</color>
|
||||
<color name="graphgrid">#757575</color>
|
||||
<color name="warning">#ff1a1a</color>
|
||||
<color name="info">#77dd77</color>
|
||||
<color name="error_background">#66FC0000</color>
|
||||
<color name="ok_background">@color/colorPrimaryDark</color>
|
||||
|
||||
<color name="tempTargetBackground">#77dd77</color>
|
||||
<color name="exercise">#67DFE8</color>
|
||||
|
||||
|
||||
<color name="cardObjectiveText">#779ECB</color>
|
||||
|
||||
<color name="colorAcceptTempButton">#f4d700</color>
|
||||
<color name="colorTreatmentButton">#67dfe8</color>
|
||||
<color name="colorInsulinButton">#67dfe8</color>
|
||||
<color name="colorCarbsButton">#ffae01</color>
|
||||
<color name="colorCalibrationButton">#e93057</color>
|
||||
<color name="colorCalculatorButton">#67e86a</color>
|
||||
<color name="colorQuickWizardButton">#ffae01</color>
|
||||
<color name="colorSetTempButton">#FF478EFF</color>
|
||||
<color name="colorSetExtendedButton">#FFDD7792</color>
|
||||
<color name="colorProfileSwitchButton">#ca77dd</color>
|
||||
|
||||
<color name="colorScheduled">#de7550</color>
|
||||
<color name="colorActive">#25912e</color>
|
||||
|
||||
<color name="deviationgrey">#c8666666</color>
|
||||
<color name="deviationgreen">#7200FF00</color>
|
||||
<color name="deviationred">#72FF0000</color>
|
||||
<color name="deviationblack">#72000000</color>
|
||||
|
||||
<color name="splashBackground">#000000</color>
|
||||
|
||||
</resources>
|
|
@ -1178,6 +1178,15 @@
|
|||
<string name="a11y_clone_profile">clone current profile</string>
|
||||
<string name="a11y_delete_current_profile">delete current profile</string>
|
||||
<string name="a11y_add_new_to_list">add new to list</string>
|
||||
<!-- Theme switcher dark and light mode-->
|
||||
<string name="theme_switcher_summary">Choose dark, light, or to follow the system theme</string>
|
||||
<string name="app_color_scheme">App Color Scheme</string>
|
||||
<string name="dark_theme">Dark theme</string>
|
||||
<string name="light_theme">Light theme</string>
|
||||
<string name="follow_system_theme">Use device theme</string>
|
||||
<string name="value_dark_theme" translatable="false">dark</string>
|
||||
<string name="value_light_theme" translatable="false">light</string>
|
||||
<string name="value_system_theme" translatable="false">system</string>
|
||||
|
||||
<!-- WEAR OS-->
|
||||
<string name="wear_action_tempt_preset_error">Temptarget unknown preset: %1$s</string>
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
<resources>
|
||||
|
||||
<!-- The launcher theme. It sets the main window background to the launch_screen drawable -->
|
||||
<style name="AppTheme.Launcher" parent="Theme.MaterialComponents.NoActionBar">
|
||||
<item name="android:windowBackground">@drawable/launch_screen</item>
|
||||
<!-- Optional, on Android 5+ you can modify the colorPrimaryDark color to match the windowBackground color for further branding-->
|
||||
<!-- <item name="colorPrimaryDark">@android:color/white</item> -->
|
||||
</style>
|
||||
|
||||
<style name="section_header_label">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_marginTop">15dp</item>
|
||||
<item name="android:paddingStart">15dp</item>
|
||||
<item name="android:paddingEnd">15dp</item>
|
||||
<item name="android:textColor">@color/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="warning_label">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_marginTop">5dp</item>
|
||||
<item name="android:layout_marginBottom">5dp</item>
|
||||
<item name="android:paddingStart">15dp</item>
|
||||
<item name="android:paddingEnd">15dp</item>
|
||||
<item name="android:textAlignment">center</item>
|
||||
<item name="android:textColor">#ff0000</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
|
@ -101,6 +101,15 @@
|
|||
android:key="@string/key_skin"
|
||||
android:title="@string/skin" />
|
||||
|
||||
<!-- Temp hide options till light mode is completed
|
||||
<ListPreference
|
||||
android:defaultValue="dark"
|
||||
android:entries="@array/darkMode"
|
||||
android:entryValues="@array/darkModeValues"
|
||||
android:key="@string/key_use_dark_mode"
|
||||
android:summary="@string/theme_switcher_summary"
|
||||
android:title="@string/app_color_scheme" /> -->
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
</androidx.preference.PreferenceScreen>
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:background="@color/ribbonDefault"
|
||||
android:background="?attr/ribbonDefaultColor"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingLeft="4dp"
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
@ -114,7 +114,7 @@
|
|||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:background="@color/ribbonDefault"
|
||||
android:background="?attr/activity_title_backgroundColor"
|
||||
android:padding="8dp"
|
||||
android:text="@string/edit_short" />
|
||||
|
||||
|
@ -177,7 +177,7 @@
|
|||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:background="@color/ribbonDefault"
|
||||
android:background="?attr/activity_title_backgroundColor"
|
||||
android:padding="8dp"
|
||||
android:text="@string/add_short" />
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:background="@color/ribbonDefault"
|
||||
android:background="?attr/activity_title_backgroundColor"
|
||||
android:clickable="true"
|
||||
android:focusable="true">
|
||||
|
||||
|
|
|
@ -51,7 +51,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingLeft="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -97,7 +96,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingLeft="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -144,7 +142,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingLeft="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:text=""
|
||||
android:textSize="14sp" />
|
||||
|
||||
|
@ -191,7 +188,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingLeft="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -237,7 +233,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingLeft="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -283,7 +278,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingLeft="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -329,7 +323,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingLeft="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -375,7 +368,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingLeft="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -421,7 +413,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingLeft="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -467,7 +458,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingLeft="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -516,7 +506,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingLeft="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
@ -32,6 +32,7 @@ class PrefImportListActivity : DaggerAppCompatActivity() {
|
|||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
// temp while switch is not public
|
||||
setTheme(R.style.AppTheme)
|
||||
binding = MaintenanceImportListActivityBinding.inflate(layoutInflater)
|
||||
val view = binding.root
|
||||
|
|
|
@ -10,13 +10,14 @@ import androidx.annotation.LayoutRes
|
|||
import androidx.annotation.StyleRes
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.appcompat.view.ContextThemeWrapper
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||
import info.nightscout.androidaps.core.R
|
||||
|
||||
object AlertDialogHelper {
|
||||
|
||||
@Suppress("FunctionName")
|
||||
fun Builder(context: Context, @StyleRes themeResId: Int = R.style.AppTheme) =
|
||||
AlertDialog.Builder(ContextThemeWrapper(context, themeResId))
|
||||
MaterialAlertDialogBuilder(ContextThemeWrapper(context, themeResId))
|
||||
|
||||
fun buildCustomTitle(context: Context, title: String,
|
||||
@DrawableRes iconResource: Int = R.drawable.ic_check_while_48dp,
|
||||
|
|
8
core/src/main/res/drawable-hdpi/background_total.xml
Normal file
8
core/src/main/res/drawable-hdpi/background_total.xml
Normal file
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="?attr/totalBackground"/>
|
||||
<stroke android:width="1dp" android:color="?attr/colorOnSecondary"/>
|
||||
<corners android:radius="4dp" />
|
||||
</shape>
|
|
@ -1,17 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||
<item>
|
||||
<item android:bottom="0dp">
|
||||
<shape
|
||||
android:shape="rectangle">
|
||||
<stroke android:width="1dp" android:color="?attr/colorOnSecondary"/>
|
||||
<solid android:color="@android:color/white" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:bottom="0.5dp">
|
||||
<shape
|
||||
android:shape="rectangle">
|
||||
<stroke android:width="1dp" android:color="@color/colorLightGray" />
|
||||
<solid android:color="@android:color/white" />
|
||||
<corners android:radius="0dp" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
|
||||
|
||||
<!-- The background color, preferably the same as your normal theme -->
|
||||
<item android:drawable="@color/splashBackground"/>
|
||||
<item android:drawable="?attr/splashBackgroundColor"/>
|
||||
|
||||
<!-- Your product logo - 144dp color version of your app icon -->
|
||||
<item>
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
|
@ -23,8 +23,7 @@
|
|||
android:layout_weight="1"
|
||||
android:background="@drawable/pillborder"
|
||||
android:gravity="center_horizontal"
|
||||
android:text="@string/tdd"
|
||||
android:textColor="@color/mdtp_white" />
|
||||
android:text="@string/tdd" />
|
||||
|
||||
<TableLayout
|
||||
android:id="@+id/main_table"
|
||||
|
@ -53,8 +52,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/pillborder"
|
||||
android:gravity="center_horizontal"
|
||||
android:text="@string/cumulative_tdd"
|
||||
android:textColor="@color/mdtp_white" />
|
||||
android:text="@string/cumulative_tdd" />
|
||||
|
||||
<TableLayout
|
||||
android:id="@+id/cumulative_table"
|
||||
|
@ -82,8 +80,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/pillborder"
|
||||
android:gravity="center_horizontal"
|
||||
android:text="@string/expweight"
|
||||
android:textColor="@color/mdtp_white" />
|
||||
android:text="@string/expweight" />
|
||||
|
||||
<TableLayout
|
||||
android:id="@+id/expweight_table"
|
||||
|
@ -118,8 +115,7 @@
|
|||
android:background="@drawable/pillborder"
|
||||
android:gravity="center_vertical|center_horizontal"
|
||||
android:inputType="numberDecimal"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="@color/mdtp_white" />
|
||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
@ -141,8 +137,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:gravity="center_vertical|center_horizontal"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="@color/mdtp_white" />
|
||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
@ -174,7 +169,7 @@
|
|||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp"
|
||||
android:text="@string/warning_Message"
|
||||
android:textColor="#ff0000"
|
||||
android:textColor="?attr/alarmColor"
|
||||
android:textSize="15sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
@ -58,7 +58,7 @@
|
|||
android:gravity="center_horizontal"
|
||||
android:text="@string/invalidprofile"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:textColor="@android:color/holo_red_light"
|
||||
android:textColor="?attr/alarmColor"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone" />
|
||||
|
||||
|
@ -69,7 +69,7 @@
|
|||
android:gravity="center_horizontal"
|
||||
android:text="@string/noprofileset"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:textColor="@android:color/holo_red_light"
|
||||
android:textColor="?attr/alarmColor"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone" />
|
||||
|
||||
|
@ -106,7 +106,6 @@
|
|||
android:layout_marginStart="5dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -152,7 +151,6 @@
|
|||
android:layout_marginStart="5dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -198,7 +196,6 @@
|
|||
android:layout_marginStart="5dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -244,7 +241,6 @@
|
|||
android:layout_marginStart="5dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -296,7 +292,6 @@
|
|||
android:layout_marginStart="5dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -348,7 +343,6 @@
|
|||
android:layout_marginStart="5dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -384,7 +378,6 @@
|
|||
android:layout_marginStart="17dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -436,7 +429,6 @@
|
|||
android:layout_marginStart="5dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
card_view:cardBackgroundColor="?android:colorBackground">
|
||||
card_view:cardBackgroundColor="?attr/cardItemBackgroundColor">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
@ -30,7 +30,7 @@
|
|||
android:layout_marginEnd="6dp"
|
||||
android:layout_marginBottom="1dp"
|
||||
card_view:srcCompat="@drawable/ic_meta_format"
|
||||
app:tint="@color/importListFileName" />
|
||||
app:tint="?attr/importListFileNameColor" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/filelist_name"
|
||||
|
@ -43,7 +43,7 @@
|
|||
android:scrollHorizontally="false"
|
||||
android:text="File name here"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="@color/importListFileName"
|
||||
android:textColor="?attr/importListFileNameColor"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
|
||||
|
@ -68,7 +68,7 @@
|
|||
android:scrollHorizontally="false"
|
||||
android:text="File dir here"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="@color/importListFileName"
|
||||
android:textColor="?attr/importListFileNameColor"
|
||||
android:textSize="11sp"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
|
@ -91,7 +91,7 @@
|
|||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="1dp"
|
||||
card_view:srcCompat="@drawable/ic_meta_name"
|
||||
app:tint="@color/importListAdditionalInfo" />
|
||||
app:tint="?attr/importListAdditionalInfoColor" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/meta_device_name"
|
||||
|
@ -100,7 +100,7 @@
|
|||
android:layout_weight="1"
|
||||
android:text="exported on this Patient phone"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="@color/importListAdditionalInfo"
|
||||
android:textColor="?attr/importListAdditionalInfoColor"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
|||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="1dp"
|
||||
card_view:srcCompat="@drawable/ic_meta_date"
|
||||
app:tint="@color/importListAdditionalInfo" />
|
||||
app:tint="?attr/importListAdditionalInfoColor" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/meta_date_time"
|
||||
|
@ -132,7 +132,7 @@
|
|||
android:layout_weight="1"
|
||||
android:text="exported how long ago"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="@color/importListAdditionalInfo"
|
||||
android:textColor="?attr/importListAdditionalInfoColor"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
<TextView
|
||||
|
@ -141,7 +141,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="v10.10.10.10"
|
||||
android:textColor="@color/metadataTextWarning"
|
||||
android:textColor="?attr/metadataTextWarningColor"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
<TextView
|
||||
|
@ -150,7 +150,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="FLAVOUR"
|
||||
android:textColor="@color/metadataOk"
|
||||
android:textColor="?attr/metadataTextOkColor"
|
||||
tools:ignore="HardcodedText" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
@ -5,14 +5,13 @@
|
|||
android:layout_height="40dp"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:orientation="horizontal"
|
||||
android:background="@drawable/background_darkgray">
|
||||
android:background="@drawable/background_total">
|
||||
|
||||
<Button
|
||||
android:id="@+id/decrement"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="0dp"
|
||||
android:textColor="@color/mdtp_white"
|
||||
android:background="@android:color/transparent"
|
||||
app:backgroundTint="@android:color/transparent"
|
||||
android:textStyle="bold"
|
||||
|
@ -25,10 +24,10 @@
|
|||
android:background="@drawable/border_gray"
|
||||
android:layout_height="match_parent"
|
||||
android:text="1"
|
||||
android:textColor="@android:color/black"
|
||||
android:inputType="number"
|
||||
android:gravity="center"
|
||||
android:imeOptions="actionDone"
|
||||
android:textColor="?attr/numPickerText"
|
||||
tools:ignore="HardcodedText" />
|
||||
<Button
|
||||
android:id="@+id/increment"
|
||||
|
@ -36,10 +35,8 @@
|
|||
android:layout_height="match_parent"
|
||||
android:padding="0dp"
|
||||
android:textSize="25sp"
|
||||
android:textColor="@color/mdtp_white"
|
||||
android:background="@android:color/transparent"
|
||||
app:backgroundTint="@android:color/transparent"
|
||||
|
||||
android:text="+"
|
||||
tools:ignore="HardcodedText" />
|
||||
</LinearLayout>
|
|
@ -5,5 +5,4 @@
|
|||
android:gravity="center"
|
||||
android:paddingTop="5dp"
|
||||
android:paddingBottom="5dp"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
||||
android:textColor="#FFFFFF" />
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
|
|
@ -27,7 +27,7 @@
|
|||
android:layout_marginRight="18dp"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:text="Toast goes here..."
|
||||
android:textColor="@color/toastBase"
|
||||
android:textColor="?attr/toastBaseTextColor"
|
||||
android:textSize="18sp"
|
||||
tools:ignore="HardcodedText,RtlHardcoded" />
|
||||
</LinearLayout>
|
216
core/src/main/res/values-night/colors.xml
Normal file
216
core/src/main/res/values-night/colors.xml
Normal file
|
@ -0,0 +1,216 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!-- Default theme color -->
|
||||
<!-- This section describes the main theme colors -->
|
||||
<color name="colorPrimary">#212121</color>
|
||||
<color name="colorPrimaryDark">#000000</color>
|
||||
<color name="colorAccent">#40bbaa</color>
|
||||
<color name="mdtp_white">#ffffff</color>
|
||||
<color name="mdtp_line_dark">#808080</color>
|
||||
<color name="colorLightGray">#d8d8d8</color>
|
||||
<color name="cardColorBackground">#212121</color>
|
||||
<color name="black_overlay">#66000000</color>
|
||||
<color name="gray">#BBBBBB</color>
|
||||
<color name="black">#FF000000</color>
|
||||
<color name="white">#FFFFFFFF</color>
|
||||
|
||||
<color name="primaryColorDefault">#222222</color>
|
||||
<color name="primaryLightColorDefault">#bbb9bb</color>
|
||||
<color name="primaryDarkColorDefault">#222222</color>
|
||||
<color name="secondaryColorDefault">#03dac6</color>
|
||||
<color name="secondaryLightColorDefault">#e3e3e3</color>
|
||||
<color name="secondaryDarkColorDefault">#848484</color>
|
||||
<color name="primaryTextColorDefault">#ffffff</color>
|
||||
<color name="secondaryTextColorDefault">#000000</color>
|
||||
<color name="overviewPillColorDefault">#1c171c</color>
|
||||
<color name="colorOnPrimaryDefault">#FFFFFF</color>
|
||||
|
||||
<color name="defaultbackground">#424242</color>
|
||||
<color name="defaulttextcolor">#B3FFFFFF</color>
|
||||
|
||||
<!-- Tabs-->
|
||||
<color name="tabText">#d0d0d0</color>
|
||||
<color name="tabSelectedText">@color/white</color>
|
||||
|
||||
<!-- Buttons-->
|
||||
<color name="buttonBackground">#555555</color>
|
||||
<color name="buttonText">#ffffff</color>
|
||||
<color name="okButtonText">@color/colorAccent</color>
|
||||
<color name="okButtonSelected">#33969696</color>
|
||||
|
||||
<color name="ic_actions_refill">#E93057</color>
|
||||
<color name="ic_local_activate">#67DFE8</color>
|
||||
<color name="ic_local_reset">#E93057</color>
|
||||
<color name="ic_local_save">#67E86A</color>
|
||||
|
||||
<!-- Fragments-->
|
||||
<color name="pumpStatusBackground">#505050</color>
|
||||
|
||||
<!-- Dialogs-->
|
||||
<color name="dialog_title_background">#303030</color>
|
||||
<color name="activity_title_background">#121212</color>
|
||||
<color name="dialog_title_color">#FFFFFF</color>
|
||||
<color name="dialog_title_icon_tint">#FFFFFF</color>
|
||||
<color name="warningAlertBackground">#FFFB8C00</color>
|
||||
<color name="warningAlertHeaderText">#FF000000</color>
|
||||
<color name="warningAccentText">#FFFB8C00</color>
|
||||
<color name="errorAlertBackground">#FFFF5555</color>
|
||||
<color name="errorAlertHeaderText">#FF000000</color>
|
||||
<color name="helperProfile">#C803A9F4</color>
|
||||
<color name="examinedProfile">#FFFF5555</color>
|
||||
<color name="defaulttext">#BBBBBB</color>
|
||||
|
||||
<!-- Treatment-->
|
||||
<color name="tempbasal">#C803A9F4</color>
|
||||
<color name="list_delimiter">#505050</color>
|
||||
<color name="basal">#00ffff</color>
|
||||
|
||||
|
||||
<!-- Loop -->
|
||||
<color name="loopDisconnected">#939393</color>
|
||||
<color name="loopClosed">#00C03E</color>
|
||||
<color name="loopSuspended">#FFFF13</color>
|
||||
<color name="loopOpened">#4983D7</color>
|
||||
<color name="loopDisabled">#FF1313</color>
|
||||
|
||||
<!-- BgReading-->
|
||||
<color name="inrange">#00FF00</color>
|
||||
<color name="low">#FF0000</color>
|
||||
<color name="high">#FFFF00</color>
|
||||
<color name="iob">#1e88e5</color>
|
||||
<color name="extendedBolus">#67DFE8</color>
|
||||
<color name="iobPredAS">#1ea3e5</color>
|
||||
<color name="cob">#FFFB8C00</color>
|
||||
<color name="carbs">#FFFB8C00</color>
|
||||
<color name="uam">#c9bd60</color>
|
||||
<color name="zt">#00d2d2</color>
|
||||
<color name="calibration">#E83258</color>
|
||||
|
||||
<color name="ribbonDefault">#5a595b</color>
|
||||
<color name="daySelected">#D000FF00</color>
|
||||
<color name="weekdayOutline">#1ea3e5</color>
|
||||
<color name="weekendOutline">#1e88e5</color>
|
||||
|
||||
<!-- Notification-->
|
||||
<color name="notificationAnnouncement">#FF8C00</color>
|
||||
<color name="notificationUrgent">#ff0400</color>
|
||||
<color name="notificationNormal">#ff5e55</color>
|
||||
<color name="notificationLow">#ff827c</color>
|
||||
|
||||
<!-- Green Colors -->
|
||||
<color name="notificationInfo">#009705</color>
|
||||
|
||||
<!-- Toasts-->
|
||||
<color name="toastBorder">#666666</color>
|
||||
<color name="toastBase">#ffffff</color>
|
||||
<color name="toastOk">#77dd77</color>
|
||||
<color name="toastError">#ff0400</color>
|
||||
<color name="toastWarn">#FF8C00</color>
|
||||
<color name="toastInfo">#03A9F4</color>
|
||||
|
||||
<!-- Black and White transparent - glass effect-->
|
||||
<color name="black_alpha_10">#1A000000</color>
|
||||
<color name="black_alpha_20">#33000000</color>
|
||||
<color name="black_alpha_30">#4D000000</color>
|
||||
<color name="black_alpha_40">#66000000</color>
|
||||
<color name="black_alpha_50">#80000000</color>
|
||||
<color name="black_alpha_60">#99000000</color>
|
||||
<color name="black_alpha_65">#A6000000</color>
|
||||
<color name="black_alpha_70">#B3000000</color>
|
||||
<color name="black_alpha_80">#CC000000</color>
|
||||
<color name="black_alpha_90">#E6000000</color>
|
||||
|
||||
<color name="white_alpha_08">#10FFFFFF</color>
|
||||
<color name="white_alpha_10">#1AFFFFFF</color>
|
||||
<color name="white_alpha_20">#33FFFFFF</color>
|
||||
<color name="white_alpha_30">#4DFFFFFF</color>
|
||||
<color name="white_alpha_40">#66FFFFFF</color>
|
||||
<color name="white_alpha_50">#80FFFFFF</color>
|
||||
<color name="white_alpha_60">#99FFFFFF</color>
|
||||
<color name="white_alpha_65">#A6FFFFFF</color>
|
||||
<color name="white_alpha_70">#B3FFFFFF</color>
|
||||
<color name="white_alpha_80">#CCFFFFFF</color>
|
||||
<color name="white_alpha_90">#E6FFFFFF</color>
|
||||
|
||||
<color name="transparent">#00000000</color>
|
||||
|
||||
<!-- Maintenance -->
|
||||
<color name="metadataOk">#77dd77</color>
|
||||
<color name="metadataTextWarning">#FF8C00</color>
|
||||
<color name="metadataTextError">#FF5555</color>
|
||||
|
||||
<!-- Import/Export -->
|
||||
<color name="importListAdditionalInfo">#BBBBBB</color>
|
||||
<color name="importListFileName">#FFFFFF</color>
|
||||
|
||||
<color name="ribbonWarning">#f4d700</color>
|
||||
<color name="ribbonCritical">#ff0400</color>
|
||||
<color name="ribbonTextDefault">#FFFFFF</color>
|
||||
<color name="ribbonTextWarning">#303030</color>
|
||||
<color name="tempTargetConfirmation">#77dd77</color>
|
||||
|
||||
<color name="prediction">#ff00ff</color>
|
||||
<color name="iobPred">#00d2d2</color>
|
||||
<color name="bolus">#1ea3e5</color>
|
||||
<color name="ratio">#FFFFFF</color>
|
||||
<color name="activity">#d3f166</color>
|
||||
<color name="bgi">#00EEEE</color>
|
||||
<color name="devslopepos">#FFFFFF00</color>
|
||||
<color name="devslopeneg">#FFFF00FF</color>
|
||||
<color name="actionsConfirm">#FFFF00</color>
|
||||
<color name="tabBgColorSelected">#FF666666</color>
|
||||
<color name="deviations">#FF0000</color>
|
||||
<color name="cobAlert">#7484E2</color>
|
||||
<color name="inrangebackground">#2800FF00</color>
|
||||
<color name="basebasal">#C83F51B5</color>
|
||||
<color name="graphgrid">#757575</color>
|
||||
<color name="warning">#ff1a1a</color>
|
||||
<color name="info">#77dd77</color>
|
||||
<color name="error_background">#66FC0000</color>
|
||||
<color name="ok_background">@color/colorPrimaryDark</color>
|
||||
|
||||
<color name="tempTargetBackground">#77dd77</color>
|
||||
<color name="exercise">#67DFE8</color>
|
||||
|
||||
<color name="action">#ffffbb33</color>
|
||||
<color name="alarm">#ffff4444</color>
|
||||
|
||||
<color name="cardObjectiveText">#779ECB</color>
|
||||
|
||||
<color name="colorAcceptTempButton">#f4d700</color>
|
||||
<color name="colorTreatmentButton">#67dfe8</color>
|
||||
<color name="colorInsulinButton">#67dfe8</color>
|
||||
<color name="colorCarbsButton">#ffae01</color>
|
||||
<color name="colorCalibrationButton">#e93057</color>
|
||||
<color name="colorCalculatorButton">#67e86a</color>
|
||||
<color name="colorQuickWizardButton">#ffae01</color>
|
||||
<color name="colorSetTempButton">#FF478EFF</color>
|
||||
<color name="colorSetExtendedButton">#FFDD7792</color>
|
||||
<color name="colorProfileSwitchButton">#ca77dd</color>
|
||||
|
||||
<color name="colorObjectivesDisabledText">#FF5722</color>
|
||||
|
||||
<color name="colorScheduled">#de7550</color>
|
||||
<color name="colorActive">#25912e</color>
|
||||
|
||||
<color name="deviationgrey">#c8666666</color>
|
||||
<color name="deviationgreen">#7200FF00</color>
|
||||
<color name="deviationred">#72FF0000</color>
|
||||
<color name="deviationblack">#72000000</color>
|
||||
|
||||
<color name="splashBackground">#000000</color>
|
||||
|
||||
<!-- Gray colors -->
|
||||
<color name="darkgray">#323232</color>
|
||||
<color name="darkgrayVariant">#424242</color>
|
||||
<color name="objectivesBackground">#3C3C3C</color>
|
||||
<color name="plastic_grey">#666666</color>
|
||||
<color name="sphere_plastic_grey">#8c8c8c</color>
|
||||
<color name="lightSandGray">#72000000</color>
|
||||
<color name="sandGray">#c8666666</color>
|
||||
<color name="treatment">#B2B2B2</color>
|
||||
<color name="lightgray">#4dB1B1B1</color>
|
||||
<color name="mdtp_button_selected">#33969696</color>
|
||||
<color name="plastic">#EBEBEA</color>
|
||||
|
||||
</resources>
|
238
core/src/main/res/values-night/styles.xml
Normal file
238
core/src/main/res/values-night/styles.xml
Normal file
|
@ -0,0 +1,238 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources xmlns:ns2="http://schemas.android.com/tools">
|
||||
|
||||
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/secondaryColorDefault</item>
|
||||
<item name="dialogTitleBackground">@color/dialog_title_background</item>
|
||||
<item name="dialogTitleColor">@color/dialog_title_color</item>
|
||||
<item name="dialogTitleIconTint">@color/dialog_title_icon_tint</item>
|
||||
<!-- New MaterialComponents attributes. -->dialogTitleBackground
|
||||
<item name="colorSecondary">@color/secondaryColorDefault</item>
|
||||
<item name="colorPrimaryVariant">@color/primaryLightColorDefault</item>
|
||||
<item name="colorSecondaryVariant">@color/secondaryLightColorDefault</item>
|
||||
<item name="colorOnPrimary">@color/primaryTextColorDefault</item>
|
||||
<item name="colorSurface">@color/black</item>
|
||||
<item name="colorOnSurface">@color/white</item>
|
||||
<item name="colorOnSecondary">@color/white</item>
|
||||
<item name="colorOnBackground">@color/white</item>
|
||||
<item name="colorOnError">@color/black</item>
|
||||
<item name="scrimBackground">@color/mtrl_scrim_color</item>
|
||||
<item name="android:textColorSecondary">@color/white</item>
|
||||
<item name="android:textColorPrimary">@color/white</item>
|
||||
<item name="android:textColor">@color/white</item>
|
||||
<item name="popupMenuStyle">@style/Widget.MaterialComponents.PopupMenu</item>
|
||||
<item name="actionOverflowMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Overflow</item>
|
||||
<!-- Fragment background for some themes default transparent -->
|
||||
<item name="fragmentbackground">@color/transparent</item>
|
||||
<!---Notification -->
|
||||
<item name="notificationUrgent">@color/notificationUrgent</item>
|
||||
<item name="notificationNormal">@color/notificationNormal</item>
|
||||
<item name="notificationLow">@color/notificationLow</item>
|
||||
<item name="notificationInfo">@color/notificationInfo</item>
|
||||
<item name="notificationAnnouncement">@color/notificationAnnouncement</item>
|
||||
|
||||
<item name="actionModeCloseDrawable">@drawable/ic_close</item>
|
||||
<!---bolus color -->
|
||||
<item name="bolusColor">@color/bolus</item>
|
||||
<!---Treatment button color -->
|
||||
<item name="treatmentButton">@color/colorTreatmentButton</item>
|
||||
<!---Number Picker text color -->
|
||||
<item name="numPickerText">@color/black</item>
|
||||
<!---NS Client action text color -->
|
||||
<item name="actionButton">@color/action</item>
|
||||
<!---Text color for Quickwizard and more -->
|
||||
<item name="cardObjectiveText">@color/cardObjectiveText</item>
|
||||
<!---Text color for misc buttons and texts -->
|
||||
<item name="alarmColor">@color/alarm</item>
|
||||
<!-- Number picker and more -->
|
||||
<item name="totalBackground">@color/sphere_plastic_grey</item>
|
||||
<!-- BG source temp button -->
|
||||
<item name="setTempButton">@color/colorSetTempButton</item>
|
||||
<!-- Card Item-->
|
||||
<item name="cardItemBackgroundColor">@color/cardColorBackground</item>
|
||||
<!-- Carbs -->
|
||||
<item name="carbsColor">@color/carbs</item>
|
||||
<!-- Exercise -->
|
||||
<item name="exerciseColor">@color/exercise</item>
|
||||
<!-- BG low -->
|
||||
<item name="lowColor">@color/low</item>
|
||||
<!-- Temp Target -->
|
||||
<item name="tempTargetConfirmation">@color/tempTargetConfirmation</item>
|
||||
<!-- Treatments -->
|
||||
<item name="setExtendedButtonColor">@color/colorSetExtendedButton</item>
|
||||
<!-- Carbs Button -->
|
||||
<item name="carbsButtonColor">@color/colorCarbsButton</item>
|
||||
<!-- Temp Button Button -->
|
||||
<item name="acceptTempButtonColor">@color/colorAcceptTempButton</item>
|
||||
<!-- Treatment Button -->
|
||||
<item name="treatmentButtonColor">@color/colorTreatmentButton</item>
|
||||
<!-- Insulin Button -->
|
||||
<item name="insulinButtonColor">@color/colorInsulinButton</item>
|
||||
<!-- Calculator Button -->
|
||||
<item name="calculatorButtonColor">@color/colorCalculatorButton</item>
|
||||
<!-- Calibration Button -->
|
||||
<item name="calibrationButtonColor">@color/colorCalibrationButton</item>
|
||||
<!-- QuickWizard Button -->
|
||||
<item name="quickWizardButtonColor">@color/colorQuickWizardButton</item>
|
||||
<!-- Pump -->
|
||||
<item name="pumpStatusBackground">@color/pumpStatusBackground</item>
|
||||
<!-- Objectives -->
|
||||
<item name="objectivesBackgroundColor">@color/objectivesBackground</item>
|
||||
<item name="objectivesDisabledTextColor">@color/colorObjectivesDisabledText</item>
|
||||
<!---Import List -->
|
||||
<item name="importListFileNameColor">@color/importListFileName</item>
|
||||
<item name="importListAdditionalInfoColor">@color/importListAdditionalInfo</item>
|
||||
<item name="metadataTextWarningColor">@color/metadataTextWarning</item>
|
||||
<item name="metadataTextOkColor">@color/metadataOk</item>
|
||||
<!---Delete selection -->
|
||||
<item name="trashBinTintColor">@color/white</item>
|
||||
<!---Dialog -->
|
||||
<item name="activity_title_backgroundColor">@color/activity_title_background</item>
|
||||
<!---Automation -->
|
||||
<item name="ribbonDefaultColor">@color/ribbonDefault</item>
|
||||
<!---Main Activity Tab -->
|
||||
<item name="tabSelectedTextColor">@color/tabSelectedText</item>
|
||||
<item name="tabTextColor">@color/tabText</item>
|
||||
<!---Background -->
|
||||
<item name="defaultbackground">@color/defaultbackground</item>
|
||||
<!---Toast -->
|
||||
<item name="toastBaseTextColor">@color/toastBase</item>
|
||||
<!---Input -->
|
||||
<item name="boxStrokeColor">@color/white</item>
|
||||
<!---Profile Helper -->
|
||||
<item name="tabBgColorSelected">@color/tabBgColorSelected</item>
|
||||
<!---Splash Background -->
|
||||
<item name="splashBackgroundColor">@color/splashBackground</item>
|
||||
<!---Dialog Helper -->
|
||||
<item name="materialAlertDialogTheme">@style/DialogTheme</item>
|
||||
<item name="android:alertDialogTheme">@style/DialogTheme</item>
|
||||
<item name="alertDialogTheme">@style/DialogTheme</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
|
||||
|
||||
<style name="AppTheme.NoActionBar" parent="Theme.MaterialComponents.DayNight.NoActionBar">
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/colorAccent</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="actionModeCloseDrawable">@drawable/ic_close</item>
|
||||
</style>
|
||||
|
||||
<!-- BolusProgress, Error -->
|
||||
<style name="Theme.MaterialComponents.Translucent" parent="Theme.MaterialComponents.NoActionBar">
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<item name="android:colorBackgroundCacheHint">@null</item>
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
<item name="android:windowAnimationStyle">@android:style/Animation</item>
|
||||
<item name="dialogTitleBackground">@color/dialog_title_background</item>
|
||||
</style>
|
||||
|
||||
<!-- Buttons from MaterialDateTimePicker, Dialogs ... -->
|
||||
<dimen name="material_button_height">48dp</dimen>
|
||||
<dimen name="material_button_text_size">14sp</dimen>
|
||||
<dimen name="material_button_min_width">64dp</dimen>
|
||||
<dimen name="material_button_text_padding_horizontal">8dp</dimen>
|
||||
|
||||
<style name="OkCancelButton">
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">@dimen/material_button_height</item>
|
||||
<item name="android:layout_gravity">center_vertical</item>
|
||||
<item name="android:focusable">true</item>
|
||||
</style>
|
||||
|
||||
<style name="OkCancelButton.Text" ns2:ignore="NewApi">
|
||||
<item name="android:textSize">@dimen/material_button_text_size</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
<item name="android:layout_gravity">center_vertical</item>
|
||||
<item name="android:gravity">center</item>
|
||||
<item name="android:stateListAnimator">@null</item>
|
||||
<item name="android:background">@drawable/material_button_background</item>
|
||||
<item name="android:minWidth">@dimen/material_button_min_width</item>
|
||||
<item name="android:paddingLeft">@dimen/material_button_text_padding_horizontal</item>
|
||||
<item name="android:paddingRight">@dimen/material_button_text_padding_horizontal</item>
|
||||
<item name="android:textColor">@color/okButtonText</item>
|
||||
<item name="android:textAllCaps">true</item>
|
||||
</style>
|
||||
|
||||
<style name="MaterialPickerTheme" parent="android:Theme.Material.Dialog.Alert">
|
||||
<item name="android:buttonBarPositiveButtonStyle">@style/PickerTextButton</item>
|
||||
<item name="android:buttonBarNegativeButtonStyle">@style/PickerTextButton</item>
|
||||
<item name="android:textColorPrimary">@color/okButtonText</item>
|
||||
<item name="android:colorPrimary">@color/okButtonText</item>
|
||||
<item name="android:calendarTextColor">@color/okButtonText</item>
|
||||
<item name="android:colorAccent">@color/okButtonText</item>
|
||||
</style>
|
||||
<style name="PickerTextButton" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
|
||||
<item name="android:textColor">@color/okButtonText</item>
|
||||
</style>
|
||||
|
||||
<!-- Common Buttons -->
|
||||
<dimen name="gray_material_button_margin_horizontal">5dp</dimen>
|
||||
|
||||
<style name="GrayButton" parent="Widget.MaterialComponents.Button">
|
||||
<item name="android:backgroundTint">@color/buttonBackground</item>
|
||||
<item name="android:textColor">@color/buttonText</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_gravity">center_vertical</item>
|
||||
<item name="android:gravity">center</item>
|
||||
<item name="android:layout_marginStart">@dimen/gray_material_button_margin_horizontal</item>
|
||||
<item name="android:layout_marginEnd">@dimen/gray_material_button_margin_horizontal</item>
|
||||
<item name="android:textAllCaps">true</item>
|
||||
</style>
|
||||
|
||||
<style name="ButtonSmallFontStyle" parent="GrayButton">
|
||||
<item name="android:textSize">10sp</item>
|
||||
</style>
|
||||
|
||||
<style name="ButtonMediumFontStyle" parent="GrayButton">
|
||||
<item name="android:textSize">15sp</item>
|
||||
</style>
|
||||
|
||||
<!-- Alert Dialogs -->
|
||||
<style name="DialogTheme" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
|
||||
<item name="backgroundColor">@color/dialog_title_background</item>
|
||||
<item name="buttonBarNegativeButtonStyle">@style/DialogOkCancelButtonStyle</item>
|
||||
<item name="buttonBarPositiveButtonStyle">@style/DialogOkCancelButtonStyle</item>
|
||||
<item name="buttonBarNeutralButtonStyle">@style/DialogOkCancelButtonStyle</item>
|
||||
</style>
|
||||
|
||||
<style name="DialogOkCancelButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
|
||||
<item name="android:textColor">@color/okButtonText</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeWarningDialog" parent="DialogTheme">
|
||||
<item name="alertDialogTheme">@style/AppThemeWarningDialogTheme</item>
|
||||
<item name="dialogTitleBackground">@color/warningAlertBackground</item>
|
||||
<item name="dialogTitleColor">@color/warningAlertHeaderText</item>
|
||||
<item name="dialogTitleIconTint">@color/warningAlertHeaderText</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeWarningDialogTheme" parent="Theme.MaterialComponents.Dialog.MinWidth">
|
||||
<item name="android:windowBackground">@drawable/alert_border_warning</item>
|
||||
<item name="colorAccent">@color/warningAlertBackground</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeErrorDialog" parent="DialogTheme">
|
||||
<item name="alertDialogTheme">@style/AppThemeErrorDialogTheme</item>
|
||||
<item name="dialogTitleBackground">@color/errorAlertBackground</item>
|
||||
<item name="dialogTitleColor">@color/errorAlertHeaderText</item>
|
||||
<item name="dialogTitleIconTint">@color/errorAlertHeaderText</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeErrorDialogTheme" parent="Theme.MaterialComponents.Dialog.MinWidth">
|
||||
<item name="android:windowBackground">@drawable/alert_border_error</item>
|
||||
<item name="colorAccent">@color/errorAlertBackground</item>
|
||||
</style>
|
||||
|
||||
<!-- The launcher theme. It sets the main window background to the launch_screen drawable -->
|
||||
<style name="AppTheme.Launcher" parent="AppTheme">
|
||||
<item name="android:windowBackground">@drawable/launch_screen</item>
|
||||
<!-- Optional, on Android 5+ you can modify the colorPrimaryDark color to match the windowBackground color for further branding-->
|
||||
<!-- <item name="colorPrimaryDark">@android:color/white</item> -->
|
||||
</style>
|
||||
</resources>
|
|
@ -1,18 +1,88 @@
|
|||
<resources>
|
||||
|
||||
<attr name="dialogTitleBackground" format="reference" />
|
||||
<attr name="dialogTitleColor" format="reference" />
|
||||
<attr name="dialogTitleIconTint" format="reference" />
|
||||
|
||||
<!---bolus color -->
|
||||
<attr name="bolusColor" format="reference|color" />
|
||||
<!---Treatment button color -->
|
||||
<attr name="treatmentButton" format="reference|color" />
|
||||
<!---Number Picker text color -->
|
||||
<attr name="numPickerText" format="reference|color" />
|
||||
<!---NS Client action text color -->
|
||||
<attr name="actionButton" format="reference|color" />
|
||||
<!---Text color for Quickwizard and more -->
|
||||
<attr name="cardObjectiveText" format="reference|color" />
|
||||
<!---Text color for misc buttons and texts -->
|
||||
<attr name="alarmColor" format="reference|color" />
|
||||
<!-- Number picker and more -->
|
||||
<attr name="totalBackground" format="reference|color" />
|
||||
<!-- BG source temp button -->
|
||||
<attr name="setTempButton" format="reference|color" />
|
||||
<!-- Card Item-->
|
||||
<attr name="cardItemBackgroundColor" format="reference|color" />
|
||||
<!-- Carbs -->
|
||||
<attr name="carbsColor" format="reference|color" />
|
||||
<!-- Exercise -->
|
||||
<attr name="exerciseColor" format="reference|color" />
|
||||
<!-- BG low -->
|
||||
<attr name="lowColor" format="reference|color" />
|
||||
<!-- Temp Target -->
|
||||
<attr name="tempTargetConfirmation" format="reference|color" />
|
||||
<!-- Treatments -->
|
||||
<attr name="setExtendedButtonColor" format="reference|color" />
|
||||
<!-- Carbs Button -->
|
||||
<attr name="carbsButtonColor" format="reference|color" />
|
||||
<!-- Temp Button Button -->
|
||||
<attr name="acceptTempButtonColor" format="reference|color" />
|
||||
<!-- Treatment Button -->
|
||||
<attr name="treatmentButtonColor" format="reference|color" />
|
||||
<!-- Insulin Button -->
|
||||
<attr name="insulinButtonColor" format="reference|color" />
|
||||
<!-- Calculator Button -->
|
||||
<attr name="calculatorButtonColor" format="reference|color" />
|
||||
<!-- Calibration Button -->
|
||||
<attr name="calibrationButtonColor" format="reference|color" />
|
||||
<!-- QuickWizard Button -->
|
||||
<attr name="quickWizardButtonColor" format="reference|color" />
|
||||
<!-- Pump -->
|
||||
<attr name="pumpStatusBackground" format="reference|color" />
|
||||
<!-- Objectives -->
|
||||
<attr name="objectivesBackgroundColor" format="reference|color" />
|
||||
<attr name="objectivesDisabledTextColor" format="reference|color" />
|
||||
<!---Import List -->
|
||||
<attr name="importListFileNameColor" format="reference|color" />
|
||||
<attr name="importListAdditionalInfoColor" format="reference|color" />
|
||||
<attr name="metadataTextWarningColor" format="reference|color" />
|
||||
<attr name="metadataTextOkColor" format="reference|color" />
|
||||
<!---Delete selection -->
|
||||
<attr name="trashBinTintColor" format="reference|color" />
|
||||
<attr name="dialogTitleBackground" format="reference|color" />
|
||||
<attr name="dialogTitleColor" format="reference|color" />
|
||||
<attr name="dialogTitleIconTint" format="reference|color" />
|
||||
<!---Dialog -->
|
||||
<attr name="activity_title_backgroundColor" format="reference|color" />
|
||||
<!---Automation -->
|
||||
<attr name="ribbonDefaultColor" format="reference|color" />
|
||||
<!---Main Activity Tab -->
|
||||
<attr name="tabSelectedTextColor" format="reference|color" />
|
||||
<attr name="tabTextColor" format="reference|color" />
|
||||
<!---Background -->
|
||||
<attr name="defaultbackground" format="reference|color" />
|
||||
<!---Toast -->
|
||||
<attr name="toastBaseTextColor" format="reference|color" />
|
||||
<!---Input -->
|
||||
<attr name="boxStrokeColor" format="reference|color" />
|
||||
<!---Profile Helper -->
|
||||
<attr name="tabBgColorSelected" format="reference|color" />
|
||||
<!-- Fragment background for some themes default transparent -->
|
||||
<attr name="fragmentbackground" format="reference|color" />
|
||||
<declare-styleable name="NumberPicker">
|
||||
<attr name="customContentDescription" format="string" />
|
||||
</declare-styleable>
|
||||
|
||||
<!---Notification -->
|
||||
<attr name="notificationUrgent" format="reference|color" />
|
||||
<attr name="notificationNormal" format="reference|color" />
|
||||
<attr name="notificationLow" format="reference|color" />
|
||||
<attr name="notificationInfo" format="reference|color" />
|
||||
<attr name="notificationAnnouncement" format="reference|color" />
|
||||
<!---Splash Background -->
|
||||
<attr name="splashBackgroundColor" format="reference|color" />
|
||||
|
||||
</resources>
|
|
@ -2,13 +2,13 @@
|
|||
<resources>
|
||||
<!-- Default theme color -->
|
||||
<!-- This section describes the main theme colors -->
|
||||
<color name="colorPrimary">#212121</color>
|
||||
<color name="colorPrimaryDark">#000000</color>
|
||||
<color name="colorPrimary">#787878</color>
|
||||
<color name="colorPrimaryDark">#676767</color>
|
||||
<color name="colorAccent">#40bbaa</color>
|
||||
<color name="mdtp_white">#ffffff</color>
|
||||
<color name="mdtp_line_dark">#808080</color>
|
||||
<color name="colorLightGray">#d8d8d8</color>
|
||||
<color name="cardColorBackground">#212121</color>
|
||||
<color name="cardColorBackground">#999999</color>
|
||||
<color name="black_overlay">#66000000</color>
|
||||
<color name="gray">#BBBBBB</color>
|
||||
<color name="black">#FF000000</color>
|
||||
|
@ -25,12 +25,12 @@
|
|||
<color name="overviewPillColorDefault">#1c171c</color>
|
||||
<color name="colorOnPrimaryDefault">#FFFFFF</color>
|
||||
|
||||
<color name="defaultbackground">#424242</color>
|
||||
<color name="defaultbackground">#999999</color>
|
||||
<color name="defaulttextcolor">#B3FFFFFF</color>
|
||||
|
||||
<!-- Tabs-->
|
||||
<color name="tabTextColor">#d0d0d0</color>
|
||||
<color name="tabSelectedTextColor">@color/white</color>
|
||||
<color name="tabText">#d0d0d0</color>
|
||||
<color name="tabSelectedText">@color/white</color>
|
||||
|
||||
<!-- Buttons-->
|
||||
<color name="buttonBackground">#555555</color>
|
||||
|
@ -133,6 +133,8 @@
|
|||
<color name="white_alpha_80">#CCFFFFFF</color>
|
||||
<color name="white_alpha_90">#E6FFFFFF</color>
|
||||
|
||||
<color name="transparent">#00000000</color>
|
||||
|
||||
<!-- Maintenance -->
|
||||
<color name="metadataOk">#77dd77</color>
|
||||
<color name="metadataTextWarning">#FF8C00</color>
|
||||
|
@ -148,4 +150,68 @@
|
|||
<color name="ribbonTextWarning">#303030</color>
|
||||
<color name="tempTargetConfirmation">#77dd77</color>
|
||||
|
||||
<color name="prediction">#ff00ff</color>
|
||||
<color name="iobPred">#00d2d2</color>
|
||||
<color name="bolus">#1ea3e5</color>
|
||||
<color name="ratio">#FFFFFF</color>
|
||||
<color name="activity">#d3f166</color>
|
||||
<color name="bgi">#00EEEE</color>
|
||||
<color name="devslopepos">#FFFFFF00</color>
|
||||
<color name="devslopeneg">#FFFF00FF</color>
|
||||
<color name="actionsConfirm">#FFFF00</color>
|
||||
<color name="tabBgColorSelected">#FF666666</color>
|
||||
<color name="deviations">#FF0000</color>
|
||||
<color name="cobAlert">#7484E2</color>
|
||||
<color name="inrangebackground">#2800FF00</color>
|
||||
<color name="basebasal">#C83F51B5</color>
|
||||
<color name="graphgrid">#757575</color>
|
||||
<color name="warning">#ff1a1a</color>
|
||||
<color name="info">#77dd77</color>
|
||||
<color name="error_background">#66FC0000</color>
|
||||
<color name="ok_background">@color/black</color>
|
||||
|
||||
<color name="tempTargetBackground">#77dd77</color>
|
||||
<color name="exercise">#67DFE8</color>
|
||||
|
||||
<color name="action">#ffffbb33</color>
|
||||
<color name="alarm">#ffff4444</color>
|
||||
|
||||
<color name="cardObjectiveText">#779ECB</color>
|
||||
|
||||
<color name="colorAcceptTempButton">#f4d700</color>
|
||||
<color name="colorTreatmentButton">#67dfe8</color>
|
||||
<color name="colorInsulinButton">#67dfe8</color>
|
||||
<color name="colorCarbsButton">#ffae01</color>
|
||||
<color name="colorCalibrationButton">#e93057</color>
|
||||
<color name="colorCalculatorButton">#67e86a</color>
|
||||
<color name="colorQuickWizardButton">#ffae01</color>
|
||||
<color name="colorSetTempButton">#FF478EFF</color>
|
||||
<color name="colorSetExtendedButton">#FFDD7792</color>
|
||||
<color name="colorProfileSwitchButton">#ca77dd</color>
|
||||
|
||||
<color name="colorObjectivesDisabledText">#FF5722</color>
|
||||
|
||||
<color name="colorScheduled">#de7550</color>
|
||||
<color name="colorActive">#25912e</color>
|
||||
|
||||
<color name="deviationgrey">#c8666666</color>
|
||||
<color name="deviationgreen">#7200FF00</color>
|
||||
<color name="deviationred">#72FF0000</color>
|
||||
<color name="deviationblack">#72000000</color>
|
||||
|
||||
<color name="splashBackground">#FFFFFF</color>
|
||||
|
||||
<!-- Gray colors -->
|
||||
<color name="darkgray">#323232</color>
|
||||
<color name="darkgrayVariant">#424242</color>
|
||||
<color name="objectivesBackground">#3C3C3C</color>
|
||||
<color name="plastic_grey">#666666</color>
|
||||
<color name="sphere_plastic_grey">#8c8c8c</color>
|
||||
<color name="lightSandGray">#72000000</color>
|
||||
<color name="sandGray">#c8666666</color>
|
||||
<color name="treatment">#B2B2B2</color>
|
||||
<color name="lightgray">#4dB1B1B1</color>
|
||||
<color name="mdtp_button_selected">#33969696</color>
|
||||
<color name="plastic">#EBEBEA</color>
|
||||
|
||||
</resources>
|
||||
|
|
|
@ -64,6 +64,7 @@
|
|||
<string name="key_resistantadult" translatable="false">resistantadult</string>
|
||||
<string name="key_pregnant" translatable="false">pregnant</string>
|
||||
<string name="key_app_expiration" translatable="false">app_expiration</string>
|
||||
<string name="key_use_dark_mode" translatable="false">use_dark_mode</string>
|
||||
|
||||
<!-- General-->
|
||||
<string name="refresh">Refresh</string>
|
||||
|
|
|
@ -1,38 +1,117 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources xmlns:ns2="http://schemas.android.com/tools">
|
||||
|
||||
<style name="AppTheme" parent="Theme.MaterialComponents">
|
||||
<style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/secondaryColorDefault</item>
|
||||
<item name="colorAccent">@android:color/holo_blue_light</item>
|
||||
<item name="dialogTitleBackground">@color/dialog_title_background</item>
|
||||
<item name="dialogTitleColor">@color/dialog_title_color</item>
|
||||
<item name="dialogTitleIconTint">@color/dialog_title_icon_tint</item>
|
||||
<!-- New MaterialComponents attributes. -->
|
||||
<item name="colorSecondary">@color/secondaryColorDefault</item>
|
||||
<item name="colorSecondary">@android:color/holo_blue_light</item>
|
||||
<item name="colorPrimaryVariant">@color/primaryLightColorDefault</item>
|
||||
<item name="colorSecondaryVariant">@color/secondaryLightColorDefault</item>
|
||||
<item name="colorOnPrimary">@color/primaryTextColorDefault</item>
|
||||
<item name="colorSurface">@color/black_alpha_90</item>
|
||||
<item name="colorSurface">@color/white</item>
|
||||
<item name="colorOnSurface">@color/gray</item>
|
||||
<item name="colorOnSecondary">@color/white</item>
|
||||
<item name="colorOnSecondary">@color/black</item>
|
||||
<item name="colorOnBackground">@color/white</item>
|
||||
<item name="colorOnError">@color/black</item>
|
||||
<item name="scrimBackground">@color/mtrl_scrim_color</item>
|
||||
<item name="android:textColorSecondary">@color/white</item>
|
||||
<item name="android:textColorPrimary">@color/white</item>
|
||||
<item name="android:textColor">@color/white</item>
|
||||
<item name="scrimBackground">@color/white</item>
|
||||
<item name="android:textColorSecondary">@color/black</item>
|
||||
<item name="android:textColorPrimary">@color/black</item>
|
||||
<item name="android:textColor">@color/black</item>
|
||||
<item name="popupMenuStyle">@style/Widget.MaterialComponents.PopupMenu</item>
|
||||
<item name="actionOverflowMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Overflow</item>
|
||||
<!---Notification -->
|
||||
<item name="notificationUrgent">@color/notificationUrgent</item>
|
||||
<item name="notificationNormal">@color/notificationNormal</item>
|
||||
<item name="notificationLow">@color/notificationLow</item>
|
||||
<item name="notificationInfo">@color/notificationInfo</item>
|
||||
<item name="notificationAnnouncement">@color/notificationAnnouncement</item>
|
||||
|
||||
<!-- Fragment background for some themes default transparent -->
|
||||
<item name="fragmentbackground">@color/transparent</item>
|
||||
<item name="actionModeCloseDrawable">@drawable/ic_close</item>
|
||||
<!---bolus color -->
|
||||
<item name="bolusColor">@color/bolus</item>
|
||||
<!---Treatment button color -->
|
||||
<item name="treatmentButton">@color/colorTreatmentButton</item>
|
||||
<!---Number Picker text color -->
|
||||
<item name="numPickerText">@color/black</item>
|
||||
<!---NS Client action text color -->
|
||||
<item name="actionButton">@android:color/holo_orange_light</item>
|
||||
<!---Text color for Quickwizard and more -->
|
||||
<item name="cardObjectiveText">@color/cardObjectiveText</item>
|
||||
<!---Text color for misc buttons and texts -->
|
||||
<item name="alarmColor">@color/alarm</item>
|
||||
<!-- Number picker and more -->
|
||||
<item name="totalBackground">@color/gray</item>
|
||||
<!-- BG source temp button -->
|
||||
<item name="setTempButton">@color/colorSetTempButton</item>
|
||||
<!-- Card Item-->
|
||||
<item name="cardItemBackgroundColor">@color/cardColorBackground</item>
|
||||
<!-- Carbs -->
|
||||
<item name="carbsColor">@color/carbs</item>
|
||||
<!-- Exercise -->
|
||||
<item name="exerciseColor">@color/exercise</item>
|
||||
<!-- BG low -->
|
||||
<item name="lowColor">@color/low</item>
|
||||
<!-- Temp Target -->
|
||||
<item name="tempTargetConfirmation">@color/tempTargetConfirmation</item>
|
||||
<!-- Treatments -->
|
||||
<item name="setExtendedButtonColor">@color/colorSetExtendedButton</item>
|
||||
<!-- Carbs Button -->
|
||||
<item name="carbsButtonColor">@color/colorCarbsButton</item>
|
||||
<!-- Temp Button Button -->
|
||||
<item name="acceptTempButtonColor">@color/colorAcceptTempButton</item>
|
||||
<!-- Treatment Button -->
|
||||
<item name="treatmentButtonColor">@color/colorTreatmentButton</item>
|
||||
<!-- Insulin Button -->
|
||||
<item name="insulinButtonColor">@color/colorInsulinButton</item>
|
||||
<!-- Calculator Button -->
|
||||
<item name="calculatorButtonColor">@color/colorCalculatorButton</item>
|
||||
<!-- Calibration Button -->
|
||||
<item name="calibrationButtonColor">@color/colorCalibrationButton</item>
|
||||
<!-- QuickWizard Button -->
|
||||
<item name="quickWizardButtonColor">@color/colorQuickWizardButton</item>
|
||||
<!-- Pump -->
|
||||
<item name="pumpStatusBackground">@color/pumpStatusBackground</item>
|
||||
<!-- Objectives -->
|
||||
<item name="objectivesBackgroundColor">@color/objectivesBackground</item>
|
||||
<item name="objectivesDisabledTextColor">@color/colorObjectivesDisabledText</item>
|
||||
<!---Import List -->
|
||||
<item name="importListFileNameColor">@color/importListFileName</item>
|
||||
<item name="importListAdditionalInfoColor">@color/importListAdditionalInfo</item>
|
||||
<item name="metadataTextWarningColor">@color/metadataTextWarning</item>
|
||||
<item name="metadataTextOkColor">@color/metadataOk</item>
|
||||
<!---Delete selection -->
|
||||
<item name="trashBinTintColor">@color/black</item>
|
||||
<!---Dialog -->
|
||||
<item name="activity_title_backgroundColor">@color/activity_title_background</item>
|
||||
<!---Automation -->
|
||||
<item name="ribbonDefaultColor">@color/ribbonDefault</item>
|
||||
<!---Main Activity Tab -->
|
||||
<item name="tabSelectedTextColor">@color/tabSelectedText</item>
|
||||
<item name="tabTextColor">@color/tabText</item>
|
||||
<!---Background -->
|
||||
<item name="defaultbackground">@color/white</item>
|
||||
<!---Toast -->
|
||||
<item name="toastBaseTextColor">@color/toastBase</item>
|
||||
<!---Input -->
|
||||
<item name="boxStrokeColor">@color/white</item>
|
||||
<!---Profile Helper -->
|
||||
<item name="tabBgColorSelected">@color/tabBgColorSelected</item>
|
||||
<!---Splash Background -->
|
||||
<item name="splashBackgroundColor">@color/splashBackground</item>
|
||||
<!---Dialog Helper -->
|
||||
<item name="materialAlertDialogTheme">@style/DialogTheme</item>
|
||||
<item name="android:alertDialogTheme">@style/DialogTheme</item>
|
||||
<item name="alertDialogTheme">@style/DialogTheme</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
|
||||
|
||||
<style name="AppTheme.NoActionBar" parent="Theme.MaterialComponents.NoActionBar">
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
|
@ -42,12 +121,13 @@
|
|||
</style>
|
||||
|
||||
<!-- BolusProgress, Error -->
|
||||
<style name="Theme.MaterialComponents.Translucent" parent="Theme.MaterialComponents.NoActionBar">
|
||||
<style name="Theme.MaterialComponents.Translucent" parent="Theme.MaterialComponents.DayNight.NoActionBar">
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<item name="android:colorBackgroundCacheHint">@null</item>
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
<item name="android:windowAnimationStyle">@android:style/Animation</item>
|
||||
<item name="dialogTitleBackground">@color/dialog_title_background</item>
|
||||
</style>
|
||||
|
||||
<!-- Buttons from MaterialDateTimePicker, Dialogs ... -->
|
||||
|
@ -114,6 +194,7 @@
|
|||
|
||||
<!-- Alert Dialogs -->
|
||||
<style name="DialogTheme" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
|
||||
<item name="backgroundColor">@color/dialog_title_background</item>
|
||||
<item name="buttonBarNegativeButtonStyle">@style/DialogOkCancelButtonStyle</item>
|
||||
<item name="buttonBarPositiveButtonStyle">@style/DialogOkCancelButtonStyle</item>
|
||||
<item name="dialogTitleBackground">@color/dialog_title_background</item>
|
||||
|
@ -148,4 +229,31 @@
|
|||
<item name="colorAccent">@color/errorAlertBackground</item>
|
||||
</style>
|
||||
|
||||
<!-- The launcher theme. It sets the main window background to the launch_screen drawable -->
|
||||
<style name="AppTheme.Launcher" parent="AppTheme">
|
||||
<item name="android:windowBackground">@drawable/launch_screen</item>
|
||||
<!-- Optional, on Android 5+ you can modify the colorPrimaryDark color to match the windowBackground color for further branding-->
|
||||
<!-- <item name="colorPrimaryDark">@android:color/white</item> -->
|
||||
</style>
|
||||
|
||||
<style name="section_header_label">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_marginTop">15dp</item>
|
||||
<item name="android:paddingStart">15dp</item>
|
||||
<item name="android:paddingEnd">15dp</item>
|
||||
<item name="android:textColor">@color/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="warning_label">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_marginTop">5dp</item>
|
||||
<item name="android:layout_marginBottom">5dp</item>
|
||||
<item name="android:paddingStart">15dp</item>
|
||||
<item name="android:paddingEnd">15dp</item>
|
||||
<item name="android:textAlignment">center</item>
|
||||
<item name="android:textColor">#ff0000</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
|
@ -51,7 +51,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -103,7 +102,6 @@
|
|||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:text="{fa-bluetooth-b}"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="HardcodedText,RtlSymmetry" />
|
||||
|
||||
|
@ -153,7 +151,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -203,7 +200,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -252,7 +248,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -301,7 +296,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -350,7 +344,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -399,7 +392,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -448,7 +440,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -497,7 +488,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -546,7 +536,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -595,7 +584,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="5dp"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
|
@ -640,7 +628,7 @@
|
|||
android:paddingBottom="6dp"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_marginRight="5dp"
|
||||
android:background="@color/pumpStatusBackground"
|
||||
android:background="?attr/pumpStatusBackground"
|
||||
android:gravity="center_vertical|center_horizontal"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||
</LinearLayout>
|
||||
|
@ -662,7 +650,7 @@
|
|||
android:paddingBottom="6dp"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_marginRight="5dp"
|
||||
android:background="@color/pumpStatusBackground"
|
||||
android:background="?attr/pumpStatusBackground"
|
||||
android:gravity="center_vertical|center_horizontal"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||
</LinearLayout>
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:background="@color/activity_title_background"
|
||||
android:background="?attr/activity_title_backgroundColor"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/spinner"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/activity_title_background"
|
||||
android:background="?attr/activity_title_backgroundColor"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/activity_title_background"
|
||||
android:background="?attr/activity_title_backgroundColor"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
android:layout_alignParentStart="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toStartOf="@+id/ble_address"
|
||||
android:textColor="#ffffff"
|
||||
android:textSize="20sp" />
|
||||
|
||||
<TextView
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/activity_title_background"
|
||||
android:background="?attr/activity_title_backgroundColor"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/dialog_title_background"
|
||||
android:background="?attr/dialogTitleBackground"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/activity_title_background"
|
||||
android:background="?attr/activity_title_backgroundColor"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue