From cc6ee5b7adc5c6f22d6cf43f20af3f12cafee3b8 Mon Sep 17 00:00:00 2001
From: Felix Prahl-Kamps <felixpk@outlook.de>
Date: Tue, 22 Oct 2019 15:56:45 +0200
Subject: [PATCH] change switch to material switch

---
 .../mispbump/customViews/MaterialPreferenceSwitch.java |  5 +++--
 app/src/main/res/layout/material_preference_switch.xml | 10 ++++------
 app/src/main/res/values/styles.xml                     |  8 +++++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/lu/circl/mispbump/customViews/MaterialPreferenceSwitch.java b/app/src/main/java/lu/circl/mispbump/customViews/MaterialPreferenceSwitch.java
index 74f0434..c056a3a 100644
--- a/app/src/main/java/lu/circl/mispbump/customViews/MaterialPreferenceSwitch.java
+++ b/app/src/main/java/lu/circl/mispbump/customViews/MaterialPreferenceSwitch.java
@@ -7,18 +7,19 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CompoundButton;
-import android.widget.Switch;
 import android.widget.TextView;
 
 import androidx.constraintlayout.widget.ConstraintLayout;
 
+import com.google.android.material.switchmaterial.SwitchMaterial;
+
 import lu.circl.mispbump.R;
 
 
 public class MaterialPreferenceSwitch extends ConstraintLayout {
 
     private TextView titleView, subTitleView;
-    private Switch switchView;
+    private SwitchMaterial switchView;
     private CompoundButton.OnCheckedChangeListener onCheckedChangeListener;
 
     public MaterialPreferenceSwitch(Context context, AttributeSet attrs) {
diff --git a/app/src/main/res/layout/material_preference_switch.xml b/app/src/main/res/layout/material_preference_switch.xml
index e23b542..dd294db 100644
--- a/app/src/main/res/layout/material_preference_switch.xml
+++ b/app/src/main/res/layout/material_preference_switch.xml
@@ -33,7 +33,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="4dp"
         android:clickable="false"
         android:focusable="false"
         android:focusableInTouchMode="false"
@@ -41,18 +41,16 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/material_preference_switch"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/material_preference_title"
+        app:layout_constraintTop_toBottomOf="@+id/material_preference_title"
         tools:text="Subtitle" />
 
-    <Switch
+    <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/material_preference_switch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
         app:layout_constraintBottom_toBottomOf="@id/material_preference_subtitle"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/material_preference_title"/>
+        app:layout_constraintTop_toTopOf="@id/material_preference_title" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a301ef7..e9bd366 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,9 +1,11 @@
 <resources>
 
     <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
 
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorOnPrimary">@color/white</item>
+
         <item name="colorSecondary">@color/colorSecondary</item>
         <item name="colorOnSecondary">@color/colorOnSecondary</item>
 
@@ -29,11 +31,11 @@
 
     <style name="AppTheme.TextAppearance.ListTitle">
         <item name="android:textColor">#de000000</item>
-        <item name="android:textSize">16dp</item>
+        <item name="android:textSize">16sp</item>
     </style>
 
     <style name="AppTheme.TextAppearance.ListSubtitle">
         <item name="android:textColor">#99000000</item>
-        <item name="android:textSize">14dp</item>
+        <item name="android:textSize">14sp</item>
     </style>
 </resources>