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 fb02746..91fd2c7 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/MainActivity.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/MainActivity.kt @@ -15,6 +15,7 @@ import fr.forum_thalie.tsumugi.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 @@ -86,6 +87,14 @@ class MainActivity : BaseActivity() { true } */ + R.id.action_refresh -> { + PlayerStore.instance.queue.clear() + //PlayerStore.instance.lp.clear() + PlayerStore.instance.initApi() + val s = Snackbar.make(findViewById(R.id.nav_host_container), getString(R.string.refreshing) as CharSequence, Snackbar.LENGTH_LONG) + s.show() + true + } R.id.action_settings -> { val i = Intent(this, ParametersActivity::class.java) startActivity(i) diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/playerstore/PlayerStore.kt b/app/src/main/java/fr/forum_thalie/tsumugi/playerstore/PlayerStore.kt index 94e16ac..1a51ce9 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/playerstore/PlayerStore.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/playerstore/PlayerStore.kt @@ -127,7 +127,7 @@ class PlayerStore { { updateApi(result) currentSongBackup.copy(currentSong) - + fetchLastRequest() isQueueUpdated.value = true isLpUpdated.value = true 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 c2357e9..1fba724 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 @@ -69,6 +69,9 @@ class NowPlayingFragment : Fragment() { listenersText,8, 16, 2, TypedValue.COMPLEX_UNIT_SP) */ + TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration( + currentProgrammeText,8, 20, 2, TypedValue.COMPLEX_UNIT_SP) + // trick : I can't observe the queue because it's an ArrayDeque that doesn't trigger any change... // so I observe a dedicated Mutable that gets set when the queue is updated. diff --git a/app/src/main/res/layout/fragment_nowplaying.xml b/app/src/main/res/layout/fragment_nowplaying.xml index 1c6823a..46115b6 100644 --- a/app/src/main/res/layout/fragment_nowplaying.xml +++ b/app/src/main/res/layout/fragment_nowplaying.xml @@ -193,7 +193,7 @@ android:text="" android:textAlignment="center" android:textColor="@color/whited3" - android:textSize="14sp" + android:textSize="16sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/upNext" android:visibility="visible"/> @@ -206,7 +206,7 @@ android:text="" android:textAlignment="center" android:textColor="@color/whited" - android:textSize="14sp" + android:textSize="16sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/text_song_artist_next" android:visibility="visible" /> @@ -222,7 +222,7 @@ android:text="@string/current_programme" android:textAlignment="center" android:textColor="@color/whited3" - android:textSize="14sp" + android:textSize="16sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="@id/topInfoGuideline" android:visibility="visible" /> @@ -237,7 +237,7 @@ android:gravity="start|bottom" android:textAlignment="textStart" android:textColor="@color/whited" - android:textSize="14sp" + android:textSize="16sp" app:layout_constraintStart_toEndOf="@id/current_programme" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="@id/topInfoGuideline" @@ -298,7 +298,7 @@ android:text="" android:textAlignment="center" android:textColor="@color/whited" - android:textSize="18sp" + android:textSize="20sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -310,7 +310,7 @@ android:text="" android:textAlignment="center" android:textColor="@color/whited3" - android:textSize="18sp" + android:textSize="20sp" app:layout_constraintBottom_toTopOf="@id/text_song_title" app:layout_constraintStart_toStartOf="parent" /> @@ -376,7 +376,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.58" /> + app:layout_constraintGuide_percent="0.63" /> - + + + app:showAsAction="never"/> \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 323a71d..2005dc1 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -52,5 +52,7 @@ Choisir une durée (en minutes) Extinction dans %1$d minutes Choisir la fréquence de mise à jour quand la radio est stoppée + Actualisation… + Raffraîchir les données diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d2a4652..6408717 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -72,5 +72,7 @@ Set duration (minutes) Will close in %1$d minutes Set update period when stopped + Refreshing data… + Refresh data