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 0000000..4016d46 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/lollipop_logo.png differ 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 0000000..9d6e952 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/lollipop_logo.png differ 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 0000000..d2a34cd Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/lollipop_logo.png differ 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 0000000..05d6f2c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/lollipop_logo.png differ 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 d71088c..0000000 Binary files a/app/src/main/res/drawable/actionbar_logo.9.png and /dev/null differ diff --git a/app/src/main/res/drawable/actionbar_logo.jpg b/app/src/main/res/drawable/actionbar_logo.jpg new file mode 100644 index 0000000..2342c48 Binary files /dev/null and b/app/src/main/res/drawable/actionbar_logo.jpg differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index ea595ac..8fc085b 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -6,6 +6,6 @@ android:viewportHeight="108" > 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 637cff9..0000000 Binary files a/app/src/main/res/drawable/lollipop_logo.png and /dev/null differ 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 aa08d79..0000000 Binary files a/app/src/main/res/drawable/news_bg.png and /dev/null differ 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 0000000..2342c48 Binary files /dev/null and b/app/src/main/res/drawable/splash_logo.jpg differ diff --git a/app/src/main/res/drawable/splash_logo.png b/app/src/main/res/drawable/splash_logo.png deleted file mode 100644 index 414b494..0000000 Binary files a/app/src/main/res/drawable/splash_logo.png and /dev/null differ 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" />