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

resolve conflict

Browse source
This commit is contained in:
Christian Schabesberger 2017-11-16 12:20:03 +01:00
commit fba3ece688
16 changed files with 134 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/src/main/res/drawable-hdpi/ic_more_vert_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 132 B

BIN
app/src/main/res/drawable-hdpi/ic_more_vert_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 134 B

BIN
app/src/main/res/drawable-mdpi/ic_more_vert_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 108 B

BIN
app/src/main/res/drawable-mdpi/ic_more_vert_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 112 B

BIN
app/src/main/res/drawable-xhdpi/ic_more_vert_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 155 B

BIN
app/src/main/res/drawable-xhdpi/ic_more_vert_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 158 B

BIN
app/src/main/res/drawable-xxhdpi/ic_more_vert_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 205 B

BIN
app/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 216 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_more_vert_black_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 272 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_more_vert_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 305 B

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

@ -209,7 +209,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="2dp"
android:layout_toLeftOf="@+id/screenRotationButton"
android:layout_toLeftOf="@+id/queueButton"
android:gravity="center"
android:minHeight="35dp"
android:minWidth="40dp"
@ -218,28 +218,13 @@
tools:ignore="RtlHardcoded,RtlSymmetry"
tools:text="1x" />
<ImageButton
android:id="@+id/screenRotationButton"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_toLeftOf="@+id/queueButton"
android:background="#00ffffff"
android:clickable="true"
android:focusable="true"
android:padding="8dp"
android:scaleType="fitXY"
android:src="@drawable/ic_screen_rotation_white"
tools:ignore="ContentDescription,RtlHardcoded"/>
<ImageButton
android:id="@+id/queueButton"
android:layout_width="30dp"
android:layout_height="35dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_toLeftOf="@+id/fullScreenButton"
android:layout_toLeftOf="@+id/moreOptionsButton"
android:background="#00ffffff"
android:clickable="true"
android:focusable="true"
@ -249,16 +234,17 @@
tools:ignore="ContentDescription,RtlHardcoded"/>
<ImageButton
android:id="@+id/fullScreenButton"
android:layout_width="35dp"
android:layout_height="35dp"
android:id="@+id/moreOptionsButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginLeft="4dp"
android:layout_marginLeft="2dp"
android:padding="5dp"
android:background="#00ffffff"
android:clickable="true"
android:focusable="true"
android:scaleType="fitXY"
android:src="@drawable/ic_fullscreen_exit_white"
android:src="?attr/options"
tools:ignore="ContentDescription,RtlHardcoded"/>
</RelativeLayout>
@ -454,4 +440,4 @@
tools:visibility="visible"/>
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>

21
app/src/main/res/menu/menu_videooptions.xml Normal file
View file

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<menu
android:id="@+id/menu_video_options"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:icon="@drawable/ic_screen_rotation_white"
android:id="@+id/toggleOrientation"
android:title="Toggle orientation"
app:showAsAction="always|withText" />
<item
android:icon="@drawable/ic_fullscreen_exit_white"
android:id="@+id/switchPopup"
android:title="Switch to popup"
app:showAsAction="always|withText" />
<item android:icon="?audio"
android:id="@+id/switchBackground"
android:title="Switch to background"
app:showAsAction="always|withText" />
</menu>

1
app/src/main/res/values/attrs.xml
View file

@ -21,6 +21,7 @@
<attr name="drag_handle" format="reference"/>
<attr name="selected" format="reference"/>
<attr name="search_add" format="reference"/>
<attr name="options" format="reference"/>
<!-- Can't refer to colors directly into drawable's xml-->
<attr name="toolbar_shadow_drawable" format="reference"/>

2
app/src/main/res/values/styles.xml
View file

@ -28,6 +28,7 @@
<item name="drag_handle">@drawable/ic_drag_handle_black_24dp</item>
<item name="selected">@drawable/ic_fiber_manual_record_black_24dp</item>
<item name="search_add">@drawable/ic_arrow_top_left_black_24dp</item>
<item name="options">@drawable/ic_more_vert_black_24dp</item>
<item name="separator_color">@color/light_separator_color</item>
<item name="contrast_background_color">@color/light_contrast_background_color</item>
@ -67,6 +68,7 @@
<item name="drag_handle">@drawable/ic_drag_handle_white_24dp</item>
<item name="selected">@drawable/ic_fiber_manual_record_white_24dp</item>
<item name="search_add">@drawable/ic_arrow_top_left_white_24dp</item>
<item name="options">@drawable/ic_more_vert_white_24dp</item>
<item name="separator_color">@color/dark_separator_color</item>
<item name="contrast_background_color">@color/dark_contrast_background_color</item>