[Android] Revert "Migrate the styles to the resources module"

[Nicolas Pomepuy]

vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Tue Mar 15 14:05:35 2022 +0100| [1e9876217f9b760702a0d55e9dd8ca75bbcd8e18] | committer: Nicolas Pomepuy

Revert "Migrate the styles to the resources module"

This reverts commit 6012b348²

> https://code.videolan.org/videolan/vlc-android/commit/1e9876217f9b760702a0d55e9dd8ca75bbcd8e18
---

 application/vlc-android/build.gradle                                   | 3 +++
 .../{resources/src/main => vlc-android}/res/values-night/styles.xml    | 0
 .../{resources/src/main => vlc-android}/res/values-v19/styles.xml      | 0
 .../{resources/src/main => vlc-android}/res/values-v21/styles.xml      | 2 +-
 .../{resources/src/main => vlc-android}/res/values-v23/styles.xml      | 0
 .../{resources/src/main => vlc-android}/res/values-v27/styles.xml      | 0
 .../{resources/src/main => vlc-android}/res/values-v29/styles.xml      | 0
 7 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle
index dd64c5aa9..bfc80d8d1 100644
--- a/application/vlc-android/build.gradle
+++ b/application/vlc-android/build.gradle
@@ -163,6 +163,7 @@ dependencies {
     api "androidx.activity:activity-ktx:$rootProject.ext.androidxActivityVersion"
     api "androidx.fragment:fragment-ktx:$rootProject.ext.androidxFragmentVersion"
     api "androidx.recyclerview:recyclerview:$rootProject.ext.androidxRecyclerviewVersion"
+    api "com.google.android.material:material:$rootProject.ext.androidxMaterialVersion"
     api "androidx.annotation:annotation:$rootProject.ext.androidxAnnotationVersion"
     api "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintLayoutVersion"
     api "androidx.viewpager2:viewpager2:$rootProject.ext.viewPager2Version"
@@ -182,6 +183,8 @@ dependencies {
 
 
     //TV
+    api "androidx.leanback:leanback:$rootProject.ext.androidxLeanbackVersion"
+    api "androidx.leanback:leanback-preference:$rootProject.ext.androidxLeanbackVersion"
     api "androidx.tvprovider:tvprovider:$rootProject.ext.androidxLeanbackVersion"
 
     // Kotlin
diff --git a/application/resources/src/main/res/values-night/styles.xml b/application/vlc-android/res/values-night/styles.xml
similarity index 100%
rename from application/resources/src/main/res/values-night/styles.xml
rename to application/vlc-android/res/values-night/styles.xml
diff --git a/application/resources/src/main/res/values-v19/styles.xml b/application/vlc-android/res/values-v19/styles.xml
similarity index 100%
rename from application/resources/src/main/res/values-v19/styles.xml
rename to application/vlc-android/res/values-v19/styles.xml
diff --git a/application/resources/src/main/res/values-v21/styles.xml b/application/vlc-android/res/values-v21/styles.xml
similarity index 92%
rename from application/resources/src/main/res/values-v21/styles.xml
rename to application/vlc-android/res/values-v21/styles.xml
index e76075460..411dbb6f5 100644
--- a/application/resources/src/main/res/values-v21/styles.xml
+++ b/application/vlc-android/res/values-v21/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!--    fixme : We'll have to revert to Widget.MaterialComponents.BottomSheet.Modal when this issue is fixed: https://github.com/material-components/material-components-android/issues/1086-->
     <style name="AppModalStyle" parent="Widget.Design.BottomSheet.Modal">
diff --git a/application/resources/src/main/res/values-v23/styles.xml b/application/vlc-android/res/values-v23/styles.xml
similarity index 100%
rename from application/resources/src/main/res/values-v23/styles.xml
rename to application/vlc-android/res/values-v23/styles.xml
diff --git a/application/resources/src/main/res/values-v27/styles.xml b/application/vlc-android/res/values-v27/styles.xml
similarity index 100%
rename from application/resources/src/main/res/values-v27/styles.xml
rename to application/vlc-android/res/values-v27/styles.xml
diff --git a/application/resources/src/main/res/values-v29/styles.xml b/application/vlc-android/res/values-v29/styles.xml
similarity index 100%
rename from application/resources/src/main/res/values-v29/styles.xml
rename to application/vlc-android/res/values-v29/styles.xml