Merge branch 'tsumugi/master' into tsumugi/release

app/src/main/java/fr/forum_thalie/tsumugi/preferences/CustomizeFragment.kt

@@ -12,7 +12,7 @@ class CustomizeFragment : PreferenceFragmentCompat() {
 
 
         val snackbarPersistent = preferenceScreen.findPreference<SwitchPreferenceCompat>("snackbarPersistent")
-        snackbarPersistent!!.summary = if (preferenceStore.getBoolean("snackbarPersistent", true))
+        snackbarPersistent!!.summary = if (preferenceStore.getBoolean("snackbarPersistent", false))
             getString(R.string.snackbarPersistent)
         else
             getString(R.string.snackbarNonPersistent)

app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingFragment.kt

@@ -192,7 +192,7 @@ class NowPlayingFragment : Fragment() {
             val clipboard = context!!.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
             val clip = android.content.ClipData.newPlainText("Copied Text", text)
             clipboard.setPrimaryClip(clip)
-            val snackBarLength = if (preferenceStore.getBoolean("snackbarPersistent", true))
+            val snackBarLength = if (preferenceStore.getBoolean("snackbarPersistent", false))
                 Snackbar.LENGTH_INDEFINITE
             else Snackbar.LENGTH_LONG
             val snackBar = Snackbar.make(it, "", snackBarLength)

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

@@ -189,7 +189,7 @@
                     android:id="@+id/text_song_artist_next"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="bottom"
+                    android:gravity="bottom|center_horizontal"
                     android:text=""
                     android:textAlignment="center"
                     android:textColor="@color/whited3"
@@ -202,7 +202,7 @@
                     android:id="@+id/text_song_title_next"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="bottom"
+                    android:gravity="bottom|center_horizontal"
                     android:text=""
                     android:textAlignment="center"
                     android:textColor="@color/whited"
@@ -294,7 +294,7 @@
                     android:id="@+id/text_song_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="bottom"
+                    android:gravity="bottom|center_horizontal"
                     android:text=""
                     android:textAlignment="center"
                     android:textColor="@color/whited"
@@ -306,7 +306,7 @@
                     android:id="@+id/text_song_artist"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="bottom"
+                    android:gravity="bottom|center_horizontal"
                     android:text=""
                     android:textAlignment="center"
                     android:textColor="@color/whited3"

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

@@ -11,7 +11,7 @@
     <color name="whited3">#999999</color>
     <color name="whited4">#999999</color>
     <color name="whited5">#7F7F7F</color>
-    <color name="rblue">#64B5F6</color>
+    <color name="rblue">#3A7AAF</color>
     <color name="bluereq">#527a8e</color>
     <color name="blueTitle">#527a8e</color>
     <color name="reqButtonPressed">#5cb85c</color>
@@ -20,10 +20,10 @@
 
     <color name="seek_bar_background">#585858</color>
     <color name="seek_bar_progress">#f58b01</color>
-    <color name="seek_bar_secondary_progress">#64B5F6</color>
+    <color name="seek_bar_secondary_progress">#3A7AAF</color>
 
     <color name="progress_bar_background">#585858</color>
-    <color name="progress_bar_progress">#64B5F6</color>
+    <color name="progress_bar_progress">#3A7AAF</color>
     <color name="progress_bar_secondary_progress">#f58b01</color>
 
     <color name="white">#FFFFFF</color>