diff --git a/app/src/main/assets/planning_example.json b/app/src/main/assets/planning_example.json new file mode 100644 index 0000000..94c582a --- /dev/null +++ b/app/src/main/assets/planning_example.json @@ -0,0 +1,66 @@ +{ + "planning": [ + { + "title": "Musique Classique", + "periodicity": "1111111", + "hour_begin": "6:00", + "hour_end": "7:00" + }, + { + "title": "Jeux Vidéos Matin", + "periodicity": "1111100", + "hour_begin": "09:00", + "hour_end": "10:30" + }, + { + "title": "Anime Matin", + "periodicity": "1111100", + "hour_begin": "10:30", + "hour_end": "12:00" + }, + { + "title": "Jeux Vidéos Aprem'", + "periodicity": "1111111", + "hour_begin": "14:00", + "hour_end": "15:30" + }, + { + "title": "Anime Aprem'", + "periodicity": "1111111", + "hour_begin": "15:30", + "hour_end": "17:00" + }, + { + "title": "Jeux Vidéos Soirée", + "periodicity": "1111100", + "hour_begin": "19:00", + "hour_end": "20:00" + }, + { + "title": "Anime Soirée", + "periodicity": "1111100", + "hour_begin": "20:00", + "hour_end": "21:00" + }, + { + "title": "Anime Nuit", + "periodicity": "1111111", + "hour_begin": "00:00", + "hour_end": "01:00" + }, + { + "title": "Jeux Vidéos Nuit", + "periodicity": "1111111", + "hour_begin": "01:00", + "hour_end": "02:00" + }, + { + "title": "Programmation nocturne", + "periodicity": "1111111", + "hour_begin": "02:00", + "hour_end": "06:00" + } + ], + "regular_programme" : "Programmation habituelle", + "timezone": "GMT+1" +} \ No newline at end of file diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/BootBroadcastReceiver.kt b/app/src/main/java/fr/forum_thalie/tsumugi/BootBroadcastReceiver.kt index e8c0c79..904283f 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/BootBroadcastReceiver.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/BootBroadcastReceiver.kt @@ -20,7 +20,7 @@ class BootBroadcastReceiver : BroadcastReceiver(){ RadioAlarm.instance.setNextAlarm(context) // schedule next alarm } - if (arg1.getStringExtra("action") == "fr.forum_thalie.tsumugi.${Actions.PLAY_OR_FALLBACK.name}" ) + if (arg1.getStringExtra("action") == "$tag.${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/fr/forum_thalie/tsumugi/MainActivity.kt b/app/src/main/java/fr/forum_thalie/tsumugi/MainActivity.kt index d66911a..511364c 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/MainActivity.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/MainActivity.kt @@ -16,6 +16,7 @@ import fr.forum_thalie.tsumugi.playerstore.PlayerStore import java.util.Timer import android.view.MenuItem import fr.forum_thalie.tsumugi.alarm.RadioAlarm +import fr.forum_thalie.tsumugi.planning.Planning /* Log to file import @@ -37,8 +38,11 @@ class MainActivity : BaseActivity() { val bottomNavigationView : BottomNavigationView = findViewById(R.id.bottom_nav) //val navGraphIds = listOf(R.navigation.home, R.navigation.list, R.navigation.form) - val navGraphIds = listOf(R.navigation.navigation_nowplaying, R.navigation.navigation_songs, - R.navigation.navigation_news) + val navGraphIds = listOf( + R.navigation.navigation_nowplaying, + R.navigation.navigation_songs, + R.navigation.navigation_news, + R.navigation.navigation_programme) // Setup the bottom navigation view with a list of navigation graphs val controller = bottomNavigationView.setupWithNavController( @@ -118,11 +122,12 @@ class MainActivity : BaseActivity() { RadioAlarm.instance.setNextAlarm(c = this) // this checks the preferenceStore before actually setting an alarm, don't worry. // initialize programmatically accessible colors - colorBlue = ResourcesCompat.getColor(resources, R.color.bluereq, null) + colorBlue = ResourcesCompat.getColor(resources, R.color.rblue, null) colorWhited = ResourcesCompat.getColor(resources, R.color.whited, null) colorGreenList = (ResourcesCompat.getColorStateList(resources, R.color.button_green, null)) colorRedList = (ResourcesCompat.getColorStateList(resources, R.color.button_red, null)) colorGreenListCompat = (ResourcesCompat.getColorStateList(resources, R.color.button_green_compat, null)) + colorAccent = (ResourcesCompat.getColor(resources, R.color.colorAccent, null)) // Post-UI Launch if (PlayerStore.instance.isInitialized) @@ -155,6 +160,9 @@ class MainActivity : BaseActivity() { isTimerStarted = true } + // fetch program + Planning.instance.parseUrl(/* getString(R.string.planning_url) */ context = this) + // initialize the UI setTheme(R.style.AppTheme) setContentView(R.layout.activity_main) diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt b/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt index 78e6bb8..cb5ba8c 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt @@ -34,6 +34,7 @@ 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 java.util.* import kotlin.math.exp @@ -129,6 +130,7 @@ class RadioService : MediaBrowserServiceCompat() { PlayerStore.instance.updateLp() } nowPlayingNotification.update(this) + Planning.instance.checkProgramme() } private val streamerPictureObserver = Observer { diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt b/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt index a2d5db1..85e49de 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt @@ -2,14 +2,27 @@ package fr.forum_thalie.tsumugi import android.content.SharedPreferences import android.content.res.ColorStateList +import kotlin.collections.ArrayList const val tag = "fr.forum_thalie.tsumugi" -const val noConnectionValue = "No connection" +const val noConnectionValue = "Arrêté." const val streamDownValue = "Tsumugi est HS !" +val weekdaysArray : Array = arrayOf( "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche") + +val weekdays = ArrayList().apply { weekdaysArray.forEach { add(it) } } +val weekdaysSundayFirst = ArrayList().apply { + weekdays.forEach { + add(it) + } + val lastDay = last() + removeAt(size - 1) + add(0, lastDay) +} + var colorBlue: Int = 0 var colorWhited: Int = 0 +var colorAccent : Int = 0 var colorGreenList: ColorStateList? = ColorStateList.valueOf(0) var colorRedList: ColorStateList? = ColorStateList.valueOf(0) var colorGreenListCompat : ColorStateList? = ColorStateList.valueOf(0) - lateinit var preferenceStore : SharedPreferences \ No newline at end of file diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/alarm/RadioAlarm.kt b/app/src/main/java/fr/forum_thalie/tsumugi/alarm/RadioAlarm.kt index 25ccaad..1aac409 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/alarm/RadioAlarm.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/alarm/RadioAlarm.kt @@ -10,6 +10,7 @@ import fr.forum_thalie.tsumugi.BootBroadcastReceiver import androidx.preference.PreferenceManager import fr.forum_thalie.tsumugi.* import java.util.* +import kotlin.collections.ArrayList class RadioAlarm { @@ -38,7 +39,7 @@ class RadioAlarm { val alarmManager = c.getSystemService(Context.ALARM_SERVICE) as AlarmManager alarmIntent = Intent(c, BootBroadcastReceiver::class.java).let { intent -> - intent.putExtra("action", "fr.forum_thalie.tsumugi.${Actions.PLAY_OR_FALLBACK.name}") + intent.putExtra("action", "$tag.${Actions.PLAY_OR_FALLBACK.name}") PendingIntent.getBroadcast(c, 0, intent, 0) } val showIntent = Intent(c, ParametersActivity::class.java).let { intent -> @@ -60,7 +61,7 @@ class RadioAlarm { val hourOfDay = time / 60 //time is in minutes val minute = time % 60 - val fullWeekOrdered = arrayListOf("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday") + val fullWeekOrdered = weekdaysSundayFirst //Sunday --> Saturday val selectedDays = arrayListOf() for (item in fullWeekOrdered) { @@ -100,7 +101,7 @@ class RadioAlarm { { val alarmManager = c.getSystemService(Context.ALARM_SERVICE) as AlarmManager alarmIntent = Intent(c, BootBroadcastReceiver::class.java).let { intent -> - intent.putExtra("action", "fr.forum_thalie.tsumugi.${Actions.PLAY_OR_FALLBACK.name}") + intent.putExtra("action", "$tag.${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/fr/forum_thalie/tsumugi/planning/Planning.kt b/app/src/main/java/fr/forum_thalie/tsumugi/planning/Planning.kt new file mode 100644 index 0000000..e9300c3 --- /dev/null +++ b/app/src/main/java/fr/forum_thalie/tsumugi/planning/Planning.kt @@ -0,0 +1,109 @@ +package fr.forum_thalie.tsumugi.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.weekdays +import org.json.JSONObject +import java.io.IOException +import java.net.URL +import java.util.* +import kotlin.collections.ArrayList + +class Planning { + + val programmes: ArrayList = ArrayList() + private var regularProgramme: String? = null + val currentProgramme: MutableLiveData = MutableLiveData() + val isDataFetched: MutableLiveData = MutableLiveData() + + var timeZone: TimeZone = Calendar.getInstance().timeZone + + private fun findCurrentProgramme(): String + { + programmes.forEach { + if (it.isCurrent()) + return it.title + } + return regularProgramme ?: "—" + } + + fun checkProgramme() + { + val newProgramme = findCurrentProgramme() + if (currentProgramme.value != newProgramme) + currentProgramme.value = newProgramme + } + + fun parseUrl(url: String? = null, context: Context? = null) + { + val scrape : (Any?) -> String = { + if (url.isNullOrEmpty() && context != null) + { + val json: String + try { + val inputStream = context.assets.open("planning_example.json") + val size = inputStream.available() + val buffer = ByteArray(size) + inputStream.use { it.read(buffer) } + json = String(buffer) + json + } catch (ioException: IOException) { + ioException.printStackTrace() + "" + } + } + else + URL(url).readText() + + } + val post : (parameter: Any?) -> Unit = { + val result = JSONObject(it as String) + if (result.has("planning")) + { + val programList = result.getJSONArray("planning") + for (i in 0 until programList.length()) + { + val item = programList[i] as JSONObject + var periodicityDec = item.getInt("periodicity") + var periodicity = 0b0000000 + var po = 1000000 + for (j in 0 until weekdays.size) + { + if (periodicityDec / (po) > 0) + { + periodicityDec -= po + periodicity += 1 shl (weekdays.size-1 - j) + } + po /= 10 + } + val hourBeginS = item.getString("hour_begin").split(":") + val hourBegin = hourBeginS.first().toInt()*60 + hourBeginS.last().toInt() + val hourEndS = item.getString("hour_end").split(":") + val hourEnd = hourEndS.first().toInt()* 60 + hourEndS.last().toInt() + val title = item.getString("title") + programmes.add(Programme(title, periodicity, hourBegin, hourEnd)) + } + } + regularProgramme = if (result.has("regular_programme")) + result.getString("regular_programme") + else + context?.getString(R.string.regular_programme) + + timeZone = if (result.has("timezone")) + TimeZone.getTimeZone(result.getString("timezone")) + else + Calendar.getInstance().timeZone + + isDataFetched.value = true + } + Async(scrape, post) + } + + companion object { + val instance by lazy { + Planning() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/planning/Programme.kt b/app/src/main/java/fr/forum_thalie/tsumugi/planning/Programme.kt new file mode 100644 index 0000000..93b5ab1 --- /dev/null +++ b/app/src/main/java/fr/forum_thalie/tsumugi/planning/Programme.kt @@ -0,0 +1,92 @@ +package fr.forum_thalie.tsumugi.planning + +import android.util.Log +import fr.forum_thalie.tsumugi.tag +import fr.forum_thalie.tsumugi.weekdays +import java.util.* +import kotlin.collections.ArrayList + +class Programme (val title: String, private val periodicity: Int, private val hourBegin: Int, private val hourEnd: Int) { + + fun isThisDay(day: Int): Boolean { + + // 0 (Monday) to 5 (Saturday) + 6 (Sunday) + + // this translates to "true" when: + // - the currentDay is flagged in the "periodicity" bit array + // OR + // - Yesterday is flagged in the "periodicity" bit array AND the program does span over 2 days (night programs). + // We'll check a after this whether the current hour is within the span. + return (((0b1000000 shr day) and (periodicity)) != 0) + } + + fun isCurrent(): Boolean { + val now = Calendar.getInstance(Planning.instance.timeZone) + val currentDay = + if (now.get(Calendar.DAY_OF_WEEK) - 1 == 0) 6 else now.get(Calendar.DAY_OF_WEEK) - 2 + // 0 (Monday) to 5 (Saturday) + 6 (Sunday) + + // this translates to "true" when: + // - the currentDay is flagged in the "periodicity" bit array + // OR + // - Yesterday is flagged in the "periodicity" bit array AND the program does span over 2 days (night programs). + // We'll check a after this whether the current hour is within the span. + val isToday: Boolean = (((0b1000000 shr currentDay) and (periodicity)) != 0) + val isSpanningOverNight = + (((0b1000000 shr ((currentDay - 1) % 7) and (periodicity)) != 0) && hourEnd < hourBegin) + + Log.d(tag, "$title is today: $isToday or spanning $isSpanningOverNight") + // shr = shift-right. It's a binary mask. + + // if the program started yesterday, and spanned over night, it means that there could be a chance that it's still active. + // we only need to check if the end time has been reached. + if (isSpanningOverNight) { + return (now.get(Calendar.HOUR_OF_DAY) * 60 + now.get(Calendar.MINUTE) < hourEnd) + } + + // if the program is today, we need to check if we're in the hour span. + if (isToday) { + val hasBegun = + (now.get(Calendar.HOUR_OF_DAY) * 60 + now.get(Calendar.MINUTE) >= hourBegin) + val hasNotEnded = + (now.get(Calendar.HOUR_OF_DAY) * 60 + now.get(Calendar.MINUTE) < hourEnd) || hourEnd < hourBegin + return (hasBegun && hasNotEnded) + } + return false + } + + override fun toString(): String { + return "Title: $title, time info (periodicity, begin, end): $periodicity, $hourBegin, $hourEnd" + } + + private val offset1 = (Planning.instance.timeZone.getOffset(System.currentTimeMillis())) / (60*1000) + private val offset2 = (Calendar.getInstance().timeZone.getOffset(System.currentTimeMillis())) / (60*1000) + + fun begin(): String { + val hourBeginTZCorrect = hourBegin // + offset1 - offset2 + return "%02d:%02d".format(hourBeginTZCorrect/60, hourBeginTZCorrect%60) + } + + fun end(): String { + val hourEndTZCorrect = hourEnd // + offset1 - offset2 + return "%02d:%02d".format(hourEndTZCorrect/60, hourEndTZCorrect%60) + } + + /* + fun days(): String { + val res = ArrayList() + for (i in 0 until weekdays.size) { + if (((0b1000000 shr i) and (periodicity)) != 0) + { + res.add(weekdays[i]) + } + } + return res.toString().drop(1).dropLast(1) // drop '[' and ']' + } + + */ + + init { + Log.d(tag, this.toString()) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/preferences/AlarmFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/AlarmFragment.kt index 46359ea..d876246 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/preferences/AlarmFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/AlarmFragment.kt @@ -5,6 +5,7 @@ import android.os.Bundle import android.util.Log 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 java.util.* @@ -18,6 +19,9 @@ class AlarmFragment : PreferenceFragmentCompat() { val alarmDays = findPreference("alarmDays") val snoozeDuration = findPreference("snoozeDuration") + alarmDays?.entries = weekdaysArray + alarmDays?.entryValues = weekdaysArray + alarmDays?.setDefaultValue(weekdaysArray) fun updateIsWakingUpSummary(preference: SwitchPreferenceCompat?, newValue: Boolean? = true, forceTime: Int? = null, forceDays: Set? = null) { @@ -26,15 +30,13 @@ class AlarmFragment : PreferenceFragmentCompat() { calendar.timeInMillis = dateLong if (newValue == true && calendar.timeInMillis > 0) { - val fullWeekOrdered = arrayListOf("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday") - preference?.summary = "Next alarm on ${fullWeekOrdered[calendar.get(Calendar.DAY_OF_WEEK) - 1]} " + - "at ${if (calendar.get(Calendar.HOUR_OF_DAY) < 10) "0" else ""}${calendar.get(Calendar.HOUR_OF_DAY)}" + - ":${if (calendar.get(Calendar.MINUTE) < 10) "0" else ""}${calendar.get(Calendar.MINUTE)}" + val fullWeekOrdered = weekdaysSundayFirst + preference?.summary = getString(R.string.next_alarm) + " ${fullWeekOrdered[calendar.get(Calendar.DAY_OF_WEEK) - 1]} ${if (calendar.get(Calendar.HOUR_OF_DAY) < 10) "0" else ""}${calendar.get(Calendar.HOUR_OF_DAY)}:${if (calendar.get(Calendar.MINUTE) < 10) "0" else ""}${calendar.get(Calendar.MINUTE)}" } else if (newValue == true) - preference?.summary = "Select at least one day" + preference?.summary = getString(R.string.select_one_day) else { - preference?.summary = "No alarm set" + preference?.summary = getString(R.string.no_alarm_set) } } @@ -76,17 +78,15 @@ class AlarmFragment : PreferenceFragmentCompat() { fun updateDays(preference : MultiSelectListPreference?, newValue : Set?) { - Log.d(tag, newValue.toString()) - val listOfDays : String - val fullWeek = context!!.resources.getStringArray(R.array.weekdays).toSet() - val workingWeek = context!!.resources.getStringArray(R.array.weekdays).toSet().minusElement("Saturday").minusElement("Sunday") - listOfDays = when (newValue) { + val fullWeek = weekdays.toSet() + val workingWeek = weekdays.toSet().minusElement(weekdays.last()).minusElement(weekdays.elementAt(weekdays.size - 2)) + val listOfDays = when (newValue) { fullWeek -> context!!.getString(R.string.every_day) workingWeek -> context!!.getString(R.string.working_days) else -> { // build ORDERED LIST of days... I don't know why the original one is in shambles!! - val fullWeekOrdered = arrayListOf("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday") - val selectedDays = arrayListOf() + val fullWeekOrdered = weekdays + val selectedDays = ArrayList() for (item in fullWeekOrdered) { if (newValue!!.contains(item)) selectedDays.add(item) diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/SongsPagerAdapter.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/APagerAdapter.kt similarity index 84% rename from app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/SongsPagerAdapter.kt rename to app/src/main/java/fr/forum_thalie/tsumugi/ui/APagerAdapter.kt index e69882b..e5d7be6 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/SongsPagerAdapter.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/APagerAdapter.kt @@ -1,11 +1,11 @@ -package fr.forum_thalie.tsumugi.ui.songs +package fr.forum_thalie.tsumugi.ui import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentPagerAdapter import androidx.fragment.app.FragmentManager -class SongsPagerAdapter(f: FragmentManager, t: Int) : FragmentPagerAdapter(f, t){ +class APagerAdapter(f: FragmentManager, t: Int) : FragmentPagerAdapter(f, t){ private val fragmentList = ArrayList() private val fragmentTitleList = ArrayList() diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingFragment.kt index f2fb0db..d7a26a6 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingFragment.kt @@ -21,8 +21,10 @@ 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 kotlinx.android.synthetic.main.fragment_nowplaying.* class NowPlayingFragment : Fragment() { @@ -51,10 +53,11 @@ class NowPlayingFragment : Fragment() { val streamerPictureImageView: ImageView = root.findViewById(R.id.streamerPicture) // Note: these values are not used in the generic app, but if you want to, you can use them. + val songTitleNextText: TextView = root.findViewById(R.id.text_song_title_next) + //val songArtistNextText: TextView = root.findViewById(R.id.text_song_artist_next) + /* val streamerNameText : TextView = root.findViewById(R.id.streamerName) - val songTitleNextText: TextView = root.findViewById(R.id.text_song_title_next) - val songArtistNextText: TextView = root.findViewById(R.id.text_song_artist_next) val listenersText : TextView = root.findViewById(R.id.listenersCount) */ @@ -86,11 +89,15 @@ class NowPlayingFragment : Fragment() { PlayerStore.instance.currentSong.title.observe(viewLifecycleOwner, Observer { - songTitleText.text = it + songTitleText.text = it + }) + + Planning.instance.currentProgramme.observe(viewLifecycleOwner, Observer { + songTitleNextText.text = it }) PlayerStore.instance.currentSong.artist.observe(viewLifecycleOwner, Observer { - songArtistText.text = it + songArtistText.text = it }) PlayerStore.instance.playbackState.observe(viewLifecycleOwner, Observer { diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeAdapter.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeAdapter.kt new file mode 100644 index 0000000..6742d87 --- /dev/null +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeAdapter.kt @@ -0,0 +1,72 @@ +package fr.forum_thalie.tsumugi.ui.programme + +import android.annotation.SuppressLint +import android.util.TypedValue +import android.view.LayoutInflater +import android.view.ViewGroup +import android.widget.TextView +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.widget.TextViewCompat +import androidx.recyclerview.widget.RecyclerView +import fr.forum_thalie.tsumugi.* +import fr.forum_thalie.tsumugi.planning.Planning +import fr.forum_thalie.tsumugi.planning.Programme +import java.util.* +import kotlin.collections.ArrayList + +class ProgrammeAdapter(private val dataSet: ArrayList, private val day: String + /*, + context: Context, + resource: Int, + objects: ArrayList*/ +) : RecyclerView.Adapter() /*ArrayAdapter(context, resource, objects)*/ { + + class MyViewHolder(view: ConstraintLayout) : RecyclerView.ViewHolder(view) + + // Create new views (invoked by the layout manager) + override fun onCreateViewHolder(parent: ViewGroup, + viewType: Int): MyViewHolder { + // create a new view + val view = LayoutInflater.from(parent.context) + .inflate(R.layout.programme_view, parent, false) as ConstraintLayout + return MyViewHolder( + view + ) + } + + // Replace the contents of a view (invoked by the layout manager) + @SuppressLint("SetTextI18n") + override fun onBindViewHolder(holder: MyViewHolder, position: Int) { + val programmeStart = holder.itemView.findViewById(R.id.programme_start) + val programmeEnd = holder.itemView.findViewById(R.id.programme_end) + val programmeName = holder.itemView.findViewById(R.id.programme_name) + + programmeStart.text = dataSet[position].begin() + programmeName.text = dataSet[position].title + programmeEnd.text = dataSet[position].end() + + val color = if (dataSet[position].isCurrent() && (Calendar.getInstance(Planning.instance.timeZone).get(Calendar.DAY_OF_WEEK) - 1 == weekdaysSundayFirst.indexOf(day))) + colorAccent + else + colorWhited + + programmeStart.setTextColor(color) + programmeEnd.setTextColor(color) + programmeName.setTextColor(color) + + //TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration( + // programmeName,8, 16, 2, TypedValue.COMPLEX_UNIT_SP) + } + + // Return the size of your dataset (invoked by the layout manager) + override fun getItemCount() = dataSet.size + + + /* + override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { + // create a new view + val view = LayoutInflater.from(parent.context) + .inflate(R.layout.song_view, parent, false) as ConstraintLayout + } + */ +} \ No newline at end of file diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeDayFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeDayFragment.kt new file mode 100644 index 0000000..98d12dd --- /dev/null +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeDayFragment.kt @@ -0,0 +1,75 @@ +package fr.forum_thalie.tsumugi.ui.programme + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +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 + + +class ProgrammeDayFragment : Fragment() { + + private lateinit var recyclerView: RecyclerView + private lateinit var viewAdapter: RecyclerView.Adapter<*> + private lateinit var viewManager: RecyclerView.LayoutManager + private val programmeOfTheDay: ArrayList = ArrayList() + + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + val viewModel: ProgrammeDayViewModel = ViewModelProviders.of(this).get(ProgrammeDayViewModel::class.java) + viewModel.day = arguments?.getString("day") ?: "" + + val root = inflater.inflate(R.layout.fragment_programme_day, container, false) + Planning.instance.programmes.forEach { + if (it.isThisDay(day = weekdays.indexOf(viewModel.day))) + programmeOfTheDay.add(it) + } + viewManager = LinearLayoutManager(context) + viewAdapter = + ProgrammeAdapter(programmeOfTheDay, viewModel.day) + recyclerView = root.findViewById(R.id.programme_recycler).apply { + // use this setting to improve performance if you know that changes + // in content do not change the layout size of the RecyclerView + setHasFixedSize(true) + layoutManager = viewManager + adapter = viewAdapter + } + Planning.instance.currentProgramme.observe(viewLifecycleOwner, Observer { + programmeOfTheDay.clear() + Planning.instance.programmes.forEach { + if (it.isThisDay(day = weekdays.indexOf(viewModel.day))) + programmeOfTheDay.add(it) + } + viewAdapter.notifyDataSetChanged() + }) + + Planning.instance.isDataFetched.observe(viewLifecycleOwner, Observer { + viewAdapter.notifyDataSetChanged() + }) + return root + } + + + companion object { + @JvmStatic + fun newInstance(day: String): ProgrammeDayFragment { + val args = Bundle() + args.putString("day", day) + val f = ProgrammeDayFragment() + f.arguments = args + return f + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeDayViewModel.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeDayViewModel.kt new file mode 100644 index 0000000..d691b01 --- /dev/null +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeDayViewModel.kt @@ -0,0 +1,8 @@ +package fr.forum_thalie.tsumugi.ui.programme + +import androidx.lifecycle.ViewModel + +class ProgrammeDayViewModel: ViewModel() { + var day: String = "" + +} \ No newline at end of file diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeFragment.kt new file mode 100644 index 0000000..d6c158b --- /dev/null +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeFragment.kt @@ -0,0 +1,49 @@ +package fr.forum_thalie.tsumugi.ui.programme + +import android.os.Bundle +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +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 java.util.* + +class ProgrammeFragment : Fragment() { + + private lateinit var adapter : APagerAdapter + private lateinit var root: View + private lateinit var viewPager: ViewPager + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + + root = inflater.inflate(R.layout.fragment_programme, container, false) + viewPager = root.findViewById(R.id.dayTabPager) + adapter = APagerAdapter(childFragmentManager, FragmentPagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) + // You can add more fragments to the adapter, to display more information (for example with R/a/dio, queue, request, faves...) + weekdays.forEach { + adapter.addFragment(ProgrammeDayFragment.newInstance(it), it) + } + + viewPager.adapter = adapter + val todaySundayFirst = Calendar.getInstance(Planning.instance.timeZone).get(Calendar.DAY_OF_WEEK) - 1 + viewPager.currentItem = (todaySundayFirst - 1)%7 + + val tabLayout : TabLayout = root.findViewById(R.id.dayTabLayout) + tabLayout.setupWithViewPager(viewPager) + Log.d(tag, "SongFragment view created") + + return root + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/SongsFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/SongsFragment.kt index 008f8c2..9e99ef7 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/SongsFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/SongsFragment.kt @@ -10,11 +10,13 @@ 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 class SongsFragment : Fragment() { - private lateinit var adapter : SongsPagerAdapter + private lateinit var adapter : APagerAdapter private lateinit var root: View private lateinit var viewPager: ViewPager @@ -26,9 +28,11 @@ class SongsFragment : Fragment() { root = inflater.inflate(R.layout.fragment_songs, container, false) viewPager = root.findViewById(R.id.tabPager) - adapter = SongsPagerAdapter(childFragmentManager, FragmentPagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) - adapter.addFragment(LastPlayedFragment.newInstance(), "last played") - + adapter = APagerAdapter( + childFragmentManager, + FragmentPagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT + ) + adapter.addFragment(LastPlayedFragment.newInstance(), getString(R.string.lp)) // You can add more fragments to the adapter, to display more information (for example with R/a/dio, queue, request, faves...) viewPager.adapter = adapter @@ -37,7 +41,6 @@ class SongsFragment : Fragment() { tabLayout.setupWithViewPager(viewPager) Log.d(tag, "SongFragment view created") - return root } diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/queuelp/SongAdaptater.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/queuelp/SongAdaptater.kt index 57a7d82..58d9bc2 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/queuelp/SongAdaptater.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/songs/queuelp/SongAdaptater.kt @@ -2,6 +2,7 @@ package fr.forum_thalie.tsumugi.ui.songs.queuelp import android.annotation.SuppressLint import android.graphics.Color +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout @@ -11,6 +12,7 @@ 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 kotlinx.android.synthetic.main.song_view.view.* import kotlin.collections.ArrayList diff --git a/app/src/main/res/drawable-anydpi/ic_programme.xml b/app/src/main/res/drawable-anydpi/ic_programme.xml new file mode 100644 index 0000000..7dd7db1 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_programme.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-hdpi/ic_programme.png b/app/src/main/res/drawable-hdpi/ic_programme.png new file mode 100644 index 0000000..3431e26 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_programme.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_programme.png b/app/src/main/res/drawable-mdpi/ic_programme.png new file mode 100644 index 0000000..a16a292 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_programme.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_programme.png b/app/src/main/res/drawable-xhdpi/ic_programme.png new file mode 100644 index 0000000..694c65d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_programme.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_programme.png b/app/src/main/res/drawable-xxhdpi/ic_programme.png new file mode 100644 index 0000000..1ad4b90 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_programme.png differ diff --git a/app/src/main/res/layout/fragment_last_played.xml b/app/src/main/res/layout/fragment_last_played.xml index 5335a58..318925c 100644 --- a/app/src/main/res/layout/fragment_last_played.xml +++ b/app/src/main/res/layout/fragment_last_played.xml @@ -1,12 +1,12 @@ - - + + app:layout_constraintGuide_percent="0.95" /> + app:layout_constraintTop_toBottomOf="@id/upNext" + android:visibility="gone"/> + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_programme_day.xml b/app/src/main/res/layout/fragment_programme_day.xml new file mode 100644 index 0000000..6564d62 --- /dev/null +++ b/app/src/main/res/layout/fragment_programme_day.xml @@ -0,0 +1,19 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/news_view.xml b/app/src/main/res/layout/news_view.xml index 112a5b4..82ab95a 100644 --- a/app/src/main/res/layout/news_view.xml +++ b/app/src/main/res/layout/news_view.xml @@ -4,7 +4,9 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="16dp"> + android:layout_marginTop="16dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp"> + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/song_view.xml b/app/src/main/res/layout/song_view.xml index 2df7ed1..4d29656 100644 --- a/app/src/main/res/layout/song_view.xml +++ b/app/src/main/res/layout/song_view.xml @@ -4,6 +4,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="8dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" > @@ -17,7 +18,6 @@ app:layout_constraintBottom_toTopOf="@id/divider" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:layout_marginTop="8dp" /> + + diff --git a/app/src/main/res/navigation/navigation_programme.xml b/app/src/main/res/navigation/navigation_programme.xml new file mode 100644 index 0000000..5f7b592 --- /dev/null +++ b/app/src/main/res/navigation/navigation_programme.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 969d1fd..22874e6 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -1,15 +1,6 @@ - - Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - Sunday - @string/disable 1 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d7b533a..21af4a5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -11,7 +11,7 @@ #999999 #999999 #7F7F7F - #3A7AAF + #4FC3F7 #527a8e #527a8e #5cb85c @@ -19,12 +19,12 @@ #a15755 #585858 - #DF4C3A - #3A7AAF + #f58b01 + #4FC3F7 #585858 - #3A7AAF - #DF4C3A + #4FC3F7 + #f58b01 #FFFFFF #000000 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8326a5f..083e151 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,6 +4,7 @@ Songs Chat News + Planning Now playing: %1$s @@ -13,9 +14,8 @@ http://stream.radiosolution.fr/rstlss.mp3 Volume: - https://r-a-d.io/api - Up next: + Émission en cours : Now streaming Error loading WebView. Try downloading Google Chrome on Google Play, or enabling it if you disabled it. Settings @@ -43,5 +43,12 @@ Disable https://tsumugi.forum-thalie.fr/ https://tsumugi.forum-thalie.fr/?feed=rss2 + ADD SOME URL HERE + Select at least one day + No alarm set + Next alarm: + Last played + Planning + Programme régulier diff --git a/app/src/main/res/xml/alarm_preferences.xml b/app/src/main/res/xml/alarm_preferences.xml index f397f61..40b231e 100644 --- a/app/src/main/res/xml/alarm_preferences.xml +++ b/app/src/main/res/xml/alarm_preferences.xml @@ -23,9 +23,7 @@ app:iconSpaceReserved="false" app:title="Select days of the week" app:singleLineTitle="false" - android:entries="@array/weekdays" - android:entryValues="@array/weekdays" - android:defaultValue="@array/weekdays" + />