From 4df1127a8c1809dc578a24afaa8c0bf368d08f51 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 11 Jul 2019 18:18:05 +0100
Subject: [PATCH] jetpack compliance, code cleanup, extracted resources

---
 .../automation/dialogs/EditEventDialog.java   |   1 +
 .../triggers/TriggerProfilePercent.java       |   2 +-
 .../res/layout/automation_action_item.xml     |   9 +-
 .../res/layout/automation_dialog_action.xml   |  46 +++---
 .../automation_dialog_choose_action.xml       |  40 ++---
 .../automation_dialog_choose_trigger.xml      |  40 ++---
 .../layout/automation_dialog_edit_action.xml  |  22 +--
 .../layout/automation_dialog_edit_trigger.xml |  44 +++--
 .../res/layout/automation_dialog_event.xml    | 152 +++++++++---------
 .../main/res/layout/automation_event_item.xml |  25 ++-
 .../main/res/layout/automation_fragment.xml   |  28 ++--
 app/src/main/res/values/strings.xml           |   9 ++
 .../ActionProfileSwitchPercentTest.java       |   2 +-
 13 files changed, 197 insertions(+), 223 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.java
index 1fa4b607e1..c4734c8a2e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java
index 2124601e15..f9f3c4b36d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java
@@ -118,7 +118,7 @@ public class TriggerProfilePercent extends Trigger {
 
     @Override
     public Optional<Integer> icon() {
-        return Optional.of(R.drawable.remove);
+        return Optional.of(R.drawable.icon_actions_profileswitch);
     }
 
     @Override
diff --git a/app/src/main/res/layout/automation_action_item.xml b/app/src/main/res/layout/automation_action_item.xml
index add8e4968a..40ca024d56 100644
--- a/app/src/main/res/layout/automation_action_item.xml
+++ b/app/src/main/res/layout/automation_action_item.xml
@@ -16,9 +16,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:srcCompat="@drawable/ic_trash_outline"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
-        android:layout_alignParentBottom="true"/>
+        android:layout_alignParentBottom="true"
+        android:contentDescription="@string/overview_quickwizard_item_remove_button" />
 
     <LinearLayout
         android:id="@+id/layoutText"
@@ -27,8 +28,8 @@
         android:orientation="vertical"
         android:layout_alignParentTop="true"
         android:layout_alignParentBottom="true"
-        android:layout_toLeftOf="@id/iconTrash"
-        android:layout_alignParentLeft="true">
+        android:layout_toStartOf="@id/iconTrash"
+        android:layout_alignParentStart="true">
 
         <TextView
             android:id="@+id/viewActionTitle"
diff --git a/app/src/main/res/layout/automation_dialog_action.xml b/app/src/main/res/layout/automation_dialog_action.xml
index 223f459453..f3787d4a1d 100644
--- a/app/src/main/res/layout/automation_dialog_action.xml
+++ b/app/src/main/res/layout/automation_dialog_action.xml
@@ -1,39 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:minWidth="300dp"
     android:padding="10dp">
 
-    <ScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/viewActionTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_gravity="center_horizontal"
+            android:paddingBottom="10dp"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            <TextView
-                android:id="@+id/viewActionTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:paddingBottom="10dp"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
+        <LinearLayout
+            android:id="@+id/layout_root"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:focusableInTouchMode="true"
+            android:orientation="vertical"
+            android:padding="10dp" />
 
-            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:focusableInTouchMode="true"
-                android:orientation="vertical"
-                android:padding="10dp"
-                android:id="@+id/layout_root" />
+        <include layout="@layout/mdtp_done_button" />
 
-            <include layout="@layout/mdtp_done_button" />
+    </LinearLayout>
 
-        </LinearLayout>
-
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
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 291f175cd4..5929736550 100644
--- a/app/src/main/res/layout/automation_dialog_choose_action.xml
+++ b/app/src/main/res/layout/automation_dialog_choose_action.xml
@@ -1,36 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
 
-    <ScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical"
+        android:padding="10dp">
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical"
-            android:padding="10dp">
+            android:text="@string/please_choose_an_action_type" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Please choose an action type:"/>
+        <RadioGroup
+            android:id="@+id/radioGroup"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginVertical="5dp" />
 
-            <RadioGroup
-                android:id="@+id/radioGroup"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginVertical="5dp"/>
+        <include layout="@layout/mdtp_done_button" />
 
-            <include layout="@layout/mdtp_done_button" />
+    </LinearLayout>
 
-        </LinearLayout>
-
-    </ScrollView>
-
-</FrameLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
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 37e456702e..a7bf66aa7e 100644
--- a/app/src/main/res/layout/automation_dialog_choose_trigger.xml
+++ b/app/src/main/res/layout/automation_dialog_choose_trigger.xml
@@ -1,36 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
 
-    <ScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical"
+        android:padding="10dp">
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical"
-            android:padding="10dp">
+            android:text="@string/please_choose_a_trigger_type" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Please choose a trigger type:"/>
+        <RadioGroup
+            android:id="@+id/radioGroup"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginVertical="5dp" />
 
-            <RadioGroup
-                android:id="@+id/radioGroup"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginVertical="5dp"/>
+        <include layout="@layout/mdtp_done_button" />
 
-            <include layout="@layout/mdtp_done_button" />
+    </LinearLayout>
 
-        </LinearLayout>
-
-    </ScrollView>
-
-</FrameLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/automation_dialog_edit_action.xml b/app/src/main/res/layout/automation_dialog_edit_action.xml
index d354ebe2a4..7be2cf1478 100644
--- a/app/src/main/res/layout/automation_dialog_edit_action.xml
+++ b/app/src/main/res/layout/automation_dialog_edit_action.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
 
-    <ScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:focusableInTouchMode="true"
@@ -20,7 +16,7 @@
                 android:id="@+id/inputEventTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="Event Name" />
+                android:hint="@string/eventname" />
 
             <View
                 android:layout_width="fill_parent"
@@ -36,7 +32,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="if:"/>
+                    android:text="@string/if_label"/>
 
                 <TextView
                     android:id="@+id/editTrigger"
@@ -44,7 +40,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentTop="true"
-                    android:text="Edit" />
+                    android:text="@string/edit_short" />
 
             </RelativeLayout>
 
@@ -70,7 +66,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="then:"/>
+                    android:text="@string/then_label"/>
 
                 <TextView
                     android:id="@+id/editAction"
@@ -78,7 +74,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentTop="true"
-                    android:text="Edit" />
+                    android:text="@string/edit_short" />
 
             </RelativeLayout>
 
@@ -94,6 +90,4 @@
 
         </LinearLayout>
 
-    </ScrollView>
-
-</FrameLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
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 e627d0bb5f..3ffbad2bd4 100644
--- a/app/src/main/res/layout/automation_dialog_edit_trigger.xml
+++ b/app/src/main/res/layout/automation_dialog_edit_trigger.xml
@@ -1,38 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
 
-    <ScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical"
+        android:padding="10dp">
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical"
-            android:padding="10dp">
+            android:text="@string/triggers" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Triggers:"/>
+        <LinearLayout
+            android:id="@+id/layoutTrigger"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:orientation="vertical" />
 
-            <LinearLayout
-                android:id="@+id/layoutTrigger"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:orientation="vertical" />
+        <include layout="@layout/mdtp_done_button" />
 
-            <include layout="@layout/mdtp_done_button" />
+    </LinearLayout>
 
-        </LinearLayout>
-
-    </ScrollView>
-
-</FrameLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/automation_dialog_event.xml b/app/src/main/res/layout/automation_dialog_event.xml
index 8cd9bee897..2792a6c5f6 100644
--- a/app/src/main/res/layout/automation_dialog_event.xml
+++ b/app/src/main/res/layout/automation_dialog_event.xml
@@ -1,102 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
 
-    <ScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical"
+        android:padding="10dp">
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/inputEventTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical"
-            android:padding="10dp">
+            android:hint="@string/taskname" />
 
-            <android.support.design.widget.TextInputEditText
-                android:id="@+id/inputEventTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="Task Name" />
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="2dip"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/listdelimiter" />
 
-            <View
-                android:layout_width="fill_parent"
-                android:layout_height="2dip"
-                android:layout_marginBottom="5dp"
-                android:layout_marginTop="5dp"
-                android:background="@color/listdelimiter" />
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/condition"/>
-
-                <TextView
-                    android:id="@+id/editTrigger"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentTop="true"
-                    android:padding="8dp"
-                    android:background="@color/ribbonDefault"
-                    android:text="Edit" />
-
-            </RelativeLayout>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
             <TextView
-                android:id="@+id/triggerDescription"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:orientation="vertical" />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/condition" />
 
-            <View
-                android:layout_width="fill_parent"
-                android:layout_height="2dip"
-                android:layout_marginBottom="5dp"
-                android:layout_marginTop="5dp"
-                android:background="@color/listdelimiter" />
+            <TextView
+                android:id="@+id/editTrigger"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true"
+                android:background="@color/ribbonDefault"
+                android:padding="8dp"
+                android:text="@string/edit_short" />
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+        </RelativeLayout>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/action"/>
+        <TextView
+            android:id="@+id/triggerDescription"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:orientation="vertical" />
 
-                <TextView
-                    android:id="@+id/editAction"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentTop="true"
-                    android:padding="8dp"
-                    android:background="@color/ribbonDefault"
-                    android:text="Add" />
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="2dip"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/listdelimiter" />
 
-            </RelativeLayout>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/actionListView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/action" />
 
-            <include layout="@layout/mdtp_done_button" />
+            <TextView
+                android:id="@+id/editAction"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true"
+                android:background="@color/ribbonDefault"
+                android:padding="8dp"
+                android:text="@string/add_short" />
 
-        </LinearLayout>
+        </RelativeLayout>
 
-    </ScrollView>
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/actionListView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp" />
 
-</FrameLayout>
\ No newline at end of file
+        <include layout="@layout/mdtp_done_button" />
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/automation_event_item.xml b/app/src/main/res/layout/automation_event_item.xml
index 7c845d93bb..ce377a6aa0 100644
--- a/app/src/main/res/layout/automation_event_item.xml
+++ b/app/src/main/res/layout/automation_event_item.xml
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rootLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="8dp"
-    android:layout_marginEnd="8dp"
     android:layout_marginStart="8dp"
     android:layout_marginTop="8dp"
-    android:padding="8dp"
-    android:background="@color/ribbonDefault">
+    android:layout_marginEnd="8dp"
+    android:layout_marginBottom="8dp"
+    android:background="@color/ribbonDefault"
+    android:padding="8dp">
 
     <ImageView
         android:id="@+id/iconTrash"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:src="@drawable/ic_trash_outline"
-        android:contentDescription="Remove"/>
+        android:layout_alignParentEnd="true"
+        android:contentDescription="@string/remove_label"
+        android:orientation="horizontal"
+        android:src="@drawable/ic_trash_outline" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:layout_toLeftOf="@id/iconTrash"
+        android:layout_toStartOf="@id/iconTrash"
+        android:orientation="vertical"
         app:layout_constraintTop_toTopOf="parent">
 
         <TextView
diff --git a/app/src/main/res/layout/automation_fragment.xml b/app/src/main/res/layout/automation_fragment.xml
index 56e84808d7..c671fde897 100644
--- a/app/src/main/res/layout/automation_fragment.xml
+++ b/app/src/main/res/layout/automation_fragment.xml
@@ -1,12 +1,11 @@
 <?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"
     tools:context="info.nightscout.androidaps.plugins.general.automation.AutomationFragment">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/eventListView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -15,22 +14,23 @@
         android:layout_alignParentTop="true"
         android:layout_marginBottom="-100dp" />
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fabAddEvent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_gravity="bottom"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        android:src="@drawable/ic_add_black_24dp"
-        app:backgroundTint="@color/defaulttext" />
-
     <TextView
         android:id="@+id/logView"
         android:layout_width="match_parent"
         android:layout_height="100dp"
         android:layout_alignParentBottom="true" />
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabAddEvent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:src="@drawable/ic_add_black_24dp"
+        tools:ignore="RelativeOverlap" />
+
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e1cc34c2c6..c8aa28de89 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1422,6 +1422,15 @@
     <string name="lastboluscompared">Last bolus time %1$s %2$s min ago</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
+    <string name="taskname">Task name</string>
+    <string name="eventname">Event name</string>
+    <string name="edit_short">EDIT</string>
+    <string name="please_choose_an_action_type">Please choose an action type:</string>
+    <string name="please_choose_a_trigger_type">Please choose a trigger type:</string>
+    <string name="if_label">If:</string>
+    <string name="then_label">Then:</string>
+    <string name="triggers">Triggers:</string>
+    <string name="remove_label">REMOVE</string>
 
     <plurals name="objective_days">
         <item quantity="one">%1$d day</item>
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.java
index 27f676d007..78a603701e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.java
@@ -39,7 +39,7 @@ public class ActionProfileSwitchPercentTest {
 
     @Test
     public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.remove), actionProfileSwitchPercent.icon());
+        Assert.assertEquals(Optional.of(R.drawable.icon_actions_profileswitch), actionProfileSwitchPercent.icon());
     }
 
     @Test