From 2262391749738b427f90b67d5a93372b52d561e4 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 12 Nov 2021 19:08:21 +0100
Subject: [PATCH] removing some checkbox hacks

---
 commons/src/main/AndroidManifest.xml                 |  2 +-
 .../commons/views/MyAppCompatCheckbox.kt             | 12 +-----------
 commons/src/main/res/values/styles.xml               |  4 +---
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/commons/src/main/AndroidManifest.xml b/commons/src/main/AndroidManifest.xml
index 8b5602f9b..a8ceee5aa 100644
--- a/commons/src/main/AndroidManifest.xml
+++ b/commons/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
         android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY"
         tools:node="remove" />
 
-    <application>
+    <application android:supportsRtl="true">
         <activity
             android:name="com.simplemobiletools.commons.activities.ContributorsActivity"
             android:label="@string/contributors"
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyAppCompatCheckbox.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyAppCompatCheckbox.kt
index 9fd33a2d0..e1c205029 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyAppCompatCheckbox.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyAppCompatCheckbox.kt
@@ -4,9 +4,6 @@ import android.content.Context
 import android.content.res.ColorStateList
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatCheckBox
-import com.simplemobiletools.commons.R
-import com.simplemobiletools.commons.extensions.applyColorFilter
-import com.simplemobiletools.commons.helpers.isMarshmallowPlus
 
 class MyAppCompatCheckbox : AppCompatCheckBox {
     constructor(context: Context) : super(context)
@@ -17,19 +14,12 @@ class MyAppCompatCheckbox : AppCompatCheckBox {
 
     fun setColors(textColor: Int, accentColor: Int, backgroundColor: Int) {
         setTextColor(textColor)
-        if (isMarshmallowPlus()) {
-            buttonDrawable?.applyColorFilter(textColor)
-            compoundDrawablesRelative.forEach {
-                it?.applyColorFilter(textColor)
-            }
-        }
-
         val colorStateList = ColorStateList(
             arrayOf(
                 intArrayOf(-android.R.attr.state_checked),
                 intArrayOf(android.R.attr.state_checked)
             ),
-            intArrayOf(context.resources.getColor(R.color.radiobutton_disabled), accentColor)
+            intArrayOf(textColor, accentColor)
         )
         supportButtonTintList = colorStateList
     }
diff --git a/commons/src/main/res/values/styles.xml b/commons/src/main/res/values/styles.xml
index 1903cabad..a2cadd241 100644
--- a/commons/src/main/res/values/styles.xml
+++ b/commons/src/main/res/values/styles.xml
@@ -136,10 +136,8 @@
 
     <style name="SettingsCheckboxStyle">
         <item name="android:background">@null</item>
-        <item name="android:button">@null</item>
         <item name="android:clickable">false</item>
-        <item name="drawableEndCompat">?android:attr/listChoiceIndicatorMultiple</item>
-        <item name="android:drawablePadding">@dimen/activity_margin</item>
+        <item name="android:layoutDirection">rtl</item>
     </style>
 
     <style name="SettingsLeftLabelStyle">