Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'nitehu-fix/icon_sizes' into develop

This commit is contained in:
Óscar García Amor 2020-11-04 18:22:17 +01:00
parent 19f8196268 3f6c45f25f
commit 8d45a3d106
No known key found for this signature in database
GPG Key ID: E18B2370D3D566EE
10 changed files with 99 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ultrasonic/src/main/res/layout/album_buttons.xml
View File

@ -9,7 +9,8 @@
<ImageView
android:id="@+id/select_album_select"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="32dp"
android:scaleType="fitCenter"
android:layout_weight="1"
android:src="?attr/select_all"
android:visibility="gone" />
@ -17,7 +18,8 @@
<ImageView
android:id="@+id/select_album_play_now"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="32dp"
android:scaleType="fitCenter"
android:layout_weight="1"
android:src="?attr/media_play"
android:visibility="gone" />
@ -25,7 +27,8 @@
<ImageView
android:id="@+id/select_album_play_next"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="32dp"
android:scaleType="fitCenter"
android:layout_weight="1"
android:src="?attr/media_play_next"
android:visibility="gone" />
@ -33,7 +36,8 @@
<ImageView
android:id="@+id/select_album_play_last"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="32dp"
android:scaleType="fitCenter"
android:layout_weight="1"
android:src="?attr/add_to_queue"
android:visibility="gone" />
@ -41,7 +45,8 @@
<ImageView
android:id="@+id/select_album_pin"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="32dp"
android:scaleType="fitCenter"
android:layout_weight="1"
android:src="?attr/pin"
android:visibility="gone" />
@ -49,7 +54,8 @@
<ImageView
android:id="@+id/select_album_unpin"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="32dp"
android:scaleType="fitCenter"
android:layout_weight="1"
android:src="?attr/unpin"
android:visibility="gone" />
@ -57,7 +63,8 @@
<ImageView
android:id="@+id/select_album_download"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="32dp"
android:scaleType="fitCenter"
android:layout_weight="1"
android:src="?attr/download"
android:visibility="gone" />
@ -65,7 +72,8 @@
<ImageView
android:id="@+id/select_album_delete"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="32dp"
android:scaleType="fitCenter"
android:layout_weight="1"
android:src="?attr/stop"
android:visibility="gone" />
@ -73,7 +81,8 @@
<ImageView
android:id="@+id/select_album_more"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="32dp"
android:scaleType="fitCenter"
android:layout_weight="1"
android:src="?attr/forward"
android:visibility="gone" />

6
ultrasonic/src/main/res/layout/appwidget4x1.xml
View File

@ -79,7 +79,7 @@
a:layout_height="fill_parent"
a:layout_weight="1"
a:background="@color/transparent"
a:scaleType="center"
a:scaleType="fitCenter"
a:src="@drawable/media_backward_normal_dark" />
<ImageButton
@ -88,7 +88,7 @@
a:layout_height="fill_parent"
a:layout_weight="1"
a:background="@color/transparent"
a:scaleType="center"
a:scaleType="fitCenter"
a:src="@drawable/media_start_normal_dark" />
<ImageButton
@ -97,7 +97,7 @@
a:layout_height="fill_parent"
a:layout_weight="1"
a:background="@color/transparent"
a:scaleType="center"
a:scaleType="fitCenter"
a:src="@drawable/media_forward_normal_dark" />
</LinearLayout>
</LinearLayout>

12
ultrasonic/src/main/res/layout/appwidget4x2.xml
View File

@ -97,28 +97,28 @@
<ImageButton
a:id="@+id/control_previous"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_height="32dp"
a:layout_weight="1"
a:background="@color/transparent"
a:scaleType="center"
a:scaleType="fitCenter"
a:src="@drawable/media_backward_normal_dark" />
<ImageButton
a:id="@+id/control_play"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_height="32dp"
a:layout_weight="1"
a:background="@color/transparent"
a:scaleType="center"
a:scaleType="fitCenter"
a:src="@drawable/media_start_normal_dark" />
<ImageButton
a:id="@+id/control_next"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_height="32dp"
a:layout_weight="1"
a:background="@color/transparent"
a:scaleType="center"
a:scaleType="fitCenter"
a:src="@drawable/media_forward_normal_dark" />
</LinearLayout>
</LinearLayout>

12
ultrasonic/src/main/res/layout/appwidget4x3.xml
View File

@ -82,28 +82,28 @@
<ImageButton
a:id="@+id/control_previous"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_height="32dp"
a:layout_weight="1"
a:background="@color/transparent"
a:scaleType="center"
a:scaleType="fitCenter"
a:src="@drawable/media_backward_normal_dark" />
<ImageButton
a:id="@+id/control_play"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_height="32dp"
a:layout_weight="1"
a:background="@color/transparent"
a:scaleType="center"
a:scaleType="fitCenter"
a:src="@drawable/media_start_normal_dark" />
<ImageButton
a:id="@+id/control_next"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_height="32dp"
a:layout_weight="1"
a:background="@color/transparent"
a:scaleType="center"
a:scaleType="fitCenter"
a:src="@drawable/media_forward_normal_dark" />
</LinearLayout>

12
ultrasonic/src/main/res/layout/appwidget4x4.xml
View File

@ -83,28 +83,28 @@
<ImageButton
a:id="@+id/control_previous"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_height="32dp"
a:layout_weight="1"
a:background="@color/transparent"
a:scaleType="center"
a:scaleType="fitCenter"
a:src="@drawable/media_backward_normal_dark" />
<ImageButton
a:id="@+id/control_play"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_height="32dp"
a:layout_weight="1"
a:background="@color/transparent"
a:scaleType="center"
a:scaleType="fitCenter"
a:src="@drawable/media_start_normal_dark" />
<ImageButton
a:id="@+id/control_next"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_height="32dp"
a:layout_weight="1"
a:background="@color/transparent"
a:scaleType="center"
a:scaleType="fitCenter"
a:src="@drawable/media_forward_normal_dark" />
</LinearLayout>

57
ultrasonic/src/main/res/layout/media_buttons.xml
View File

@ -9,74 +9,73 @@
a:paddingRight="4dip"
>
<ImageView
<ImageView
a:id="@+id/download_shuffle"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_height="32dp"
a:layout_gravity="center"
a:layout_weight="1"
a:focusable="true"
a:src="?attr/media_shuffle"
a:paddingLeft="2dip"
a:paddingRight="8dip"/>
a:scaleType="fitCenter"
a:src="?attr/media_shuffle" />
<org.moire.ultrasonic.view.AutoRepeatButton
a:id="@+id/download_previous"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_height="48dp"
a:scaleType="fitCenter"
a:layout_gravity="center"
a:layout_weight="1"
a:focusable="true"
a:src="?attr/media_previous"
a:paddingLeft="8dip"
a:paddingRight="8dip"/>
a:src="?attr/media_previous" />
<ImageView
a:id="@+id/download_start"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_width="48dip"
a:layout_height="96dp"
a:layout_weight="1"
a:focusable="true"
a:src="?attr/media_play"
a:paddingRight="8dip"
a:paddingLeft="8dip"/>
a:scaleType="fitCenter"
a:src="?attr/media_play" />
<ImageView
a:id="@+id/download_pause"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_width="48dip"
a:layout_height="96dp"
a:layout_weight="1"
a:focusable="true"
a:src="?attr/media_pause"
a:paddingLeft="8dip"
a:paddingRight="8dip"/>
a:scaleType="fitCenter"
a:src="?attr/media_pause" />
<ImageView
a:id="@+id/download_stop"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_width="48dip"
a:layout_height="96dp"
a:layout_weight="1"
a:focusable="true"
a:src="?attr/media_stop"
a:paddingLeft="8dip"
a:paddingRight="8dip"/>
a:scaleType="fitCenter"
a:src="?attr/media_stop" />
<org.moire.ultrasonic.view.AutoRepeatButton
a:id="@+id/download_next"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_height="48dp"
a:scaleType="fitCenter"
a:layout_gravity="center"
a:layout_weight="1"
a:focusable="true"
a:src="?attr/media_next"
a:paddingLeft="8dip"
a:paddingRight="8dip"/>
a:src="?attr/media_next" />
<ImageView
a:id="@+id/download_repeat"
a:layout_width="0dip"
a:layout_height="wrap_content"
a:layout_height="32dp"
a:scaleType="fitCenter"
a:layout_gravity="center"
a:layout_weight="1"
a:focusable="true"
a:src="?attr/media_repeat_off"
a:paddingLeft="8dip"
a:paddingRight="2dip"/>
</LinearLayout>

26
ultrasonic/src/main/res/layout/notification.xml
View File

@ -70,23 +70,25 @@
android:layout_gravity="center"
android:gravity="end"
android:orientation="horizontal"
android:paddingRight="4dp">
android:paddingRight="8dp">
<ImageButton
android:id="@+id/control_previous"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center"
android:layout_weight="1"
android:background="@drawable/btn_bg"
android:scaleType="fitXY"
android:layout_margin="2dp"
android:src="@drawable/media_backward_normal_dark" />
<ImageButton
android:id="@+id/control_play"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_margin="2dp"
android:layout_weight="1"
android:background="@drawable/btn_bg"
android:scaleType="fitXY"
@ -94,24 +96,26 @@
<ImageButton
android:id="@+id/control_next"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center"
android:layout_weight="1"
android:background="@drawable/btn_bg"
android:scaleType="fitXY"
android:layout_margin="2dp"
android:src="@drawable/media_forward_normal_dark" />
<ImageButton
android:id="@+id/control_stop"
android:layout_width="32dip"
android:layout_height="32dip"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center"
android:layout_marginLeft="4dp"
android:alpha="70"
android:background="@drawable/btn_bg"
android:scaleType="fitXY"
android:src="@drawable/ic_menu_close_dark" />
android:src="@drawable/ic_menu_close_dark"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" />
</LinearLayout>
</LinearLayout>

17
ultrasonic/src/main/res/layout/notification_large.xml
View File

@ -83,7 +83,7 @@
<LinearLayout
android:id="@+id/notification_rating"
android:layout_width="match_parent"
android:layout_height="30dip"
android:layout_height="24dip"
android:layout_gravity="center"
android:orientation="horizontal"
android:visibility="visible">
@ -157,8 +157,9 @@
<ImageButton
android:id="@+id/control_previous"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="fitCenter"
android:layout_gravity="center"
android:layout_weight="1"
android:background="@drawable/btn_bg"
@ -166,8 +167,9 @@
<ImageButton
android:id="@+id/control_play"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="fitCenter"
android:layout_gravity="center"
android:layout_weight="1"
android:background="@drawable/btn_bg"
@ -175,8 +177,9 @@
<ImageButton
android:id="@+id/control_next"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="fitCenter"
android:layout_gravity="center"
android:layout_weight="1"
android:background="@drawable/btn_bg"

7
ultrasonic/src/main/res/layout/now_playing.xml
View File

@ -54,13 +54,14 @@
<ImageView
android:id="@+id/now_playing_control_play"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center|right"
android:layout_marginTop="2dip"
android:layout_marginRight="5dip"
android:layout_marginRight="16dip"
android:layout_weight="0.0"
android:focusable="false"
android:scaleType="fitCenter"
android:src="?attr/media_pause" />
</LinearLayout>

5
ultrasonic/src/main/res/layout/song_list_item.xml
View File

@ -93,7 +93,8 @@
a:background="@android:color/transparent"
a:focusable="false"
a:gravity="center_vertical"
a:paddingRight="8dip"
a:src="?attr/drag_queue" />
a:layout_marginRight="16dip"
a:src="?attr/drag_queue"
a:layout_marginEnd="16dip" />
</LinearLayout>