diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java index ea6715f16..cbd2bacaa 100644 --- a/app/src/main/java/org/schabi/newpipe/MainActivity.java +++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java @@ -41,6 +41,8 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import android.widget.Button; +import android.widget.ImageButton; import android.widget.Toast; import org.schabi.newpipe.extractor.StreamingService; @@ -79,6 +81,7 @@ public class MainActivity extends AppCompatActivity { setSupportActionBar(findViewById(R.id.toolbar)); setupDrawer(); + setupDrawerFooter(); } private void setupDrawer() { @@ -123,6 +126,16 @@ public class MainActivity extends AppCompatActivity { } } + private void setupDrawerFooter() { + ImageButton settings = findViewById(R.id.drawer_settings); + ImageButton downloads = findViewById(R.id.drawer_downloads); + ImageButton history = findViewById(R.id.drawer_history); + + settings.setOnClickListener(view -> NavigationHelper.openSettings(this) ); + downloads.setOnClickListener(view -> NavigationHelper.openDownloads(this)); + history.setOnClickListener(view -> NavigationHelper.openHistory(this)); + } + @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java index 230f3b5ee..728da0ae5 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java @@ -1,6 +1,7 @@ package org.schabi.newpipe.settings; import android.os.Bundle; +import android.support.v7.preference.Preference; import org.schabi.newpipe.R; diff --git a/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png new file mode 100644 index 000000000..acf1ddf85 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png new file mode 100644 index 000000000..97ded33b5 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png new file mode 100644 index 000000000..c59419c02 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png new file mode 100644 index 000000000..8909c3553 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png new file mode 100644 index 000000000..e84e188a1 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png new file mode 100644 index 000000000..5caedc8e5 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png new file mode 100644 index 000000000..3023ff8da Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png new file mode 100644 index 000000000..eabb0a2ba Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png new file mode 100644 index 000000000..476d5c978 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png new file mode 100644 index 000000000..507c5edd4 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7eafc6c69..b894c23aa 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,7 +1,6 @@ - + + \ No newline at end of file diff --git a/app/src/main/res/layout/drawer_laoyut.xml b/app/src/main/res/layout/drawer_laoyut.xml new file mode 100644 index 000000000..dcf29c42f --- /dev/null +++ b/app/src/main/res/layout/drawer_laoyut.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml index 330fb34da..fb9ee2890 100644 --- a/app/src/main/res/layout/fragment_video_detail.xml +++ b/app/src/main/res/layout/fragment_video_detail.xml @@ -310,7 +310,7 @@ android:layout_height="55dp" android:layout_gravity="center_vertical" android:layout_weight="1" - android:background="?attr/selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:clickable="true" android:focusable="true" android:contentDescription="@string/append_playlist" @@ -327,7 +327,7 @@ android:layout_height="55dp" android:layout_gravity="center_vertical" android:layout_weight="1" - android:background="?attr/selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:clickable="true" android:focusable="true" android:contentDescription="@string/play_audio" @@ -344,7 +344,7 @@ android:layout_height="55dp" android:layout_gravity="center_vertical" android:layout_weight="1" - android:background="?attr/selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:clickable="true" android:focusable="true" android:contentDescription="@string/open_in_popup_mode" @@ -361,7 +361,7 @@ android:layout_height="55dp" android:layout_gravity="center_vertical" android:layout_weight="1" - android:background="?attr/selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:clickable="true" android:focusable="true" android:contentDescription="@string/controls_download_desc" diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 31eda4fbc..c8e0907be 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -25,6 +25,7 @@ + @@ -39,4 +40,6 @@ + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index dcf8f9268..ad767835b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -15,6 +15,7 @@ @color/light_youtube_dark_color @color/light_youtube_accent_color @color/light_background_color + @color/light_background_color @drawable/ic_thumb_up_black_24dp @drawable/ic_thumb_down_black_24dp @@ -40,6 +41,7 @@ @drawable/ic_arrow_top_left_black_24dp @drawable/ic_more_vert_black_24dp @drawable/ic_play_arrow_black_24dp + @drawable/ic_settings_black_24dp @drawable/ic_whatshot_black_24dp @drawable/ic_channel_black_24dp @drawable/ic_bookmark_black_24dp @@ -66,6 +68,7 @@ @color/dark_youtube_dark_color @color/dark_youtube_accent_color @color/dark_background_color + @color/dark_background_color @drawable/ic_thumb_up_white_24dp @drawable/ic_thumb_down_white_24dp @@ -91,6 +94,7 @@ @drawable/ic_arrow_top_left_white_24dp @drawable/ic_more_vert_white_24dp @drawable/ic_play_arrow_white_24dp + @drawable/ic_settings_white_24dp @drawable/ic_whatshot_white_24dp @drawable/ic_channel_white_24dp @drawable/ic_bookmark_white_24dp @@ -114,6 +118,7 @@