From 252c69a3efa16420396801efe8d9b56494e5203a Mon Sep 17 00:00:00 2001
From: denizk0461 <denizk0461@gmail.com>
Date: Mon, 8 May 2023 13:15:09 +0200
Subject: [PATCH] Added text fields to change colours for text and background,
 but background logic for that is not yet implemented. BUG: settings don't
 react as they should. Clicking on "serif," for example, doesn't actually
 select and store serif. What is going on?

---
 .idea/misc.xml                                |   1 -
 .../java/com/denizd/textbasic/QuoteStorage.kt |   2 +-
 .../textbasic/fragment/SettingsFragment.kt    |  25 ++--
 .../com/denizd/textbasic/widget/CanvasText.kt |   1 -
 .../main/res/color/selector_text_input.xml    |   5 +
 app/src/main/res/drawable/rounded_shape.xml   |   7 +
 app/src/main/res/layout/fragment_settings.xml | 121 +++++++++++++++---
 app/src/main/res/values-de/strings.xml        |   3 +
 app/src/main/res/values-night/themes.xml      |   6 +
 app/src/main/res/values/attrs.xml             |   4 +-
 app/src/main/res/values/strings.xml           |   3 +
 app/src/main/res/values/themes.xml            |   6 +
 12 files changed, 149 insertions(+), 35 deletions(-)
 create mode 100644 app/src/main/res/color/selector_text_input.xml
 create mode 100644 app/src/main/res/drawable/rounded_shape.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 833f612..1d7c6b3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
diff --git a/app/src/main/java/com/denizd/textbasic/QuoteStorage.kt b/app/src/main/java/com/denizd/textbasic/QuoteStorage.kt
index 8556239..f44efea 100644
--- a/app/src/main/java/com/denizd/textbasic/QuoteStorage.kt
+++ b/app/src/main/java/com/denizd/textbasic/QuoteStorage.kt
@@ -106,7 +106,7 @@ class QuoteStorage(context: Context) {
         backgroundType: Int,
         typefaceIndex: Int,
         typefaceStyleIndex: Int,
-        outlineSize: Float
+        outlineSize: Float,
     ) {
         prefs.edit().apply {
             putInt(KEY_TEXT_SIZE, textSize)
diff --git a/app/src/main/java/com/denizd/textbasic/fragment/SettingsFragment.kt b/app/src/main/java/com/denizd/textbasic/fragment/SettingsFragment.kt
index d7e74c0..97fece4 100644
--- a/app/src/main/java/com/denizd/textbasic/fragment/SettingsFragment.kt
+++ b/app/src/main/java/com/denizd/textbasic/fragment/SettingsFragment.kt
@@ -17,6 +17,7 @@ import com.google.android.material.transition.MaterialSharedAxis
 import java.lang.reflect.Field
 import kotlin.math.abs
 
+
 class SettingsFragment : BaseFragment(R.layout.fragment_settings) {
 
     private lateinit var storage: QuoteStorage
@@ -44,6 +45,8 @@ class SettingsFragment : BaseFragment(R.layout.fragment_settings) {
 
 //        binding.animationLl.animateLayoutChanges(true)
 
+        // TODO a lot of the buttons don't at all do what they're supposed to do!
+
         storage = QuoteStorage(context)
 
         gravityButtons = arrayOf(
@@ -124,6 +127,8 @@ class SettingsFragment : BaseFragment(R.layout.fragment_settings) {
             }
         }
 
+        ////////////////////////////////////////////
+
         binding.switchInvert.apply {
             isChecked = storage.isInvertedEnabled()
 
@@ -260,16 +265,16 @@ class SettingsFragment : BaseFragment(R.layout.fragment_settings) {
 
     private fun save() {
         storage.saveSettings(
-            binding.textSizePicker.value,
-            binding.switchInvert.isChecked,
-            binding.textTransparencyPicker.value,
-            binding.bgTransparencyPicker.value,
-            binding.switchRandom.isChecked,
-            widgetGravity,
-            backgroundIndex,
-            typefaceIndex,
-            typefaceStyleIndex,
-            binding.outlinePicker.value.toFloat()
+            textSize = binding.textSizePicker.value,
+            inverted = binding.switchInvert.isChecked,
+            textTransparency = binding.textTransparencyPicker.value,
+            bgTransparency = binding.bgTransparencyPicker.value,
+            random = binding.switchRandom.isChecked,
+            widgetPosition = widgetGravity,
+            backgroundType = backgroundIndex,
+            typefaceIndex = typefaceIndex,
+            typefaceStyleIndex = typefaceStyleIndex,
+            outlineSize = binding.outlinePicker.value.toFloat()
         )
     }
 
diff --git a/app/src/main/java/com/denizd/textbasic/widget/CanvasText.kt b/app/src/main/java/com/denizd/textbasic/widget/CanvasText.kt
index cc4ee23..fd2e801 100644
--- a/app/src/main/java/com/denizd/textbasic/widget/CanvasText.kt
+++ b/app/src/main/java/com/denizd/textbasic/widget/CanvasText.kt
@@ -27,7 +27,6 @@ class CanvasText {
             val bmp = if (isPreview) {
                 Bitmap.createBitmap(1024, 256, Bitmap.Config.ARGB_8888)
             } else {
-//                Log.d("ASDFasdf", "${widgetSize.first} + ${widgetSize.second}")
                 Bitmap.createBitmap(widgetSize.first * 3, widgetSize.second * 3, Bitmap.Config.ARGB_8888)
             }
 
diff --git a/app/src/main/res/color/selector_text_input.xml b/app/src/main/res/color/selector_text_input.xml
new file mode 100644
index 0000000..a264cb5
--- /dev/null
+++ b/app/src/main/res/color/selector_text_input.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/colorOnSurfaceVariant" android:state_focused="true"/>
+    <item android:color="?attr/colorOutlineVariant"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rounded_shape.xml b/app/src/main/res/drawable/rounded_shape.xml
new file mode 100644
index 0000000..982884b
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_shape.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FFFFFF"/>
+    <stroke android:width="3dp" android:color="#B1BCBE" />
+    <corners android:radius="10dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 6966e7d..2affb28 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -39,18 +39,21 @@
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="4dp"/>
 
+                <!-- TODO the following 4 elements are hidden but must be removed once their features are implemented custom -->
                 <com.denizd.textbasic.VerticalTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/text_opacity"
                     android:textSize="12sp"
                     android:fontFamily="@font/mono_light"
+                    android:visibility="gone"
                     android:padding="4dp"/>
 
                 <NumberPicker
                     android:id="@+id/text_transparency_picker"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:visibility="gone"
                     android:layout_marginHorizontal="4dp"/>
 
                 <com.denizd.textbasic.VerticalTextView
@@ -59,12 +62,14 @@
                     android:text="@string/bg_opacity"
                     android:textSize="12sp"
                     android:fontFamily="@font/mono_light"
+                    android:visibility="gone"
                     android:padding="4dp"/>
 
                 <NumberPicker
                     android:id="@+id/bg_transparency_picker"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:visibility="gone"
                     android:layout_marginHorizontal="4dp"/>
 
                 <com.denizd.textbasic.VerticalTextView
@@ -84,6 +89,7 @@
 
             </LinearLayout>
 
+            <!-- TODO this must be replaced with a custom solution later -->
             <com.google.android.material.button.MaterialButtonToggleGroup
                 android:id="@+id/typeface_toggle_button"
                 android:layout_width="match_parent"
@@ -122,21 +128,6 @@
 
             </com.google.android.material.button.MaterialButtonToggleGroup>
 
-<!--            <com.google.android.material.textfield.TextInputLayout-->
-<!--                style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"-->
-<!--                android:id="@+id/typeface_menu"-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_marginBottom="16dp">-->
-
-<!--                <AutoCompleteTextView-->
-<!--                    android:id="@+id/typeface_menu_textview"-->
-<!--                    android:layout_width="match_parent"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:inputType="none"/>-->
-
-<!--            </com.google.android.material.textfield.TextInputLayout>-->
-
             <com.google.android.material.button.MaterialButtonToggleGroup
                 android:id="@+id/typeface_style_toggle_button"
                 android:layout_width="match_parent"
@@ -222,9 +213,102 @@
 
             </com.google.android.material.button.MaterialButtonToggleGroup>
 
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                        android:id="@+id/text_layout_text_colour"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="3"
+                        android:maxLines="1"
+                        android:scrollHorizontally="true"
+                        android:hint="@string/text_colour_input_hint"
+                        app:boxStrokeColor="@color/selector_text_input"
+                        app:hintTextColor="@color/selector_text_input">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            style="@style/ThemeOverlay.Material3.TextInputEditText.OutlinedBox"
+                            android:textColor="?attr/colorOnSurfaceVariant"
+                            android:maxLength="8"
+                            android:digits="abcdefABCDEF1234567890"
+                            android:id="@+id/edit_text_text_colour"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"/>
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/preview_text_colour"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginHorizontal="8dp"
+                        android:layout_marginBottom="4dp"
+                        android:background="@drawable/rounded_shape"
+                        android:backgroundTint="@color/design_default_color_primary"/>
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                        android:id="@+id/text_layout_bg_colour"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="3"
+                        android:maxLines="1"
+                        android:scrollHorizontally="true"
+                        android:hint="@string/bg_colour_input_hint"
+                        app:boxStrokeColor="@color/selector_text_input"
+                        app:hintTextColor="@color/selector_text_input">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            style="@style/ThemeOverlay.Material3.TextInputEditText.OutlinedBox"
+                            android:textColor="?attr/colorOnSurfaceVariant"
+                            android:maxLength="8"
+                            android:digits="abcdefABCDEF1234567890"
+                            android:id="@+id/edit_text_bg_colour"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"/>
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/preview_bg_colour"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginHorizontal="8dp"
+                        android:layout_marginBottom="4dp"
+                        android:background="@drawable/rounded_shape"
+                        android:backgroundTint="@color/design_default_color_primary"/>
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <!-- TODO this view is hidden but must be removed later -->
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="0dp"
@@ -242,7 +326,7 @@
                     app:layout_constraintEnd_toEndOf="parent"/>
 <!--                    android:textColor="?attr/colorOnPrimary"-->
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/switch_invert"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -273,7 +357,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"/>
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/switch_random"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -336,7 +420,6 @@
                     android:padding="8dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="12dp">
-                    <!--                    android:backgroundTint="?attr/colorSecondary"-->
 
                     <LinearLayout
                         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 442fa35..926fd1d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -32,6 +32,9 @@
     <string name="position_button_content_desc_bc">Positioniere Widget unten zentriert</string>
     <string name="position_button_content_desc_br">Positioniere Widget unten rechts</string>
 
+    <string name="text_colour_input_hint">Textfarbe (hex, ohne #)</string>
+    <string name="bg_colour_input_hint">Hintergrundfarbe (hex, ohne #)</string>
+
     <string name="sansserif">Sans-Serif</string>
     <string name="serif">Serif</string>
     <string name="monospace">Monospace</string>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 948db55..f9f2754 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -34,5 +34,11 @@
 
         <item name="android:statusBarColor">@color/md_theme_dark_background</item>
         <item name="android:navigationBarColor">@color/color_tint_background_dark</item>
+
+        <item name="android:textColor">@color/md_theme_dark_onSurfaceVariant</item>
+        <item name="android:textColorHighlight">@color/md_theme_dark_primaryContainer</item>
+        <item name="colorText">@color/md_theme_dark_onSurfaceVariant</item>
+        <item name="android:scrollbarThumbVertical">@color/md_theme_dark_primary</item>
+        <item name="colorOutlineVariant">@color/md_theme_dark_outlineVariant</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c2817df..db5853b 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-<!--    <attr name="colorOnPrimarySoftest" format="color"/>-->
-<!--    <attr name="colorOnSecondarySoft" format="color"/>-->
-<!--    <attr name="colorTertiary" format="color"/>-->
     <attr name="colorTintBackground" format="color"/>
     <attr name="colorSecContainer" format="color"/>
+    <attr name="colorText" format="color"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2d3a284..09cfcf3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,6 +31,9 @@
     <string name="position_button_content_desc_bc">Position widget at bottom center</string>
     <string name="position_button_content_desc_br">Position widget at bottom right</string>
 
+    <string name="text_colour_input_hint">Text colour (hex, no #)</string>
+    <string name="bg_colour_input_hint">Background colour (hex, no #)</string>
+
     <string name="sansserif">Sans-Serif</string>
     <string name="serif">Serif</string>
     <string name="monospace">Monospace</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8959ff7..adfed29 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -36,5 +36,11 @@
         <item name="android:navigationBarColor">@color/color_tint_background_light</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="p">true</item>
+
+        <item name="android:textColor">@color/md_theme_light_onSurfaceVariant</item>
+        <item name="android:textColorHighlight">@color/md_theme_light_primaryContainer</item>
+        <item name="colorText">@color/md_theme_light_onSurfaceVariant</item>
+        <item name="android:scrollbarThumbVertical">@color/md_theme_light_primary</item>
+        <item name="colorOutlineVariant">@color/md_theme_light_outlineVariant</item>
     </style>
 </resources>