- reference resources matching build 966

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10'
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Apr 22 21:25:44 MSK 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

poweramp_api_example/build.gradle

@@ -21,6 +21,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+    namespace 'com.maxmpz.poweramp.apiexample'
 }
 
 

poweramp_api_example/src/main/AndroidManifest.xml

@@ -2,8 +2,7 @@
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	package="com.maxmpz.poweramp.apiexample"
-	android:versionCode="1"
+    android:versionCode="1"
 	android:versionName="1.0">
 
 	<application

poweramp_lyrics_plugin_example/build.gradle

@@ -21,6 +21,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.maxmpz.poweramplyricspluginexample'
 }
 
 dependencies {

poweramp_lyrics_plugin_example/src/main/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	package="com.maxmpz.poweramplyricspluginexample"
-	>
+	xmlns:tools="http://schemas.android.com/tools">
 
 	<application
 		android:allowBackup="false"

poweramp_provider_example/build.gradle

@@ -21,6 +21,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.maxmpz.powerampproviderexample'
 }
 
 dependencies {

poweramp_provider_example/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	package="com.maxmpz.powerampproviderexample">
+	xmlns:tools="http://schemas.android.com/tools">
 
 	<application
 		android:allowBackup="false"

poweramp_skin_sample/build.gradle

@@ -18,33 +18,20 @@ android {
         }
     }
 
-    lintOptions {
-        disable "ResAuto", "MissingTranslation", "OnClick", "ExtraTranslation"
 
-    }
-
-    aaptOptions {
-        def localProps = new Properties()
-        localProps.load(rootProject.file("local.properties").newDataInputStream())
-        def paResources = localProps['poweramp.apk'] ?: "Poweramp-build-953-resources.zip"
-        println "Using $paResources PA resources"
-
-        additionalParameters "--emit-ids", "${projectDir}/stable-ids.txt",
-                                "--package-id", "0x80",
-                                "-I", "${projectDir}/../${paResources}"
-        if(project.file("stable-ids.txt").exists()) {
-            println "Got stable-ids OK"
-            additionalParameters "--stable-ids", "${projectDir}/stable-ids.txt"
-        } else {
-            println "WARNING: no stable-ids.txt specified"
-        }
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.poweramp.v3.sampleskin'
+    androidResources {
+        additionalParameters '--emit-ids', "$projectDir/stable-ids.txt", '--package-id', '0x80', '-I', "$projectDir/../$aaptOptions.paResources"
+    }
+    lint {
+        disable 'ResAuto', 'MissingTranslation', 'OnClick', 'ExtraTranslation'
+    }
 }
 
 dependencies {
-    implementation "androidx.appcompat:appcompat-resources:1.4.1"
+    implementation "androidx.appcompat:appcompat-resources:1.6.1"
 }

poweramp_skin_sample/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	package="com.poweramp.v3.sampleskin">
+	xmlns:tools="http://schemas.android.com/tools">
 
 	<!-- Queries element to support new package visibility rules for target sdk=30 and Android 11:
 	     https://developer.android.com/about/versions/11/privacy/package-visibility -->

poweramp_skin_sdk/reference_resources/color-sw2dp/eq_linear_knob_text_color_selector.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false" android:color="?colorTextDisabled" />
+	<item android:state_enabled="false" android:color="?colorTextDisabledSecondary" />
 	<item android:color="?android:textColorPrimary" />
 </selector>
 

poweramp_skin_sdk/reference_resources/color-sw2dp/eq_value_text_color_selector.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false" android:color="#0000" />
-	<item android:color="?android:textColorSecondary" />
+	<item android:state_enabled="false" android:color="?colorTextDisabled" />
+	<item android:color="?android:textColorSecondary" /><!-- Also for state_locked -->
 </selector>
 

poweramp_skin_sdk/reference_resources/drawable-sw1dp/ripple_with_check_selector.xml

@@ -10,7 +10,10 @@
 		<selector android:exitFadeDuration="250">
 			<item android:state_activated="true">
 				<bitmap android:src="@drawable/check_16dp" android:gravity="right|center_vertical" android:tint="?colorIconPrimary"/>
-			</item>	
+			</item>
+			<item android:state_checked="true">
+				<bitmap android:src="@drawable/check_16dp" android:gravity="right|center_vertical" android:tint="?colorIconPrimary"/>
+			</item>
 		</selector>
 	</item>
 </ripple>

poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_back_10s_round.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 	>
 	<item>
 		<shape android:shape="oval">

poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_ff_round.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 >
 	<item>
 		<shape android:shape="oval">

poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_forward_10s_round.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 	>
 	<item>
 		<shape android:shape="oval">

poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_next_cat_round.xml

@@ -6,7 +6,7 @@
 <!-- NOTE: not using fill scaling for the buttons, they pretty much never scaled and size is defined
      by the appropriate style (e.g. TopSmallButton_size) -->
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 >
 	<item>
 		<shape android:shape="oval">

poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_pause_round.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 	android:effectColor="#0000"
 	>
 	<item>

poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_play_round_100dp.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 	android:effectColor="#0000"
 >
 	<item>

poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_prev_cat_round.xml

@@ -6,7 +6,7 @@
 <!-- NOTE: not using fill scaling for the buttons, they pretty much never scaled and size is defined
      by the appropriate style (e.g. TopSmallButton_size) -->
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 >
 	<item>
 		<shape android:shape="oval">

poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_rw_round.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 >
 	<item>
 		<shape android:shape="oval">

poweramp_skin_sdk/reference_resources/drawable-sw2dp/alpha_strict_rounded_large.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<corners android:radius="?corners_large"/>
+	<solid android:color="?colorBgPrimaryStrictAlpha"/>
+</shape>

poweramp_skin_sdk/reference_resources/drawable-sw2dp/checkable_non_tr_lighter_rounded_large.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This one has non-transparent popup background -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_checked="true">
+		<ripple android:color="?colorInverse">
+			<item android:id="@android:id/mask" android:drawable="@drawable/rounded_large" />
+			<item>
+				<shape>
+					<corners android:radius="?corners_large"/>
+					<solid android:color="?colorBgCheckedLight"/>
+				</shape>
+			</item>
+		</ripple>
+	</item>
+
+	<item>
+		<ripple android:color="?colorPrimary">
+			<item android:id="@android:id/mask" android:drawable="@drawable/rounded_large" />
+			<item>
+				<shape>
+					<corners android:radius="?corners_large"/>
+					<stroke android:color="?colorStroke" android:width="1.25dp"/>
+					<solid android:color="?colorBgPrimary"/>
+				</shape>
+			</item>
+		</ripple>
+	</item>
+</selector>

poweramp_skin_sdk/reference_resources/drawable-sw2dp/knob_hole_selector.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010-2022 Maksim Petrov
+Copyright (C) 2010-2023 Maksim Petrov
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted for themes, skins, widgets, plugins, applications and other software
@@ -21,7 +21,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <!-- NOTE: can't change size of drawable, thus, emulating bolder hole when pressed with invisile (#0000) stroke.
      Also, width/height=3dp defines min size for appropriate axis. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:w="http://schemas.android.com/apk/res-auto"
 	android:exitFadeDuration="300"
 >
 	<item android:state_enabled="false">
@@ -33,7 +33,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 			<stroke android:color="#0000" android:width="0dp"/>
 		</shape>
 	</item>
-
+
+	<item w:state_locked="true">
+		<shape>
+			<size android:width="3dp" android:height="3dp"/>
+			<padding android:left="18dp" android:right="18dp" android:top="20dp" android:bottom="20dp"/>
+			<corners android:radius="3dp"/>
+			<solid android:color="?colorKnobHoleDisabled"/>
+			<stroke android:color="#0000" android:width="0dp"/>
+		</shape>
+	</item>
+
 	<item android:state_pressed="true">
 		<shape>
 			<size android:width="3dp" android:height="3dp"/>