riff
/
riff_app
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'tsumugi/devel' into tsumugi/master

remotes/origin/devel
yattoz 2020-01-12 18:23:53 +01:00
parent e3d96aa843 563c209165
commit 1fddd50b56
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

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

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

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

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

@ -52,7 +52,8 @@ class Song(artistTitle: String = "", _id : Int = 0) {
} }
fun copy(song: Song) { 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.startTime.value = song.startTime.value
this.stopTime.value = song.stopTime.value this.stopTime.value = song.stopTime.value
this.type.value = song.type.value this.type.value = song.type.value

10
app/src/main/res/layout/fragment_nowplaying.xml
View File

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