caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

chore: move dialog and header style to theme

Browse source
This commit is contained in:
Andries Smit 2022-03-24 12:15:56 +01:00
parent 91467b1f49
commit 18cf4b14c8
46 changed files with 164 additions and 238 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
View file

@ -27,6 +27,7 @@ import javax.inject.Inject
class CalibrationDialog : DialogFragmentWithDate() {
@Inject lateinit var injector: HasAndroidInjector
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var profileFunction: ProfileFunction
@Inject lateinit var xDripBroadcast: XDripBroadcast
@Inject lateinit var uel: UserEntryLogger

1
app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
View file

@ -41,6 +41,7 @@ import kotlin.math.max
class CarbsDialog : DialogFragmentWithDate() {
@Inject lateinit var ctx: Context
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var constraintChecker: ConstraintChecker
@Inject lateinit var defaultValueHelper: DefaultValueHelper
@Inject lateinit var profileFunction: ProfileFunction

1
app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
View file

@ -41,6 +41,7 @@ class CareDialog : DialogFragmentWithDate() {
@Inject lateinit var injector: HasAndroidInjector
@Inject lateinit var ctx: Context
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var profileFunction: ProfileFunction
@Inject lateinit var translator: Translator
@Inject lateinit var uel: UserEntryLogger

1
app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
View file

@ -35,6 +35,7 @@ import kotlin.math.abs
class ExtendedBolusDialog : DialogFragmentWithDate() {
@Inject lateinit var ctx: Context
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var constraintChecker: ConstraintChecker
@Inject lateinit var commandQueue: CommandQueue
@Inject lateinit var activePlugin: ActivePlugin

1
app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
View file

@ -41,6 +41,7 @@ import kotlin.math.abs
class FillDialog : DialogFragmentWithDate() {
@Inject lateinit var constraintChecker: ConstraintChecker
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var ctx: Context
@Inject lateinit var commandQueue: CommandQueue
@Inject lateinit var activePlugin: ActivePlugin

1
app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
View file

@ -44,6 +44,7 @@ import kotlin.math.max
class InsulinDialog : DialogFragmentWithDate() {
@Inject lateinit var constraintChecker: ConstraintChecker
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var defaultValueHelper: DefaultValueHelper
@Inject lateinit var profileFunction: ProfileFunction
@Inject lateinit var commandQueue: CommandQueue

1
app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
View file

@ -46,6 +46,7 @@ import kotlin.collections.ArrayList
class ProfileSwitchDialog : DialogFragmentWithDate() {
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var profileFunction: ProfileFunction
@Inject lateinit var activePlugin: ActivePlugin
@Inject lateinit var repository: AppRepository

1
app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
View file

@ -33,6 +33,7 @@ import kotlin.math.abs
class TempBasalDialog : DialogFragmentWithDate() {
@Inject lateinit var constraintChecker: ConstraintChecker
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var profileFunction: ProfileFunction
@Inject lateinit var activePlugin: ActivePlugin
@Inject lateinit var commandQueue: CommandQueue

1
app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
View file

@ -42,6 +42,7 @@ import javax.inject.Inject
class TempTargetDialog : DialogFragmentWithDate() {
@Inject lateinit var constraintChecker: ConstraintChecker
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var profileFunction: ProfileFunction
@Inject lateinit var defaultValueHelper: DefaultValueHelper
@Inject lateinit var uel: UserEntryLogger

1
app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
View file

@ -43,6 +43,7 @@ import kotlin.math.abs
class TreatmentDialog : DialogFragmentWithDate() {
@Inject lateinit var constraintChecker: ConstraintChecker
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var activePlugin: ActivePlugin
@Inject lateinit var commandQueue: CommandQueue
@Inject lateinit var ctx: Context

9
app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
View file

@ -2,9 +2,6 @@ package info.nightscout.androidaps.dialogs
import android.annotation.SuppressLint
import android.content.Context
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
import android.graphics.drawable.Drawable
import android.os.Bundle
import android.text.Editable
import android.text.TextWatcher
@ -16,7 +13,6 @@ import android.view.WindowManager
import android.widget.AdapterView
import android.widget.ArrayAdapter
import android.widget.CompoundButton
import androidx.core.content.ContextCompat
import androidx.fragment.app.FragmentManager
import dagger.android.HasAndroidInjector
import dagger.android.support.DaggerDialogFragment
@ -124,11 +120,6 @@ class WizardDialog : DaggerDialogFragment() {
isCancelable = true
dialog?.setCanceledOnTouchOutside(false)
val drawable: Drawable? = context?.let { ContextCompat.getDrawable(it, info.nightscout.androidaps.core.R.drawable.dialog) }
drawable?.setColorFilter(PorterDuffColorFilter((context?.let { rh.gac(it, info.nightscout.androidaps.core.R.attr.dialogFragmentBackground) }!!), PorterDuff.Mode.SRC_IN))
dialog?.window?.setBackgroundDrawable(drawable)
_binding = DialogWizardBinding.inflate(inflater, container, false)
return binding.root
}

10
app/src/main/res/layout/dialog_calibration.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".dialogs.CalibrationDialog">
<LinearLayout
@ -14,14 +13,11 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

9
app/src/main/res/layout/dialog_carbs.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".dialogs.CarbsDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

10
app/src/main/res/layout/dialog_care.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".dialogs.CareDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:id="@+id/icon"
@ -40,6 +37,7 @@
android:text="@string/careportal_profileswitch"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceLarge" />
</RelativeLayout>
<LinearLayout

9
app/src/main/res/layout/dialog_extendedbolus.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".dialogs.ExtendedBolusDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

9
app/src/main/res/layout/dialog_fill.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".dialogs.FillDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

9
app/src/main/res/layout/dialog_insulin.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".dialogs.InsulinDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

9
app/src/main/res/layout/dialog_loop.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".dialogs.LoopDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:id="@+id/loop_icon"

9
app/src/main/res/layout/dialog_profileswitch.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".dialogs.ProfileSwitchDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

9
app/src/main/res/layout/dialog_tempbasal.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".dialogs.TempBasalDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

9
app/src/main/res/layout/dialog_temptarget.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".dialogs.TempTargetDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

10
app/src/main/res/layout/dialog_treatment.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".dialogs.TreatmentDialog">
<LinearLayout
@ -15,13 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp"
android:layout_marginBottom="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

9
app/src/main/res/layout/dialog_wizard.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".dialogs.InsulinDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

9
app/src/main/res/layout/dialog_wizardinfo.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".dialogs.WizardInfoDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

7
app/src/main/res/layout/overview_editquickwizard_dialog.xml
View file

@ -1,6 +1,7 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".plugins.general.overview.dialogs.EditQuickWizardDialog">
@ -11,12 +12,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseOperationDialog.kt
View file

@ -13,6 +13,8 @@ import javax.inject.Inject
class ChooseOperationDialog : DialogFragmentWithDate() {
@Inject lateinit var rh: ResourceHelper
private var checkedIndex = -1
private var _binding: AutomationDialogChooseOperationBinding? = null

9
automation/src/main/res/layout/automation_dialog_action.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".plugins.general.automation.dialogs.EditActionDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

10
automation/src/main/res/layout/automation_dialog_choose_action.xml
View file

@ -2,11 +2,11 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".plugins.general.automation.dialogs.EditEventDialog">
<LinearLayout
@ -15,12 +15,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

9
automation/src/main/res/layout/automation_dialog_choose_operation.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseOperationDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

9
automation/src/main/res/layout/automation_dialog_choose_trigger.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".plugins.general.automation.dialogs.EditEventDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

9
automation/src/main/res/layout/automation_dialog_edit_trigger.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

9
automation/src/main/res/layout/automation_dialog_event.xml
View file

@ -2,11 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
<LinearLayout
@ -15,12 +14,10 @@
android:orientation="vertical">
<LinearLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

16
core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
View file

@ -1,9 +1,5 @@
package info.nightscout.androidaps.dialogs
import android.content.Context
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
import android.graphics.drawable.Drawable
import android.os.Bundle
import android.os.SystemClock
import android.view.LayoutInflater
@ -11,7 +7,6 @@ import android.view.View
import android.view.ViewGroup
import android.view.Window
import android.view.WindowManager
import androidx.core.content.ContextCompat
import dagger.android.support.DaggerDialogFragment
import info.nightscout.androidaps.activities.BolusProgressHelperActivity
import info.nightscout.androidaps.core.R
@ -29,7 +24,6 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewB
import info.nightscout.androidaps.utils.FabricPrivacy
import info.nightscout.androidaps.utils.resources.ResourceHelper
import info.nightscout.androidaps.utils.rx.AapsSchedulers
import info.nightscout.shared.sharedPreferences.SP
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject
@ -43,7 +37,6 @@ class BolusProgressDialog : DaggerDialogFragment() {
@Inject lateinit var fabricPrivacy: FabricPrivacy
@Inject lateinit var aapsSchedulers: AapsSchedulers
@Inject lateinit var uel: UserEntryLogger
@Inject lateinit var sp: SP
private val disposable = CompositeDisposable()
@ -90,15 +83,6 @@ class BolusProgressDialog : DaggerDialogFragment() {
isCancelable = false
dialog?.setCanceledOnTouchOutside(false)
val drawable: Drawable? = context?.let { ContextCompat.getDrawable(it, R.drawable.dialog) }
if ( sp.getBoolean(R.string.key_use_dark_mode, true)) {
drawable?.setColorFilter(PorterDuffColorFilter((rh.gc(R.color.background_dark)), PorterDuff.Mode.SRC_IN))
} else {
drawable?.setColorFilter(PorterDuffColorFilter((rh.gc(R.color.background_light)), PorterDuff.Mode.SRC_IN))
}
dialog?.window?.setBackgroundDrawable(drawable)
_binding = DialogBolusprogressBinding.inflate(inflater, container, false)
return binding.root
}

11
core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
View file

@ -2,9 +2,6 @@ package info.nightscout.androidaps.dialogs
import android.app.DatePickerDialog
import android.app.TimePickerDialog
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
import android.graphics.drawable.Drawable
import android.os.Bundle
import android.text.format.DateFormat
import android.view.View
@ -13,7 +10,6 @@ import android.view.Window
import android.view.WindowManager
import android.widget.Button
import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.fragment.app.FragmentManager
import dagger.android.support.DaggerDialogFragment
import info.nightscout.androidaps.core.R
@ -21,7 +17,6 @@ import info.nightscout.shared.logging.AAPSLogger
import info.nightscout.shared.logging.LTag
import info.nightscout.androidaps.utils.DateUtil
import info.nightscout.androidaps.extensions.toVisibility
import info.nightscout.androidaps.utils.resources.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import java.util.*
import javax.inject.Inject
@ -31,7 +26,6 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
@Inject lateinit var aapsLogger: AAPSLogger
@Inject lateinit var sp: SP
@Inject lateinit var dateUtil: DateUtil
@Inject lateinit var rh: ResourceHelper
fun interface OnValueChangedListener {
fun onValueChanged(value: Long)
@ -74,11 +68,6 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
isCancelable = true
dialog?.setCanceledOnTouchOutside(false)
val drawable: Drawable? = context?.let { ContextCompat.getDrawable(it, info.nightscout.androidaps.core.R.drawable.dialog) }
drawable?.setColorFilter(PorterDuffColorFilter((context?.let { rh.gac(it, info.nightscout.androidaps.core.R.attr.dialogFragmentBackground) }!!), PorterDuff.Mode.SRC_IN))
dialog?.window?.setBackgroundDrawable(drawable)
}
fun updateDateTime(timeMs: Long) {

31
core/src/main/res/drawable-hdpi/dialog.xml
View file

@ -1,21 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:right="10dp"
android:left="10dp"
android:bottom="10dp"
android:top="10dp"
>
<shape >
<padding
android:top="10dp"
android:bottom="2dp"
android:left="10dp"
android:right="10dp"
/>
<solid android:color="#303030" />
<corners android:radius="12dp" />
</shape>
</item>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<padding
android:bottom="2dp"
android:left="10dp"
android:right="10dp"
android:top="10dp" />
<solid android:color="?attr/backgroundColor" />
<corners android:radius="?android:dialogCornerRadius" />
</shape>
</item>
</layer-list>

12
core/src/main/res/drawable-hdpi/dialog_header.xml Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<padding/>
<solid android:color="?dialogTitleBackground" />
<corners
android:topRightRadius="?android:dialogCornerRadius"
android:topLeftRadius="?android:dialogCornerRadius" />
</shape>
</item>
</layer-list>

13
core/src/main/res/drawable/ic_trending_flat_white_48dp.xml
View file

@ -1,5 +1,10 @@
<vector android:height="48dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M22,12l-4,-4v3H3v2h15v3z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:tint="#FFFFFF"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="?attr/colorControlNormal"
android:pathData="M22,12l-4,-4v3H3v2h15v3z" />
</vector>

10
core/src/main/res/layout/dialog_alert_custom.xml
View file

@ -4,17 +4,15 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="match_parent">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center" >
<ImageView
android:id="@+id/alertdialog_icon"

8
core/src/main/res/layout/dialog_bolusprogress.xml
View file

@ -1,18 +1,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="info.nightscout.androidaps.dialogs.BolusProgressDialog">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:id="@+id/header_icon"

8
core/src/main/res/layout/dialog_error.xml
View file

@ -1,18 +1,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="info.nightscout.androidaps.dialogs.ErrorDialog">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"

9
core/src/main/res/layout/dialog_profileviewer.xml
View file

@ -1,11 +1,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context="info.nightscout.androidaps.dialogs.ProfileViewerDialog">
<LinearLayout
@ -14,12 +13,10 @@
android:orientation="vertical">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:id="@+id/header_icon"

1
core/src/main/res/values-night/styles.xml
View file

@ -114,7 +114,6 @@
<!---Application Background Color -->
<item name="android:windowBackground">@color/black</item>
<!---Dialogfragment Background Color -->
<item name="dialogFragmentBackground">@color/background_dark</item>
<item name="android:dialogCornerRadius">12dp</item>
</style>

2
core/src/main/res/values/attrs.xml
View file

@ -86,7 +86,5 @@
<attr name="splashBackgroundColor" format="reference|color" />
<!---Disabled Text Color -->
<attr name="disabledTextColor" format="reference|color" />
<!---Dialogfragment Background Color -->
<attr name="dialogFragmentBackground" format="reference|color" />
</resources>

2
core/src/main/res/values/colors.xml
View file

@ -52,7 +52,7 @@
<color name="pumpStatusBackground">#505050</color>
<!-- Dialogs-->
<color name="dialog_title_background">#303030</color>
<color name="dialog_title_background">#CCCCCC</color>
<color name="activity_title_background">#121212</color>
<color name="dialog_title_color">#FFFFFF</color>
<color name="dialog_title_icon_tint">#FFFFFF</color>

14
core/src/main/res/values/styles.xml
View file

@ -113,7 +113,6 @@
<!---Application Background Color -->
<item name="android:windowBackground">@color/white</item>
<!---Dialogfragment Background Color -->
<item name="dialogFragmentBackground">@color/background_light</item>
<item name="android:dialogCornerRadius">12dp</item>
</style>
@ -149,6 +148,19 @@
<item name="android:focusable">true</item>
</style>
<style name="StyleDialog">
<item name="android:padding">0dp</item>
<item name="android:minWidth">300dp</item>
<item name="android:orientation">vertical</item>
<item name="android:background">@drawable/dialog</item>
</style>
<style name="StyleDialogHeader">
<item name="android:padding">5dp</item>
<item name="android:orientation">horizontal</item>
<item name="android:background">@drawable/dialog_header</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>

60
danars/src/main/res/layout/danars_pairing_progress_dialog.xml
View file

@ -1,18 +1,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="info.nightscout.androidaps.danars.dialogs.PairingProgressDialog" >
tools:context="info.nightscout.androidaps.danars.dialogs.PairingProgressDialog">
<RelativeLayout
style="@style/StyleDialogHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/dialogTitleBackground"
android:orientation="horizontal"
android:padding="5dp">
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"
@ -41,32 +39,32 @@
android:padding="5dp" />
<TextView
android:id="@+id/danars_pairingprogress_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="15dp"
android:text="STATUS" />
android:id="@+id/danars_pairingprogress_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="15dp"
android:text="STATUS" />
<ProgressBar
android:id="@+id/danars_pairingprogress_progressbar"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_marginBottom="20dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="20dp"
android:maxHeight="5dp"
android:minHeight="3dp" />
<ProgressBar
android:id="@+id/danars_pairingprogress_progressbar"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_marginBottom="20dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="20dp"
android:maxHeight="5dp"
android:minHeight="3dp" />
<com.google.android.material.button.MaterialButton
style="@style/OkCancelButton.Text"
android:id="@+id/ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="15dp"
android:text="@string/ok" />
<com.google.android.material.button.MaterialButton
style="@style/OkCancelButton.Text"
android:id="@+id/ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="15dp"
android:text="@string/ok" />
</LinearLayout>