diff --git a/.idea/gradle.xml b/.idea/gradle.xml index bb80ebf..6e5389e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -14,7 +14,6 @@ - diff --git a/.idea/misc.xml b/.idea/misc.xml index ef61796..1b6dac9 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/debug/ic_launcher-playstore.png b/app/src/debug/ic_launcher-playstore.png new file mode 100644 index 0000000..67fff88 Binary files /dev/null and b/app/src/debug/ic_launcher-playstore.png differ diff --git a/app/src/debug/logo_roundsquare-playstore.png b/app/src/debug/logo_roundsquare-playstore.png new file mode 100644 index 0000000..7cb2eca Binary files /dev/null and b/app/src/debug/logo_roundsquare-playstore.png differ diff --git a/app/src/debug/res/drawable/ic_launcher_background.xml b/app/src/debug/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..7ec99ba --- /dev/null +++ b/app/src/debug/res/drawable/ic_launcher_background.xml @@ -0,0 +1,14 @@ + + + + + diff --git a/app/src/debug/res/drawable/logo_roundsquare.png b/app/src/debug/res/drawable/logo_roundsquare.png new file mode 100644 index 0000000..690c3a8 Binary files /dev/null and b/app/src/debug/res/drawable/logo_roundsquare.png differ diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..c4a603d --- /dev/null +++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..c4a603d --- /dev/null +++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..1af900d Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..3b53b71 Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..bc9bfb4 Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..3cc5e6a Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..6e6dbd8 Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..09def1d Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..f8e342e Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..eb863f7 Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..f575c58 Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..66f366c Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..62b9fcb Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..f329205 Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..e311555 Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..6854549 Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..60d6796 Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/assets/planning_example.json b/app/src/main/assets/planning_example.json index 68380a9..62adc8d 100644 --- a/app/src/main/assets/planning_example.json +++ b/app/src/main/assets/planning_example.json @@ -1,82 +1,76 @@ { "planning": [ { - "title": "Le Classique du Matin", + "title": "La playlist Base Rock", "periodicity": "1111111", - "hour_begin": "6:00", - "hour_end": "7:00" - }, - { - "title": "Tsumugi Rétro", - "periodicity": "1000000", - "hour_begin": "09:00", - "hour_end": "12:00" - }, - { - "title": "Tournant du Millénaire", - "periodicity": "0100000", - "hour_begin": "09:00", - "hour_end": "12:00" - }, - { - "title": "Tsumugi Netpop", - "periodicity": "0010000", - "hour_begin": "09:00", - "hour_end": "12:00" - }, - { - "title": "Tsumugi Moderne", - "periodicity": "0001000", - "hour_begin": "09:00", - "hour_end": "12:00" - }, - { - "title": "Tsumugi Très Récent", - "periodicity": "0000100", - "hour_begin": "09:00", - "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_begin": "00:00", "hour_end": "21:00" }, { - "title": "Anime Nuit", - "periodicity": "1111111", - "hour_begin": "00:00", - "hour_end": "01:00" + "title": "Only Covers", + "periodicity": "1000000", + "hour_begin": "20:30", + "hour_end": "00:00" }, { - "title": "Jeux Vidéos Nuit", - "periodicity": "1111111", - "hour_begin": "01:00", - "hour_end": "02:00" + "title": "Only Indies", + "periodicity": "0100000", + "hour_begin": "20:30", + "hour_end": "00:00" }, { - "title": "Programmation nocturne", - "periodicity": "1111111", - "hour_begin": "02:00", - "hour_end": "06:00" + "title": "Only Acoustic", + "periodicity": "0010000", + "hour_begin": "20:30", + "hour_end": "00:00" + }, + { + "title": "Only Sweden", + "periodicity": "0001000", + "hour_begin": "20:30", + "hour_end": "00:00" + }, + { + "title": "Only Lives", + "periodicity": "0000100", + "hour_begin": "20:30", + "hour_end": "00:00" + }, + { + "title": "Only Games", + "periodicity": "0000010", + "hour_begin": "21:00", + "hour_end": "23:15" + }, + { + "title": "Beyond [Azraël]", + "periodicity": "0100000", + "hour_begin": "21:00", + "hour_end": "23:00" + }, + { + "title": "Piste Rouge [Louise et Trotsky]", + "periodicity": "0010000", + "hour_begin": "21:00", + "hour_end": "23:00" + }, + { + "title": "Katamariff [Herondil & co.]", + "periodicity": "0000100", + "hour_begin": "21:00", + "hour_end": "23:00" + }, + { + "title": "Le 4/4 Jazz [Melomaniaque]", + "periodicity": "0000001", + "hour_begin": "21:00", + "hour_end": "22:00" + }, + { + "title": "Beyond, la playlist", + "periodicity": "0000001", + "hour_begin": "22:10", + "hour_end": "00:00" } ], "regular_programme" : "Programmation habituelle", 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 95b51b9..7717d3f 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt @@ -6,7 +6,7 @@ import kotlin.collections.ArrayList const val tag = "fr.forum_thalie.tsumugi" const val noConnectionValue = "—" -const val streamDownValue = "Tsumugi est HS !" // we don't want this value to be displaed in the "last played" screen. +const val streamDownValue = "Riff est HS !" // we don't want this value to be displaed in the "last played" screen. val weekdaysArray : Array = arrayOf( "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche") const val newsDateTimePattern = "EEE, d MMM yyyy HH:mm:ss Z" const val newsDisplayDatePattern = "dd MMM yyyy" diff --git a/app/src/main/res/drawable-v23/launch_screen.xml b/app/src/main/res/drawable-v23/launch_screen.xml index 4fd97f2..fd6811b 100644 --- a/app/src/main/res/drawable-v23/launch_screen.xml +++ b/app/src/main/res/drawable-v23/launch_screen.xml @@ -1,11 +1,11 @@ - + - + android:width="128dp" + android:height="128dp" + android:viewportWidth="128" + android:viewportHeight="128"> + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 1f055b6..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_tsumugi_lineart.xml b/app/src/main/res/drawable/ic_tsumugi_lineart.xml deleted file mode 100644 index 4fcc31c..0000000 --- a/app/src/main/res/drawable/ic_tsumugi_lineart.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/launch_screen.xml b/app/src/main/res/drawable/launch_screen.xml index e15331c..233bc2f 100644 --- a/app/src/main/res/drawable/launch_screen.xml +++ b/app/src/main/res/drawable/launch_screen.xml @@ -1,13 +1,13 @@ - + diff --git a/app/src/main/res/drawable/logo_roundsquare.png b/app/src/main/res/drawable/logo_roundsquare.png deleted file mode 100644 index fd5e6a3..0000000 Binary files a/app/src/main/res/drawable/logo_roundsquare.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 deleted file mode 100644 index 2342c48..0000000 Binary files a/app/src/main/res/drawable/splash_logo.jpg and /dev/null differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index be58590..0988d2b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -42,7 +42,7 @@ android:id="@+id/logo_persistent" android:layout_width="?attr/actionBarSize" android:layout_height="?attr/actionBarSize" - app:srcCompat="@drawable/logo_roundsquare" + app:srcCompat="@mipmap/ic_launcher" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" android:padding="12dp" diff --git a/app/src/main/res/layout/fragment_nowplaying.xml b/app/src/main/res/layout/fragment_nowplaying.xml index 35f5f80..b8eccf5 100644 --- a/app/src/main/res/layout/fragment_nowplaying.xml +++ b/app/src/main/res/layout/fragment_nowplaying.xml @@ -39,7 +39,7 @@ app:layout_constraintBottom_toBottomOf="@id/scrollViewMetadataNext" app:layout_constraintStart_toStartOf="@id/imageGuideline" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/logo_roundsquare" + app:srcCompat="@mipmap/ic_launcher" android:layout_margin="8dp" tools:ignore="HardcodedText" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index dad40a0..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index cb451fd..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 66bef29..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index e5ffdf0..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 446031c..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index cded4d8..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 1c1cf4a..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 0a3e6a9..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index c96da67..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index a0d9df8..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/values-v21/strings.xml b/app/src/main/res/values-v21/strings.xml index bf9af95..1c9ffd4 100644 --- a/app/src/main/res/values-v21/strings.xml +++ b/app/src/main/res/values-v21/strings.xml @@ -1,6 +1,6 @@ - https://radio.mahoro-net.org/streams/tsumugi + https://sstream.riff-radio.org/;stream.mp3 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2d05c06..2a9aeda 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,7 +2,7 @@ #333333 #222222 - #f58b01 + #ff0000 #454545 #DF4C3A #DDDDDD @@ -19,13 +19,15 @@ #a15755 #585858 - #f58b01 - #3A7AAF + #ff0000 + #ff0000 #585858 - #3A7AAF - #f58b01 + #ff0000 + #ff0000 #FFFFFF #000000 + + #ff0000 diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml index 2604d87..beab31f 100644 --- a/app/src/main/res/values/ic_launcher_background.xml +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - #F58B01 + #000000 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8fcad32..6080867 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,18 +1,19 @@ - https://relay0.r-a-d.io/main.mp3 - http://shelter.mahoro-net.org:8000/tsumugi - http://stream.radiosolution.fr/rstlss.mp3 - https://github.com/yattoz/Tsumugi-app/issues/ - https://tsumugi.forum-thalie.fr/ - https://tsumugi.forum-thalie.fr/?feed=rss2 - https://radio.mahoro-net.org/airtime/api/live-info-v2 + https://sstream.riff-radio.org/;stream.mp3 + https://sstream.riff-radio.org/;stream.mp3 + https://sstream.riff-radio.org/;stream.mp3 + https://git.pagelibre.org/riff/riff_app + https://m.riff-radio.fr/ + https://www.riff-radio.org/rss.xml + + http://media.pagelibre.org/riff/api/live-info-v2 ADD SOME URL HERE - Tsumugi - Tsumugi + Riff + Riff Songs Chat News @@ -26,7 +27,7 @@ Volume: Up next : - Current programme : + Playing now : Now streaming Error loading WebView. Try downloading Google Chrome on Google Play, or enabling it if you disabled it. Settings diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 96c951a..3a9c244 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -5,9 +5,9 @@ @color/colorPrimary @color/colorPrimaryDark - @color/colorAccent - @drawable/logo_roundsquare - @color/rblue + @color/riffRed + @mipmap/ic_launcher + @color/riffRed @color/colorPrimaryDark @@ -15,8 +15,8 @@ @color/colorPrimary @color/colorPrimaryDark - @color/colorAccent - @color/rblue + @color/riffRed + @color/riffRed @color/colorPrimaryDark @drawable/none @@ -30,8 +30,8 @@ @color/colorPrimary @color/colorPrimaryDark - @color/colorAccent - @color/rblue + @color/riffRed + @color/riffRed @color/colorPrimaryDark diff --git a/svg/ic_launcher_background.svg b/svg/ic_launcher_background.svg new file mode 100644 index 0000000..b42f7fe --- /dev/null +++ b/svg/ic_launcher_background.svg @@ -0,0 +1,63 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/svg/riff_logo.svg b/svg/riff_logo.svg new file mode 100644 index 0000000..a6f8ddb --- /dev/null +++ b/svg/riff_logo.svg @@ -0,0 +1,258 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/riff_square.png b/svg/riff_square.png new file mode 100644 index 0000000..ec36ab6 Binary files /dev/null and b/svg/riff_square.png differ