From 1c95cb107d66ce384d7e9aca961513a3d4d1c1d8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 9 Nov 2022 10:48:59 +0100
Subject: [PATCH] WeekDayPicker -> automations

---
 automation/build.gradle                                  | 3 +++
 .../info/nightscout/automation/elements/InputWeekDay.kt  | 2 +-
 .../java/info/nightscout/automation}/ui/WeekdayPicker.kt | 6 +++---
 .../src/main/res/drawable/weekday_circle_brackground.xml | 0
 .../src/main/res/drawable/weekend_circle_brackground.xml | 0
 .../src/main/res/layout/weekday_picker.xml               | 0
 automation/src/main/res/values/strings.xml               | 9 +++++++++
 core/src/main/res/values/strings.xml                     | 9 ---------
 8 files changed, 16 insertions(+), 13 deletions(-)
 rename {core/src/main/java/info/nightscout/androidaps/utils => automation/src/main/java/info/nightscout/automation}/ui/WeekdayPicker.kt (95%)
 rename {core => automation}/src/main/res/drawable/weekday_circle_brackground.xml (100%)
 rename {core => automation}/src/main/res/drawable/weekend_circle_brackground.xml (100%)
 rename {core => automation}/src/main/res/layout/weekday_picker.xml (100%)

diff --git a/automation/build.gradle b/automation/build.gradle
index 320fffc2b2..0b7f76f4f4 100644
--- a/automation/build.gradle
+++ b/automation/build.gradle
@@ -11,6 +11,7 @@ apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/allopen_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+
 android {
     namespace 'info.nightscout.automation'
 }
@@ -22,4 +23,6 @@ dependencies {
     implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
     implementation project(':interfaces')
+
+    api "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/automation/elements/InputWeekDay.kt b/automation/src/main/java/info/nightscout/automation/elements/InputWeekDay.kt
index 4f761687e5..e63e5acb21 100644
--- a/automation/src/main/java/info/nightscout/automation/elements/InputWeekDay.kt
+++ b/automation/src/main/java/info/nightscout/automation/elements/InputWeekDay.kt
@@ -2,7 +2,7 @@ package info.nightscout.automation.elements
 
 import android.widget.LinearLayout
 import androidx.annotation.StringRes
-import info.nightscout.androidaps.utils.ui.WeekdayPicker
+import info.nightscout.automation.ui.WeekdayPicker
 import info.nightscout.automation.R
 import java.util.Calendar
 
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/WeekdayPicker.kt b/automation/src/main/java/info/nightscout/automation/ui/WeekdayPicker.kt
similarity index 95%
rename from core/src/main/java/info/nightscout/androidaps/utils/ui/WeekdayPicker.kt
rename to automation/src/main/java/info/nightscout/automation/ui/WeekdayPicker.kt
index c5eaa9986b..4b86c01ac5 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/ui/WeekdayPicker.kt
+++ b/automation/src/main/java/info/nightscout/automation/ui/WeekdayPicker.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.utils.ui
+package info.nightscout.automation.ui
 
 import android.content.Context
 import android.util.AttributeSet
@@ -6,9 +6,9 @@ import android.view.LayoutInflater
 import android.widget.Checkable
 import androidx.appcompat.widget.AppCompatCheckedTextView
 import androidx.constraintlayout.widget.ConstraintLayout
-import info.nightscout.androidaps.core.databinding.WeekdayPickerBinding
+import info.nightscout.automation.databinding.WeekdayPickerBinding
 import info.nightscout.shared.extensions.toVisibility
-import java.util.*
+import java.util.Calendar
 
 class WeekdayPicker constructor(
     context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
diff --git a/core/src/main/res/drawable/weekday_circle_brackground.xml b/automation/src/main/res/drawable/weekday_circle_brackground.xml
similarity index 100%
rename from core/src/main/res/drawable/weekday_circle_brackground.xml
rename to automation/src/main/res/drawable/weekday_circle_brackground.xml
diff --git a/core/src/main/res/drawable/weekend_circle_brackground.xml b/automation/src/main/res/drawable/weekend_circle_brackground.xml
similarity index 100%
rename from core/src/main/res/drawable/weekend_circle_brackground.xml
rename to automation/src/main/res/drawable/weekend_circle_brackground.xml
diff --git a/core/src/main/res/layout/weekday_picker.xml b/automation/src/main/res/layout/weekday_picker.xml
similarity index 100%
rename from core/src/main/res/layout/weekday_picker.xml
rename to automation/src/main/res/layout/weekday_picker.xml
diff --git a/automation/src/main/res/values/strings.xml b/automation/src/main/res/values/strings.xml
index 62883c0dc6..73f6fa9b0d 100644
--- a/automation/src/main/res/values/strings.xml
+++ b/automation/src/main/res/values/strings.xml
@@ -126,4 +126,13 @@
     <string name="remove_sort">Remove/sort</string>
     <string name="stop_processing">Stop processing</string>
 
+    <!-- WeekdayPicker -->
+    <string name="monday_short">M</string>
+    <string name="tuesday_short">T</string>
+    <string name="wednesday_short">W</string>
+    <string name="thursday_short">T</string>
+    <string name="friday_short">F</string>
+    <string name="saturday_short">S</string>
+    <string name="sunday_short">S</string>
+
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 44760211ae..441a580345 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -434,15 +434,6 @@
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Please reboot your phone or restart AAPS from the System Settings \notherwise Android APS will not have logging (important to track and verify that the algorithms are working correctly)!</string>
 
-    <!-- WeekdayPicker -->
-    <string name="monday_short">M</string>
-    <string name="tuesday_short">T</string>
-    <string name="wednesday_short">W</string>
-    <string name="thursday_short">T</string>
-    <string name="friday_short">F</string>
-    <string name="saturday_short">S</string>
-    <string name="sunday_short">S</string>
-
     <!-- User Entry -->
     <string name="uel_bolus">BOLUS</string>
     <string name="uel_bolus_calculator">BOLUS CALCULATOR</string>