From fe5cc3d3341089b6cc3eff9e80798c7d9c0f8bcf Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 19 Oct 2020 19:24:33 +0200
Subject: [PATCH] layouts -> AppCompat

---
 .../objectives/ObjectivesPlugin.kt            |  1 -
 .../general/maintenance/ImportExportPrefs.kt  |  4 ++--
 .../main/res/layout/activity_setupwizard.xml  |  2 +-
 .../res/layout/automation_action_item.xml     |  2 +-
 .../res/layout/automation_dialog_action.xml   |  3 ++-
 .../automation_dialog_choose_action.xml       |  3 ++-
 .../automation_dialog_choose_trigger.xml      |  3 ++-
 .../layout/automation_dialog_edit_trigger.xml |  3 ++-
 .../res/layout/automation_dialog_event.xml    |  6 +++---
 .../main/res/layout/automation_event_item.xml |  2 +-
 app/src/main/res/layout/bgsource_item.xml     |  2 +-
 .../layout/configbuilder_single_plugin.xml    |  2 +-
 app/src/main/res/layout/datetime.xml          |  2 +-
 .../main/res/layout/dialog_calibration.xml    |  5 +++--
 app/src/main/res/layout/dialog_carbs.xml      |  9 +++++----
 app/src/main/res/layout/dialog_care.xml       |  7 ++++---
 .../main/res/layout/dialog_extendedbolus.xml  |  7 ++++---
 app/src/main/res/layout/dialog_fill.xml       |  3 ++-
 app/src/main/res/layout/dialog_insulin.xml    |  7 ++++---
 .../main/res/layout/dialog_profileswitch.xml  | 13 ++++++------
 app/src/main/res/layout/dialog_tempbasal.xml  |  9 +++++----
 app/src/main/res/layout/dialog_temptarget.xml |  9 +++++----
 app/src/main/res/layout/dialog_treatment.xml  |  7 ++++---
 app/src/main/res/layout/dialog_wizard.xml     | 17 ++++++++--------
 app/src/main/res/layout/dialog_wizardinfo.xml |  3 ++-
 .../main/res/layout/import_summary_item.xml   |  5 +++--
 .../main/res/layout/localprofile_fragment.xml |  7 ++++---
 .../layout/maintenance_importlist_item.xml    |  6 +++---
 app/src/main/res/layout/notes.xml             |  2 +-
 .../overview_editquickwizard_dialog.xml       | 20 +++++++++----------
 .../overview_fragment_nsclient_tablet.xml     |  2 +-
 .../main/res/layout/overview_info_layout.xml  | 12 +++++------
 .../layout/overview_quickwizardlist_item.xml  | 10 +++++-----
 .../layout/overview_statuslights_layout.xml   | 11 +++++-----
 .../main/res/layout/timelistedit_element.xml  |  5 +++--
 .../layout/timelistedit_element_vertical.xml  |  5 +++--
 .../main/res/layout/dialog_bolusprogress.xml  |  3 ++-
 core/src/main/res/layout/dialog_error.xml     |  3 ++-
 .../main/res/layout/dialog_profileviewer.xml  |  3 ++-
 core/src/main/res/layout/toast.xml            |  3 ++-
 .../main/res/layout/danar_historyactivity.xml |  3 ++-
 .../layout/danar_user_options_activity.xml    |  3 ++-
 .../res/layout/danars_blescanner_activity.xml |  3 ++-
 .../res/layout/danars_enter_pin_activity.xml  |  3 ++-
 .../layout/danars_pairingprogressdialog.xml   |  3 ++-
 .../omnipod_wizard_action_page_fragment.xml   |  3 ++-
 46 files changed, 138 insertions(+), 108 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
index fcf77f9b6c..1c33eb7a2f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.constraints.objectives
 
-import android.app.Activity
 import androidx.fragment.app.FragmentActivity
 import com.google.common.base.Charsets
 import com.google.common.hash.Hashing
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
index 1ad7099031..e63960b9fc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.general.maintenance
 
 import android.Manifest
-import android.app.Activity
+import androidx.appcompat.app.AppCompatActivity
 import android.bluetooth.BluetoothAdapter
 import android.content.Context
 import android.content.Intent
@@ -344,7 +344,7 @@ class ImportExportPrefs @Inject constructor(
         show(context, resourceHelper.gs(R.string.setting_imported), resourceHelper.gs(R.string.restartingapp), Runnable {
             log.debug(TAG, "Exiting")
             rxBus.send(EventAppExit())
-            if (context is Activity) {
+            if (context is AppCompatActivity) {
                 context.finish()
             }
             System.runFinalization()
diff --git a/app/src/main/res/layout/activity_setupwizard.xml b/app/src/main/res/layout/activity_setupwizard.xml
index 1a9a7aad94..dc0a0c2e81 100644
--- a/app/src/main/res/layout/activity_setupwizard.xml
+++ b/app/src/main/res/layout/activity_setupwizard.xml
@@ -31,7 +31,7 @@
             android:layout_weight="1"
             android:text="@string/exit"
             android:onClick="exitPressed"
-            android:textAppearance="@android:style/TextAppearance.Material.Medium"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textStyle="bold" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/automation_action_item.xml b/app/src/main/res/layout/automation_action_item.xml
index 539ce1a400..5c66c86e5a 100644
--- a/app/src/main/res/layout/automation_action_item.xml
+++ b/app/src/main/res/layout/automation_action_item.xml
@@ -36,7 +36,7 @@
             android:id="@+id/automation_action_image"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:src="@drawable/ic_action_orange_48dp" />
+            app:srcCompat="@drawable/ic_action_orange_48dp" />
 
         <TextView
             android:id="@+id/automation_viewActionTitle"
diff --git a/app/src/main/res/layout/automation_dialog_action.xml b/app/src/main/res/layout/automation_dialog_action.xml
index 994b8cb010..df5dce8af8 100644
--- a/app/src/main/res/layout/automation_dialog_action.xml
+++ b/app/src/main/res/layout/automation_dialog_action.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/action"
-                android:src="@drawable/ic_action_orange_48dp" />
+                app:srcCompat="@drawable/ic_action_orange_48dp" />
 
             <TextView
                 android:id="@+id/automation_actionTitle"
diff --git a/app/src/main/res/layout/automation_dialog_choose_action.xml b/app/src/main/res/layout/automation_dialog_choose_action.xml
index 029ba36b07..8bdffa0a25 100644
--- a/app/src/main/res/layout/automation_dialog_choose_action.xml
+++ b/app/src/main/res/layout/automation_dialog_choose_action.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/please_choose_an_action_type"
-                android:src="@drawable/ic_action_orange_48dp" />
+                app:srcCompat="@drawable/ic_action_orange_48dp" />
 
             <TextView
                 android:id="@+id/actions_care_title"
diff --git a/app/src/main/res/layout/automation_dialog_choose_trigger.xml b/app/src/main/res/layout/automation_dialog_choose_trigger.xml
index 11b874b3eb..734e939820 100644
--- a/app/src/main/res/layout/automation_dialog_choose_trigger.xml
+++ b/app/src/main/res/layout/automation_dialog_choose_trigger.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/please_choose_a_trigger_type"
-                android:src="@drawable/ic_trigger_green_48dp" />
+                app:srcCompat="@drawable/ic_trigger_green_48dp" />
 
             <TextView
                 android:id="@+id/actions_care_title"
diff --git a/app/src/main/res/layout/automation_dialog_edit_trigger.xml b/app/src/main/res/layout/automation_dialog_edit_trigger.xml
index a30a54ce4b..6ec9767e5a 100644
--- a/app/src/main/res/layout/automation_dialog_edit_trigger.xml
+++ b/app/src/main/res/layout/automation_dialog_edit_trigger.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/triggers"
-                android:src="@drawable/ic_trigger_green_48dp" />
+                app:srcCompat="@drawable/ic_trigger_green_48dp" />
 
             <TextView
                 android:id="@+id/automation_actionTitle"
diff --git a/app/src/main/res/layout/automation_dialog_event.xml b/app/src/main/res/layout/automation_dialog_event.xml
index 03ff617168..ea0c90dd36 100644
--- a/app/src/main/res/layout/automation_dialog_event.xml
+++ b/app/src/main/res/layout/automation_dialog_event.xml
@@ -26,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/automation"
-                android:src="@drawable/ic_action_orange_48dp" />
+                app:srcCompat="@drawable/ic_action_orange_48dp" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -69,7 +69,7 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_centerVertical="true"
-                    android:src="@drawable/ic_trigger_green_48dp" />
+                    app:srcCompat="@drawable/ic_trigger_green_48dp" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -132,7 +132,7 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_centerVertical="true"
-                    android:src="@drawable/ic_action_orange_48dp" />
+                    app:srcCompat="@drawable/ic_action_orange_48dp" />
 
                 <TextView
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/automation_event_item.xml b/app/src/main/res/layout/automation_event_item.xml
index 1785c8c452..543f452d64 100644
--- a/app/src/main/res/layout/automation_event_item.xml
+++ b/app/src/main/res/layout/automation_event_item.xml
@@ -42,7 +42,7 @@
         android:layout_alignParentEnd="true"
         android:contentDescription="@string/reorder_label"
         android:orientation="horizontal"
-        android:src="@drawable/ic_reorder_gray_24dp" />
+        app:srcCompat="@drawable/ic_reorder_gray_24dp" />
 
     <LinearLayout
         android:id="@+id/iconLayout"
diff --git a/app/src/main/res/layout/bgsource_item.xml b/app/src/main/res/layout/bgsource_item.xml
index ff84837cba..80aba91349 100644
--- a/app/src/main/res/layout/bgsource_item.xml
+++ b/app/src/main/res/layout/bgsource_item.xml
@@ -40,7 +40,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_flat" />
+                card_view:srcCompat="@drawable/ic_flat" />
 
             <TextView
                 android:id="@+id/ns_sign"
diff --git a/app/src/main/res/layout/configbuilder_single_plugin.xml b/app/src/main/res/layout/configbuilder_single_plugin.xml
index 70d044ce27..587fbce2af 100644
--- a/app/src/main/res/layout/configbuilder_single_plugin.xml
+++ b/app/src/main/res/layout/configbuilder_single_plugin.xml
@@ -52,7 +52,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        android:background="?android:selectableItemBackgroundBorderless"
+        android:background="?attr/selectableItemBackgroundBorderless"
         app:srcCompat="@drawable/ic_settings" />
 
     <CheckBox
diff --git a/app/src/main/res/layout/datetime.xml b/app/src/main/res/layout/datetime.xml
index 043c7de761..e7808f7384 100644
--- a/app/src/main/res/layout/datetime.xml
+++ b/app/src/main/res/layout/datetime.xml
@@ -12,7 +12,7 @@
         android:width="120dp"
         android:padding="10dp"
         android:text="@string/event_time_label"
-        android:textAppearance="@android:style/TextAppearance.Material.Small"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold" />
 
 
diff --git a/app/src/main/res/layout/dialog_calibration.xml b/app/src/main/res/layout/dialog_calibration.xml
index 5b298a0db5..d236cd6a1a 100644
--- a/app/src/main/res/layout/dialog_calibration.xml
+++ b/app/src/main/res/layout/dialog_calibration.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -26,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/overview_calibration"
-                android:src="@drawable/ic_calibration" />
+                app:srcCompat="@drawable/ic_calibration" />
 
             <TextView
                 android:id="@+id/actions_care_title"
@@ -63,7 +64,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/treatments_wizard_bg_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index 3274cc08b7..e5c5af48aa 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/carbs"
-                android:src="@drawable/ic_cp_bolus_carbs" />
+                app:srcCompat="@drawable/ic_cp_bolus_carbs" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -86,7 +87,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/time_offset"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
@@ -119,7 +120,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/careportal_newnstreatment_duration_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
@@ -152,7 +153,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/overview_carbs_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
diff --git a/app/src/main/res/layout/dialog_care.xml b/app/src/main/res/layout/dialog_care.xml
index d6987d6922..e932f49ee7 100644
--- a/app/src/main/res/layout/dialog_care.xml
+++ b/app/src/main/res/layout/dialog_care.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -26,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/careportal_profileswitch"
-                android:src="@drawable/ic_actions_profileswitch" />
+                app:srcCompat="@drawable/ic_actions_profileswitch" />
 
             <TextView
                 android:id="@+id/actions_care_title"
@@ -91,7 +92,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/treatments_wizard_bg_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
@@ -126,7 +127,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/careportal_newnstreatment_duration_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
diff --git a/app/src/main/res/layout/dialog_extendedbolus.xml b/app/src/main/res/layout/dialog_extendedbolus.xml
index 2d80b4ab32..c245c9a001 100644
--- a/app/src/main/res/layout/dialog_extendedbolus.xml
+++ b/app/src/main/res/layout/dialog_extendedbolus.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/virtualpump_extendedbolus_label"
-                android:src="@drawable/ic_actions_startextbolus" />
+                app:srcCompat="@drawable/ic_actions_startextbolus" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -58,7 +59,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/overview_insulin_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
@@ -91,7 +92,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/careportal_newnstreatment_duration_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
diff --git a/app/src/main/res/layout/dialog_fill.xml b/app/src/main/res/layout/dialog_fill.xml
index 9cd88f525a..8c2f1bda63 100644
--- a/app/src/main/res/layout/dialog_fill.xml
+++ b/app/src/main/res/layout/dialog_fill.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/primefill"
-                android:src="@drawable/ic_cp_pump_canula" />
+                app:srcCompat="@drawable/ic_cp_pump_canula" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_insulin.xml b/app/src/main/res/layout/dialog_insulin.xml
index cfcf957761..23ed8a0e6e 100644
--- a/app/src/main/res/layout/dialog_insulin.xml
+++ b/app/src/main/res/layout/dialog_insulin.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/overview_insulin_label"
-                android:src="@drawable/ic_bolus" />
+                app:srcCompat="@drawable/ic_bolus" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -81,7 +82,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/time"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
@@ -114,7 +115,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/overview_insulin_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index 01de170277..82871eb689 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/careportal_profileswitch"
-                android:src="@drawable/ic_actions_profileswitch" />
+                app:srcCompat="@drawable/ic_actions_profileswitch" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -59,7 +60,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/careportal_newnstreatment_duration_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
@@ -92,7 +93,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/careportal_newnstreatment_profile_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <Spinner
@@ -117,7 +118,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text=""
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <Button
@@ -151,7 +152,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/careportal_newnstreatment_percentage_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
@@ -184,7 +185,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/careportal_newnstreatment_timeshift_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
diff --git a/app/src/main/res/layout/dialog_tempbasal.xml b/app/src/main/res/layout/dialog_tempbasal.xml
index cf0dc627fd..3c403e9d3a 100644
--- a/app/src/main/res/layout/dialog_tempbasal.xml
+++ b/app/src/main/res/layout/dialog_tempbasal.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/tempbasal_label"
-                android:src="@drawable/ic_cp_basal_start" />
+                app:srcCompat="@drawable/ic_cp_basal_start" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -59,7 +60,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/basal_rate"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
@@ -93,7 +94,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/basal_rate"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
@@ -126,7 +127,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/careportal_newnstreatment_duration_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
diff --git a/app/src/main/res/layout/dialog_temptarget.xml b/app/src/main/res/layout/dialog_temptarget.xml
index 30912b4a1d..ee95db3f67 100644
--- a/app/src/main/res/layout/dialog_temptarget.xml
+++ b/app/src/main/res/layout/dialog_temptarget.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/careportal_temporarytarget"
-                android:src="@drawable/ic_actions_temptarget" />
+                app:srcCompat="@drawable/ic_actions_temptarget" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -59,7 +60,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/reason"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <Spinner
@@ -82,7 +83,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/target_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
@@ -117,7 +118,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/careportal_newnstreatment_duration_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
diff --git a/app/src/main/res/layout/dialog_treatment.xml b/app/src/main/res/layout/dialog_treatment.xml
index 662df3e91f..9ab16b91d0 100644
--- a/app/src/main/res/layout/dialog_treatment.xml
+++ b/app/src/main/res/layout/dialog_treatment.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/overview_treatment_label"
-                android:src="@drawable/ic_bolus" />
+                app:srcCompat="@drawable/ic_bolus" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -73,7 +74,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/overview_insulin_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
@@ -106,7 +107,7 @@
                 android:width="120dp"
                 android:padding="10dp"
                 android:text="@string/overview_carbs_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
diff --git a/app/src/main/res/layout/dialog_wizard.xml b/app/src/main/res/layout/dialog_wizard.xml
index 7a6e70e066..eccf8f38bb 100644
--- a/app/src/main/res/layout/dialog_wizard.xml
+++ b/app/src/main/res/layout/dialog_wizard.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:contentDescription="@string/boluswizard"
-                android:src="@drawable/ic_calculator" />
+                app:srcCompat="@drawable/ic_calculator" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -62,7 +63,7 @@
                     android:layout_weight="1"
                     android:padding="10dp"
                     android:text="@string/treatments_wizard_bg_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textStyle="bold" />
 
                 <info.nightscout.androidaps.utils.ui.NumberPicker
@@ -92,7 +93,7 @@
                     android:layout_weight="1"
                     android:padding="10dp"
                     android:text="@string/treatments_wizard_carbs_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textStyle="bold" />
 
                 <info.nightscout.androidaps.utils.ui.NumberPicker
@@ -123,7 +124,7 @@
                     android:layout_weight="1"
                     android:padding="10dp"
                     android:text="@string/treatments_wizard_correction_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textStyle="bold" />
 
                 <info.nightscout.androidaps.utils.ui.NumberPicker
@@ -153,7 +154,7 @@
                     android:layout_weight="1"
                     android:padding="10dp"
                     android:text="@string/careportal_newnstreatment_carbtime_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textStyle="bold" />
 
                 <info.nightscout.androidaps.utils.ui.NumberPicker
@@ -186,7 +187,7 @@
                 android:layout_height="wrap_content"
                 android:padding="10dp"
                 android:text="@string/careportal_newnstreatment_profile_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <Spinner
@@ -252,7 +253,7 @@
                 android:labelFor="@+id/treatment_wizard_notes"
                 android:padding="10dp"
                 android:text="@string/careportal_newnstreatment_notes_label"
-                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <EditText
@@ -289,7 +290,7 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/show_calculation"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_visibility" />
+                app:srcCompat="@drawable/ic_visibility" />
 
             <Button
                 android:id="@+id/cancel"
diff --git a/app/src/main/res/layout/dialog_wizardinfo.xml b/app/src/main/res/layout/dialog_wizardinfo.xml
index ee6609fd24..393cb8d6c2 100644
--- a/app/src/main/res/layout/dialog_wizardinfo.xml
+++ b/app/src/main/res/layout/dialog_wizardinfo.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/carbs"
-                android:src="@drawable/ic_calculator" />
+                app:srcCompat="@drawable/ic_calculator" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/import_summary_item.xml b/app/src/main/res/layout/import_summary_item.xml
index 66c0922d5c..eb05684550 100644
--- a/app/src/main/res/layout/import_summary_item.xml
+++ b/app/src/main/res/layout/import_summary_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableRow 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="fill_parent"
     android:layout_height="wrap_content"
@@ -10,7 +11,7 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_margin="4dp"
-        android:src="@drawable/ic_toast_check" />
+        app:srcCompat="@drawable/ic_toast_check" />
 
     <ImageView
         android:id="@+id/summary_icon"
@@ -19,7 +20,7 @@
         android:layout_marginTop="4dp"
         android:layout_marginRight="4dp"
         android:layout_marginBottom="4dp"
-        android:src="@drawable/ic_meta_format"
+        app:srcCompat="@drawable/ic_meta_format"
         android:tint="#ffffff" />
 
     <TextView
diff --git a/app/src/main/res/layout/localprofile_fragment.xml b/app/src/main/res/layout/localprofile_fragment.xml
index 2bba675168..53d6733985 100644
--- a/app/src/main/res/layout/localprofile_fragment.xml
+++ b/app/src/main/res/layout/localprofile_fragment.xml
@@ -1,4 +1,5 @@
 <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"
@@ -63,7 +64,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="15dp"
                 android:contentDescription="@string/addnew"
-                android:src="@drawable/ic_add" />
+                app:srcCompat="@drawable/ic_add" />
 
             <ImageView
                 android:id="@+id/localprofile_profile_clone"
@@ -72,7 +73,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="15dp"
                 android:contentDescription="@string/clone_label"
-                android:src="@drawable/ic_clone" />
+                app:srcCompat="@drawable/ic_clone" />
 
             <ImageView
                 android:id="@+id/localprofile_profile_remove"
@@ -83,7 +84,7 @@
                 android:contentDescription="@string/remove_label"
                 android:scaleX="1"
                 android:scaleY="1"
-                android:src="@drawable/ic_remove" />
+                app:srcCompat="@drawable/ic_remove" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/maintenance_importlist_item.xml b/app/src/main/res/layout/maintenance_importlist_item.xml
index 8c2cfc0557..232b3632cd 100644
--- a/app/src/main/res/layout/maintenance_importlist_item.xml
+++ b/app/src/main/res/layout/maintenance_importlist_item.xml
@@ -28,7 +28,7 @@
                 android:layout_marginTop="4dp"
                 android:layout_marginEnd="6dp"
                 android:layout_marginBottom="1dp"
-                android:src="@drawable/ic_meta_format"
+                card_view:srcCompat="@drawable/ic_meta_format"
                 android:tint="@color/importListFileName" />
 
             <TextView
@@ -89,7 +89,7 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="1dp"
-                android:src="@drawable/ic_meta_name"
+                card_view:srcCompat="@drawable/ic_meta_name"
                 android:tint="@color/importListAdditionalInfo" />
 
             <TextView
@@ -121,7 +121,7 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="1dp"
-                android:src="@drawable/ic_meta_date"
+                card_view:srcCompat="@drawable/ic_meta_date"
                 android:tint="@color/importListAdditionalInfo" />
 
             <TextView
diff --git a/app/src/main/res/layout/notes.xml b/app/src/main/res/layout/notes.xml
index de41e03a84..927b565628 100644
--- a/app/src/main/res/layout/notes.xml
+++ b/app/src/main/res/layout/notes.xml
@@ -13,7 +13,7 @@
         android:width="120dp"
         android:padding="10dp"
         android:text="@string/careportal_newnstreatment_notes_label"
-        android:textAppearance="@android:style/TextAppearance.Material.Small"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold" />
 
     <EditText
diff --git a/app/src/main/res/layout/overview_editquickwizard_dialog.xml b/app/src/main/res/layout/overview_editquickwizard_dialog.xml
index fe7862d93f..f7517bcfbe 100644
--- a/app/src/main/res/layout/overview_editquickwizard_dialog.xml
+++ b/app/src/main/res/layout/overview_editquickwizard_dialog.xml
@@ -18,7 +18,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/overview_editquickwizard_buttontext"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <EditText
                 android:id="@+id/overview_editquickwizard_button_edit"
@@ -31,7 +31,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/overview_editquickwizard_carbs"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <EditText
                 android:id="@+id/overview_editquickwizard_carbs_edit"
@@ -44,7 +44,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/overview_editquickwizard_valid"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -70,7 +70,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/overview_editquickwizard_usebg"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <Spinner
                 android:id="@+id/overview_editquickwizard_usebg_spinner"
@@ -82,7 +82,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/overview_editquickwizard_usebolusiob"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <Spinner
                 android:id="@+id/overview_editquickwizard_usebolusiob_spinner"
@@ -94,7 +94,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/overview_editquickwizard_usebasaliob"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <Spinner
                 android:id="@+id/overview_editquickwizard_usebasaliob_spinner"
@@ -106,7 +106,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/overview_editquickwizard_usecob"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <Spinner
                 android:id="@+id/overview_editquickwizard_usecob_spinner"
@@ -118,7 +118,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/overview_editquickwizard_usetrend"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <Spinner
                 android:id="@+id/overview_editquickwizard_usetrend_spinner"
@@ -130,7 +130,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/overview_editquickwizard_usesuperbolus"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <Spinner
                 android:id="@+id/overview_editquickwizard_usesuperbolus_spinner"
@@ -142,7 +142,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/overview_editquickwizard_usetemptarget"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <Spinner
                 android:id="@+id/overview_editquickwizard_usetemptarget_spinner"
diff --git a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
index e4b9da7bfd..22b87fb6f7 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
@@ -50,7 +50,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:paddingTop="18dp"
-                        android:src="@drawable/ic_flat" />
+                        app:srcCompat="@drawable/ic_flat" />
 
                     <TextView
                         android:id="@+id/overview_deltashort"
diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml
index 193563ee09..d71a249d0f 100644
--- a/app/src/main/res/layout/overview_info_layout.xml
+++ b/app/src/main/res/layout/overview_info_layout.xml
@@ -28,7 +28,7 @@
         app:layout_constraintStart_toEndOf="@+id/overview_bg"
         app:layout_constraintTop_toTopOf="@+id/overview_bg"
         android:paddingTop="18dp"
-        android:src="@drawable/ic_flat" />
+        app:srcCompat="@drawable/ic_flat" />
 
     <LinearLayout
         android:id="@+id/overview_deltas_llayout"
@@ -121,7 +121,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="-4dp"
-            android:src="@drawable/ic_loop_closed" />
+            app:srcCompat="@drawable/ic_loop_closed" />
 
         <TextView
             android:id="@+id/overview_apsmode_text"
@@ -150,7 +150,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/ic_bolus" />
+            app:srcCompat="@drawable/ic_bolus" />
 
         <TextView
             android:id="@+id/overview_iob"
@@ -208,7 +208,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/ic_cp_basal_no_tbr" />
+            app:srcCompat="@drawable/ic_cp_basal_no_tbr" />
 
         <TextView
             android:id="@+id/overview_basebasal"
@@ -236,7 +236,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/ic_actions_startextbolus" />
+            app:srcCompat="@drawable/ic_actions_startextbolus" />
 
         <TextView
             android:id="@+id/overview_extendedbolus"
@@ -265,7 +265,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/ic_swap_vert_black_48dp_green" />
+            app:srcCompat="@drawable/ic_swap_vert_black_48dp_green" />
 
         <TextView
             android:id="@+id/overview_sensitivity"
diff --git a/app/src/main/res/layout/overview_quickwizardlist_item.xml b/app/src/main/res/layout/overview_quickwizardlist_item.xml
index 443030ba65..eed4db51dc 100644
--- a/app/src/main/res/layout/overview_quickwizardlist_item.xml
+++ b/app/src/main/res/layout/overview_quickwizardlist_item.xml
@@ -46,7 +46,7 @@
                         android:layout_height="wrap_content"
                         android:paddingLeft="10dp"
                         android:text="Sample button text"
-                        android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                         android:textStyle="normal|bold"
                         android:textColor="@color/cardObjectiveText" />
 
@@ -56,7 +56,7 @@
                         android:layout_height="wrap_content"
                         android:paddingLeft="10dp"
                         android:text="36g"
-                        android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                         android:textColor="@color/cardObjectiveText"
                         android:textStyle="normal|bold" />
 
@@ -75,7 +75,7 @@
                         android:paddingLeft="10dp"
                         android:paddingRight="5dp"
                         android:text="@string/overview_editquickwizard_valid"
-                        android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
                     <TextView
                         android:id="@+id/overview_quickwizard_item_from"
@@ -84,7 +84,7 @@
                         android:layout_gravity="center_vertical"
                         android:paddingRight="10dp"
                         android:text="07:45"
-                        android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                         android:textStyle="normal|bold" />
 
                     <TextView
@@ -99,7 +99,7 @@
                         android:layout_gravity="center_vertical"
                         android:paddingLeft="10dp"
                         android:text="11:45"
-                        android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                         android:textStyle="normal|bold" />
 
                 </LinearLayout>
diff --git a/app/src/main/res/layout/overview_statuslights_layout.xml b/app/src/main/res/layout/overview_statuslights_layout.xml
index 2d318f900d..d63593f148 100644
--- a/app/src/main/res/layout/overview_statuslights_layout.xml
+++ b/app/src/main/res/layout/overview_statuslights_layout.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/overview_statuslights"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="3dp"
     android:layout_marginBottom="3dp"
-    android:background="?android:attr/colorControlHighlight"
+    android:background="?attr/colorControlHighlight"
     android:orientation="horizontal"
     android:paddingTop="4dp"
     android:paddingBottom="4dp">
@@ -18,7 +19,7 @@
         android:scaleType="centerInside"
         android:scaleX="2"
         android:scaleY="2"
-        android:src="@drawable/ic_cp_age_canula" />
+        app:srcCompat="@drawable/ic_cp_age_canula" />
 
     <TextView
         android:id="@+id/careportal_canulaage"
@@ -37,7 +38,7 @@
         android:scaleType="centerInside"
         android:scaleX="1.8"
         android:scaleY="1.8"
-        android:src="@drawable/ic_cp_age_insulin" />
+        app:srcCompat="@drawable/ic_cp_age_insulin" />
 
     <TextView
         android:id="@+id/careportal_insulinage"
@@ -63,7 +64,7 @@
         android:scaleType="centerInside"
         android:scaleX="2"
         android:scaleY="2"
-        android:src="@drawable/ic_cp_age_sensor" />
+        app:srcCompat="@drawable/ic_cp_age_sensor" />
 
     <TextView
         android:id="@+id/careportal_sensorage"
@@ -82,7 +83,7 @@
         android:scaleType="centerInside"
         android:scaleX="2"
         android:scaleY="2"
-        android:src="@drawable/ic_cp_age_battery" />
+        app:srcCompat="@drawable/ic_cp_age_battery" />
 
     <TextView
         android:id="@+id/careportal_pbage"
diff --git a/app/src/main/res/layout/timelistedit_element.xml b/app/src/main/res/layout/timelistedit_element.xml
index 9d852aefa6..fb4b84bd96 100644
--- a/app/src/main/res/layout/timelistedit_element.xml
+++ b/app/src/main/res/layout/timelistedit_element.xml
@@ -1,4 +1,5 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal"
@@ -37,7 +38,7 @@
         android:layout_height="35dp"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="15dp"
-        android:src="@drawable/ic_add" />
+        app:srcCompat="@drawable/ic_add" />
 
     <ImageView
         android:id="@+id/timelistedit_remove"
@@ -45,5 +46,5 @@
         android:layout_height="35dp"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="15dp"
-        android:src="@drawable/ic_remove" />
+        app:srcCompat="@drawable/ic_remove" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/timelistedit_element_vertical.xml b/app/src/main/res/layout/timelistedit_element_vertical.xml
index 7ecb7d7956..d10a7f46ab 100644
--- a/app/src/main/res/layout/timelistedit_element_vertical.xml
+++ b/app/src/main/res/layout/timelistedit_element_vertical.xml
@@ -1,4 +1,5 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal"
@@ -37,7 +38,7 @@
         android:layout_height="35dp"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="15dp"
-        android:src="@drawable/ic_add" />
+        app:srcCompat="@drawable/ic_add" />
 
     <ImageView
         android:id="@+id/timelistedit_remove"
@@ -45,5 +46,5 @@
         android:layout_height="35dp"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="15dp"
-        android:src="@drawable/ic_remove" />
+        app:srcCompat="@drawable/ic_remove" />
 </LinearLayout>
diff --git a/core/src/main/res/layout/dialog_bolusprogress.xml b/core/src/main/res/layout/dialog_bolusprogress.xml
index d6a2527288..b20b64b8e5 100644
--- a/core/src/main/res/layout/dialog_bolusprogress.xml
+++ b/core/src/main/res/layout/dialog_bolusprogress.xml
@@ -1,4 +1,5 @@
 <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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -18,7 +19,7 @@
             android:id="@+id/header_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_trending_flat_white_48dp" />
+            app:srcCompat="@drawable/ic_trending_flat_white_48dp" />
 
         <TextView
             android:id="@+id/overview_bolusprogress_title"
diff --git a/core/src/main/res/layout/dialog_error.xml b/core/src/main/res/layout/dialog_error.xml
index a731078fd4..6256c1c721 100644
--- a/core/src/main/res/layout/dialog_error.xml
+++ b/core/src/main/res/layout/dialog_error.xml
@@ -1,4 +1,5 @@
 <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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -17,7 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="@string/error"
-            android:src="@drawable/ic_error_red_48dp" />
+            app:srcCompat="@drawable/ic_error_red_48dp" />
 
         <TextView
             android:id="@+id/error_title"
diff --git a/core/src/main/res/layout/dialog_profileviewer.xml b/core/src/main/res/layout/dialog_profileviewer.xml
index 914cc8e71b..70636b1f51 100644
--- a/core/src/main/res/layout/dialog_profileviewer.xml
+++ b/core/src/main/res/layout/dialog_profileviewer.xml
@@ -1,4 +1,5 @@
 <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"
@@ -25,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:src="@drawable/ic_home_profile" />
+                app:srcCompat="@drawable/ic_home_profile" />
 
             <TextView
                 android:id="@+id/profileview_activeprofile"
diff --git a/core/src/main/res/layout/toast.xml b/core/src/main/res/layout/toast.xml
index 6f1f2cce39..43c9eea8e5 100644
--- a/core/src/main/res/layout/toast.xml
+++ b/core/src/main/res/layout/toast.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -13,7 +14,7 @@
         android:layout_marginLeft="6dp"
         android:layout_marginTop="6dp"
         android:layout_marginBottom="6dp"
-        android:src="@drawable/ic_toast_check"
+        app:srcCompat="@drawable/ic_toast_check"
         tools:ignore="RtlHardcoded" />
 
     <TextView
diff --git a/dana/src/main/res/layout/danar_historyactivity.xml b/dana/src/main/res/layout/danar_historyactivity.xml
index 3d1771dde4..dcf7a21ed3 100644
--- a/dana/src/main/res/layout/danar_historyactivity.xml
+++ b/dana/src/main/res/layout/danar_historyactivity.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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="fill_parent"
     android:layout_height="fill_parent"
@@ -20,7 +21,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="@string/pumphistory"
-            android:src="@drawable/ic_danarhistory" />
+            app:srcCompat="@drawable/ic_danarhistory" />
 
         <TextView
             android:layout_width="match_parent"
diff --git a/dana/src/main/res/layout/danar_user_options_activity.xml b/dana/src/main/res/layout/danar_user_options_activity.xml
index 94f23c5f96..1340d35e8e 100644
--- a/dana/src/main/res/layout/danar_user_options_activity.xml
+++ b/dana/src/main/res/layout/danar_user_options_activity.xml
@@ -1,4 +1,5 @@
 <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"
@@ -26,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/danar_pump_settings"
-                android:src="@drawable/ic_danar_useropt" />
+                app:srcCompat="@drawable/ic_danar_useropt" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/danars/src/main/res/layout/danars_blescanner_activity.xml b/danars/src/main/res/layout/danars_blescanner_activity.xml
index 9a22d37441..6a973181f1 100644
--- a/danars/src/main/res/layout/danars_blescanner_activity.xml
+++ b/danars/src/main/res/layout/danars_blescanner_activity.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -18,7 +19,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="@string/danars_pairing"
-            android:src="@drawable/ic_bluetooth_white_48dp" />
+            app:srcCompat="@drawable/ic_bluetooth_white_48dp" />
 
         <TextView
             android:layout_width="match_parent"
diff --git a/danars/src/main/res/layout/danars_enter_pin_activity.xml b/danars/src/main/res/layout/danars_enter_pin_activity.xml
index b56b13ae2e..8a9640de5f 100644
--- a/danars/src/main/res/layout/danars_enter_pin_activity.xml
+++ b/danars/src/main/res/layout/danars_enter_pin_activity.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -18,7 +19,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="@string/pairing"
-            android:src="@drawable/ic_bluetooth_white_48dp" />
+            app:srcCompat="@drawable/ic_bluetooth_white_48dp" />
 
         <TextView
             android:layout_width="match_parent"
diff --git a/danars/src/main/res/layout/danars_pairingprogressdialog.xml b/danars/src/main/res/layout/danars_pairingprogressdialog.xml
index c95374f3cb..5874e9bff8 100644
--- a/danars/src/main/res/layout/danars_pairingprogressdialog.xml
+++ b/danars/src/main/res/layout/danars_pairingprogressdialog.xml
@@ -1,4 +1,5 @@
 <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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -17,7 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="@string/pairing"
-            android:src="@drawable/ic_bluetooth_white_48dp" />
+            app:srcCompat="@drawable/ic_bluetooth_white_48dp" />
 
         <TextView
             android:layout_width="match_parent"
diff --git a/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml b/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
index 6e300995b7..aa6b68a941 100644
--- a/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
+++ b/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -28,7 +29,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="@dimen/omnipod_wizard_vertical_spacing"
         android:layout_marginBottom="@dimen/omnipod_wizard_vertical_spacing"
-        android:src="@drawable/ic_toast_check"
+        app:srcCompat="@drawable/ic_toast_check"
         android:visibility="gone" />
 
     <TextView