Riff v0.1

.idea/gradle.xml

@@ -14,7 +14,6 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -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="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/debug/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.84375"
+      android:scaleY="0.84375">
+    <path
+        android:strokeWidth="1"
+        android:pathData="M-22.4,-18.02h249.46v189.63h-249.46z"
+        android:fillColor="#000000"
+        android:strokeColor="#ffffff"/>
+  </group>
+</vector>

app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

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",

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<String> = 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"

app/src/main/res/drawable-v23/launch_screen.xml

@@ -1,11 +1,11 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     android:opacity="opaque">
     <!-- The background color, preferably the same as your normal theme -->
-    <item android:drawable="@color/colorAccent"/>
+    <item android:drawable="@color/black"/>
     <!-- Your product logo - 144dp color version of your app icon -->
 
     <item
-        android:drawable="@drawable/ic_tsumugi_lineart"
+        android:drawable="@mipmap/ic_launcher"
         android:gravity="center"
         android:height="144dp"
         android:width="144dp"

app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
-    >
-    <path
-        android:fillColor="@color/colorAccent"
-        android:pathData="M0,0h108v108h-108z" />
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M-22.4,-18.02h249.46v189.63h-249.46z"
+      android:fillColor="#000000"
+      android:strokeColor="#ffffff"/>
 </vector>

app/src/main/res/drawable/launch_screen.xml

@@ -1,13 +1,13 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     android:opacity="opaque">
     <!-- The background color, preferably the same as your normal theme -->
-    <item android:drawable="@color/colorPrimaryDark"/>
+    <item android:drawable="@color/black"/>
     <!-- Your product logo - 144dp color version of your app icon -->
 
     <item
         >
         <bitmap
-            android:src="@drawable/splash_logo"
+            android:src="@mipmap/ic_launcher"
             android:gravity="center"
             />
     </item>

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"

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" />
         <!--             app:layout_constraintBottom_toTopOf="@id/imageLeftGuideline" -->

app/src/main/res/values-v21/strings.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
     <!-- URLs -->
-    <string name="STREAM_URL_TSUMUGI">https://radio.mahoro-net.org/streams/tsumugi</string>
+    <string name="STREAM_URL_TSUMUGI">https://sstream.riff-radio.org/;stream.mp3</string>
 
 </resources>

app/src/main/res/values/colors.xml

@@ -2,7 +2,7 @@
 <resources>
     <color name="colorPrimary">#333333</color>
     <color name="colorPrimaryDark">#222222</color>
-    <color name="colorAccent">#f58b01</color>
+    <color name="colorAccent">#ff0000</color>
     <color name="dark">#454545</color>
     <color name="orange">#DF4C3A</color>
     <color name="whited">#DDDDDD</color>
@@ -19,13 +19,15 @@
     <color name="reqButtonDisabled">#a15755</color>
 
     <color name="seek_bar_background">#585858</color>
-    <color name="seek_bar_progress">#f58b01</color>
-    <color name="seek_bar_secondary_progress">#3A7AAF</color>
+    <color name="seek_bar_progress">#ff0000</color>
+    <color name="seek_bar_secondary_progress">#ff0000</color>
 
     <color name="progress_bar_background">#585858</color>
-    <color name="progress_bar_progress">#3A7AAF</color>
-    <color name="progress_bar_secondary_progress">#f58b01</color>
+    <color name="progress_bar_progress">#ff0000</color>
+    <color name="progress_bar_secondary_progress">#ff0000</color>
 
     <color name="white">#FFFFFF</color>
     <color name="black">#000000</color>
+
+    <color name="riffRed">#ff0000</color>
 </resources>

app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#F58B01</color>
+    <color name="ic_launcher_background">#000000</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -1,18 +1,19 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
     <!-- URLs -->
-    <string name="STREAM_URL_RADIO">https://relay0.r-a-d.io/main.mp3</string>
-    <string name="STREAM_URL_TSUMUGI">http://shelter.mahoro-net.org:8000/tsumugi</string>
-    <string name="STREAM_URL_RSTLSS">http://stream.radiosolution.fr/rstlss.mp3</string>
-    <string name="github_url_new_issue">https://github.com/yattoz/Tsumugi-app/issues/</string>
-    <string name="website_url">https://tsumugi.forum-thalie.fr/</string>
-    <string name="rss_url">https://tsumugi.forum-thalie.fr/?feed=rss2</string>
-    <string name="API_URL">https://radio.mahoro-net.org/airtime/api/live-info-v2</string>
+    <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_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>
+    <string name="rss_url">https://www.riff-radio.org/rss.xml</string>
+<!--    <string name="API_URL">https://radio.mahoro-net.org/airtime/api/live-info-v2</string>-->
+    <string name="API_URL">http://media.pagelibre.org/riff/api/live-info-v2</string>
     <string name="planning_url">ADD SOME URL HERE</string>
 
 
-    <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">Songs</string>
     <string name="title_chat">Chat</string>
     <string name="title_news">News</string>
@@ -26,7 +27,7 @@
     <string name="volume">Volume: </string>
 
     <string name="up_next">Up next :</string>
-    <string name="current_programme">Current programme : </string>
+    <string name="current_programme">Playing now : </string>
     <string name="now_streaming">Now streaming</string>
     <string name="error_webView">Error loading WebView. Try downloading Google Chrome on Google Play, or enabling it if you disabled it.</string>
     <string name="action_settings">Settings</string>

app/src/main/res/values/styles.xml

@@ -5,9 +5,9 @@
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="icon">@drawable/logo_roundsquare</item>
-        <item name="android:textColorHighlight">@color/rblue</item>
+        <item name="colorAccent">@color/riffRed</item>
+        <item name="icon">@mipmap/ic_launcher</item>
+        <item name="android:textColorHighlight">@color/riffRed</item>
         <item name="android:colorBackground">@color/colorPrimaryDark</item>
     </style>
 
@@ -15,8 +15,8 @@
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textColorHighlight">@color/rblue</item>
+        <item name="colorAccent">@color/riffRed</item>
+        <item name="android:textColorHighlight">@color/riffRed</item>
         <item name="android:colorBackground">@color/colorPrimaryDark</item>
         <item name="icon">@drawable/none</item>
     </style>
@@ -30,8 +30,8 @@
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textColorHighlight">@color/rblue</item>
+        <item name="colorAccent">@color/riffRed</item>
+        <item name="android:textColorHighlight">@color/riffRed</item>
         <item name="android:colorBackground">@color/colorPrimaryDark</item>
     </style>
 

svg/ic_launcher_background.svg

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   sodipodi:docname="ic_launcher_background.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1676"
+     inkscape:window-height="934"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="1.8554688"
+     inkscape:cx="46.738169"
+     inkscape:cy="74.057228"
+     inkscape:window-x="1920"
+     inkscape:window-y="111"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g10" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+       id="rect8065"
+       width="249.45645"
+       height="189.62999"
+       x="-22.404869"
+       y="-18.024458" />
+  </g>
+</svg>