From 71aba16cbf50e6a5b070c4411858dcecb1f74b1e Mon Sep 17 00:00:00 2001
From: Mugurell <mugurell@users.noreply.github.com>
Date: Mon, 24 Feb 2020 18:27:57 +0200
Subject: [PATCH] For #8673 - Don't mirror the onboarding - theme picker tiles

Don't mirror the images and keep the radio buttons fixed in place at the top
left corner of the images.
---
 app/src/main/res/drawable/ic_onboarding_dark_theme.xml  | 8 --------
 app/src/main/res/drawable/ic_onboarding_light_theme.xml | 8 --------
 app/src/main/res/layout/onboarding_theme_picker.xml     | 8 ++++----
 3 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_onboarding_dark_theme.xml
 delete mode 100644 app/src/main/res/drawable/ic_onboarding_light_theme.xml

diff --git a/app/src/main/res/drawable/ic_onboarding_dark_theme.xml b/app/src/main/res/drawable/ic_onboarding_dark_theme.xml
deleted file mode 100644
index b6d4dbc51..000000000
--- a/app/src/main/res/drawable/ic_onboarding_dark_theme.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/onboarding_dark_theme"
-        android:autoMirrored="true">
-</bitmap>
diff --git a/app/src/main/res/drawable/ic_onboarding_light_theme.xml b/app/src/main/res/drawable/ic_onboarding_light_theme.xml
deleted file mode 100644
index 2bc8350aa..000000000
--- a/app/src/main/res/drawable/ic_onboarding_light_theme.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/onboarding_light_theme"
-        android:autoMirrored="true">
-</bitmap>
diff --git a/app/src/main/res/layout/onboarding_theme_picker.xml b/app/src/main/res/layout/onboarding_theme_picker.xml
index 322cfe9c5..d88233916 100644
--- a/app/src/main/res/layout/onboarding_theme_picker.xml
+++ b/app/src/main/res/layout/onboarding_theme_picker.xml
@@ -54,7 +54,7 @@
         android:elevation="1dp"
         android:translationX="@dimen/onboarding_dual_pane_radio_button_translation_x"
         android:translationY="@dimen/onboarding_dual_pane_radio_button_translation_y"
-        app:layout_constraintStart_toStartOf="@+id/theme_light_image"
+        app:layout_constraintLeft_toLeftOf="@+id/theme_light_image"
         app:layout_constraintTop_toTopOf="@+id/theme_light_image"
         app:onboardingKey="@string/pref_key_light_theme" />
 
@@ -64,7 +64,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:background="@drawable/ic_onboarding_light_theme"
+        android:background="@drawable/onboarding_light_theme"
         android:contentDescription="@string/onboarding_theme_light_title"
         android:foreground="@drawable/rounded_ripple"
         app:layout_constraintEnd_toStartOf="@+id/theme_dark_image"
@@ -80,7 +80,7 @@
         android:elevation="1dp"
         android:translationX="@dimen/onboarding_dual_pane_radio_button_translation_x"
         android:translationY="@dimen/onboarding_dual_pane_radio_button_translation_y"
-        app:layout_constraintStart_toStartOf="@+id/theme_dark_image"
+        app:layout_constraintLeft_toLeftOf="@+id/theme_dark_image"
         app:layout_constraintTop_toTopOf="@+id/theme_dark_image"
         app:onboardingKey="@string/pref_key_dark_theme" />
 
@@ -91,7 +91,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-        android:background="@drawable/ic_onboarding_dark_theme"
+        android:background="@drawable/onboarding_dark_theme"
         android:contentDescription="@string/onboarding_theme_dark_title"
         android:foreground="@drawable/rounded_ripple"
         app:layout_constraintEnd_toEndOf="parent"