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

Add simple drawer for selecting service

Browse source
This commit is contained in:
wb9688 2017-11-19 17:21:46 +01:00
parent 621a1909ec
commit 54aa40eac1
7 changed files with 86 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/res/layout/activity_main.xml
View file

@ -1,18 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<merge
<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="org.schabi.newpipe.MainActivity">
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/fragment_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize"/>
android:orientation="vertical"
tools:context="org.schabi.newpipe.MainActivity">
<FrameLayout
android:id="@+id/fragment_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize" />
<include layout="@layout/toolbar_layout"/>
<include layout="@layout/toolbar_layout" />
</FrameLayout>
</merge>
<android.support.design.widget.NavigationView
android:id="@+id/navigation"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
app:menu="@menu/drawer_items" />
</android.support.v4.widget.DrawerLayout>

5
app/src/main/res/menu/drawer_items.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:title="@string/youtube" />
<item android:title="@string/soundcloud" />
</menu>

12
app/src/main/res/values/settings_keys.xml
View file

@ -46,16 +46,12 @@
<item>144p</item>
</string-array>
<string-array name="service_list_description" translatable="false">
<item>YouTube</item>
<item>SoundCloud</item>
</string-array>
<string-array name="service_list_values" translatable="false">
<item>0</item>
<item>1</item>
<string-array name="service_list" translatable="false">
<item>@string/youtube</item>
<item>@string/soundcloud</item>
</string-array>
<string name="service_key" translatable="false">service</string>
<string name="default_service_value" translatable="false">0</string>
<string name="default_service_value" translatable="false">@string/youtube</string>
<string name="video_mp4_key" translatable="false">video_mp4</string>
<string name="video_webm_key" translatable="false">video_webm</string>

6
app/src/main/res/values/strings.xml
View file

@ -309,4 +309,10 @@
<string name="play_queue_stream_detail">Details</string>
<string name="play_queue_audio_settings">Audio Settings</string>
<string name="hold_to_append">Hold To Enqueue</string>
<!-- Drawer -->
<string name="drawer_open">Open Drawer</string>
<string name="drawer_close">Close Drawer</string>
<string name="youtube" translatable="false">YouTube</string>
<string name="soundcloud" translatable="false">SoundCloud</string>
</resources>

4
app/src/main/res/xml/content_settings.xml
View file

@ -5,8 +5,8 @@
<ListPreference
android:defaultValue="@string/default_service_value"
android:entries="@array/service_list_description"
android:entryValues="@array/service_list_values"
android:entries="@array/service_list"
android:entryValues="@array/service_list"
android:key="@string/service_key"
android:summary="%s"
android:title="@string/service_title"/>