mirror of
https://github.com/Michatec/Radio.git
synced 2026-03-31 23:46:28 +02:00
Compare commits
36 Commits
14.1
...
c3c2ccfdd9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c3c2ccfdd9 | ||
|
|
38fb4d162b | ||
|
|
3c3c18104b | ||
|
|
4e1ee7d6a7 | ||
|
|
64ba020eae | ||
|
|
b35d7bd67c | ||
|
|
d3dd098639 | ||
|
|
a8f6c7f946 | ||
|
|
765ccc9250 | ||
|
|
c9d6cf27ec | ||
|
|
7b7579d416 | ||
|
|
d452d7f7ee | ||
|
|
2bb3d22cab | ||
|
|
b4ed3e107c | ||
|
|
ef843b601a | ||
|
|
219d54f4e4 | ||
|
|
c8a39bf2d7 | ||
|
|
81ff920c2c | ||
|
|
f4a5209e14 | ||
|
|
c7b7bdcbed | ||
|
|
eae9176f21 | ||
|
|
b3a833fa44 | ||
|
|
35a8ed46ff | ||
|
|
fd18943878 | ||
|
|
094fb508e2 | ||
|
|
874cf1eb39 | ||
|
|
211cb387ad | ||
|
|
5481a06343 | ||
| fbafcb9773 | |||
| 27c405fd58 | |||
|
|
c2cba26c66 | ||
|
|
9224e45b18 | ||
|
|
90164d7e6a | ||
|
|
45e208e7a9 | ||
|
|
1d040e3edc | ||
|
|
efe17bc82b |
@@ -1,7 +1,7 @@
|
||||
The MIT License (MIT)
|
||||
=====================
|
||||
|
||||
Copyright (c) 2025 - Michatec
|
||||
Copyright (c) 2026 - Michatec
|
||||
--------------------------------
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
|
||||
@@ -19,8 +19,8 @@ android {
|
||||
applicationId 'com.michatec.radio'
|
||||
minSdk 28
|
||||
targetSdk 36
|
||||
versionCode 141
|
||||
versionName '14.1'
|
||||
versionCode 142
|
||||
versionName '14.2'
|
||||
resourceConfigurations += ['en', 'de', 'el', 'nl', 'pl', 'ru','uk', 'ja', 'da', 'fr']
|
||||
}
|
||||
|
||||
@@ -59,19 +59,21 @@ dependencies {
|
||||
implementation 'com.google.code.gson:gson:2.13.2'
|
||||
|
||||
// AndroidX Stuff //
|
||||
implementation 'androidx.core:core-ktx:1.17.0'
|
||||
implementation 'androidx.activity:activity-ktx:1.12.4'
|
||||
implementation 'androidx.core:core-ktx:1.18.0'
|
||||
implementation 'androidx.activity:activity-ktx:1.13.0'
|
||||
implementation 'androidx.palette:palette-ktx:1.0.0'
|
||||
implementation 'androidx.preference:preference-ktx:1.2.1'
|
||||
implementation 'androidx.media:media:1.7.1'
|
||||
implementation 'androidx.media3:media3-exoplayer:1.9.2'
|
||||
implementation 'androidx.media3:media3-exoplayer-hls:1.9.2'
|
||||
implementation 'androidx.media3:media3-session:1.9.2'
|
||||
implementation 'androidx.media3:media3-datasource-okhttp:1.9.2'
|
||||
implementation 'androidx.media3:media3-exoplayer:1.9.3'
|
||||
implementation 'androidx.media3:media3-exoplayer-hls:1.9.3'
|
||||
implementation 'androidx.media3:media3-session:1.9.3'
|
||||
implementation 'androidx.media3:media3-datasource-okhttp:1.9.3'
|
||||
implementation 'androidx.navigation:navigation-fragment-ktx:2.9.7'
|
||||
implementation 'androidx.navigation:navigation-ui-ktx:2.9.7'
|
||||
implementation 'androidx.work:work-runtime-ktx:2.11.1'
|
||||
|
||||
implementation 'com.github.woheller69:FreeDroidWarn:V1.10'
|
||||
|
||||
// Volley HTTP request //
|
||||
implementation 'com.android.volley:volley:1.2.1'
|
||||
implementation 'androidx.compose.material3:material3:1.4.0'
|
||||
|
||||
@@ -25,7 +25,7 @@ import androidx.navigation.ui.navigateUp
|
||||
import com.michatec.radio.helpers.AppThemeHelper
|
||||
import com.michatec.radio.helpers.FileHelper
|
||||
import com.michatec.radio.helpers.PreferencesHelper
|
||||
|
||||
import org.woheller69.freeDroidWarn.FreeDroidWarn;
|
||||
|
||||
/*
|
||||
* MainActivity class
|
||||
@@ -39,6 +39,9 @@ class MainActivity : AppCompatActivity() {
|
||||
/* Overrides onCreate from AppCompatActivity */
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
// Free Android
|
||||
FreeDroidWarn.showWarningOnUpgrade(this, BuildConfig.VERSION_CODE);
|
||||
|
||||
// set up views
|
||||
setContentView(R.layout.activity_main)
|
||||
@@ -60,6 +63,16 @@ class MainActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
|
||||
/* Overrides onResume from AppCompatActivity */
|
||||
override fun onResume() {
|
||||
try {
|
||||
super.onResume()
|
||||
} catch (_: ClassCastException) {
|
||||
// Do nothing
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Overrides onSupportNavigateUp from AppCompatActivity */
|
||||
override fun onSupportNavigateUp(): Boolean {
|
||||
// Taken from: https://developer.android.com/guide/navigation/navigation-ui#action_bar
|
||||
|
||||
@@ -400,19 +400,19 @@ class PlayerService : MediaLibraryService() {
|
||||
customLayout: ImmutableList<CommandButton>,
|
||||
showPauseButton: Boolean
|
||||
): ImmutableList<CommandButton> {
|
||||
val seekToPreviousCommandButton = CommandButton.Builder()
|
||||
val seekToPreviousCommandButton = CommandButton.Builder(CommandButton.ICON_UNDEFINED)
|
||||
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
|
||||
.setIconResId(R.drawable.ic_notification_skip_to_previous_36dp)
|
||||
.setCustomIconResId(R.drawable.ic_notification_skip_to_previous_36dp)
|
||||
.setEnabled(true)
|
||||
.build()
|
||||
val playCommandButton = CommandButton.Builder()
|
||||
val playCommandButton = CommandButton.Builder(CommandButton.ICON_UNDEFINED)
|
||||
.setPlayerCommand(Player.COMMAND_PLAY_PAUSE)
|
||||
.setIconResId(if (player.isPlaying) R.drawable.ic_notification_stop_36dp else R.drawable.ic_notification_play_36dp)
|
||||
.setCustomIconResId(if (player.isPlaying) R.drawable.ic_notification_stop_36dp else R.drawable.ic_notification_play_36dp)
|
||||
.setEnabled(true)
|
||||
.build()
|
||||
val seekToNextCommandButton = CommandButton.Builder()
|
||||
val seekToNextCommandButton = CommandButton.Builder(CommandButton.ICON_UNDEFINED)
|
||||
.setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT)
|
||||
.setIconResId(R.drawable.ic_notification_skip_to_next_36dp)
|
||||
.setCustomIconResId(R.drawable.ic_notification_skip_to_next_36dp)
|
||||
.setEnabled(true)
|
||||
.build()
|
||||
val commandButtons: MutableList<CommandButton> = mutableListOf(
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
|
||||
plugins {
|
||||
id 'com.android.application' version '9.0.1' apply false
|
||||
id 'com.android.library' version '9.0.1' apply false
|
||||
id 'org.jetbrains.kotlin.android' version "2.3.10" apply false
|
||||
id 'com.android.application' version '9.1.0' apply false
|
||||
id 'com.android.library' version '9.1.0' apply false
|
||||
id 'org.jetbrains.kotlin.android' version "2.3.20" apply false
|
||||
}
|
||||
|
||||
tasks.register('clean', Delete) {
|
||||
delete rootProject.buildDir()
|
||||
}
|
||||
}
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
2
gradlew
vendored
2
gradlew
vendored
@@ -57,7 +57,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
|
||||
@@ -3,13 +3,19 @@ pluginManagement {
|
||||
google()
|
||||
mavenCentral()
|
||||
gradlePluginPortal()
|
||||
maven { url 'https://jitpack.io' }
|
||||
}
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
|
||||
}
|
||||
dependencyResolutionManagement {
|
||||
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
maven { url 'https://jitpack.io' }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user