From 00e65153f4ef067c70f42e6f8b5ddbd7a3ab213b Mon Sep 17 00:00:00 2001 From: TobiGr Date: Fri, 16 Feb 2018 13:13:40 +0100 Subject: [PATCH 1/5] Enable SoundCloud kiosks as main page fragment for debug and beta --- .../org/schabi/newpipe/settings/SelectKioskFragment.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java index 5ab1ed1f2..00b618889 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java @@ -13,6 +13,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import org.schabi.newpipe.MainActivity; import org.schabi.newpipe.R; import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.ServiceList; @@ -45,6 +46,8 @@ import java.util.Vector; public class SelectKioskFragment extends DialogFragment { + private static final boolean DEBUG = MainActivity.DEBUG; + RecyclerView recyclerView = null; SelectKioskAdapter selectKioskAdapter = null; @@ -122,7 +125,7 @@ public class SelectKioskFragment extends DialogFragment { for(StreamingService service : NewPipe.getServices()) { //TODO: Multi-service support - if (service.getServiceId() != ServiceList.YouTube.getServiceId()) continue; + if (service.getServiceId() != ServiceList.YouTube.getServiceId() && !DEBUG) continue; for(String kioskId : service.getKioskList().getAvailableKiosks()) { String name = String.format(getString(R.string.service_kiosk_string), From 3e5e7f49ccc5c1ff488b37484d70f7f1d7ede9e5 Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Fri, 16 Feb 2018 23:56:04 +0100 Subject: [PATCH 2/5] add inital drawer hader layout --- .../java/org/schabi/newpipe/MainActivity.java | 51 ++++++++++----- .../res/drawable-nodpi/background_header.png | Bin 0 -> 28190 bytes .../drawable-nodpi/np_logo_nude_shadow.png | Bin 0 -> 5460 bytes app/src/main/res/layout/drawer_laoyut.xml | 58 +++++++++++++++++- app/src/main/res/values/strings.xml | 1 + 5 files changed, 93 insertions(+), 17 deletions(-) create mode 100644 app/src/main/res/drawable-nodpi/background_header.png create mode 100644 app/src/main/res/drawable-nodpi/np_logo_nude_shadow.png diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java index cbd2bacaa..7ca72cff5 100644 --- a/app/src/main/java/org/schabi/newpipe/MainActivity.java +++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java @@ -37,12 +37,14 @@ import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.util.Log; +import android.view.Gravity; 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.TextView; import android.widget.Toast; import org.schabi.newpipe.extractor.StreamingService; @@ -61,6 +63,9 @@ public class MainActivity extends AppCompatActivity { public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release"); private ActionBarDrawerToggle toggle = null; + private DrawerLayout drawer = null; + private NavigationView drawerItems = null; + private TextView headerServiceView = null; /*////////////////////////////////////////////////////////////////////////// // Activity's LifeCycle @@ -81,13 +86,12 @@ public class MainActivity extends AppCompatActivity { setSupportActionBar(findViewById(R.id.toolbar)); setupDrawer(); - setupDrawerFooter(); } private void setupDrawer() { final Toolbar toolbar = findViewById(R.id.toolbar); - final DrawerLayout drawer = findViewById(R.id.drawer_layout); - final NavigationView drawerItems = findViewById(R.id.navigation); + drawer = findViewById(R.id.drawer_layout); + drawerItems = findViewById(R.id.navigation); //drawerItems.setItemIconTintList(null); // Set null to use the original icon drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true); @@ -112,30 +116,45 @@ public class MainActivity extends AppCompatActivity { } }); - drawerItems.setNavigationItemSelectedListener(item -> { - if (item.getGroupId() == R.id.menu_services_group) { - drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(false); - ServiceHelper.setSelectedServiceId(this, item.getTitle().toString()); - drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true); - } - drawer.closeDrawers(); - return true; - }); + drawerItems.setNavigationItemSelectedListener(this::changeService); + + setupDrawerFooter(); + setupDrawerHeader(); } else { drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED); } } + private boolean changeService(MenuItem item) { + if (item.getGroupId() == R.id.menu_services_group) { + drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(false); + ServiceHelper.setSelectedServiceId(this, item.getTitle().toString()); + drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true); + headerServiceView.setText("gurken"); + } else { + return false; + } + drawer.closeDrawers(); + return true; + } + 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)); + settings.setOnClickListener(view -> NavigationHelper.openSettings(this)); + downloads.setOnClickListener(view ->NavigationHelper.openDownloads(this)); history.setOnClickListener(view -> NavigationHelper.openHistory(this)); } + private void setupDrawerHeader() { + headerServiceView = findViewById(R.id.drawer_header_service_view); + Button action = findViewById(R.id.drawer_header_action_button); + action.setOnClickListener(view -> Toast.makeText(this, + R.string.drawer_header_action_paceholder_text, Toast.LENGTH_SHORT).show()); + } + @Override protected void onDestroy() { super.onDestroy(); @@ -148,6 +167,10 @@ public class MainActivity extends AppCompatActivity { protected void onResume() { super.onResume(); + // close drawer on return, and don't show animation, so its looks like the drawer isn't open + // when the user returns to MainActivity + drawer.closeDrawer(Gravity.START, false); + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); if (sharedPreferences.getBoolean(Constants.KEY_THEME_CHANGE, false)) { if (DEBUG) Log.d(TAG, "Theme has changed, recreating activity..."); diff --git a/app/src/main/res/drawable-nodpi/background_header.png b/app/src/main/res/drawable-nodpi/background_header.png new file mode 100644 index 0000000000000000000000000000000000000000..b417038f6b989de95d5241cfde630be40d45f32e GIT binary patch literal 28190 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-nodpi/np_logo_nude_shadow.png b/app/src/main/res/drawable-nodpi/np_logo_nude_shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..99b91d3745eee637338542f6f841bd4dbce57dab GIT binary patch literal 5460 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 WCDFt9u^F|q9WWXX&}FD6um1-{c2mLt literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/drawer_laoyut.xml b/app/src/main/res/layout/drawer_laoyut.xml index dcf29c42f..aba90430c 100644 --- a/app/src/main/res/layout/drawer_laoyut.xml +++ b/app/src/main/res/layout/drawer_laoyut.xml @@ -6,9 +6,11 @@ android:layout_width="wrap_content" android:layout_gravity="start" xmlns:app="http://schemas.android.com/apk/res-auto" - android:background="?attr/android:windowBackground"> + android:background="?attr/android:windowBackground" + android:clickable="true" + android:focusable="true"> - + android:clickable="true" + android:focusable="true"> + +