Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/dev' into patch1_ui

Browse source
This commit is contained in:
Vasiliy 2019-02-12 10:21:03 +02:00
commit dc8d304a7a
147 changed files with 3387 additions and 1765 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/layout/activity_main_player.xml
View file

@ -237,7 +237,7 @@
android:focusable="true"
android:padding="5dp"
android:scaleType="fitXY"
android:src="@drawable/list"
android:src="@drawable/ic_list_white_24dp"
android:background="?attr/selectableItemBackground"
tools:ignore="ContentDescription,RtlHardcoded"/>

4
app/src/main/res/layout/missions_header.xml
View file

@ -4,8 +4,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="16dp"
android:orientation="vertical"
android:layout_marginLeft="8dp"