[Android] Migrate the styles to the resources module

Nicolas Pomepuy git at videolan.org
Tue Nov 2 13:00:50 UTC 2021


vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Mon Sep 20 15:42:26 2021 +0200| [6012b348a9c1211d6f664ac6b9f83772c654197e] | committer: Nicolas Pomepuy

Migrate the styles to the resources module

(cherry picked from commit 23cea5df0e3cd08bbde6e0dc8c220c8979a92fdd)

> https://code.videolan.org/videolan/vlc-android/commit/6012b348a9c1211d6f664ac6b9f83772c654197e
---

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

diff --git a/application/resources/build.gradle b/application/resources/build.gradle
index d5d3e67fd..798c0f2be 100644
--- a/application/resources/build.gradle
+++ b/application/resources/build.gradle
@@ -58,6 +58,12 @@ dependencies {
     releaseApi "org.videolan.android:libvlc-all:$rootProject.ext.libvlcVersion"
     releaseApi "org.videolan.android:medialibrary-all:$rootProject.ext.medialibraryVersion"
 
+    api "com.google.android.material:material:$rootProject.ext.androidxMaterialVersion"
+
+    api "androidx.preference:preference:$androidxPreferencesVersion"
+    api "androidx.leanback:leanback:$rootProject.ext.androidxLeanbackVersion"
+    api "androidx.leanback:leanback-preference:$rootProject.ext.androidxLeanbackVersion"
+
     // Retrofit
     api "com.squareup.retrofit2:retrofit:$rootProject.ext.retrofit"
     api "com.squareup.retrofit2:converter-moshi:$rootProject.ext.retrofit"
diff --git a/application/vlc-android/res/values-night/styles.xml b/application/resources/src/main/res/values-night/styles.xml
similarity index 100%
rename from application/vlc-android/res/values-night/styles.xml
rename to application/resources/src/main/res/values-night/styles.xml
diff --git a/application/vlc-android/res/values-v19/styles.xml b/application/resources/src/main/res/values-v19/styles.xml
similarity index 100%
rename from application/vlc-android/res/values-v19/styles.xml
rename to application/resources/src/main/res/values-v19/styles.xml
diff --git a/application/vlc-android/res/values-v21/styles.xml b/application/resources/src/main/res/values-v21/styles.xml
similarity index 100%
rename from application/vlc-android/res/values-v21/styles.xml
rename to application/resources/src/main/res/values-v21/styles.xml
diff --git a/application/vlc-android/res/values-v23/styles.xml b/application/resources/src/main/res/values-v23/styles.xml
similarity index 100%
rename from application/vlc-android/res/values-v23/styles.xml
rename to application/resources/src/main/res/values-v23/styles.xml
diff --git a/application/vlc-android/res/values-v27/styles.xml b/application/resources/src/main/res/values-v27/styles.xml
similarity index 100%
rename from application/vlc-android/res/values-v27/styles.xml
rename to application/resources/src/main/res/values-v27/styles.xml
diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle
index 2fec2ab67..07e92504d 100644
--- a/application/vlc-android/build.gradle
+++ b/application/vlc-android/build.gradle
@@ -161,7 +161,6 @@ 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"
@@ -181,8 +180,6 @@ 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



More information about the Android mailing list