Removed deprecated kotlin-android-extensions

app/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-parcelize'
 
 android {
     compileSdkVersion 33

app/src/main/java/com/cappielloantonio/play/model/Chronology.kt

@@ -7,7 +7,7 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.cappielloantonio.play.subsonic.models.Child
 import com.cappielloantonio.play.util.Preferences
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.util.*
 
 @Keep

app/src/main/java/com/cappielloantonio/play/model/Download.kt

@@ -5,7 +5,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.cappielloantonio.play.subsonic.models.Child
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize

app/src/main/java/com/cappielloantonio/play/model/Queue.kt

@@ -5,7 +5,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.cappielloantonio.play.subsonic.models.Child
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize

app/src/main/java/com/cappielloantonio/play/model/RecentSearch.kt

@@ -5,7 +5,7 @@ import androidx.annotation.Keep
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize

app/src/main/java/com/cappielloantonio/play/model/Server.kt

@@ -5,7 +5,7 @@ import androidx.annotation.Keep
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize

app/src/main/java/com/cappielloantonio/play/subsonic/base/Version.java

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
 
 public class Version implements Comparable<Version> {
 
-    private static final String VERSION_PATTERN = "[0-9]+(\\.[0-9]+)*";
+    private static final String VERSION_PATTERN = "\\d+(\\.\\d+)*";
     private final String versionString;
 
     public static Version of(String versionString) {

app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumID3.kt

@@ -2,7 +2,7 @@ package com.cappielloantonio.play.subsonic.models
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.util.*
 
 @Parcelize

app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumWithSongsID3.kt

@@ -2,7 +2,7 @@ package com.cappielloantonio.play.subsonic.models
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class AlbumWithSongsID3 : AlbumID3(), Parcelable {

app/src/main/java/com/cappielloantonio/play/subsonic/models/Artist.kt

@@ -3,69 +3,9 @@ package com.cappielloantonio.play.subsonic.models
 import java.time.LocalDateTime
 
 class Artist {
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var id: String? = null
-    /**
-     * Gets the value of the name property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the name property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var name: String? = null
-    /**
-     * Gets the value of the starred property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the starred property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var starred: LocalDateTime? = null
-    /**
-     * Gets the value of the userRating property.
-     *
-     * @return possible object is
-     * [Integer]
-     */
-    /**
-     * Sets the value of the userRating property.
-     *
-     * @param value allowed object is
-     * [Integer]
-     */
     var userRating: Int? = null
-    /**
-     * Gets the value of the averageRating property.
-     *
-     * @return possible object is
-     * [Double]
-     */
-    /**
-     * Sets the value of the averageRating property.
-     *
-     * @param value allowed object is
-     * [Double]
-     */
     var averageRating: Double? = null
 }

app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistID3.kt

@@ -2,7 +2,7 @@ package com.cappielloantonio.play.subsonic.models
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.util.*
 
 @Parcelize

app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistWithAlbumsID3.kt

@@ -2,7 +2,7 @@ package com.cappielloantonio.play.subsonic.models
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class ArtistWithAlbumsID3 : ArtistID3(), Parcelable {

app/src/main/java/com/cappielloantonio/play/subsonic/models/AudioTrack.kt

@@ -1,43 +1,7 @@
 package com.cappielloantonio.play.subsonic.models
 
 class AudioTrack {
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var id: String? = null
-    /**
-     * Gets the value of the name property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the name property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var name: String? = null
-    /**
-     * Gets the value of the languageCode property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the languageCode property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var languageCode: String? = null
 }

app/src/main/java/com/cappielloantonio/play/subsonic/models/Bookmark.kt

@@ -3,76 +3,10 @@ package com.cappielloantonio.play.subsonic.models
 import java.time.LocalDateTime
 
 class Bookmark {
-    /**
-     * Gets the value of the entry property.
-     *
-     * @return possible object is
-     * [Child]
-     */
-    /**
-     * Sets the value of the entry property.
-     *
-     * @param value allowed object is
-     * [Child]
-     */
     var entry: Child? = null
-    /**
-     * Gets the value of the position property.
-     */
-    /**
-     * Sets the value of the position property.
-     */
     var position: Long = 0
-    /**
-     * Gets the value of the username property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the username property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var username: String? = null
-    /**
-     * Gets the value of the comment property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the comment property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var comment: String? = null
-    /**
-     * Gets the value of the created property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the created property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var created: LocalDateTime? = null
-    /**
-     * Gets the value of the changed property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the changed property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var changed: LocalDateTime? = null
 }

app/src/main/java/com/cappielloantonio/play/subsonic/models/Captions.kt

@@ -1,30 +1,6 @@
 package com.cappielloantonio.play.subsonic.models
 
 class Captions {
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var id: String? = null
-    /**
-     * Gets the value of the name property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the name property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var name: String? = null
 }

app/src/main/java/com/cappielloantonio/play/subsonic/models/ChatMessage.kt

@@ -1,37 +1,7 @@
 package com.cappielloantonio.play.subsonic.models
 
 class ChatMessage {
-    /**
-     * Gets the value of the username property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the username property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var username: String? = null
-    /**
-     * Gets the value of the time property.
-     */
-    /**
-     * Sets the value of the time property.
-     */
     var time: Long = 0
-    /**
-     * Gets the value of the message property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the message property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var message: String? = null
 }

app/src/main/java/com/cappielloantonio/play/subsonic/models/Child.kt

@@ -4,7 +4,7 @@ import android.os.Parcelable
 import androidx.room.ColumnInfo
 import androidx.room.PrimaryKey
 import com.google.gson.annotations.SerializedName
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.util.*
 
 @Parcelize

app/src/main/java/com/cappielloantonio/play/subsonic/models/Directory.kt

@@ -3,126 +3,12 @@ package com.cappielloantonio.play.subsonic.models
 import java.time.LocalDateTime
 
 class Directory {
-    protected var children: List<Child>? = null
+    var children: List<Child>? = null
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var id: String? = null
-    /**
-     * Gets the value of the parentId property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the parentId property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var parentId: String? = null
-    /**
-     * Gets the value of the name property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the name property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var name: String? = null
-    /**
-     * Gets the value of the starred property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the starred property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var starred: LocalDateTime? = null
-    /**
-     * Gets the value of the userRating property.
-     *
-     * @return possible object is
-     * [Integer]
-     */
-    /**
-     * Sets the value of the userRating property.
-     *
-     * @param value allowed object is
-     * [Integer]
-     */
     var userRating: Int? = null
-    /**
-     * Gets the value of the averageRating property.
-     *
-     * @return possible object is
-     * [Double]
-     */
-    /**
-     * Sets the value of the averageRating property.
-     *
-     * @param value allowed object is
-     * [Double]
-     */
     var averageRating: Double? = null
-    /**
-     * Gets the value of the playCount property.
-     *
-     * @return possible object is
-     * [Long]
-     */
-    /**
-     * Sets the value of the playCount property.
-     *
-     * @param value allowed object is
-     * [Long]
-     */
     var playCount: Long? = null
-
-    /**
-     * Gets the value of the children property.
-     *
-     *
-     *
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the children property.
-     *
-     *
-     *
-     * For example, to add a new item, do as follows:
-     * <pre>
-     * getchildren().add(newItem);
-    </pre> *
-     *
-     *
-     *
-     *
-     * Objects of the following type(s) are allowed in the list
-     * [Child]
-     */
-    fun getchildren(): List<Child>? {
-        if (children == null) {
-            children = ArrayList()
-        }
-        return children
-    }
 }

app/src/main/java/com/cappielloantonio/play/subsonic/models/Genre.kt

@@ -2,7 +2,7 @@ package com.cappielloantonio.play.subsonic.models
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class Genre : Parcelable {

app/src/main/java/com/cappielloantonio/play/subsonic/models/InternetRadioStation.kt

@@ -1,56 +1,8 @@
 package com.cappielloantonio.play.subsonic.models
 
 class InternetRadioStation {
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var id: String? = null
-    /**
-     * Gets the value of the name property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the name property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var name: String? = null
-    /**
-     * Gets the value of the streamUrl property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the streamUrl property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var streamUrl: String? = null
-    /**
-     * Gets the value of the homePageUrl property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the homePageUrl property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var homePageUrl: String? = null
 }

app/src/main/java/com/cappielloantonio/play/subsonic/models/JukeboxStatus.kt

@@ -1,38 +1,8 @@
 package com.cappielloantonio.play.subsonic.models
 
 open class JukeboxStatus {
-    /**
-     * Gets the value of the currentIndex property.
-     */
-    /**
-     * Sets the value of the currentIndex property.
-     */
     var currentIndex = 0
-    /**
-     * Gets the value of the playing property.
-     */
-    /**
-     * Sets the value of the playing property.
-     */
     var isPlaying = false
-    /**
-     * Gets the value of the gain property.
-     */
-    /**
-     * Sets the value of the gain property.
-     */
     var gain = 0f
-    /**
-     * Gets the value of the position property.
-     *
-     * @return possible object is
-     * [Integer]
-     */
-    /**
-     * Sets the value of the position property.
-     *
-     * @param value allowed object is
-     * [Integer]
-     */
     var position: Int? = null
 }

app/src/main/java/com/cappielloantonio/play/subsonic/models/License.kt

@@ -3,50 +3,8 @@ package com.cappielloantonio.play.subsonic.models
 import java.time.LocalDateTime
 
 class License {
-    /**
-     * Gets the value of the valid property.
-     */
-    /**
-     * Sets the value of the valid property.
-     */
     var isValid = false
-    /**
-     * Gets the value of the email property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the email property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var email: String? = null
-    /**
-     * Gets the value of the licenseExpires property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the licenseExpires property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var licenseExpires: LocalDateTime? = null
-    /**
-     * Gets the value of the trialExpires property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the trialExpires property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var trialExpires: LocalDateTime? = null
 }

app/src/main/java/com/cappielloantonio/play/subsonic/models/NowPlayingEntry.kt

@@ -1,7 +1,7 @@
 package com.cappielloantonio.play.subsonic.models
 
 import com.google.gson.annotations.SerializedName
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class NowPlayingEntry(

app/src/main/java/com/cappielloantonio/play/subsonic/models/Playlist.kt

@@ -6,7 +6,7 @@ import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.PrimaryKey
 import com.google.gson.annotations.SerializedName
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.util.*
 
 @Parcelize

app/src/main/java/com/cappielloantonio/play/subsonic/models/PlaylistWithSongs.kt

@@ -2,7 +2,7 @@ package com.cappielloantonio.play.subsonic.models
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class PlaylistWithSongs(

app/src/main/java/com/cappielloantonio/play/subsonic/models/PodcastChannel.kt

@@ -2,7 +2,7 @@ package com.cappielloantonio.play.subsonic.models
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class PodcastChannel : Parcelable {

app/src/main/java/com/cappielloantonio/play/subsonic/models/PodcastEpisode.kt

@@ -2,7 +2,7 @@ package com.cappielloantonio.play.subsonic.models
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.util.*
 
 @Parcelize

app/src/main/java/com/cappielloantonio/play/subsonic/models/SimilarArtistID3.kt

@@ -1,7 +1,7 @@
 package com.cappielloantonio.play.subsonic.models
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class SimilarArtistID3 : ArtistID3(), Parcelable

app/src/main/java/com/cappielloantonio/play/subsonic/models/VideoConversion.kt

@@ -1,43 +1,7 @@
 package com.cappielloantonio.play.subsonic.models
 
 class VideoConversion {
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is
-     * [String]
-     */
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is
-     * [String]
-     */
     var id: String? = null
-    /**
-     * Gets the value of the bitRate property.
-     *
-     * @return possible object is
-     * [Integer]
-     */
-    /**
-     * Sets the value of the bitRate property.
-     *
-     * @param value allowed object is
-     * [Integer]
-     */
     var bitRate: Int? = null
-    /**
-     * Gets the value of the audioTrackId property.
-     *
-     * @return possible object is
-     * [Integer]
-     */
-    /**
-     * Sets the value of the audioTrackId property.
-     *
-     * @param value allowed object is
-     * [Integer]
-     */
     var audioTrackId: Int? = null
 }

app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java

@@ -15,7 +15,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 public class MusicUtil {
@@ -122,7 +121,7 @@ public class MusicUtil {
                     .replaceAll(""", "\"")
                     .replaceAll("'", "'")
                     .replaceAll("&", "'")
-                    .replaceAll("<a[\\s]+([^>]+)>((?:.(?!</a>))*.)</a>", "");
+                    .replaceAll("<a\\s+([^>]+)>((?:.(?!</a>))*.)</a>", "");
         }
 
         return "";
@@ -140,18 +139,6 @@ public class MusicUtil {
         return "";
     }
 
-    public static String normalizedArtistName(String string) {
-        if (string != null) {
-            if (string.toLowerCase().contains(" feat."))
-                return Pattern.compile(" feat.", Pattern.CASE_INSENSITIVE).split(string)[0].trim();
-            else if (string.toLowerCase().contains(" featuring"))
-                return Pattern.compile(" featuring", Pattern.CASE_INSENSITIVE).split(string)[0].trim();
-            else return string;
-        }
-
-        return "";
-    }
-
     public static List<String> getReadableStrings(List<String> strings) {
         List<String> readableStrings = new ArrayList<>();
 

build.gradle

@@ -1,4 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
         google()
@@ -6,10 +5,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }