Browse Source

changed some layout info (size/orga)

yattoz 5 years ago
parent
commit
e9ef198baa

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

30
         <ImageView
30
         <ImageView
31
             android:id="@+id/streamerPicture"
31
             android:id="@+id/streamerPicture"
32
             android:layout_width="0dp"
32
             android:layout_width="0dp"
33
-            android:layout_height="0dp"
33
+            android:layout_height="wrap_content"
34
             android:layout_gravity="top|center_horizontal"
34
             android:layout_gravity="top|center_horizontal"
35
             android:adjustViewBounds="true"
35
             android:adjustViewBounds="true"
36
             android:contentDescription="dj-image"
36
             android:contentDescription="dj-image"
37
             android:scaleType="fitCenter"
37
             android:scaleType="fitCenter"
38
-            app:layout_constraintBottom_toTopOf="@id/imageLeftGuideline"
39
             app:layout_constraintEnd_toEndOf="parent"
38
             app:layout_constraintEnd_toEndOf="parent"
40
 
39
 
41
             app:layout_constraintStart_toStartOf="@id/imageGuideline"
40
             app:layout_constraintStart_toStartOf="@id/imageGuideline"
42
             app:layout_constraintTop_toTopOf="parent"
41
             app:layout_constraintTop_toTopOf="parent"
43
             app:srcCompat="@drawable/logo_roundsquare"
42
             app:srcCompat="@drawable/logo_roundsquare"
43
+            android:layout_margin="8dp"
44
             tools:ignore="HardcodedText" />
44
             tools:ignore="HardcodedText" />
45
+        <!--             app:layout_constraintBottom_toTopOf="@id/imageLeftGuideline" -->
45
 
46
 
46
         <androidx.constraintlayout.widget.Guideline
47
         <androidx.constraintlayout.widget.Guideline
47
             android:id="@+id/imageGuideline"
48
             android:id="@+id/imageGuideline"
97
             android:layout_width="wrap_content"
98
             android:layout_width="wrap_content"
98
             android:layout_height="wrap_content"
99
             android:layout_height="wrap_content"
99
             android:orientation="horizontal"
100
             android:orientation="horizontal"
100
-            app:layout_constraintGuide_percent="0.80" />
101
+            app:layout_constraintGuide_percent="0.95" />
101
 
102
 
102
         <TextView
103
         <TextView
103
             android:id="@+id/sleepInfo"
104
             android:id="@+id/sleepInfo"

+ 3 - 2
app/src/main/res/layout/programme_view.xml View File

5
     android:orientation="vertical" android:layout_width="match_parent"
5
     android:orientation="vertical" android:layout_width="match_parent"
6
     android:layout_height="wrap_content"
6
     android:layout_height="wrap_content"
7
     android:layout_marginTop="8dp"
7
     android:layout_marginTop="8dp"
8
-    android:layout_marginStart="16dp"
9
-    android:layout_marginEnd="16dp">
8
+    android:layout_marginStart="12dp"
9
+    android:layout_marginEnd="12dp">
10
 
10
 
11
     <TextView
11
     <TextView
12
         android:id="@+id/programme_start"
12
         android:id="@+id/programme_start"
27
         app:layout_constraintEnd_toEndOf="parent"
27
         app:layout_constraintEnd_toEndOf="parent"
28
         android:gravity="center"
28
         android:gravity="center"
29
         android:textAlignment="center"
29
         android:textAlignment="center"
30
+        android:textSize="16sp"
30
         />
31
         />
31
 
32
 
32
     <TextView
33
     <TextView

+ 2 - 2
app/src/main/res/layout/song_view.xml View File

5
     android:layout_width="match_parent"
5
     android:layout_width="match_parent"
6
     android:layout_height="wrap_content"
6
     android:layout_height="wrap_content"
7
     android:layout_marginTop="8dp"
7
     android:layout_marginTop="8dp"
8
-    android:layout_marginStart="16dp"
9
-    android:layout_marginEnd="16dp"
8
+    android:layout_marginStart="12dp"
9
+    android:layout_marginEnd="12dp"
10
     >
10
     >
11
 
11
 
12
     <TextView
12
     <TextView

+ 2 - 2
app/src/main/res/values/strings.xml View File

4
     <string name="title_queue_lp">Songs</string>
4
     <string name="title_queue_lp">Songs</string>
5
     <string name="title_chat">Chat</string>
5
     <string name="title_chat">Chat</string>
6
     <string name="title_news">News</string>
6
     <string name="title_news">News</string>
7
-    <string name="title_programme">Programme</string>
7
+    <string name="title_programme">Planning</string>
8
 
8
 
9
     <string name="now_playing_notification_title_template">Now playing: %1$s</string>
9
     <string name="now_playing_notification_title_template">Now playing: %1$s</string>
10
 
10
 
48
     <string name="no_alarm_set">No alarm set</string>
48
     <string name="no_alarm_set">No alarm set</string>
49
     <string name="next_alarm">Next alarm:</string>
49
     <string name="next_alarm">Next alarm:</string>
50
     <string name="lp">Last played</string>
50
     <string name="lp">Last played</string>
51
-    <string name="programme">Programme</string>
51
+    <string name="programme">Planning</string>
52
     <string name="regular_programme">Programme régulier</string>
52
     <string name="regular_programme">Programme régulier</string>
53
 
53
 
54
 </resources>
54
 </resources>