fix riff renaming
Ursprung
eb8698a8e2
Commit
dc62f8f591
|
|
@ -1 +0,0 @@
|
|||
Tsumugi-app
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ android {
|
|||
jvmTarget = "11"
|
||||
}
|
||||
defaultConfig {
|
||||
applicationId "fr.forum_thalie.tsumugi"
|
||||
applicationId "fr.riff_app.riff"
|
||||
minSdkVersion 16
|
||||
targetSdkVersion 32
|
||||
multiDexEnabled true
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
package fr.forum_thalie.tsumugi
|
||||
|
||||
import androidx.test.platform.app.InstrumentationRegistry
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
|
||||
import org.junit.Assert.*
|
||||
|
||||
/**
|
||||
* Instrumented test, which will execute on an Android device.
|
||||
*
|
||||
* See [testing documentation](http://d.android.com/tools/testing).
|
||||
*/
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
class ExampleInstrumentedTest {
|
||||
@Test
|
||||
fun useAppContext() {
|
||||
// Context of the app under test.
|
||||
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
|
||||
assertEquals("fr.forum_thalie.tsumugi", appContext.packageName)
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
package="fr.forum_thalie.tsumugi">
|
||||
package="fr.riff_app.riff">
|
||||
|
||||
<uses-permission android:name="android.permission.VIBRATE" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
|
|
@ -40,8 +40,8 @@
|
|||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.BOOT_COMPLETED" />
|
||||
<action android:name="fr.forum_thalie.tsumugi.PLAY_OR_FALLBACK" />
|
||||
<action android:name="fr.forum_thalie.tsumugi.NOTIFY" /> <!-- this is for Snooze -->
|
||||
<action android:name="fr.riff_app.riff.PLAY_OR_FALLBACK" />
|
||||
<action android:name="fr.riff_app.riff.NOTIFY" /> <!-- this is for Snooze -->
|
||||
<category android:name="android.intent.category.DEFAULT"/>
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi
|
||||
package fr.riff_app.riff
|
||||
|
||||
enum class Actions
|
||||
{
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package fr.forum_thalie.tsumugi
|
||||
package fr.riff_app.riff
|
||||
|
||||
import android.os.AsyncTask
|
||||
import android.util.Log
|
||||
import fr.forum_thalie.tsumugi.playerstore.PlayerStore
|
||||
import fr.riff_app.riff.playerstore.PlayerStore
|
||||
|
||||
class Async(val handler: (Any?) -> Any?, val post: (Any?) -> Unit = {},
|
||||
private val actionOnError: ActionOnError = ActionOnError.RESET, private val parameters: Any? = null) :
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi
|
||||
package fr.riff_app.riff
|
||||
|
||||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi
|
||||
package fr.riff_app.riff
|
||||
|
||||
import android.app.Notification
|
||||
import android.app.NotificationChannel
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi
|
||||
package fr.riff_app.riff
|
||||
|
||||
import android.content.BroadcastReceiver
|
||||
import android.content.Context
|
||||
|
|
@ -6,9 +6,9 @@ import android.content.Intent
|
|||
import android.os.Build
|
||||
import android.util.Log
|
||||
import androidx.preference.PreferenceManager
|
||||
import fr.forum_thalie.tsumugi.alarm.RadioAlarm
|
||||
import fr.forum_thalie.tsumugi.planning.Planning
|
||||
import fr.forum_thalie.tsumugi.playerstore.PlayerStore
|
||||
import fr.riff_app.riff.alarm.RadioAlarm
|
||||
import fr.riff_app.riff.planning.Planning
|
||||
import fr.riff_app.riff.playerstore.PlayerStore
|
||||
|
||||
class BootBroadcastReceiver : BroadcastReceiver(){
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi
|
||||
package fr.riff_app.riff
|
||||
|
||||
import android.os.Bundle
|
||||
import com.google.android.material.bottomnavigation.BottomNavigationView
|
||||
|
|
@ -11,13 +11,13 @@ import androidx.core.content.res.ResourcesCompat
|
|||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.Observer
|
||||
import androidx.navigation.NavController
|
||||
import fr.forum_thalie.tsumugi.playerstore.PlayerStore
|
||||
import fr.riff_app.riff.playerstore.PlayerStore
|
||||
|
||||
import java.util.Timer
|
||||
import android.view.MenuItem
|
||||
import com.google.android.material.snackbar.Snackbar
|
||||
import fr.forum_thalie.tsumugi.alarm.RadioAlarm
|
||||
import fr.forum_thalie.tsumugi.planning.Planning
|
||||
import fr.riff_app.riff.alarm.RadioAlarm
|
||||
import fr.riff_app.riff.planning.Planning
|
||||
|
||||
|
||||
/* Log to file import
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi
|
||||
package fr.riff_app.riff
|
||||
|
||||
|
||||
import android.content.Intent
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi
|
||||
package fr.riff_app.riff
|
||||
|
||||
import android.app.PendingIntent
|
||||
import android.content.Context
|
||||
|
|
@ -8,7 +8,7 @@ import android.support.v4.media.session.MediaSessionCompat
|
|||
import android.support.v4.media.session.PlaybackStateCompat
|
||||
import androidx.annotation.RequiresApi
|
||||
import androidx.core.app.NotificationCompat
|
||||
import fr.forum_thalie.tsumugi.playerstore.PlayerStore
|
||||
import fr.riff_app.riff.playerstore.PlayerStore
|
||||
|
||||
class NowPlayingNotification(
|
||||
notificationChannelId: String,
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package fr.forum_thalie.tsumugi
|
||||
package fr.riff_app.riff
|
||||
|
||||
import android.os.Bundle
|
||||
import android.view.MenuItem
|
||||
import fr.forum_thalie.tsumugi.preferences.*
|
||||
import fr.riff_app.riff.preferences.*
|
||||
|
||||
|
||||
class ParametersActivity : BaseActivity() {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi
|
||||
package fr.riff_app.riff
|
||||
|
||||
import android.app.Service
|
||||
import android.content.BroadcastReceiver
|
||||
|
|
@ -32,10 +32,10 @@ import androidx.media.AudioManagerCompat
|
|||
import androidx.preference.PreferenceManager
|
||||
import com.google.android.exoplayer2.*
|
||||
import com.google.android.exoplayer2.metadata.icy.*
|
||||
import fr.forum_thalie.tsumugi.alarm.RadioAlarm
|
||||
import fr.forum_thalie.tsumugi.alarm.RadioSleeper
|
||||
import fr.forum_thalie.tsumugi.planning.Planning
|
||||
import fr.forum_thalie.tsumugi.playerstore.PlayerStore
|
||||
import fr.riff_app.riff.alarm.RadioAlarm
|
||||
import fr.riff_app.riff.alarm.RadioSleeper
|
||||
import fr.riff_app.riff.planning.Planning
|
||||
import fr.riff_app.riff.playerstore.PlayerStore
|
||||
import java.util.*
|
||||
import kotlin.math.exp
|
||||
import kotlin.math.ln
|
||||
|
|
@ -428,7 +428,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_TSUMUGI)))
|
||||
.createMediaSource(Uri.parse(getString(R.string.STREAM_URL_RIFF)))
|
||||
|
||||
fallbackMediaSource = ProgressiveMediaSource.Factory(dataSourceFactory)
|
||||
.createMediaSource(Uri.parse("file:///android_asset/the_stream_is_down.mp3"))
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package fr.forum_thalie.tsumugi
|
||||
package fr.riff_app.riff
|
||||
|
||||
import android.support.v4.media.session.PlaybackStateCompat
|
||||
import fr.forum_thalie.tsumugi.playerstore.PlayerStore
|
||||
import fr.riff_app.riff.playerstore.PlayerStore
|
||||
import java.util.*
|
||||
|
||||
class ApiFetchTick : TimerTask() {
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
package fr.forum_thalie.tsumugi
|
||||
package fr.riff_app.riff
|
||||
|
||||
import android.content.SharedPreferences
|
||||
import android.content.res.ColorStateList
|
||||
import kotlin.collections.ArrayList
|
||||
|
||||
const val tag = "fr.forum_thalie.tsumugi"
|
||||
const val tag = "fr.riff_app.riff"
|
||||
const val noConnectionValue = "—"
|
||||
const val streamDownValue = "Riff est HS !" // we don't want this value to be displaed in the "last played" screen.
|
||||
val weekdaysArray : Array<String> = arrayOf( "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche")
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.alarm
|
||||
package fr.riff_app.riff.alarm
|
||||
|
||||
import android.app.AlarmManager
|
||||
import android.app.PendingIntent
|
||||
|
|
@ -8,9 +8,9 @@ import android.os.Build
|
|||
import android.util.Log
|
||||
import androidx.annotation.RequiresApi
|
||||
import androidx.core.app.AlarmManagerCompat
|
||||
import fr.forum_thalie.tsumugi.BootBroadcastReceiver
|
||||
import fr.riff_app.riff.BootBroadcastReceiver
|
||||
import androidx.preference.PreferenceManager
|
||||
import fr.forum_thalie.tsumugi.*
|
||||
import fr.riff_app.riff.*
|
||||
import java.util.*
|
||||
import kotlin.collections.ArrayList
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.alarm
|
||||
package fr.riff_app.riff.alarm
|
||||
|
||||
import android.app.AlarmManager
|
||||
import android.app.PendingIntent
|
||||
|
|
@ -10,7 +10,7 @@ import androidx.annotation.RequiresApi
|
|||
import androidx.core.app.AlarmManagerCompat
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import androidx.preference.PreferenceManager
|
||||
import fr.forum_thalie.tsumugi.*
|
||||
import fr.riff_app.riff.*
|
||||
|
||||
class RadioSleeper {
|
||||
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
package fr.forum_thalie.tsumugi.planning
|
||||
package fr.riff_app.riff.planning
|
||||
|
||||
import android.content.Context
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import fr.forum_thalie.tsumugi.Async
|
||||
import fr.forum_thalie.tsumugi.R
|
||||
import fr.forum_thalie.tsumugi.noConnectionValue
|
||||
import fr.forum_thalie.tsumugi.weekdays
|
||||
import fr.riff_app.riff.Async
|
||||
import fr.riff_app.riff.R
|
||||
import fr.riff_app.riff.noConnectionValue
|
||||
import fr.riff_app.riff.weekdays
|
||||
import org.json.JSONObject
|
||||
import java.io.IOException
|
||||
import java.net.URL
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package fr.forum_thalie.tsumugi.planning
|
||||
package fr.riff_app.riff.planning
|
||||
|
||||
import android.util.Log
|
||||
import fr.forum_thalie.tsumugi.tag
|
||||
import fr.forum_thalie.tsumugi.weekdays
|
||||
import fr.riff_app.riff.tag
|
||||
import fr.riff_app.riff.weekdays
|
||||
import java.util.*
|
||||
import kotlin.collections.ArrayList
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.playerstore
|
||||
package fr.riff_app.riff.playerstore
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.Bitmap
|
||||
|
|
@ -6,8 +6,8 @@ import android.graphics.BitmapFactory
|
|||
import android.support.v4.media.session.PlaybackStateCompat
|
||||
import android.util.Log
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import fr.forum_thalie.tsumugi.*
|
||||
import fr.forum_thalie.tsumugi.planning.Planning
|
||||
import fr.riff_app.riff.*
|
||||
import fr.riff_app.riff.planning.Planning
|
||||
import org.json.JSONObject
|
||||
import java.net.URL
|
||||
import java.text.ParseException
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package fr.forum_thalie.tsumugi.playerstore
|
||||
package fr.riff_app.riff.playerstore
|
||||
|
||||
import androidx.core.text.HtmlCompat
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import fr.forum_thalie.tsumugi.noConnectionValue
|
||||
import fr.riff_app.riff.noConnectionValue
|
||||
|
||||
class Song(artistTitle: String = "", _id : Int = 0) {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.preferences
|
||||
package fr.riff_app.riff.preferences
|
||||
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
|
|
@ -14,10 +14,10 @@ import androidx.preference.PreferenceFragmentCompat
|
|||
import androidx.preference.PreferenceManager
|
||||
import androidx.preference.SeekBarPreference
|
||||
import androidx.preference.SwitchPreferenceCompat
|
||||
import fr.forum_thalie.tsumugi.Actions
|
||||
import fr.forum_thalie.tsumugi.R
|
||||
import fr.forum_thalie.tsumugi.RadioService
|
||||
import fr.forum_thalie.tsumugi.playerstore.PlayerStore
|
||||
import fr.riff_app.riff.Actions
|
||||
import fr.riff_app.riff.R
|
||||
import fr.riff_app.riff.RadioService
|
||||
import fr.riff_app.riff.playerstore.PlayerStore
|
||||
import kotlinx.coroutines.*
|
||||
import kotlin.coroutines.CoroutineContext
|
||||
import kotlin.math.max
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.preferences
|
||||
package fr.riff_app.riff.preferences
|
||||
|
||||
import android.app.TimePickerDialog
|
||||
import android.content.Context
|
||||
|
|
@ -11,10 +11,10 @@ import androidx.appcompat.app.AlertDialog
|
|||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.core.content.edit
|
||||
import androidx.preference.*
|
||||
import fr.forum_thalie.tsumugi.*
|
||||
import fr.forum_thalie.tsumugi.R
|
||||
import fr.forum_thalie.tsumugi.alarm.RadioAlarm
|
||||
import fr.forum_thalie.tsumugi.playerstore.PlayerStore
|
||||
import fr.riff_app.riff.*
|
||||
import fr.riff_app.riff.R
|
||||
import fr.riff_app.riff.alarm.RadioAlarm
|
||||
import fr.riff_app.riff.playerstore.PlayerStore
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.GlobalScope.coroutineContext
|
||||
import kotlinx.coroutines.Job
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
package fr.forum_thalie.tsumugi.preferences
|
||||
package fr.riff_app.riff.preferences
|
||||
|
||||
import android.content.Context
|
||||
import android.os.Bundle
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.preference.*
|
||||
import fr.forum_thalie.tsumugi.R
|
||||
import fr.forum_thalie.tsumugi.preferenceStore
|
||||
import fr.riff_app.riff.R
|
||||
import fr.riff_app.riff.preferenceStore
|
||||
|
||||
class CustomizeFragment : PreferenceFragmentCompat() {
|
||||
override fun onAttach(context: Context) {
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
package fr.forum_thalie.tsumugi.preferences
|
||||
package fr.riff_app.riff.preferences
|
||||
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.os.Bundle
|
||||
import fr.forum_thalie.tsumugi.R
|
||||
import fr.riff_app.riff.R
|
||||
import android.annotation.SuppressLint
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.preference.*
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
package fr.forum_thalie.tsumugi.preferences
|
||||
package fr.riff_app.riff.preferences
|
||||
|
||||
import android.content.Context
|
||||
import android.os.Bundle
|
||||
import androidx.preference.*
|
||||
import fr.forum_thalie.tsumugi.R
|
||||
import fr.riff_app.riff.R
|
||||
import android.text.InputType
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import fr.forum_thalie.tsumugi.alarm.RadioSleeper
|
||||
import fr.riff_app.riff.alarm.RadioSleeper
|
||||
|
||||
|
||||
class SleepFragment : PreferenceFragmentCompat() {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.ui
|
||||
package fr.riff_app.riff.ui
|
||||
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.fragment.app.FragmentPagerAdapter
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.ui.news
|
||||
package fr.riff_app.riff.ui.news
|
||||
|
||||
import java.util.*
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.ui.news
|
||||
package fr.riff_app.riff.ui.news
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.app.Activity
|
||||
|
|
@ -20,8 +20,8 @@ import androidx.core.content.ContextCompat
|
|||
import androidx.core.text.HtmlCompat
|
||||
import androidx.core.widget.TextViewCompat
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import fr.forum_thalie.tsumugi.R
|
||||
import fr.forum_thalie.tsumugi.newsDisplayDatePattern
|
||||
import fr.riff_app.riff.R
|
||||
import fr.riff_app.riff.newsDisplayDatePattern
|
||||
import java.io.IOException
|
||||
import java.io.InputStream
|
||||
import java.net.URL
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.ui.news
|
||||
package fr.riff_app.riff.ui.news
|
||||
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
|
|
@ -12,7 +12,7 @@ import androidx.lifecycle.ViewModelProviders
|
|||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
|
||||
import fr.forum_thalie.tsumugi.R
|
||||
import fr.riff_app.riff.R
|
||||
|
||||
class NewsFragment : Fragment() {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.ui.news
|
||||
package fr.riff_app.riff.ui.news
|
||||
|
||||
import android.content.Context
|
||||
import android.os.Build
|
||||
|
|
@ -8,9 +8,9 @@ import android.webkit.WebView
|
|||
import androidx.lifecycle.ViewModel
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import com.prof.rssparser.Parser
|
||||
import fr.forum_thalie.tsumugi.R
|
||||
import fr.forum_thalie.tsumugi.newsDateTimePattern
|
||||
import fr.forum_thalie.tsumugi.tag
|
||||
import fr.riff_app.riff.R
|
||||
import fr.riff_app.riff.newsDateTimePattern
|
||||
import fr.riff_app.riff.tag
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.Job
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.ui.news
|
||||
package fr.riff_app.riff.ui.news
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.Intent
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.ui.nowplaying
|
||||
package fr.riff_app.riff.ui.nowplaying
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.ClipboardManager
|
||||
|
|
@ -16,11 +16,11 @@ import androidx.constraintlayout.widget.ConstraintSet
|
|||
import androidx.lifecycle.Observer
|
||||
import com.google.android.material.snackbar.BaseTransientBottomBar
|
||||
import com.google.android.material.snackbar.Snackbar
|
||||
import fr.forum_thalie.tsumugi.*
|
||||
import fr.forum_thalie.tsumugi.alarm.RadioSleeper
|
||||
import fr.forum_thalie.tsumugi.planning.Planning
|
||||
import fr.forum_thalie.tsumugi.playerstore.PlayerStore
|
||||
import fr.forum_thalie.tsumugi.playerstore.Song
|
||||
import fr.riff_app.riff.*
|
||||
import fr.riff_app.riff.alarm.RadioSleeper
|
||||
import fr.riff_app.riff.planning.Planning
|
||||
import fr.riff_app.riff.playerstore.PlayerStore
|
||||
import fr.riff_app.riff.playerstore.Song
|
||||
|
||||
|
||||
class NowPlayingFragment : Fragment() {
|
||||
|
|
@ -89,7 +89,7 @@ class NowPlayingFragment : Fragment() {
|
|||
|
||||
|
||||
Planning.instance.currentProgramme.observe(viewLifecycleOwner, Observer {
|
||||
currentProgrammeText.text = "${context!!.getString(R.string.current_programme)} $it"
|
||||
currentProgrammeText.text = "${requireContext().getString(R.string.current_programme)} $it"
|
||||
})
|
||||
|
||||
|
||||
|
|
@ -184,7 +184,7 @@ class NowPlayingFragment : Fragment() {
|
|||
|
||||
val setClipboardListener: View.OnLongClickListener = View.OnLongClickListener {
|
||||
val text = PlayerStore.instance.currentSong.artist.value + " - " + PlayerStore.instance.currentSong.title.value
|
||||
val clipboard = context!!.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
|
||||
val clipboard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
|
||||
val clip = android.content.ClipData.newPlainText("Copied Text", text)
|
||||
clipboard.setPrimaryClip(clip)
|
||||
val snackBarLength = if (preferenceStore.getBoolean("snackbarPersistent", false))
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
package fr.forum_thalie.tsumugi.ui.nowplaying
|
||||
package fr.riff_app.riff.ui.nowplaying
|
||||
|
||||
import android.widget.SeekBar
|
||||
import androidx.core.content.edit
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import androidx.lifecycle.ViewModel
|
||||
import fr.forum_thalie.tsumugi.playerstore.PlayerStore
|
||||
import fr.forum_thalie.tsumugi.preferenceStore
|
||||
import fr.riff_app.riff.playerstore.PlayerStore
|
||||
import fr.riff_app.riff.preferenceStore
|
||||
|
||||
class NowPlayingViewModel: ViewModel() {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.ui.programme
|
||||
package fr.riff_app.riff.ui.programme
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.view.LayoutInflater
|
||||
|
|
@ -6,12 +6,12 @@ import android.view.ViewGroup
|
|||
import android.widget.TextView
|
||||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import fr.forum_thalie.tsumugi.R
|
||||
import fr.forum_thalie.tsumugi.colorAccent
|
||||
import fr.forum_thalie.tsumugi.colorWhited
|
||||
import fr.forum_thalie.tsumugi.planning.Planning
|
||||
import fr.forum_thalie.tsumugi.planning.Programme
|
||||
import fr.forum_thalie.tsumugi.weekdaysSundayFirst
|
||||
import fr.riff_app.riff.R
|
||||
import fr.riff_app.riff.colorAccent
|
||||
import fr.riff_app.riff.colorWhited
|
||||
import fr.riff_app.riff.planning.Planning
|
||||
import fr.riff_app.riff.planning.Programme
|
||||
import fr.riff_app.riff.weekdaysSundayFirst
|
||||
import java.util.*
|
||||
|
||||
class ProgrammeAdapter(private val dataSet: ArrayList<Programme>, private val day: String
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.ui.programme
|
||||
package fr.riff_app.riff.ui.programme
|
||||
|
||||
import android.os.Bundle
|
||||
import android.view.LayoutInflater
|
||||
|
|
@ -9,10 +9,10 @@ import androidx.lifecycle.Observer
|
|||
import androidx.lifecycle.ViewModelProviders
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import fr.forum_thalie.tsumugi.R
|
||||
import fr.forum_thalie.tsumugi.planning.Planning
|
||||
import fr.forum_thalie.tsumugi.planning.Programme
|
||||
import fr.forum_thalie.tsumugi.weekdays
|
||||
import fr.riff_app.riff.R
|
||||
import fr.riff_app.riff.planning.Planning
|
||||
import fr.riff_app.riff.planning.Programme
|
||||
import fr.riff_app.riff.weekdays
|
||||
|
||||
|
||||
class ProgrammeDayFragment : Fragment() {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.ui.programme
|
||||
package fr.riff_app.riff.ui.programme
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.ui.programme
|
||||
package fr.riff_app.riff.ui.programme
|
||||
|
||||
import android.os.Bundle
|
||||
import android.util.Log
|
||||
|
|
@ -9,10 +9,10 @@ import androidx.fragment.app.Fragment
|
|||
import androidx.fragment.app.FragmentPagerAdapter
|
||||
import androidx.viewpager.widget.ViewPager
|
||||
import com.google.android.material.tabs.TabLayout
|
||||
import fr.forum_thalie.tsumugi.R
|
||||
import fr.forum_thalie.tsumugi.planning.Planning
|
||||
import fr.forum_thalie.tsumugi.ui.APagerAdapter
|
||||
import fr.forum_thalie.tsumugi.weekdays
|
||||
import fr.riff_app.riff.R
|
||||
import fr.riff_app.riff.planning.Planning
|
||||
import fr.riff_app.riff.ui.APagerAdapter
|
||||
import fr.riff_app.riff.weekdays
|
||||
import java.util.*
|
||||
|
||||
class ProgrammeFragment : Fragment() {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.ui.songs
|
||||
package fr.riff_app.riff.ui.songs
|
||||
|
||||
import android.os.Bundle
|
||||
import android.util.Log
|
||||
|
|
@ -9,10 +9,10 @@ import androidx.fragment.app.Fragment
|
|||
import androidx.fragment.app.FragmentPagerAdapter
|
||||
import androidx.viewpager.widget.ViewPager
|
||||
import com.google.android.material.tabs.TabLayout
|
||||
import fr.forum_thalie.tsumugi.R
|
||||
import fr.forum_thalie.tsumugi.ui.APagerAdapter
|
||||
import fr.forum_thalie.tsumugi.ui.programme.ProgrammeDayFragment
|
||||
import fr.forum_thalie.tsumugi.ui.songs.queuelp.LastPlayedFragment
|
||||
import fr.riff_app.riff.R
|
||||
import fr.riff_app.riff.ui.APagerAdapter
|
||||
import fr.riff_app.riff.ui.programme.ProgrammeDayFragment
|
||||
import fr.riff_app.riff.ui.songs.queuelp.LastPlayedFragment
|
||||
|
||||
class SongsFragment : Fragment() {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.ui.songs.queuelp
|
||||
package fr.riff_app.riff.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 fr.forum_thalie.tsumugi.R
|
||||
import fr.forum_thalie.tsumugi.playerstore.PlayerStore
|
||||
import fr.riff_app.riff.R
|
||||
import fr.riff_app.riff.playerstore.PlayerStore
|
||||
|
||||
/**
|
||||
* A simple [Fragment] subclass.
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fr.forum_thalie.tsumugi.ui.songs.queuelp
|
||||
package fr.riff_app.riff.ui.songs.queuelp
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.graphics.Color
|
||||
|
|
@ -8,11 +8,11 @@ import android.view.ViewGroup
|
|||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
import androidx.core.content.res.ResourcesCompat
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
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 fr.forum_thalie.tsumugi.tag
|
||||
import fr.riff_app.riff.R
|
||||
import fr.riff_app.riff.colorBlue
|
||||
import fr.riff_app.riff.colorWhited
|
||||
import fr.riff_app.riff.playerstore.Song
|
||||
import fr.riff_app.riff.tag
|
||||
import kotlinx.android.synthetic.main.song_view.view.*
|
||||
import kotlin.collections.ArrayList
|
||||
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
tools:ignore="UnusedNavigation">
|
||||
<fragment
|
||||
android:id="@+id/fragment_news"
|
||||
android:name="fr.forum_thalie.tsumugi.ui.news.NewsFragment"
|
||||
android:name="fr.riff_app.riff.ui.news.NewsFragment"
|
||||
android:label="@string/title_news"
|
||||
tools:layout="@layout/fragment_songs" />
|
||||
</navigation>
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
<fragment
|
||||
android:id="@+id/fragment_nowplaying"
|
||||
android:name="fr.forum_thalie.tsumugi.ui.nowplaying.NowPlayingFragment"
|
||||
android:name="fr.riff_app.riff.ui.nowplaying.NowPlayingFragment"
|
||||
android:label="@string/title_nowplaying" />
|
||||
|
||||
</navigation>
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
<fragment
|
||||
android:id="@+id/fragment_programme"
|
||||
android:name="fr.forum_thalie.tsumugi.ui.programme.ProgrammeFragment"
|
||||
android:name="fr.riff_app.riff.ui.programme.ProgrammeFragment"
|
||||
android:label="@string/title_programme" />
|
||||
|
||||
</navigation>
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
tools:ignore="UnusedNavigation">
|
||||
<fragment
|
||||
android:id="@+id/fragment_songs"
|
||||
android:name="fr.forum_thalie.tsumugi.ui.songs.SongsFragment"
|
||||
android:name="fr.riff_app.riff.ui.songs.SongsFragment"
|
||||
android:label="@string/title_queue_lp"
|
||||
tools:layout="@layout/fragment_songs" />
|
||||
</navigation>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<resources>
|
||||
<string name="app_name">Tsumugi</string>
|
||||
<string name="title_nowplaying">Tsumugi</string>
|
||||
<string name="app_name">Riff</string>
|
||||
<string name="title_nowplaying">Riff</string>
|
||||
<string name="title_queue_lp">Titres</string>
|
||||
<string name="title_chat">Chat</string>
|
||||
<string name="title_news">Actus</string>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
|
||||
|
||||
<!-- URLs -->
|
||||
<string name="STREAM_URL_TSUMUGI">https://sstream.riff-radio.org/;stream.mp3</string>
|
||||
<string name="STREAM_URL_RIFF">https://sstream.riff-radio.org/;stream.mp3</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<!-- URLs -->
|
||||
<string name="STREAM_URL_RADIO">https://sstream.riff-radio.org/;stream.mp3</string>
|
||||
<string name="STREAM_URL_TSUMUGI">https://sstream.riff-radio.org/;stream.mp3</string>
|
||||
<string name="STREAM_URL_RIFF">https://sstream.riff-radio.org/;stream.mp3</string>
|
||||
<string name="STREAM_URL_RSTLSS">https://sstream.riff-radio.org/;stream.mp3</string>
|
||||
<string name="github_url_new_issue">https://git.pagelibre.org/riff/riff_app</string>
|
||||
<string name="website_url">https://m.riff-radio.fr/</string>
|
||||
|
|
@ -33,8 +33,8 @@
|
|||
<string name="action_settings">Settings</string>
|
||||
<string name="action_bug_submit">Submit a bug (GitHub)</string>
|
||||
|
||||
<string name="nowPlayingNotificationChannel">Tsumugi Stream Service</string>
|
||||
<string name="nowPlayingChannelId">fr.forum_thalie.tsumugi.PLAYER_SERVICE</string>
|
||||
<string name="nowPlayingNotificationChannel">Riff Stream Service</string>
|
||||
<string name="nowPlayingChannelId">fr.riff_app.riff.PLAYER_SERVICE</string>
|
||||
|
||||
<string name="snackbarPersistent">Stay visible, can be closed with \"OK\" button</string>
|
||||
<string name="snackbarNonPersistent">Disappear after some time</string>
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
android:title="@string/test_alarm_volume"
|
||||
android:summary="@string/test_alarm_volume_summary"
|
||||
app:icon="@drawable/ic_volume_high"
|
||||
app:fragment="fr.forum_thalie.tsumugi.preferences.AlarmAdjustVolumeFragment"
|
||||
app:fragment="fr.riff_app.riff.preferences.AlarmAdjustVolumeFragment"
|
||||
/>
|
||||
|
||||
</PreferenceScreen>
|
||||
|
|
@ -6,21 +6,21 @@
|
|||
app:icon="@drawable/ic_alarm"
|
||||
app:key="alarmScreen"
|
||||
app:title="@string/setupAlarmClock"
|
||||
app:fragment="fr.forum_thalie.tsumugi.preferences.AlarmFragment"
|
||||
app:fragment="fr.riff_app.riff.preferences.AlarmFragment"
|
||||
/>
|
||||
|
||||
<Preference
|
||||
app:icon="@drawable/ic_av_timer"
|
||||
app:key="sleepScreen"
|
||||
app:title="@string/setSleepTimer"
|
||||
app:fragment="fr.forum_thalie.tsumugi.preferences.SleepFragment"
|
||||
app:fragment="fr.riff_app.riff.preferences.SleepFragment"
|
||||
/>
|
||||
|
||||
<Preference
|
||||
app:icon="@drawable/ic_customize"
|
||||
app:key="CustomizeFragment"
|
||||
app:title="@string/customizeAppBehavior"
|
||||
app:fragment="fr.forum_thalie.tsumugi.preferences.CustomizeFragment"
|
||||
app:fragment="fr.riff_app.riff.preferences.CustomizeFragment"
|
||||
/>
|
||||
|
||||
<Preference
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
package fr.forum_thalie.tsumugi
|
||||
|
||||
import org.junit.Test
|
||||
|
||||
import org.junit.Assert.*
|
||||
|
||||
/**
|
||||
* Example local unit test, which will execute on the development machine (host).
|
||||
*
|
||||
* See [testing documentation](http://d.android.com/tools/testing).
|
||||
*/
|
||||
class ExampleUnitTest {
|
||||
@Test
|
||||
fun addition_isCorrect() {
|
||||
assertEquals(4, 2 + 2)
|
||||
}
|
||||
}
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
include ':app'
|
||||
rootProject.name='Tsumugi-app'
|
||||
rootProject.name='riff_app'
|
||||
|
|
|
|||
Laden…
In neuem Issue referenzieren