caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1494 from osodebailar/feature/rounded-dialogs

Browse source 
rounded dialogs like in android 12
This commit is contained in:
Milos Kozak 2022-03-24 15:26:58 +01:00 committed by GitHub
commit ea995f705a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 167 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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"

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"

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

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<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"

6
core/src/main/res/values-night/colors.xml
View file

@ -25,9 +25,13 @@
<color name="overviewPillColorDefault">#1c171c</color>
<color name="colorOnPrimaryDefault">#FFFFFF</color>
<color name="defaultbackground">#424242</color>
<color name="defaultbackground">#000000</color>
<color name="defaulttextcolor">#B3FFFFFF</color>
<!---Android Dark ans Light Theme Base colors-->
<color name="background_dark">#262626</color>
<color name="background_light">#FFFFFF</color>
<!-- Tabs-->
<color name="tabText">#d0d0d0</color>
<color name="tabSelectedText">@color/white</color>

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

@ -113,6 +113,8 @@
<item name="splashBackgroundColor">@color/splashBackground</item>
<!---Application Background Color -->
<item name="android:windowBackground">@color/black</item>
<!---Dialogfragment Background Color -->
<item name="android:dialogCornerRadius">12dp</item>
</style>
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
@ -203,7 +205,7 @@
<!-- Alert Dialogs -->
<style name="DialogTheme" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
<item name="backgroundColor">@color/dialog_title_background</item>
<item name="backgroundColor">@color/background_dark</item>
<item name="buttonBarNegativeButtonStyle">@style/DialogOkCancelButtonStyle</item>
<item name="buttonBarPositiveButtonStyle">@style/DialogOkCancelButtonStyle</item>
<item name="buttonBarNeutralButtonStyle">@style/DialogOkCancelButtonStyle</item>

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

@ -28,6 +28,10 @@
<color name="defaultbackground">#424242</color>
<color name="defaulttextcolor">#B3FFFFFF</color>
<!---Android Dark ans Light Theme Base colors-->
<color name="background_dark">#262626</color>
<color name="background_light">#FFFFFF</color>
<!-- Tabs-->
<color name="tabText">#d0d0d0</color>
<color name="tabSelectedText">@color/white</color>
@ -48,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>

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

@ -112,6 +112,8 @@
<item name="splashBackgroundColor">@color/splashBackground</item>
<!---Application Background Color -->
<item name="android:windowBackground">@color/white</item>
<!---Dialogfragment Background Color -->
<item name="android:dialogCornerRadius">12dp</item>
</style>
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
@ -146,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>