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

Merge branch 'usability' into develop

This commit is contained in:
Óscar García Amor 2020-09-05 14:28:59 +02:00
parent f07f0344fd 0f7238e961
commit 387457cf99
No known key found for this signature in database
GPG Key ID: E18B2370D3D566EE
5 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ultrasonic/src/main/res/layout/main_buttons.xml
View File

@ -10,16 +10,25 @@
<ImageView a:layout_width="wrap_content" a:layout_height="wrap_content" <ImageView a:layout_width="wrap_content" a:layout_height="wrap_content"
a:layout_gravity="center_vertical" a:src="?attr/select_folder" /> a:layout_gravity="center_vertical" a:src="?attr/select_folder" />
<LinearLayout a:orientation="vertical" a:layout_width="wrap_content" <LinearLayout
a:layout_height="fill_parent"> a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:orientation="vertical">
<TextView a:id="@+id/main.select_server_1" a:text="@string/main.select_server" <TextView
a:layout_width="fill_parent" a:layout_height="wrap_content" a:id="@+id/main.select_server_1"
a:layout_marginLeft="10dip" a:layout_marginTop="6dip" a:layout_width="fill_parent"
a:layout_height="wrap_content"
a:layout_marginLeft="10dip"
a:layout_marginTop="6dip"
a:text="@string/main.select_server"
a:textAppearance="?android:attr/textAppearanceLarge" /> a:textAppearance="?android:attr/textAppearanceLarge" />
<TextView a:id="@+id/main.select_server_2" a:layout_width="fill_parent" <TextView
a:layout_height="wrap_content" a:layout_marginLeft="10dip" a:id="@+id/main.select_server_2"
a:layout_width="fill_parent"
a:layout_height="wrap_content"
a:layout_marginLeft="10dip"
a:textAppearance="?android:attr/textAppearanceSmall" /> a:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>

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

@ -70,7 +70,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="end" android:gravity="end"
android:orientation="horizontal" android:orientation="horizontal"
> android:paddingRight="4dp">
<ImageButton <ImageButton
android:id="@+id/control_previous" android:id="@+id/control_previous"
@ -104,12 +104,13 @@
<ImageButton <ImageButton
android:id="@+id/control_stop" android:id="@+id/control_stop"
android:layout_width="22dip" android:layout_width="32dip"
android:layout_height="22dip" android:layout_height="32dip"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="4dp"
android:alpha="70"
android:background="@drawable/btn_bg" android:background="@drawable/btn_bg"
android:scaleType="fitXY" android:scaleType="fitXY"
android:alpha="70"
android:src="@drawable/ic_menu_exit_dark" /> android:src="@drawable/ic_menu_exit_dark" />
</LinearLayout> </LinearLayout>

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

@ -30,7 +30,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" > android:orientation="horizontal"
android:paddingRight="4dp">
<TextView <TextView
android:id="@+id/trackname" android:id="@+id/trackname"
@ -42,19 +43,17 @@
android:ellipsize="marquee" android:ellipsize="marquee"
android:focusable="true" android:focusable="true"
android:singleLine="true" android:singleLine="true"
tools:text="Track name" tools:text="Track name" />
/>
<ImageButton <ImageButton
android:id="@+id/control_stop" android:id="@+id/control_stop"
android:layout_width="22dip" android:layout_width="32dip"
android:layout_height="22dip" android:layout_height="32dip"
android:layout_gravity="center|end" android:layout_gravity="center|end"
android:gravity="center_vertical"
android:background="@drawable/btn_bg" android:background="@drawable/btn_bg"
android:gravity="center_vertical"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/ic_menu_exit_dark" android:src="@drawable/ic_menu_exit_dark" />
/>
</LinearLayout> </LinearLayout>
<TextView <TextView

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

@ -70,7 +70,7 @@
a:focusable="false" a:focusable="false"
a:gravity="center_vertical" a:gravity="center_vertical"
a:scaleType="centerInside" a:scaleType="centerInside"
a:layout_marginRight="3dip" a:layout_marginRight="8dip"
a:src="?attr/star_hollow" /> a:src="?attr/star_hollow" />
</LinearLayout> </LinearLayout>
@ -82,7 +82,7 @@
a:background="@android:color/transparent" a:background="@android:color/transparent"
a:focusable="false" a:focusable="false"
a:gravity="center_vertical" a:gravity="center_vertical"
a:paddingRight="3dip" a:paddingRight="8dip"
a:src="?attr/star_hollow" /> a:src="?attr/star_hollow" />
<ImageView <ImageView
@ -92,7 +92,7 @@
a:background="@android:color/transparent" a:background="@android:color/transparent"
a:focusable="false" a:focusable="false"
a:gravity="center_vertical" a:gravity="center_vertical"
a:paddingRight="3dip" a:paddingRight="8dip"
a:src="@drawable/ic_drag_queue" /> a:src="@drawable/ic_drag_queue" />
</LinearLayout> </LinearLayout>

2
ultrasonic/src/main/res/layout/video_list_item.xml
View File

@ -23,7 +23,7 @@
a:background="@android:color/transparent" a:background="@android:color/transparent"
a:focusable="false" a:focusable="false"
a:gravity="center_vertical" a:gravity="center_vertical"
a:paddingRight="3dip" a:paddingRight="8dip"
a:src="?attr/star_hollow" /> a:src="?attr/star_hollow" />
</LinearLayout> </LinearLayout>