瀏覽代碼

Merge branch 'devel'

yattoz 4 年之前
父節點
當前提交
4602911441

+ 1 - 1
app/src/main/java/fr/forum_thalie/tsumugi/preferences/CustomizeFragment.kt 查看文件

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

+ 1 - 1
app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingFragment.kt 查看文件

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

+ 4 - 4
app/src/main/res/layout/fragment_nowplaying.xml 查看文件

195
                     android:id="@+id/text_song_artist_next"
195
                     android:id="@+id/text_song_artist_next"
196
                     android:layout_width="match_parent"
196
                     android:layout_width="match_parent"
197
                     android:layout_height="wrap_content"
197
                     android:layout_height="wrap_content"
198
-                    android:gravity="bottom"
198
+                    android:gravity="bottom|center_horizontal"
199
                     android:text=""
199
                     android:text=""
200
                     android:textAlignment="center"
200
                     android:textAlignment="center"
201
                     android:textColor="@color/whited3"
201
                     android:textColor="@color/whited3"
208
                     android:id="@+id/text_song_title_next"
208
                     android:id="@+id/text_song_title_next"
209
                     android:layout_width="match_parent"
209
                     android:layout_width="match_parent"
210
                     android:layout_height="wrap_content"
210
                     android:layout_height="wrap_content"
211
-                    android:gravity="bottom"
211
+                    android:gravity="bottom|center_horizontal"
212
                     android:text=""
212
                     android:text=""
213
                     android:textAlignment="center"
213
                     android:textAlignment="center"
214
                     android:textColor="@color/whited"
214
                     android:textColor="@color/whited"
264
                     android:id="@+id/text_song_title"
264
                     android:id="@+id/text_song_title"
265
                     android:layout_width="match_parent"
265
                     android:layout_width="match_parent"
266
                     android:layout_height="wrap_content"
266
                     android:layout_height="wrap_content"
267
-                    android:gravity="bottom"
267
+                    android:gravity="bottom|center_horizontal"
268
                     android:text=""
268
                     android:text=""
269
                     android:textAlignment="center"
269
                     android:textAlignment="center"
270
                     android:textColor="@color/whited"
270
                     android:textColor="@color/whited"
276
                     android:id="@+id/text_song_artist"
276
                     android:id="@+id/text_song_artist"
277
                     android:layout_width="match_parent"
277
                     android:layout_width="match_parent"
278
                     android:layout_height="wrap_content"
278
                     android:layout_height="wrap_content"
279
-                    android:gravity="bottom"
279
+                    android:gravity="bottom|center_horizontal"
280
                     android:text=""
280
                     android:text=""
281
                     android:textAlignment="center"
281
                     android:textAlignment="center"
282
                     android:textColor="@color/whited3"
282
                     android:textColor="@color/whited3"

+ 3 - 3
app/src/main/res/values/colors.xml 查看文件

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">#4FC3F7</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">#4FC3F7</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">#4FC3F7</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>