Browse Source

Merge branch 'devel' into tsumugi/master

yattoz 4 years ago
parent
commit
d92ae128fb

+ 1 - 1
app/src/main/java/fr/forum_thalie/tsumugi/preferences/CustomizeFragment.kt View File

12
 
12
 
13
 
13
 
14
         val snackbarPersistent = preferenceScreen.findPreference<SwitchPreferenceCompat>("snackbarPersistent")
14
         val snackbarPersistent = preferenceScreen.findPreference<SwitchPreferenceCompat>("snackbarPersistent")
15
-        snackbarPersistent!!.summary = if (preferenceStore.getBoolean("snackbarPersistent", true))
15
+        snackbarPersistent!!.summary = if (preferenceStore.getBoolean("snackbarPersistent", false))
16
             getString(R.string.snackbarPersistent)
16
             getString(R.string.snackbarPersistent)
17
         else
17
         else
18
             getString(R.string.snackbarNonPersistent)
18
             getString(R.string.snackbarNonPersistent)

+ 1 - 1
app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingFragment.kt View File

192
             val clipboard = context!!.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
192
             val clipboard = context!!.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
193
             val clip = android.content.ClipData.newPlainText("Copied Text", text)
193
             val clip = android.content.ClipData.newPlainText("Copied Text", text)
194
             clipboard.setPrimaryClip(clip)
194
             clipboard.setPrimaryClip(clip)
195
-            val snackBarLength = if (preferenceStore.getBoolean("snackbarPersistent", true))
195
+            val snackBarLength = if (preferenceStore.getBoolean("snackbarPersistent", false))
196
                 Snackbar.LENGTH_INDEFINITE
196
                 Snackbar.LENGTH_INDEFINITE
197
             else Snackbar.LENGTH_LONG
197
             else Snackbar.LENGTH_LONG
198
             val snackBar = Snackbar.make(it, "", snackBarLength)
198
             val snackBar = Snackbar.make(it, "", snackBarLength)

+ 4 - 4
app/src/main/res/layout/fragment_nowplaying.xml View File

189
                     android:id="@+id/text_song_artist_next"
189
                     android:id="@+id/text_song_artist_next"
190
                     android:layout_width="match_parent"
190
                     android:layout_width="match_parent"
191
                     android:layout_height="wrap_content"
191
                     android:layout_height="wrap_content"
192
-                    android:gravity="bottom"
192
+                    android:gravity="bottom|center_horizontal"
193
                     android:text=""
193
                     android:text=""
194
                     android:textAlignment="center"
194
                     android:textAlignment="center"
195
                     android:textColor="@color/whited3"
195
                     android:textColor="@color/whited3"
202
                     android:id="@+id/text_song_title_next"
202
                     android:id="@+id/text_song_title_next"
203
                     android:layout_width="match_parent"
203
                     android:layout_width="match_parent"
204
                     android:layout_height="wrap_content"
204
                     android:layout_height="wrap_content"
205
-                    android:gravity="bottom"
205
+                    android:gravity="bottom|center_horizontal"
206
                     android:text=""
206
                     android:text=""
207
                     android:textAlignment="center"
207
                     android:textAlignment="center"
208
                     android:textColor="@color/whited"
208
                     android:textColor="@color/whited"
294
                     android:id="@+id/text_song_title"
294
                     android:id="@+id/text_song_title"
295
                     android:layout_width="match_parent"
295
                     android:layout_width="match_parent"
296
                     android:layout_height="wrap_content"
296
                     android:layout_height="wrap_content"
297
-                    android:gravity="bottom"
297
+                    android:gravity="bottom|center_horizontal"
298
                     android:text=""
298
                     android:text=""
299
                     android:textAlignment="center"
299
                     android:textAlignment="center"
300
                     android:textColor="@color/whited"
300
                     android:textColor="@color/whited"
306
                     android:id="@+id/text_song_artist"
306
                     android:id="@+id/text_song_artist"
307
                     android:layout_width="match_parent"
307
                     android:layout_width="match_parent"
308
                     android:layout_height="wrap_content"
308
                     android:layout_height="wrap_content"
309
-                    android:gravity="bottom"
309
+                    android:gravity="bottom|center_horizontal"
310
                     android:text=""
310
                     android:text=""
311
                     android:textAlignment="center"
311
                     android:textAlignment="center"
312
                     android:textColor="@color/whited3"
312
                     android:textColor="@color/whited3"

+ 3 - 3
app/src/main/res/values/colors.xml View File

11
     <color name="whited3">#999999</color>
11
     <color name="whited3">#999999</color>
12
     <color name="whited4">#999999</color>
12
     <color name="whited4">#999999</color>
13
     <color name="whited5">#7F7F7F</color>
13
     <color name="whited5">#7F7F7F</color>
14
-    <color name="rblue">#64B5F6</color>
14
+    <color name="rblue">#3A7AAF</color>
15
     <color name="bluereq">#527a8e</color>
15
     <color name="bluereq">#527a8e</color>
16
     <color name="blueTitle">#527a8e</color>
16
     <color name="blueTitle">#527a8e</color>
17
     <color name="reqButtonPressed">#5cb85c</color>
17
     <color name="reqButtonPressed">#5cb85c</color>
20
 
20
 
21
     <color name="seek_bar_background">#585858</color>
21
     <color name="seek_bar_background">#585858</color>
22
     <color name="seek_bar_progress">#f58b01</color>
22
     <color name="seek_bar_progress">#f58b01</color>
23
-    <color name="seek_bar_secondary_progress">#64B5F6</color>
23
+    <color name="seek_bar_secondary_progress">#3A7AAF</color>
24
 
24
 
25
     <color name="progress_bar_background">#585858</color>
25
     <color name="progress_bar_background">#585858</color>
26
-    <color name="progress_bar_progress">#64B5F6</color>
26
+    <color name="progress_bar_progress">#3A7AAF</color>
27
     <color name="progress_bar_secondary_progress">#f58b01</color>
27
     <color name="progress_bar_secondary_progress">#f58b01</color>
28
 
28
 
29
     <color name="white">#FFFFFF</color>
29
     <color name="white">#FFFFFF</color>