From 300a806d81385f1aff6125255a675e94aa4d7b76 Mon Sep 17 00:00:00 2001
From: yattoz <12408848+yattoz@users.noreply.github.com>
Date: Tue, 22 Feb 2022 11:55:10 +0900
Subject: [PATCH 1/6] updated gradle
---
app/build.gradle | 1 -
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index e7ea61a..c989b8d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,7 +17,6 @@ configurations.all {
android {
compileSdkVersion 30
- buildToolsVersion "30.0.1"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
diff --git a/build.gradle b/build.gradle
index d69ad16..6f110b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.0.1'
+ classpath 'com.android.tools.build:gradle:7.1.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3cbf824..be1fbf0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
From c5c4bdd8388a5801d57c72c4aab19ce0ca69a988 Mon Sep 17 00:00:00 2001
From: yattoz <12408848+yattoz@users.noreply.github.com>
Date: Tue, 22 Feb 2022 12:27:03 +0900
Subject: [PATCH 2/6] rollback change related to alarm playback, fix stutter
when changing tab
---
app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt b/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt
index d89e00e..1132477 100644
--- a/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt
+++ b/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt
@@ -514,6 +514,10 @@ class RadioService : MediaBrowserServiceCompat() {
if (result != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
return
}
+ if (mediaSession.controller.playbackState.state == PlaybackStateCompat.STATE_PLAYING && !isRinging && isAlarmStopped)
+ {
+ return //nothing to do here
+ }
PlayerStore.instance.playbackState.value = PlaybackStateCompat.STATE_PLAYING
@@ -530,6 +534,7 @@ class RadioService : MediaBrowserServiceCompat() {
}
// START PLAYBACK, LET'S ROCK
+ player.playWhenReady = true
nowPlayingNotification.update(this, isUpdatingNotificationButton = true, isRinging = isRinging)
playbackStateBuilder.setState(
@@ -539,7 +544,6 @@ class RadioService : MediaBrowserServiceCompat() {
SystemClock.elapsedRealtime()
)
mediaSession.setPlaybackState(playbackStateBuilder.build())
- player.playWhenReady = true
//[REMOVE LOG CALLS]Log.d(tag, radioTag + "begin playing")
}
From c41ce1d5509178f23ce8310402e13825eb9b41bf Mon Sep 17 00:00:00 2001
From: yattoz <12408848+yattoz@users.noreply.github.com>
Date: Sun, 13 Mar 2022 10:18:47 +0900
Subject: [PATCH 3/6] updated planning for 2022 (cf
https://tsumugi.forum-thalie.fr/?p=517 )
---
app/src/main/assets/planning_example.json | 30 ++++++++++++++++++-----
1 file changed, 24 insertions(+), 6 deletions(-)
diff --git a/app/src/main/assets/planning_example.json b/app/src/main/assets/planning_example.json
index 96ac5b8..68380a9 100644
--- a/app/src/main/assets/planning_example.json
+++ b/app/src/main/assets/planning_example.json
@@ -7,15 +7,33 @@
"hour_end": "7:00"
},
{
- "title": "Jeux Vidéos Matin",
- "periodicity": "1111100",
+ "title": "Tsumugi Rétro",
+ "periodicity": "1000000",
"hour_begin": "09:00",
- "hour_end": "10:30"
+ "hour_end": "12:00"
},
{
- "title": "Anime Matin",
- "periodicity": "1111100",
- "hour_begin": "10:30",
+ "title": "Tournant du Millénaire",
+ "periodicity": "0100000",
+ "hour_begin": "09:00",
+ "hour_end": "12:00"
+ },
+ {
+ "title": "Tsumugi Netpop",
+ "periodicity": "0010000",
+ "hour_begin": "09:00",
+ "hour_end": "12:00"
+ },
+ {
+ "title": "Tsumugi Moderne",
+ "periodicity": "0001000",
+ "hour_begin": "09:00",
+ "hour_end": "12:00"
+ },
+ {
+ "title": "Tsumugi Très Récent",
+ "periodicity": "0000100",
+ "hour_begin": "09:00",
"hour_end": "12:00"
},
{
From 63d18856f15c2e70fc79589fa947d7d1193f0d36 Mon Sep 17 00:00:00 2001
From: yattoz <12408848+yattoz@users.noreply.github.com>
Date: Sun, 13 Mar 2022 11:25:49 +0900
Subject: [PATCH 4/6] updated many dependencies
---
.idea/gradle.xml | 1 +
.idea/jarRepositories.xml | 5 ++++
.idea/misc.xml | 2 +-
app/build.gradle | 29 +++++++++++-------
app/src/main/AndroidManifest.xml | 16 +++++-----
.../tsumugi/preferences/AlarmFragment.kt | 30 +++++++++----------
build.gradle | 5 ++--
7 files changed, 52 insertions(+), 36 deletions(-)
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 526b4c2..bb80ebf 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
+