Browse Source

tweaked font size, should fix Fragment first selection.

yattoz 4 years ago
parent
commit
813dc66aa1

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

37
 
37
 
38
         viewPager.adapter = adapter
38
         viewPager.adapter = adapter
39
         val todaySundayFirst = Calendar.getInstance(Planning.instance.timeZone).get(Calendar.DAY_OF_WEEK) - 1
39
         val todaySundayFirst = Calendar.getInstance(Planning.instance.timeZone).get(Calendar.DAY_OF_WEEK) - 1
40
-        viewPager.currentItem = (todaySundayFirst - 1)%7
40
+        viewPager.currentItem = (todaySundayFirst - 1 + 7)%7 // don't do modulos on negative, seems like it's weird
41
 
41
 
42
         val tabLayout : TabLayout = root.findViewById(R.id.dayTabLayout)
42
         val tabLayout : TabLayout = root.findViewById(R.id.dayTabLayout)
43
         tabLayout.setupWithViewPager(viewPager)
43
         tabLayout.setupWithViewPager(viewPager)

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

178
                     android:layout_gravity="top"
178
                     android:layout_gravity="top"
179
                     android:text="@string/up_next"
179
                     android:text="@string/up_next"
180
                     android:textAlignment="center"
180
                     android:textAlignment="center"
181
-                    android:textColor="@color/whited3"
181
+                    android:textColor="@color/whited5"
182
                     android:layout_marginTop="8dp"
182
                     android:layout_marginTop="8dp"
183
                     app:layout_constraintStart_toStartOf="parent"
183
                     app:layout_constraintStart_toStartOf="parent"
184
                     app:layout_constraintEnd_toEndOf="parent"
184
                     app:layout_constraintEnd_toEndOf="parent"
193
                     android:text=""
193
                     android:text=""
194
                     android:textAlignment="center"
194
                     android:textAlignment="center"
195
                     android:textColor="@color/whited3"
195
                     android:textColor="@color/whited3"
196
-                    android:textSize="16sp"
196
+                    android:textSize="14sp"
197
                     app:layout_constraintStart_toStartOf="parent"
197
                     app:layout_constraintStart_toStartOf="parent"
198
                     app:layout_constraintTop_toBottomOf="@id/upNext"
198
                     app:layout_constraintTop_toBottomOf="@id/upNext"
199
                     android:visibility="visible"/>
199
                     android:visibility="visible"/>
206
                     android:text=""
206
                     android:text=""
207
                     android:textAlignment="center"
207
                     android:textAlignment="center"
208
                     android:textColor="@color/whited"
208
                     android:textColor="@color/whited"
209
-                    android:textSize="16sp"
209
+                    android:textSize="14sp"
210
                     app:layout_constraintStart_toStartOf="parent"
210
                     app:layout_constraintStart_toStartOf="parent"
211
                     app:layout_constraintTop_toBottomOf="@id/text_song_artist_next"
211
                     app:layout_constraintTop_toBottomOf="@id/text_song_artist_next"
212
                     android:visibility="visible" />
212
                     android:visibility="visible" />
298
                     android:text=""
298
                     android:text=""
299
                     android:textAlignment="center"
299
                     android:textAlignment="center"
300
                     android:textColor="@color/whited"
300
                     android:textColor="@color/whited"
301
-                    android:textSize="20sp"
301
+                    android:textSize="18sp"
302
                     app:layout_constraintBottom_toBottomOf="parent"
302
                     app:layout_constraintBottom_toBottomOf="parent"
303
                     app:layout_constraintStart_toStartOf="parent" />
303
                     app:layout_constraintStart_toStartOf="parent" />
304
 
304
 
310
                     android:text=""
310
                     android:text=""
311
                     android:textAlignment="center"
311
                     android:textAlignment="center"
312
                     android:textColor="@color/whited3"
312
                     android:textColor="@color/whited3"
313
-                    android:textSize="20sp"
313
+                    android:textSize="18sp"
314
                     app:layout_constraintBottom_toTopOf="@id/text_song_title"
314
                     app:layout_constraintBottom_toTopOf="@id/text_song_title"
315
                     app:layout_constraintStart_toStartOf="parent" />
315
                     app:layout_constraintStart_toStartOf="parent" />
316
 
316