Merge branch 'tsumugi/devel' into tsumugi/master

app/build.gradle

@@ -29,8 +29,8 @@ android {
         applicationId "fr.forum_thalie.tsumugi"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 111
-        versionName "1.1.1"
+        versionCode 112
+        versionName "1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/java/fr/forum_thalie/tsumugi/playerstore/PlayerStore.kt

@@ -46,8 +46,8 @@ class PlayerStore {
         isQueueUpdated.value = false
         isLpUpdated.value = false
         isMuted.value = false
-        currentSong.title.value = noConnectionValue
-        currentSongBackup.title.value = noConnectionValue
+        currentSong.setTitleArtist(noConnectionValue)
+        currentSongBackup.setTitleArtist(noConnectionValue)
         listenersCount.value = 0
     }
 
@@ -181,7 +181,7 @@ class PlayerStore {
         //if (lp.isNotEmpty()){
             val n = Song()
             n.copy(currentSongBackup)
-            if (n.title.value != noConnectionValue && n.title.value != streamDownValue)
+            if (n != Song(noConnectionValue) && n != Song(streamDownValue))
                 lp.add(0, n)
             currentSongBackup.copy(currentSong)
             isLpUpdated.value = true

app/src/main/java/fr/forum_thalie/tsumugi/playerstore/Song.kt

@@ -52,7 +52,8 @@ class Song(artistTitle: String = "", _id : Int = 0) {
     }
 
     fun copy(song: Song) {
-        this.setTitleArtist(song.artist.value + " - " + song.title.value)
+        this.artist.value = song.artist.value
+        this.title. value = song.title.value
         this.startTime.value = song.startTime.value
         this.stopTime.value = song.stopTime.value
         this.type.value = song.type.value

app/src/main/res/layout/fragment_nowplaying.xml

@@ -36,7 +36,7 @@
             android:contentDescription="dj-image"
             android:scaleType="fitStart"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toBottomOf="@id/scrollViewMetadataNext"
             app:layout_constraintStart_toStartOf="@id/imageGuideline"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/logo_roundsquare"
@@ -160,7 +160,7 @@
             app:layout_constraintEnd_toStartOf="@id/streamerPicture"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/seek_bar_volume"
-            app:layout_constraintVertical_weight="3">
+            >
 
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -180,7 +180,7 @@
                     android:text="@string/up_next"
                     android:textAlignment="center"
                     android:textColor="@color/whited5"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginTop="0dp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -218,14 +218,14 @@
         <ScrollView
             android:id="@+id/scrollProgramme"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:fillViewport="true"
             android:layout_marginBottom="0dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/scrollViewMetadataNext"
             app:layout_constraintBottom_toBottomOf="@id/topInfoGuideline"
-            app:layout_constraintVertical_weight="1">
+            >
 
 
         <androidx.constraintlayout.widget.ConstraintLayout