Merge pull request #85 from solrudev/develop

0.8.0
solrudev · Oct 25, 2024 · 75f834b · 75f834b
2 parents 69e9fd9 + 971e000
commit 75f834b
Show file tree

Hide file tree

Showing 58 changed files with 1,580 additions and 329 deletions.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ Ackpine depends on Jetpack libraries, so it's necessary to declare the `google()
 
 ```kotlin
 dependencies {
-    val ackpineVersion = "0.7.6"
+    val ackpineVersion = "0.8.0"
     implementation("ru.solrudev.ackpine:ackpine-core:$ackpineVersion")
 
     // optional - Kotlin extensions and Coroutines support

diff --git a/ackpine-core/api/ackpine-core.api b/ackpine-core/api/ackpine-core.api
@@ -458,27 +458,31 @@ public abstract interface class ru/solrudev/ackpine/session/parameters/Confirmat
 	public abstract fun getNotificationData ()Lru/solrudev/ackpine/session/parameters/NotificationData;
 }
 
+public abstract interface class ru/solrudev/ackpine/session/parameters/DrawableId : java/io/Serializable {
+	public abstract fun drawableId ()I
+}
+
 public final class ru/solrudev/ackpine/session/parameters/NotificationData {
 	public static final field Companion Lru/solrudev/ackpine/session/parameters/NotificationData$Companion;
 	public static final field DEFAULT Lru/solrudev/ackpine/session/parameters/NotificationData;
-	public synthetic fun <init> (ILru/solrudev/ackpine/session/parameters/NotificationString;Lru/solrudev/ackpine/session/parameters/NotificationString;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Lru/solrudev/ackpine/session/parameters/DrawableId;Lru/solrudev/ackpine/resources/ResolvableString;Lru/solrudev/ackpine/resources/ResolvableString;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getContentText ()Lru/solrudev/ackpine/session/parameters/NotificationString;
-	public final fun getIcon ()I
-	public final fun getTitle ()Lru/solrudev/ackpine/session/parameters/NotificationString;
+	public final fun getContentText ()Lru/solrudev/ackpine/resources/ResolvableString;
+	public final fun getIcon ()Lru/solrudev/ackpine/session/parameters/DrawableId;
+	public final fun getTitle ()Lru/solrudev/ackpine/resources/ResolvableString;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
 public final class ru/solrudev/ackpine/session/parameters/NotificationData$Builder {
 	public fun <init> ()V
 	public final fun build ()Lru/solrudev/ackpine/session/parameters/NotificationData;
-	public final fun getContentText ()Lru/solrudev/ackpine/session/parameters/NotificationString;
-	public final fun getIcon ()I
-	public final fun getTitle ()Lru/solrudev/ackpine/session/parameters/NotificationString;
-	public final fun setContentText (Lru/solrudev/ackpine/session/parameters/NotificationString;)Lru/solrudev/ackpine/session/parameters/NotificationData$Builder;
-	public final fun setIcon (I)Lru/solrudev/ackpine/session/parameters/NotificationData$Builder;
-	public final fun setTitle (Lru/solrudev/ackpine/session/parameters/NotificationString;)Lru/solrudev/ackpine/session/parameters/NotificationData$Builder;
+	public final fun getContentText ()Lru/solrudev/ackpine/resources/ResolvableString;
+	public final fun getIcon ()Lru/solrudev/ackpine/session/parameters/DrawableId;
+	public final fun getTitle ()Lru/solrudev/ackpine/resources/ResolvableString;
+	public final fun setContentText (Lru/solrudev/ackpine/resources/ResolvableString;)Lru/solrudev/ackpine/session/parameters/NotificationData$Builder;
+	public final fun setIcon (Lru/solrudev/ackpine/session/parameters/DrawableId;)Lru/solrudev/ackpine/session/parameters/NotificationData$Builder;
+	public final fun setTitle (Lru/solrudev/ackpine/resources/ResolvableString;)Lru/solrudev/ackpine/session/parameters/NotificationData$Builder;
 }
 
 public final class ru/solrudev/ackpine/session/parameters/NotificationData$Companion {

diff --git a/ackpine-core/build.gradle.kts b/ackpine-core/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ilya Fomichev
+ * Copyright (C) 2023-2024 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@ dependencies {
 	api(androidx.annotation)
 	api(androidx.startup)
 	api(libs.listenablefuture)
+	api(projects.ackpineResources)
 	implementation(projects.ackpineRuntime)
 	implementation(androidx.concurrent.futures.core)
 	implementation(androidx.core.ktx)

diff --git a/ackpine-core/consumer-rules.pro b/ackpine-core/consumer-rules.pro
@@ -5,6 +5,8 @@
 -keep class ru.solrudev.ackpine.session.parameters.Empty { *; }
 -keep class ru.solrudev.ackpine.session.parameters.Raw { *; }
 -keep class ru.solrudev.ackpine.session.parameters.Resource { *; }
+-keep interface ru.solrudev.ackpine.session.parameters.DrawableId { *; }
+-keep class * implements ru.solrudev.ackpine.session.parameters.DrawableId { *; }
 -keep class ru.solrudev.ackpine.installer.InstallFailure { *; }
 -keep class ru.solrudev.ackpine.installer.InstallFailure$* { *; }
 -keep class ru.solrudev.ackpine.uninstaller.UninstallFailure { *; }