resolve conflict

app/src/main/res/layout/activity_main.xml

@@ -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>

app/src/main/res/layout/fragment_video_detail.xml

@@ -273,7 +273,7 @@
                             android:paddingBottom="6dp"
                             android:paddingTop="6dp"
                             android:text="@string/controls_background_title"
-                            android:textSize="12sp"/>
+                            android:textSize="12sp" />
                     </RelativeLayout>
 
                     <!--UPLOADER-->

app/src/main/res/menu/drawer_items.xml

@@ -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>

app/src/main/res/values/settings_keys.xml

@@ -46,6 +46,13 @@
         <item>144p</item>
     </string-array>
 
+    <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">@string/youtube</string>
+
     <string name="video_mp4_key" translatable="false">video_mp4</string>
     <string name="video_webm_key" translatable="false">video_webm</string>
     <string name="video_3gp_key" translatable="false">video_3gp</string>

app/src/main/res/values/strings.xml

@@ -84,6 +84,7 @@
     <string name="show_hold_to_append_summary">Show tip when background or popup button is pressed on video details page</string>
     <string name="url_not_supported_toast">URL not supported</string>
     <string name="default_content_country_title">Default content country</string>
+    <string name="service_title">Service</string>
     <string name="search_language_title">Default content language</string>
     <string name="settings_category_player_title">Player</string>
     <string name="settings_category_player_behavior_title">Behavior</string>
@@ -329,4 +330,10 @@
     <string name="start_here_on_main">Start Playing Here</string>
     <string name="start_here_on_background">Start Here on Background</string>
     <string name="start_here_on_popup">Start Here on Popup</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>

app/src/main/res/xml/content_settings.xml

@@ -2,7 +2,6 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/content">
-
     <ListPreference
         android:defaultValue="@string/default_country_value"
         android:entries="@array/country_names"
@@ -38,5 +37,4 @@
         android:key="@string/main_page_content_key"
         android:title="@string/main_page_content"
         android:summary="%s"/>
-
 </PreferenceScreen>