From d1fb81f615e8b4b8ace4e9fba01d37c981401ca5 Mon Sep 17 00:00:00 2001 From: yattoz <12408848+yattoz@users.noreply.github.com> Date: Sat, 7 Dec 2019 12:58:04 +0100 Subject: [PATCH] changed package name and some images --- .idea/.name | 1 - .idea/dictionaries/dict.xml | 9 --------- .idea/encodings.xml | 6 ------ app/build.gradle | 2 +- .../tsumugi}/ExampleInstrumentedTest.kt | 4 ++-- app/src/main/AndroidManifest.xml | 6 +++--- .../forum_thalie/tsumugi}/Actions.kt | 2 +- .../radio2 => fr/forum_thalie/tsumugi}/Async.kt | 4 ++-- .../forum_thalie/tsumugi}/BaseActivity.kt | 2 +- .../forum_thalie/tsumugi}/BaseNotification.kt | 4 ++-- .../tsumugi}/BootBroadcastReceiver.kt | 12 ++++++------ .../forum_thalie/tsumugi}/MainActivity.kt | 12 ++++++------ .../tsumugi}/NavigationExtensions.kt | 2 +- .../tsumugi}/NowPlayingNotification.kt | 6 +++--- .../forum_thalie/tsumugi}/ParametersActivity.kt | 4 ++-- .../forum_thalie/tsumugi}/RadioService.kt | 10 +++++----- .../forum_thalie/tsumugi}/Tickers.kt | 6 +++--- .../forum_thalie/tsumugi}/Values.kt | 4 ++-- .../forum_thalie/tsumugi}/alarm/RadioAlarm.kt | 10 +++++----- .../forum_thalie/tsumugi}/alarm/RadioSleeper.kt | 4 ++-- .../tsumugi}/playerstore/PlayerStore.kt | 4 ++-- .../forum_thalie/tsumugi}/playerstore/Song.kt | 2 +- .../tsumugi}/preferences/AlarmFragment.kt | 6 +++--- .../tsumugi}/preferences/CustomizeFragment.kt | 8 ++++---- .../preferences/MainPreferenceFragment.kt | 4 ++-- .../tsumugi}/preferences/SleepFragment.kt | 6 +++--- .../preferences/StreamerNotifServiceFragment.kt | 12 ++++++------ .../ServiceNotification.kt | 4 ++-- .../StreamerMonitorExtensions.kt | 8 ++++---- .../StreamerMonitorService.kt | 8 ++++---- .../StreamerNotification.kt | 4 ++-- .../streamerNotificationService/WorkerStore.kt | 6 +++--- .../tsumugi}/ui/chat/ChatFragment.kt | 4 ++-- .../tsumugi}/ui/chat/ChatViewModel.kt | 2 +- .../tsumugi}/ui/chat/WebViewChat.kt | 2 +- .../forum_thalie/tsumugi}/ui/news/News.kt | 2 +- .../tsumugi}/ui/news/NewsAdapter.kt | 4 ++-- .../tsumugi}/ui/news/NewsFragment.kt | 4 ++-- .../tsumugi}/ui/news/NewsViewModel.kt | 6 +++--- .../ui/nowplaying/NowPlayingFragment.kt | 10 +++++----- .../ui/nowplaying/NowPlayingViewModel.kt | 4 ++-- .../tsumugi}/ui/songs/SongsFragment.kt | 16 ++++++++-------- .../tsumugi}/ui/songs/SongsPagerAdapter.kt | 2 +- .../ui/songs/queuelp/LastPlayedFragment.kt | 6 +++--- .../tsumugi}/ui/songs/queuelp/QueueFragment.kt | 8 ++++---- .../tsumugi}/ui/songs/queuelp/SongAdaptater.kt | 10 +++++----- .../ui/songs/request/CooldownCalculator.kt | 2 +- .../ui/songs/request/FavoritesFragment.kt | 4 ++-- .../ui/songs/request/RequestFragment.kt | 4 ++-- .../ui/songs/request/RequestResponse.kt | 4 ++-- .../ui/songs/request/RequestSongAdapter.kt | 6 +++--- .../tsumugi}/ui/songs/request/Requestor.kt | 12 ++++++------ .../res/drawable-anydpi-v24/lollipop_logo.xml | 13 +++++++++++++ .../main/res/drawable-hdpi/lollipop_logo.png | Bin 0 -> 402 bytes .../main/res/drawable-mdpi/lollipop_logo.png | Bin 0 -> 318 bytes .../main/res/drawable-xhdpi/lollipop_logo.png | Bin 0 -> 494 bytes .../main/res/drawable-xxhdpi/lollipop_logo.png | Bin 0 -> 698 bytes app/src/main/res/drawable/actionbar_logo.9.png | Bin 14669 -> 0 bytes app/src/main/res/drawable/actionbar_logo.jpg | Bin 0 -> 13237 bytes .../res/drawable/ic_launcher_background.xml | 2 +- app/src/main/res/drawable/lollipop_logo.png | Bin 1687 -> 0 bytes app/src/main/res/drawable/news_bg.png | Bin 1747 -> 0 bytes app/src/main/res/drawable/splash_logo.jpg | Bin 0 -> 13237 bytes app/src/main/res/drawable/splash_logo.png | Bin 12637 -> 0 bytes app/src/main/res/navigation/navigation_chat.xml | 2 +- app/src/main/res/navigation/navigation_news.xml | 2 +- .../res/navigation/navigation_nowplaying.xml | 2 +- .../main/res/navigation/navigation_songs.xml | 2 +- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/strings.xml | 10 +++++----- app/src/main/res/xml/preferences.xml | 8 ++++---- .../forum_thalie/tsumugi}/ExampleUnitTest.kt | 2 +- build.gradle | 2 +- 73 files changed, 169 insertions(+), 172 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/dictionaries/dict.xml delete mode 100644 .idea/encodings.xml rename app/src/androidTest/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ExampleInstrumentedTest.kt (84%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/Actions.kt (90%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/Async.kt (95%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/BaseActivity.kt (98%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/BaseNotification.kt (96%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/BootBroadcastReceiver.kt (79%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/MainActivity.kt (96%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/NavigationExtensions.kt (99%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/NowPlayingNotification.kt (97%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ParametersActivity.kt (94%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/RadioService.kt (99%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/Tickers.kt (77%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/Values.kt (75%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/alarm/RadioAlarm.kt (93%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/alarm/RadioSleeper.kt (97%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/playerstore/PlayerStore.kt (99%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/playerstore/Song.kt (97%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/preferences/AlarmFragment.kt (98%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/preferences/CustomizeFragment.kt (94%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/preferences/MainPreferenceFragment.kt (91%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/preferences/SleepFragment.kt (91%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/preferences/StreamerNotifServiceFragment.kt (86%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/streamerNotificationService/ServiceNotification.kt (91%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/streamerNotificationService/StreamerMonitorExtensions.kt (94%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/streamerNotificationService/StreamerMonitorService.kt (96%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/streamerNotificationService/StreamerNotification.kt (91%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/streamerNotificationService/WorkerStore.kt (91%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/chat/ChatFragment.kt (95%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/chat/ChatViewModel.kt (86%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/chat/WebViewChat.kt (97%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/news/News.kt (86%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/news/NewsAdapter.kt (97%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/news/NewsFragment.kt (96%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/news/NewsViewModel.kt (93%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/nowplaying/NowPlayingFragment.kt (98%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/nowplaying/NowPlayingViewModel.kt (91%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/songs/SongsFragment.kt (88%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/songs/SongsPagerAdapter.kt (94%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/songs/queuelp/LastPlayedFragment.kt (95%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/songs/queuelp/QueueFragment.kt (91%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/songs/queuelp/SongAdaptater.kt (91%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/songs/request/CooldownCalculator.kt (97%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/songs/request/FavoritesFragment.kt (98%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/songs/request/RequestFragment.kt (97%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/songs/request/RequestResponse.kt (93%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/songs/request/RequestSongAdapter.kt (97%) rename app/src/main/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ui/songs/request/Requestor.kt (97%) create mode 100644 app/src/main/res/drawable-anydpi-v24/lollipop_logo.xml create mode 100644 app/src/main/res/drawable-hdpi/lollipop_logo.png create mode 100644 app/src/main/res/drawable-mdpi/lollipop_logo.png create mode 100644 app/src/main/res/drawable-xhdpi/lollipop_logo.png create mode 100644 app/src/main/res/drawable-xxhdpi/lollipop_logo.png delete mode 100644 app/src/main/res/drawable/actionbar_logo.9.png create mode 100644 app/src/main/res/drawable/actionbar_logo.jpg delete mode 100644 app/src/main/res/drawable/lollipop_logo.png delete mode 100644 app/src/main/res/drawable/news_bg.png create mode 100644 app/src/main/res/drawable/splash_logo.jpg delete mode 100644 app/src/main/res/drawable/splash_logo.png rename app/src/test/java/{io/r_a_d/radio2 => fr/forum_thalie/tsumugi}/ExampleUnitTest.kt (90%) diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 9f28921..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -R-a-dio2 \ No newline at end of file diff --git a/.idea/dictionaries/dict.xml b/.idea/dictionaries/dict.xml deleted file mode 100644 index 365cca9..0000000 --- a/.idea/dictionaries/dict.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - debouncing - requestable - requestor - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 34e4ce5..5a306fc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,7 +26,7 @@ android { jvmTarget = "1.8" } defaultConfig { - applicationId "io.r_a_d.radio2" + applicationId "fr.forum_thalie.tsumugi" minSdkVersion 16 targetSdkVersion 29 versionCode 2 diff --git a/app/src/androidTest/java/io/r_a_d/radio2/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/forum_thalie/tsumugi/ExampleInstrumentedTest.kt similarity index 84% rename from app/src/androidTest/java/io/r_a_d/radio2/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/fr/forum_thalie/tsumugi/ExampleInstrumentedTest.kt index 9e258d8..952a9f6 100644 --- a/app/src/androidTest/java/io/r_a_d/radio2/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/fr/forum_thalie/tsumugi/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2 +package fr.forum_thalie.tsumugi import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.r_a_d.radio2", appContext.packageName) + assertEquals("fr.forum_thalie.tsumugi", appContext.packageName) } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bf27179..12e9c38 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="fr.forum_thalie.tsumugi"> @@ -40,8 +40,8 @@ tools:targetApi="n"> - - + + diff --git a/app/src/main/java/io/r_a_d/radio2/Actions.kt b/app/src/main/java/fr/forum_thalie/tsumugi/Actions.kt similarity index 90% rename from app/src/main/java/io/r_a_d/radio2/Actions.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/Actions.kt index dfdfbe6..fb017c3 100644 --- a/app/src/main/java/io/r_a_d/radio2/Actions.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/Actions.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2 +package fr.forum_thalie.tsumugi enum class Actions { diff --git a/app/src/main/java/io/r_a_d/radio2/Async.kt b/app/src/main/java/fr/forum_thalie/tsumugi/Async.kt similarity index 95% rename from app/src/main/java/io/r_a_d/radio2/Async.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/Async.kt index 7f8e88a..6488ad2 100644 --- a/app/src/main/java/io/r_a_d/radio2/Async.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/Async.kt @@ -1,8 +1,8 @@ -package io.r_a_d.radio2 +package fr.forum_thalie.tsumugi import android.os.AsyncTask import android.util.Log -import io.r_a_d.radio2.playerstore.PlayerStore +import fr.forum_thalie.tsumugi.playerstore.PlayerStore class Async(val handler: (Any?) -> Any?, val post: (Any?) -> Unit = {}, private val actionOnError: ActionOnError = ActionOnError.RESET, private val parameters: Any? = null) : diff --git a/app/src/main/java/io/r_a_d/radio2/BaseActivity.kt b/app/src/main/java/fr/forum_thalie/tsumugi/BaseActivity.kt similarity index 98% rename from app/src/main/java/io/r_a_d/radio2/BaseActivity.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/BaseActivity.kt index cb956bf..e7b718d 100644 --- a/app/src/main/java/io/r_a_d/radio2/BaseActivity.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/BaseActivity.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2 +package fr.forum_thalie.tsumugi import android.content.Intent import android.os.Bundle diff --git a/app/src/main/java/io/r_a_d/radio2/BaseNotification.kt b/app/src/main/java/fr/forum_thalie/tsumugi/BaseNotification.kt similarity index 96% rename from app/src/main/java/io/r_a_d/radio2/BaseNotification.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/BaseNotification.kt index 1c4e4ef..1b18345 100644 --- a/app/src/main/java/io/r_a_d/radio2/BaseNotification.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/BaseNotification.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2 +package fr.forum_thalie.tsumugi import android.app.Notification import android.app.NotificationChannel @@ -69,7 +69,7 @@ abstract class BaseNotification(private val notificationChannelId: String, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { builder.setSmallIcon(R.drawable.lollipop_logo) - builder.color = -0x20b3c6 + builder.color = -0xf58b01 // same color as Accent. Can't use c.getColor since it's API23+ } else { builder.setSmallIcon(R.drawable.normal_logo) } diff --git a/app/src/main/java/io/r_a_d/radio2/BootBroadcastReceiver.kt b/app/src/main/java/fr/forum_thalie/tsumugi/BootBroadcastReceiver.kt similarity index 79% rename from app/src/main/java/io/r_a_d/radio2/BootBroadcastReceiver.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/BootBroadcastReceiver.kt index d9c1abe..118b168 100644 --- a/app/src/main/java/io/r_a_d/radio2/BootBroadcastReceiver.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/BootBroadcastReceiver.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2 +package fr.forum_thalie.tsumugi import android.content.BroadcastReceiver import android.content.Context @@ -6,10 +6,10 @@ import android.content.Intent import android.os.Build import android.util.Log import androidx.preference.PreferenceManager -import io.r_a_d.radio2.alarm.RadioAlarm -import io.r_a_d.radio2.playerstore.PlayerStore -import io.r_a_d.radio2.streamerNotificationService.WorkerStore -import io.r_a_d.radio2.streamerNotificationService.startStreamerMonitor +import fr.forum_thalie.tsumugi.alarm.RadioAlarm +import fr.forum_thalie.tsumugi.playerstore.PlayerStore +import fr.forum_thalie.tsumugi.streamerNotificationService.WorkerStore +import fr.forum_thalie.tsumugi.streamerNotificationService.startStreamerMonitor class BootBroadcastReceiver : BroadcastReceiver(){ @@ -24,7 +24,7 @@ class BootBroadcastReceiver : BroadcastReceiver(){ RadioAlarm.instance.setNextAlarm(context) // schedule next alarm } - if (arg1.getStringExtra("action") == "io.r_a_d.radio2.${Actions.PLAY_OR_FALLBACK.name}" ) + if (arg1.getStringExtra("action") == "fr.forum_thalie.tsumugi.${Actions.PLAY_OR_FALLBACK.name}" ) { RadioAlarm.instance.setNextAlarm(context) // schedule next alarm if (PlayerStore.instance.streamerName.value.isNullOrBlank()) diff --git a/app/src/main/java/io/r_a_d/radio2/MainActivity.kt b/app/src/main/java/fr/forum_thalie/tsumugi/MainActivity.kt similarity index 96% rename from app/src/main/java/io/r_a_d/radio2/MainActivity.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/MainActivity.kt index 7aa3648..9e6fc8f 100644 --- a/app/src/main/java/io/r_a_d/radio2/MainActivity.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/MainActivity.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2 +package fr.forum_thalie.tsumugi import android.os.Bundle import com.google.android.material.bottomnavigation.BottomNavigationView @@ -11,16 +11,16 @@ import androidx.core.content.res.ResourcesCompat import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.navigation.NavController -import io.r_a_d.radio2.playerstore.PlayerStore +import fr.forum_thalie.tsumugi.playerstore.PlayerStore import java.util.Timer import android.view.MenuItem import androidx.preference.PreferenceManager import com.google.android.material.snackbar.Snackbar -import io.r_a_d.radio2.alarm.RadioAlarm -import io.r_a_d.radio2.streamerNotificationService.WorkerStore -import io.r_a_d.radio2.streamerNotificationService.startStreamerMonitor -import io.r_a_d.radio2.ui.songs.request.Requestor +import fr.forum_thalie.tsumugi.alarm.RadioAlarm +import fr.forum_thalie.tsumugi.streamerNotificationService.WorkerStore +import fr.forum_thalie.tsumugi.streamerNotificationService.startStreamerMonitor +import fr.forum_thalie.tsumugi.ui.songs.request.Requestor /* Log to file import diff --git a/app/src/main/java/io/r_a_d/radio2/NavigationExtensions.kt b/app/src/main/java/fr/forum_thalie/tsumugi/NavigationExtensions.kt similarity index 99% rename from app/src/main/java/io/r_a_d/radio2/NavigationExtensions.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/NavigationExtensions.kt index 2b454e7..cc0d90c 100644 --- a/app/src/main/java/io/r_a_d/radio2/NavigationExtensions.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/NavigationExtensions.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2 +package fr.forum_thalie.tsumugi import android.content.Intent diff --git a/app/src/main/java/io/r_a_d/radio2/NowPlayingNotification.kt b/app/src/main/java/fr/forum_thalie/tsumugi/NowPlayingNotification.kt similarity index 97% rename from app/src/main/java/io/r_a_d/radio2/NowPlayingNotification.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/NowPlayingNotification.kt index af1db5c..9e65a6f 100644 --- a/app/src/main/java/io/r_a_d/radio2/NowPlayingNotification.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/NowPlayingNotification.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2 +package fr.forum_thalie.tsumugi import android.app.PendingIntent import android.content.Context @@ -6,8 +6,8 @@ import android.content.Intent import android.support.v4.media.session.MediaSessionCompat import android.support.v4.media.session.PlaybackStateCompat import androidx.core.app.NotificationCompat -import io.r_a_d.radio2.playerstore.PlayerStore -import io.r_a_d.radio2.BootBroadcastReceiver +import fr.forum_thalie.tsumugi.playerstore.PlayerStore +import fr.forum_thalie.tsumugi.BootBroadcastReceiver class NowPlayingNotification( notificationChannelId: String, diff --git a/app/src/main/java/io/r_a_d/radio2/ParametersActivity.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ParametersActivity.kt similarity index 94% rename from app/src/main/java/io/r_a_d/radio2/ParametersActivity.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ParametersActivity.kt index c526360..4bcef87 100644 --- a/app/src/main/java/io/r_a_d/radio2/ParametersActivity.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ParametersActivity.kt @@ -1,7 +1,7 @@ -package io.r_a_d.radio2 +package fr.forum_thalie.tsumugi import android.os.Bundle -import io.r_a_d.radio2.preferences.* +import fr.forum_thalie.tsumugi.preferences.* class ParametersActivity : BaseActivity() { diff --git a/app/src/main/java/io/r_a_d/radio2/RadioService.kt b/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt similarity index 99% rename from app/src/main/java/io/r_a_d/radio2/RadioService.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt index e3f4106..6ed4eb5 100644 --- a/app/src/main/java/io/r_a_d/radio2/RadioService.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2 +package fr.forum_thalie.tsumugi import android.app.Service import android.content.BroadcastReceiver @@ -33,9 +33,9 @@ import androidx.preference.PreferenceManager import com.google.android.exoplayer2.* import com.google.android.exoplayer2.metadata.icy.* import com.google.android.exoplayer2.trackselection.DefaultTrackSelector -import io.r_a_d.radio2.alarm.RadioAlarm -import io.r_a_d.radio2.alarm.RadioSleeper -import io.r_a_d.radio2.playerstore.PlayerStore +import fr.forum_thalie.tsumugi.alarm.RadioAlarm +import fr.forum_thalie.tsumugi.alarm.RadioSleeper +import fr.forum_thalie.tsumugi.playerstore.PlayerStore import java.util.* import kotlin.math.exp import kotlin.math.ln @@ -429,7 +429,7 @@ class RadioService : MediaBrowserServiceCompat() { ) // This is the MediaSource representing the media to be played. radioMediaSource = ProgressiveMediaSource.Factory(dataSourceFactory) - .createMediaSource(Uri.parse(getString(R.string.STREAM_URL_RADIO))) + .createMediaSource(Uri.parse(getString(R.string.STREAM_URL_TSUMUGI))) fallbackMediaSource = ProgressiveMediaSource.Factory(dataSourceFactory) .createMediaSource(Uri.parse("file:///android_asset/the_stream_is_down.mp3")) diff --git a/app/src/main/java/io/r_a_d/radio2/Tickers.kt b/app/src/main/java/fr/forum_thalie/tsumugi/Tickers.kt similarity index 77% rename from app/src/main/java/io/r_a_d/radio2/Tickers.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/Tickers.kt index 8b3c02e..a99ae5a 100644 --- a/app/src/main/java/io/r_a_d/radio2/Tickers.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/Tickers.kt @@ -1,8 +1,8 @@ -package io.r_a_d.radio2 +package fr.forum_thalie.tsumugi import android.support.v4.media.session.PlaybackStateCompat -import io.r_a_d.radio2.alarm.RadioSleeper -import io.r_a_d.radio2.playerstore.PlayerStore +import fr.forum_thalie.tsumugi.alarm.RadioSleeper +import fr.forum_thalie.tsumugi.playerstore.PlayerStore import java.util.* class Tick : TimerTask() { diff --git a/app/src/main/java/io/r_a_d/radio2/Values.kt b/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt similarity index 75% rename from app/src/main/java/io/r_a_d/radio2/Values.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/Values.kt index b350253..08b2fb1 100644 --- a/app/src/main/java/io/r_a_d/radio2/Values.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt @@ -1,9 +1,9 @@ -package io.r_a_d.radio2 +package fr.forum_thalie.tsumugi import android.content.SharedPreferences import android.content.res.ColorStateList -const val tag = "io.r_a_d.radio2" +const val tag = "fr.forum_thalie.tsumugi" const val noConnectionValue = "No connection" var colorBlue: Int = 0 var colorWhited: Int = 0 diff --git a/app/src/main/java/io/r_a_d/radio2/alarm/RadioAlarm.kt b/app/src/main/java/fr/forum_thalie/tsumugi/alarm/RadioAlarm.kt similarity index 93% rename from app/src/main/java/io/r_a_d/radio2/alarm/RadioAlarm.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/alarm/RadioAlarm.kt index 52de66b..25ccaad 100644 --- a/app/src/main/java/io/r_a_d/radio2/alarm/RadioAlarm.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/alarm/RadioAlarm.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.alarm +package fr.forum_thalie.tsumugi.alarm import android.app.AlarmManager import android.app.PendingIntent @@ -6,9 +6,9 @@ import android.content.Context import android.content.Intent import android.util.Log import androidx.core.app.AlarmManagerCompat -import io.r_a_d.radio2.BootBroadcastReceiver +import fr.forum_thalie.tsumugi.BootBroadcastReceiver import androidx.preference.PreferenceManager -import io.r_a_d.radio2.* +import fr.forum_thalie.tsumugi.* import java.util.* class RadioAlarm { @@ -38,7 +38,7 @@ class RadioAlarm { val alarmManager = c.getSystemService(Context.ALARM_SERVICE) as AlarmManager alarmIntent = Intent(c, BootBroadcastReceiver::class.java).let { intent -> - intent.putExtra("action", "io.r_a_d.radio2.${Actions.PLAY_OR_FALLBACK.name}") + intent.putExtra("action", "fr.forum_thalie.tsumugi.${Actions.PLAY_OR_FALLBACK.name}") PendingIntent.getBroadcast(c, 0, intent, 0) } val showIntent = Intent(c, ParametersActivity::class.java).let { intent -> @@ -100,7 +100,7 @@ class RadioAlarm { { val alarmManager = c.getSystemService(Context.ALARM_SERVICE) as AlarmManager alarmIntent = Intent(c, BootBroadcastReceiver::class.java).let { intent -> - intent.putExtra("action", "io.r_a_d.radio2.${Actions.PLAY_OR_FALLBACK.name}") + intent.putExtra("action", "fr.forum_thalie.tsumugi.${Actions.PLAY_OR_FALLBACK.name}") PendingIntent.getBroadcast(c, 0, intent, 0) } val showIntent = Intent(c, ParametersActivity::class.java).let { intent -> diff --git a/app/src/main/java/io/r_a_d/radio2/alarm/RadioSleeper.kt b/app/src/main/java/fr/forum_thalie/tsumugi/alarm/RadioSleeper.kt similarity index 97% rename from app/src/main/java/io/r_a_d/radio2/alarm/RadioSleeper.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/alarm/RadioSleeper.kt index 3f39b98..870edf5 100644 --- a/app/src/main/java/io/r_a_d/radio2/alarm/RadioSleeper.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/alarm/RadioSleeper.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.alarm +package fr.forum_thalie.tsumugi.alarm import android.app.AlarmManager import android.app.PendingIntent @@ -8,7 +8,7 @@ import android.util.Log import androidx.core.app.AlarmManagerCompat import androidx.lifecycle.MutableLiveData import androidx.preference.PreferenceManager -import io.r_a_d.radio2.* +import fr.forum_thalie.tsumugi.* class RadioSleeper { diff --git a/app/src/main/java/io/r_a_d/radio2/playerstore/PlayerStore.kt b/app/src/main/java/fr/forum_thalie/tsumugi/playerstore/PlayerStore.kt similarity index 99% rename from app/src/main/java/io/r_a_d/radio2/playerstore/PlayerStore.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/playerstore/PlayerStore.kt index cbf24bf..4cf734e 100644 --- a/app/src/main/java/io/r_a_d/radio2/playerstore/PlayerStore.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/playerstore/PlayerStore.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.playerstore +package fr.forum_thalie.tsumugi.playerstore import android.content.Context import android.graphics.Bitmap @@ -7,7 +7,7 @@ import android.support.v4.media.session.PlaybackStateCompat import android.util.Log import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import io.r_a_d.radio2.* +import fr.forum_thalie.tsumugi.* import org.json.JSONObject import java.io.IOException import java.io.InputStream diff --git a/app/src/main/java/io/r_a_d/radio2/playerstore/Song.kt b/app/src/main/java/fr/forum_thalie/tsumugi/playerstore/Song.kt similarity index 97% rename from app/src/main/java/io/r_a_d/radio2/playerstore/Song.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/playerstore/Song.kt index fa3ef89..09b8b99 100644 --- a/app/src/main/java/io/r_a_d/radio2/playerstore/Song.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/playerstore/Song.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.playerstore +package fr.forum_thalie.tsumugi.playerstore import androidx.lifecycle.MutableLiveData diff --git a/app/src/main/java/io/r_a_d/radio2/preferences/AlarmFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/AlarmFragment.kt similarity index 98% rename from app/src/main/java/io/r_a_d/radio2/preferences/AlarmFragment.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/preferences/AlarmFragment.kt index 2e43478..46359ea 100644 --- a/app/src/main/java/io/r_a_d/radio2/preferences/AlarmFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/AlarmFragment.kt @@ -1,12 +1,12 @@ -package io.r_a_d.radio2.preferences +package fr.forum_thalie.tsumugi.preferences import android.app.TimePickerDialog import android.os.Bundle import android.util.Log import androidx.core.content.edit import androidx.preference.* -import io.r_a_d.radio2.R -import io.r_a_d.radio2.alarm.RadioAlarm +import fr.forum_thalie.tsumugi.R +import fr.forum_thalie.tsumugi.alarm.RadioAlarm import java.util.* class AlarmFragment : PreferenceFragmentCompat() { diff --git a/app/src/main/java/io/r_a_d/radio2/preferences/CustomizeFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/CustomizeFragment.kt similarity index 94% rename from app/src/main/java/io/r_a_d/radio2/preferences/CustomizeFragment.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/preferences/CustomizeFragment.kt index ce24075..f8d8efb 100644 --- a/app/src/main/java/io/r_a_d/radio2/preferences/CustomizeFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/CustomizeFragment.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.preferences +package fr.forum_thalie.tsumugi.preferences import android.content.Intent import android.net.Uri @@ -6,9 +6,9 @@ import android.os.Bundle import android.util.Log import androidx.appcompat.app.AlertDialog import androidx.preference.* -import io.r_a_d.radio2.R -import io.r_a_d.radio2.preferenceStore -import io.r_a_d.radio2.ui.songs.request.Requestor +import fr.forum_thalie.tsumugi.R +import fr.forum_thalie.tsumugi.preferenceStore +import fr.forum_thalie.tsumugi.ui.songs.request.Requestor class CustomizeFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/src/main/java/io/r_a_d/radio2/preferences/MainPreferenceFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/MainPreferenceFragment.kt similarity index 91% rename from app/src/main/java/io/r_a_d/radio2/preferences/MainPreferenceFragment.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/preferences/MainPreferenceFragment.kt index a685c2b..61d30fd 100644 --- a/app/src/main/java/io/r_a_d/radio2/preferences/MainPreferenceFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/MainPreferenceFragment.kt @@ -1,9 +1,9 @@ -package io.r_a_d.radio2.preferences +package fr.forum_thalie.tsumugi.preferences import android.content.Intent import android.net.Uri import android.os.Bundle -import io.r_a_d.radio2.R +import fr.forum_thalie.tsumugi.R import android.annotation.SuppressLint import androidx.preference.* diff --git a/app/src/main/java/io/r_a_d/radio2/preferences/SleepFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/SleepFragment.kt similarity index 91% rename from app/src/main/java/io/r_a_d/radio2/preferences/SleepFragment.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/preferences/SleepFragment.kt index b772bc8..4c62ae3 100644 --- a/app/src/main/java/io/r_a_d/radio2/preferences/SleepFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/SleepFragment.kt @@ -1,10 +1,10 @@ -package io.r_a_d.radio2.preferences +package fr.forum_thalie.tsumugi.preferences import android.os.Bundle import androidx.preference.* -import io.r_a_d.radio2.R +import fr.forum_thalie.tsumugi.R import android.text.InputType -import io.r_a_d.radio2.alarm.RadioSleeper +import fr.forum_thalie.tsumugi.alarm.RadioSleeper class SleepFragment : PreferenceFragmentCompat() { diff --git a/app/src/main/java/io/r_a_d/radio2/preferences/StreamerNotifServiceFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/StreamerNotifServiceFragment.kt similarity index 86% rename from app/src/main/java/io/r_a_d/radio2/preferences/StreamerNotifServiceFragment.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/preferences/StreamerNotifServiceFragment.kt index db7326e..0383ee1 100644 --- a/app/src/main/java/io/r_a_d/radio2/preferences/StreamerNotifServiceFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/StreamerNotifServiceFragment.kt @@ -1,13 +1,13 @@ -package io.r_a_d.radio2.preferences +package fr.forum_thalie.tsumugi.preferences import android.os.Bundle import androidx.appcompat.app.AlertDialog import androidx.preference.* -import io.r_a_d.radio2.R -import io.r_a_d.radio2.preferenceStore -import io.r_a_d.radio2.streamerNotificationService.WorkerStore -import io.r_a_d.radio2.streamerNotificationService.startStreamerMonitor -import io.r_a_d.radio2.streamerNotificationService.stopStreamerMonitor +import fr.forum_thalie.tsumugi.R +import fr.forum_thalie.tsumugi.preferenceStore +import fr.forum_thalie.tsumugi.streamerNotificationService.WorkerStore +import fr.forum_thalie.tsumugi.streamerNotificationService.startStreamerMonitor +import fr.forum_thalie.tsumugi.streamerNotificationService.stopStreamerMonitor class StreamerNotifServiceFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/src/main/java/io/r_a_d/radio2/streamerNotificationService/ServiceNotification.kt b/app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/ServiceNotification.kt similarity index 91% rename from app/src/main/java/io/r_a_d/radio2/streamerNotificationService/ServiceNotification.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/ServiceNotification.kt index ba2ca2b..bd203aa 100644 --- a/app/src/main/java/io/r_a_d/radio2/streamerNotificationService/ServiceNotification.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/ServiceNotification.kt @@ -1,7 +1,7 @@ -package io.r_a_d.radio2.streamerNotificationService +package fr.forum_thalie.tsumugi.streamerNotificationService import android.content.Context -import io.r_a_d.radio2.BaseNotification +import fr.forum_thalie.tsumugi.BaseNotification import java.util.* class ServiceNotification( diff --git a/app/src/main/java/io/r_a_d/radio2/streamerNotificationService/StreamerMonitorExtensions.kt b/app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/StreamerMonitorExtensions.kt similarity index 94% rename from app/src/main/java/io/r_a_d/radio2/streamerNotificationService/StreamerMonitorExtensions.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/StreamerMonitorExtensions.kt index 651ef02..d3cb66c 100644 --- a/app/src/main/java/io/r_a_d/radio2/streamerNotificationService/StreamerMonitorExtensions.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/StreamerMonitorExtensions.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.streamerNotificationService +package fr.forum_thalie.tsumugi.streamerNotificationService import android.app.AlarmManager import android.app.PendingIntent @@ -10,9 +10,9 @@ import android.os.SystemClock import android.util.Log import androidx.core.app.NotificationCompat import androidx.preference.PreferenceManager -import io.r_a_d.radio2.* -import io.r_a_d.radio2.alarm.RadioAlarm -import io.r_a_d.radio2.playerstore.PlayerStore +import fr.forum_thalie.tsumugi.* +import fr.forum_thalie.tsumugi.alarm.RadioAlarm +import fr.forum_thalie.tsumugi.playerstore.PlayerStore import org.json.JSONObject import java.net.URL diff --git a/app/src/main/java/io/r_a_d/radio2/streamerNotificationService/StreamerMonitorService.kt b/app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/StreamerMonitorService.kt similarity index 96% rename from app/src/main/java/io/r_a_d/radio2/streamerNotificationService/StreamerMonitorService.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/StreamerMonitorService.kt index 50b42fe..fae27ae 100644 --- a/app/src/main/java/io/r_a_d/radio2/streamerNotificationService/StreamerMonitorService.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/StreamerMonitorService.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.streamerNotificationService +package fr.forum_thalie.tsumugi.streamerNotificationService import android.app.Service @@ -9,9 +9,9 @@ import android.util.Log import androidx.core.app.NotificationCompat import androidx.lifecycle.Observer import androidx.preference.PreferenceManager -import io.r_a_d.radio2.Actions -import io.r_a_d.radio2.R -import io.r_a_d.radio2.tag +import fr.forum_thalie.tsumugi.Actions +import fr.forum_thalie.tsumugi.R +import fr.forum_thalie.tsumugi.tag import java.util.* class StreamerMonitorService : Service() { diff --git a/app/src/main/java/io/r_a_d/radio2/streamerNotificationService/StreamerNotification.kt b/app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/StreamerNotification.kt similarity index 91% rename from app/src/main/java/io/r_a_d/radio2/streamerNotificationService/StreamerNotification.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/StreamerNotification.kt index 5525482..f40c028 100644 --- a/app/src/main/java/io/r_a_d/radio2/streamerNotificationService/StreamerNotification.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/StreamerNotification.kt @@ -1,7 +1,7 @@ -package io.r_a_d.radio2.streamerNotificationService +package fr.forum_thalie.tsumugi.streamerNotificationService import android.content.Context -import io.r_a_d.radio2.BaseNotification +import fr.forum_thalie.tsumugi.BaseNotification import java.util.* class StreamerNotification( diff --git a/app/src/main/java/io/r_a_d/radio2/streamerNotificationService/WorkerStore.kt b/app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/WorkerStore.kt similarity index 91% rename from app/src/main/java/io/r_a_d/radio2/streamerNotificationService/WorkerStore.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/WorkerStore.kt index 5c5dc43..b20b50d 100644 --- a/app/src/main/java/io/r_a_d/radio2/streamerNotificationService/WorkerStore.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/streamerNotificationService/WorkerStore.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.streamerNotificationService +package fr.forum_thalie.tsumugi.streamerNotificationService import android.content.Context import android.util.Log @@ -6,8 +6,8 @@ import androidx.core.app.NotificationCompat import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer import androidx.preference.PreferenceManager -import io.r_a_d.radio2.R -import io.r_a_d.radio2.tag +import fr.forum_thalie.tsumugi.R +import fr.forum_thalie.tsumugi.tag class WorkerStore { companion object { diff --git a/app/src/main/java/io/r_a_d/radio2/ui/chat/ChatFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/chat/ChatFragment.kt similarity index 95% rename from app/src/main/java/io/r_a_d/radio2/ui/chat/ChatFragment.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/chat/ChatFragment.kt index 0fa081f..89718b1 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/chat/ChatFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/chat/ChatFragment.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.chat +package fr.forum_thalie.tsumugi.ui.chat import android.os.Bundle import android.util.Log @@ -9,7 +9,7 @@ import android.view.WindowManager import android.webkit.WebView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProviders -import io.r_a_d.radio2.R +import fr.forum_thalie.tsumugi.R class ChatFragment : Fragment() { diff --git a/app/src/main/java/io/r_a_d/radio2/ui/chat/ChatViewModel.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/chat/ChatViewModel.kt similarity index 86% rename from app/src/main/java/io/r_a_d/radio2/ui/chat/ChatViewModel.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/chat/ChatViewModel.kt index ca60c0c..0a4a1aa 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/chat/ChatViewModel.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/chat/ChatViewModel.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.chat +package fr.forum_thalie.tsumugi.ui.chat import android.view.View import android.webkit.WebView diff --git a/app/src/main/java/io/r_a_d/radio2/ui/chat/WebViewChat.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/chat/WebViewChat.kt similarity index 97% rename from app/src/main/java/io/r_a_d/radio2/ui/chat/WebViewChat.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/chat/WebViewChat.kt index aafa4d7..580c617 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/chat/WebViewChat.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/chat/WebViewChat.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.chat +package fr.forum_thalie.tsumugi.ui.chat import android.annotation.SuppressLint import android.content.Intent diff --git a/app/src/main/java/io/r_a_d/radio2/ui/news/News.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/news/News.kt similarity index 86% rename from app/src/main/java/io/r_a_d/radio2/ui/news/News.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/news/News.kt index bb126b2..2c7d6fd 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/news/News.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/news/News.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.news +package fr.forum_thalie.tsumugi.ui.news import java.util.* diff --git a/app/src/main/java/io/r_a_d/radio2/ui/news/NewsAdapter.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/news/NewsAdapter.kt similarity index 97% rename from app/src/main/java/io/r_a_d/radio2/ui/news/NewsAdapter.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/news/NewsAdapter.kt index 517ff99..1e5b728 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/news/NewsAdapter.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/news/NewsAdapter.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.news +package fr.forum_thalie.tsumugi.ui.news import android.annotation.SuppressLint import android.widget.TextView @@ -8,7 +8,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.text.HtmlCompat import androidx.core.widget.TextViewCompat import androidx.recyclerview.widget.RecyclerView -import io.r_a_d.radio2.R +import fr.forum_thalie.tsumugi.R import kotlin.collections.ArrayList class NewsAdapter(private val dataSet: ArrayList diff --git a/app/src/main/java/io/r_a_d/radio2/ui/news/NewsFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/news/NewsFragment.kt similarity index 96% rename from app/src/main/java/io/r_a_d/radio2/ui/news/NewsFragment.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/news/NewsFragment.kt index b4118a8..5eff667 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/news/NewsFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/news/NewsFragment.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.news +package fr.forum_thalie.tsumugi.ui.news import android.os.Bundle import android.util.Log @@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import io.r_a_d.radio2.R +import fr.forum_thalie.tsumugi.R class NewsFragment : Fragment() { diff --git a/app/src/main/java/io/r_a_d/radio2/ui/news/NewsViewModel.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/news/NewsViewModel.kt similarity index 93% rename from app/src/main/java/io/r_a_d/radio2/ui/news/NewsViewModel.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/news/NewsViewModel.kt index df6b65d..f0a862e 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/news/NewsViewModel.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/news/NewsViewModel.kt @@ -1,10 +1,10 @@ -package io.r_a_d.radio2.ui.news +package fr.forum_thalie.tsumugi.ui.news import android.util.Log import androidx.lifecycle.ViewModel import androidx.recyclerview.widget.RecyclerView -import io.r_a_d.radio2.Async -import io.r_a_d.radio2.tag +import fr.forum_thalie.tsumugi.Async +import fr.forum_thalie.tsumugi.tag import org.json.JSONArray import org.json.JSONObject import java.net.URL diff --git a/app/src/main/java/io/r_a_d/radio2/ui/nowplaying/NowPlayingFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingFragment.kt similarity index 98% rename from app/src/main/java/io/r_a_d/radio2/ui/nowplaying/NowPlayingFragment.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingFragment.kt index 8bca91c..e92a6cc 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/nowplaying/NowPlayingFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingFragment.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.nowplaying +package fr.forum_thalie.tsumugi.ui.nowplaying import android.annotation.SuppressLint import android.content.ClipboardManager @@ -19,10 +19,10 @@ import androidx.core.widget.TextViewCompat import androidx.lifecycle.Observer import com.google.android.material.snackbar.BaseTransientBottomBar import com.google.android.material.snackbar.Snackbar -import io.r_a_d.radio2.* -import io.r_a_d.radio2.alarm.RadioSleeper -import io.r_a_d.radio2.playerstore.PlayerStore -import io.r_a_d.radio2.playerstore.Song +import fr.forum_thalie.tsumugi.* +import fr.forum_thalie.tsumugi.alarm.RadioSleeper +import fr.forum_thalie.tsumugi.playerstore.PlayerStore +import fr.forum_thalie.tsumugi.playerstore.Song class NowPlayingFragment : Fragment() { diff --git a/app/src/main/java/io/r_a_d/radio2/ui/nowplaying/NowPlayingViewModel.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingViewModel.kt similarity index 91% rename from app/src/main/java/io/r_a_d/radio2/ui/nowplaying/NowPlayingViewModel.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingViewModel.kt index 2481c5d..627abeb 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/nowplaying/NowPlayingViewModel.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingViewModel.kt @@ -1,9 +1,9 @@ -package io.r_a_d.radio2.ui.nowplaying +package fr.forum_thalie.tsumugi.ui.nowplaying import android.widget.SeekBar import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import io.r_a_d.radio2.playerstore.PlayerStore +import fr.forum_thalie.tsumugi.playerstore.PlayerStore class NowPlayingViewModel: ViewModel() { diff --git a/app/src/main/java/io/r_a_d/radio2/ui/songs/SongsFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/SongsFragment.kt similarity index 88% rename from app/src/main/java/io/r_a_d/radio2/ui/songs/SongsFragment.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/SongsFragment.kt index cc87514..1e68823 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/songs/SongsFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/SongsFragment.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.songs +package fr.forum_thalie.tsumugi.ui.songs import android.os.Bundle import android.util.Log @@ -14,13 +14,13 @@ import androidx.viewpager.widget.ViewPager import com.google.android.material.snackbar.BaseTransientBottomBar import com.google.android.material.snackbar.Snackbar import com.google.android.material.tabs.TabLayout -import io.r_a_d.radio2.R -import io.r_a_d.radio2.preferenceStore -import io.r_a_d.radio2.ui.songs.queuelp.LastPlayedFragment -import io.r_a_d.radio2.ui.songs.queuelp.QueueFragment -import io.r_a_d.radio2.ui.songs.request.FavoritesFragment -import io.r_a_d.radio2.ui.songs.request.RequestFragment -import io.r_a_d.radio2.ui.songs.request.Requestor +import fr.forum_thalie.tsumugi.R +import fr.forum_thalie.tsumugi.preferenceStore +import fr.forum_thalie.tsumugi.ui.songs.queuelp.LastPlayedFragment +import fr.forum_thalie.tsumugi.ui.songs.queuelp.QueueFragment +import fr.forum_thalie.tsumugi.ui.songs.request.FavoritesFragment +import fr.forum_thalie.tsumugi.ui.songs.request.RequestFragment +import fr.forum_thalie.tsumugi.ui.songs.request.Requestor class SongsFragment : Fragment() { diff --git a/app/src/main/java/io/r_a_d/radio2/ui/songs/SongsPagerAdapter.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/SongsPagerAdapter.kt similarity index 94% rename from app/src/main/java/io/r_a_d/radio2/ui/songs/SongsPagerAdapter.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/SongsPagerAdapter.kt index 9620638..e69882b 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/songs/SongsPagerAdapter.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/SongsPagerAdapter.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.songs +package fr.forum_thalie.tsumugi.ui.songs import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentPagerAdapter diff --git a/app/src/main/java/io/r_a_d/radio2/ui/songs/queuelp/LastPlayedFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/queuelp/LastPlayedFragment.kt similarity index 95% rename from app/src/main/java/io/r_a_d/radio2/ui/songs/queuelp/LastPlayedFragment.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/queuelp/LastPlayedFragment.kt index 381734b..c8f5c81 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/songs/queuelp/LastPlayedFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/queuelp/LastPlayedFragment.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.songs.queuelp +package fr.forum_thalie.tsumugi.ui.songs.queuelp import android.os.Bundle import android.util.Log @@ -9,8 +9,8 @@ import android.view.ViewGroup import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import io.r_a_d.radio2.R -import io.r_a_d.radio2.playerstore.PlayerStore +import fr.forum_thalie.tsumugi.R +import fr.forum_thalie.tsumugi.playerstore.PlayerStore /** * A simple [Fragment] subclass. diff --git a/app/src/main/java/io/r_a_d/radio2/ui/songs/queuelp/QueueFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/queuelp/QueueFragment.kt similarity index 91% rename from app/src/main/java/io/r_a_d/radio2/ui/songs/queuelp/QueueFragment.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/queuelp/QueueFragment.kt index b97cb59..72a7b7f 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/songs/queuelp/QueueFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/queuelp/QueueFragment.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.songs.queuelp +package fr.forum_thalie.tsumugi.ui.songs.queuelp import android.os.Bundle import android.util.Log @@ -9,9 +9,9 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import io.r_a_d.radio2.R -import io.r_a_d.radio2.playerstore.PlayerStore -import io.r_a_d.radio2.playerstore.Song +import fr.forum_thalie.tsumugi.R +import fr.forum_thalie.tsumugi.playerstore.PlayerStore +import fr.forum_thalie.tsumugi.playerstore.Song class QueueFragment : Fragment(){ private val lastPlayedFragmentTag = this::class.java.name diff --git a/app/src/main/java/io/r_a_d/radio2/ui/songs/queuelp/SongAdaptater.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/queuelp/SongAdaptater.kt similarity index 91% rename from app/src/main/java/io/r_a_d/radio2/ui/songs/queuelp/SongAdaptater.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/queuelp/SongAdaptater.kt index 9101881..57a7d82 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/songs/queuelp/SongAdaptater.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/queuelp/SongAdaptater.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.songs.queuelp +package fr.forum_thalie.tsumugi.ui.songs.queuelp import android.annotation.SuppressLint import android.graphics.Color @@ -7,10 +7,10 @@ import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.RecyclerView -import io.r_a_d.radio2.R -import io.r_a_d.radio2.colorBlue -import io.r_a_d.radio2.colorWhited -import io.r_a_d.radio2.playerstore.Song +import fr.forum_thalie.tsumugi.R +import fr.forum_thalie.tsumugi.colorBlue +import fr.forum_thalie.tsumugi.colorWhited +import fr.forum_thalie.tsumugi.playerstore.Song import kotlinx.android.synthetic.main.song_view.view.* import kotlin.collections.ArrayList diff --git a/app/src/main/java/io/r_a_d/radio2/ui/songs/request/CooldownCalculator.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/CooldownCalculator.kt similarity index 97% rename from app/src/main/java/io/r_a_d/radio2/ui/songs/request/CooldownCalculator.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/CooldownCalculator.kt index 0c268a4..64175fe 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/songs/request/CooldownCalculator.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/CooldownCalculator.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.songs.request +package fr.forum_thalie.tsumugi.ui.songs.request import kotlin.math.exp import kotlin.math.max diff --git a/app/src/main/java/io/r_a_d/radio2/ui/songs/request/FavoritesFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/FavoritesFragment.kt similarity index 98% rename from app/src/main/java/io/r_a_d/radio2/ui/songs/request/FavoritesFragment.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/FavoritesFragment.kt index e2e0e35..2631a7b 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/songs/request/FavoritesFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/FavoritesFragment.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.songs.request +package fr.forum_thalie.tsumugi.ui.songs.request import android.os.Build import android.os.Bundle @@ -14,7 +14,7 @@ import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout -import io.r_a_d.radio2.* +import fr.forum_thalie.tsumugi.* class FavoritesFragment : Fragment() { diff --git a/app/src/main/java/io/r_a_d/radio2/ui/songs/request/RequestFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/RequestFragment.kt similarity index 97% rename from app/src/main/java/io/r_a_d/radio2/ui/songs/request/RequestFragment.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/RequestFragment.kt index 508a82a..fa19627 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/songs/request/RequestFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/RequestFragment.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.songs.request +package fr.forum_thalie.tsumugi.ui.songs.request import android.os.Bundle import android.util.Log @@ -11,7 +11,7 @@ import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout -import io.r_a_d.radio2.R +import fr.forum_thalie.tsumugi.R class RequestFragment : Fragment() { diff --git a/app/src/main/java/io/r_a_d/radio2/ui/songs/request/RequestResponse.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/RequestResponse.kt similarity index 93% rename from app/src/main/java/io/r_a_d/radio2/ui/songs/request/RequestResponse.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/RequestResponse.kt index 52468cd..a4c1e73 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/songs/request/RequestResponse.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/RequestResponse.kt @@ -1,6 +1,6 @@ -package io.r_a_d.radio2.ui.songs.request +package fr.forum_thalie.tsumugi.ui.songs.request -import io.r_a_d.radio2.playerstore.Song +import fr.forum_thalie.tsumugi.playerstore.Song import org.json.JSONObject class RequestResponse(jsonResponse: JSONObject) { diff --git a/app/src/main/java/io/r_a_d/radio2/ui/songs/request/RequestSongAdapter.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/RequestSongAdapter.kt similarity index 97% rename from app/src/main/java/io/r_a_d/radio2/ui/songs/request/RequestSongAdapter.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/RequestSongAdapter.kt index 35da7c0..6f72f8a 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/songs/request/RequestSongAdapter.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/RequestSongAdapter.kt @@ -1,4 +1,4 @@ -package io.r_a_d.radio2.ui.songs.request +package fr.forum_thalie.tsumugi.ui.songs.request import android.annotation.SuppressLint import android.os.Build @@ -9,8 +9,8 @@ import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.widget.TextViewCompat import androidx.recyclerview.widget.RecyclerView -import io.r_a_d.radio2.* -import io.r_a_d.radio2.playerstore.Song +import fr.forum_thalie.tsumugi.* +import fr.forum_thalie.tsumugi.playerstore.Song import kotlinx.android.synthetic.main.request_song_view.view.* import android.view.View import kotlinx.android.synthetic.main.button_load_more.view.* diff --git a/app/src/main/java/io/r_a_d/radio2/ui/songs/request/Requestor.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/Requestor.kt similarity index 97% rename from app/src/main/java/io/r_a_d/radio2/ui/songs/request/Requestor.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/Requestor.kt index dadad93..a9259b2 100644 --- a/app/src/main/java/io/r_a_d/radio2/ui/songs/request/Requestor.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/request/Requestor.kt @@ -1,12 +1,12 @@ -package io.r_a_d.radio2.ui.songs.request +package fr.forum_thalie.tsumugi.ui.songs.request import android.util.Log import androidx.lifecycle.MutableLiveData -import io.r_a_d.radio2.ActionOnError -import io.r_a_d.radio2.Async -import io.r_a_d.radio2.playerstore.Song -import io.r_a_d.radio2.preferenceStore -import io.r_a_d.radio2.tag +import fr.forum_thalie.tsumugi.ActionOnError +import fr.forum_thalie.tsumugi.Async +import fr.forum_thalie.tsumugi.playerstore.Song +import fr.forum_thalie.tsumugi.preferenceStore +import fr.forum_thalie.tsumugi.tag import org.json.JSONArray import org.json.JSONException import org.json.JSONObject diff --git a/app/src/main/res/drawable-anydpi-v24/lollipop_logo.xml b/app/src/main/res/drawable-anydpi-v24/lollipop_logo.xml new file mode 100644 index 0000000..e95de7f --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v24/lollipop_logo.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable-hdpi/lollipop_logo.png b/app/src/main/res/drawable-hdpi/lollipop_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..4016d461e13907d41d19d88049ebf410879c0ed1 GIT binary patch literal 402 zcmV;D0d4+?P)!s) z=Anl}w19XL5Wh!r#19}|3dA<_a0D9=M*#6bETM4=h>L+(gdPr21maF0eu?IYpFq3{ zh@I)-2xcG-0OIXH{143`ApQ;@4hLcfGO+;=vk>bTQ6N75pZ4Gs5DO9Gpeg_92PP2X zpyN=*zks-&M)()hj$_0)=nPcxR~n{KSmAkQWIG6GMhp<|hhnqA;Gim`1nfTS97GQ= zyd3lp+UOc^2kir5B_w%4Af7W&4mypi5(J9R9S8?G;ZX+)slW7e&|gB$PoVsDdWVoG z0kse4?VvC`>XZi}4L!!zhyo>aAl^Gr+5Qo2W_EaNxg*_2L;m6 wL4m~9(m_DH38^hZZ45FyXmmJc6wm?y00k#d`v};kV*mgE07*qoM6N<$g2nWkh5!Hn literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/lollipop_logo.png b/app/src/main/res/drawable-mdpi/lollipop_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..9d6e9527c027dd90dd7daad4dfbcdd5f6e762ba0 GIT binary patch literal 318 zcmV-E0m1%>P)ObY+ z1rT##v%nCl;3yEslZlT)%`m`bfiYBaF$F=q7;1(wRV;w!hxPr|53|=4LBn7F|{nX1}c)Vluf^>83(mU z;vCR8p*RjS&=g$<1s9nqNdub&OhCMi3V8rz1{1#OP#1_D$i%wn@i+7V02tmriidju QCjbBd07*qoM6N<$g1_K;o&W#< literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/lollipop_logo.png b/app/src/main/res/drawable-xhdpi/lollipop_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..d2a34cd7e79c1e5d24858154da36c11136f5e4d5 GIT binary patch literal 494 zcmVWItyFq=^eKbbF*Owz9z??o7rSve?V!^{Zz_rh4pMWgrVlqAjcEPKM=@+m~H8EkP8!UrUpV2-8E1-wTc$-=RpGA1O z0qb%fsVBgm;88)>{HWm5kWPSkS8)mKG?=U;&Cq5{^!QB;jE$sS_Xu&WX%RFEQQQQk*1&^boK2$|rw` k1Xu`(g!af=Sy`E-PxK6$;m?>0jQ{`u07*qoM6N<$f+I52w*UYD literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/lollipop_logo.png b/app/src/main/res/drawable-xxhdpi/lollipop_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..05d6f2c727cbb44e3b364580a4827167acaae271 GIT binary patch literal 698 zcmV;r0!96aP)Efs=br&bm@5h0MmAGGi|P=u5bB@$DlPzfH`h}tNTC^j~V zTB)f5RtdHth$5l}75pJa&Ey?!K*3daZ)es0=6m5O@4K7lc4lXGW&;5Zhr{7;bVmsB zf-PK^k_p1 z{hWd+P(oQu5f}jb4#dcA)j@WEM#EA;J^1QC${Cmj5%7enm;%rXwjGFB2k$`+RVgXp z6_^A6Y)Ux?GoXg-9ZLS=pc`yBxLP*BN03W-(0!@KiZh#1$OHL5% z2zuEA89D?t3A%~u5Y$6hP`?gA!xn{ieRv1nwP?pM3t~Ymhy}4A?;8EiVmT3EL6^VH zYUd-)f>;m>VnL=0q7oLwf>;m>GD^@1m<2=N6Bq|;EGY5JT5bmgZ>UiYmP{4&4P@J_ z)%D1BM?4oKHxNS(>vfqTNFGoqPO|2*34+F4)GRYWP?gKNYt#jWT-KeSEa*@}-G0h~ z{tB1p2l4qq>Rl|)W!-t|f?8eF460=bX+htU?Ph9OV#G|kEs1*B!r5VRUkj2ilvFyX z6;f+AqZX@DQrlhKO(b4iSrv~f_xe2O2WSELS3WCG#md9wpN0Ly<-QXXPx8x;eDFju zu0v3a@FUll4nbjXKv0fsQ&`syW-~!S&APXFqeQMG*@kGqi>U4vQv>&?&xotv9u9Cg g91e%W;c)KEf9=UT--*;^ZU6uP07*qoM6N<$g5nx5YybcN literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/actionbar_logo.9.png b/app/src/main/res/drawable/actionbar_logo.9.png deleted file mode 100644 index d71088c853af6666180f69b956ecab049f2cbb8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14669 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 diff --git a/app/src/main/res/drawable/lollipop_logo.png b/app/src/main/res/drawable/lollipop_logo.png deleted file mode 100644 index 637cff97b7f716dc81bd3fcbbd1eb9c48f30d500..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1687 zcmV;I259+-P)<{98FWQhbW?9;ba!ELWdLwtX>N2bZe?^J zG%heMF)*zP3cvsW1{6s|K~#8N?VD?;RYe@dwS1&TnUzr4i>N5I2bE4_kmRR|%0SYH2!$S05M&xr6cs&%AVTbk(3i4^=yeD+d)fPaT5D$Sv**rT``kHq zW=?5)!H;|P+Ouc=|GDSvGmm}73=R%9bU~U871C^|kY+=LG#e_U*-#|& z4L+w)=nrs^sOR9~oU32KEq>X4BF#_`{0V^Xm^y6*+wIFCnkMR+Yfnk7^vm}PX@-Kp zAGh)MEY(5x+EcZ>1E)E4Ob7SzL=WoQKvJ5$fMCx6n@reYS|RE<$({<e6;p#7NK9~TWr{U>ius`6GVEn z37rK#FsZfMw}Uy(IezSx1GVs9r&VtKIgw@#kQ8s+_W<6HxUEwT6#boy5Dlm{av;r| zAh~%q$0+U99mEa9Snbsv#2wfW@y7n6ecAa23b@cPTJCAjR=rfHQtB{7>-f&w(^^ zfP^jty@(xh0XWpDqs0@2IM>VGNzzOW5*ZKPWmbXWpz#1v4@clnu|T2aewoxrGc`!$ z3Y$-`*qOCAW}M@yB?p_F_@1cBq(Yi0K>~+?&^eZ?FTe|6p;H&1H#)X>U9MrTFVE*d znyEnW+%^5wq!A~4tXiC^a6M^DQTG(E8*n*yuHSYlq?rN)&83bHK`L=mvhJhGC)lzq ze@GLJ@jw3@;Jj&yDpLo_p9)q3-Xl`#J;3cDj;`Mad^hnUSn7HePb|_TXmBCmOq*}x zN5C?`=M8=M7~YKqTp3K=F{QXuayWPy@SS-KxC4~p!dvoHMroFy!40PA|Bkq&)a_xb zWh##tq*;OnxsUa>X*y2sQ?4wapKfT9f-i&z@4$)iS zOy^p64mDc29rU2Jq|C=K71FE&jdOv$+dGNt&HVZu@+2ybQ*_W;r@j%luu~z;ZXkf8 zz!npV6&JwxRK`H7)f)C_OL0w#4qEKh`H{7UDe2>R(i{l{!ADg%VO#>nsWL7olcIwr zdvz|h_Au>q%f%wi)F9{-9dwCTC+B8ro|p77VQHoYL8s^-{wQXuSFf6z{ck&ndeWJ#?(x??T!!haGUi5_IYDxq0G|TR1*^crfKvy>LtrI1 h2h0S0-as52^AC<3;P0%Gl_vlI002ovPDHLkV1fs{69xbP diff --git a/app/src/main/res/drawable/news_bg.png b/app/src/main/res/drawable/news_bg.png deleted file mode 100644 index aa08d792973d512b7cca44820b773cabf5c218f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1747 zcmeAS@N?(olHy`uVBq!ia0y~yV15B)Pvc+%lD^4{P5>#!;vjb?hIQv;UIIBR>5jgR z3=A9lx&I`x0{NT;9+AZi419+{nDKc2iWH!rM2TxeNpOBzNqJ&XDnmhHW?qS2UTTSg ziJpO;WsY&39|HrMi>HfYNJZS+>$>YyqeNRTZekH(a+ZAK`)b~*3!Fk392FwG3XT^A zq#Q0dNIM8NF}GGuvN`9yZ1(4m;pM6wA5{;p-TSvj-E)$P=cIr9zkYmtd>&|V!}-s@ ze*L<uqX3e%by!;Q!UjZJ$~-vx z=aJ=={WB&1eeG=rsg(Zt<>lq+=Ntdc{{H@cy>f8Pb~$FCc>e2;6@RQiJVp@j{nxKw zkI#I3w+hH%*t7S!!~fc672D-Ny!`h-mA1uuqWOWG25F!oD^PIerSz4*mH;w#OtieW zHW|ox;0Dyv2Q+R}(P$8irh?IoFxbk1x3+Tq`bNihe+3p+3>DSDGV%DCk9oEr-o1Op z3;x@{3c2lHWuDhpRaX8i0~Lbc0`j@#x&Oez_}5;ak9Vs$fI4dS`OmkjH9c4V`{CjC z_vvl*wXZ?t>Vx{vS2fNX{QrEJKRzyQ-&D?j>#ODdgX)$aIrSBMU+(YSx9{Jlm+mv~ kg35X*db$6_-QD#};q5Xqdlm?>0~IrPy85}Sb4q9e0I8&#NdN!< diff --git a/app/src/main/res/drawable/splash_logo.jpg b/app/src/main/res/drawable/splash_logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2342c486ec7d6f65c99eca3a2363a49cbd84d431 GIT binary patch literal 13237 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 LNkvXXu0mjfP@|jM diff --git a/app/src/main/res/navigation/navigation_chat.xml b/app/src/main/res/navigation/navigation_chat.xml index 8fcc37d..f353eb6 100644 --- a/app/src/main/res/navigation/navigation_chat.xml +++ b/app/src/main/res/navigation/navigation_chat.xml @@ -7,7 +7,7 @@ tools:ignore="UnusedNavigation"> \ No newline at end of file diff --git a/app/src/main/res/navigation/navigation_news.xml b/app/src/main/res/navigation/navigation_news.xml index 1b1795d..83c5461 100644 --- a/app/src/main/res/navigation/navigation_news.xml +++ b/app/src/main/res/navigation/navigation_news.xml @@ -7,7 +7,7 @@ tools:ignore="UnusedNavigation"> \ No newline at end of file diff --git a/app/src/main/res/navigation/navigation_nowplaying.xml b/app/src/main/res/navigation/navigation_nowplaying.xml index 81a2fee..630ddad 100644 --- a/app/src/main/res/navigation/navigation_nowplaying.xml +++ b/app/src/main/res/navigation/navigation_nowplaying.xml @@ -8,7 +8,7 @@ \ No newline at end of file diff --git a/app/src/main/res/navigation/navigation_songs.xml b/app/src/main/res/navigation/navigation_songs.xml index d456623..ca6cfd1 100644 --- a/app/src/main/res/navigation/navigation_songs.xml +++ b/app/src/main/res/navigation/navigation_songs.xml @@ -7,7 +7,7 @@ tools:ignore="UnusedNavigation"> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b6a5935..d7b533a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,7 +2,7 @@ #333333 #222222 - #DF4C3A + #f58b01 #454545 #DF4C3A #DDDDDD diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ea618ca..2cb859b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ - R/a/dio2 - R/a/dio + Tsumugi + Tsumugi Songs Chat News @@ -34,13 +34,13 @@ .ra f R/a/dio Stream Service - io.r_a_d.radio2.PLAYER_SERVICE + fr.forum_thalie.tsumugi.PLAYER_SERVICE Streamer Monitor Service - io.r_a_d.radio2.STREAMER_NOTIFICATION_SERVICE + fr.forum_thalie.tsumugi.STREAMER_NOTIFICATION_SERVICE New Streamer Notification - io.r_a_d.radio2.STREAMER_NOTIFICATION_NEW + fr.forum_thalie.tsumugi.STREAMER_NOTIFICATION_NEW This feature is EXPERIMENTAL. \nIt WILL consume your battery by polling the server regularly. diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index c8653d5..d217084 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -8,28 +8,28 @@ app:icon="@drawable/ic_alarm" app:key="alarmScreen" app:title="Set up alarm clock" - app:fragment="io.r_a_d.radio2.preferences.AlarmFragment" + app:fragment="fr.forum_thalie.tsumugi.preferences.AlarmFragment" />