From 2dd409d68e0330474eea6945d4ad564aa1e8ec0a Mon Sep 17 00:00:00 2001 From: Stefan Schueller Date: Sun, 11 Mar 2018 14:51:39 +0100 Subject: [PATCH] Cleanup, added settings activity, server selection --- README.md | 2 +- app/src/main/AndroidManifest.xml | 11 +- .../activity/AppCompatPreferenceActivity.java | 109 +++++++++++ .../peertube/activity/SettingsActivity.java | 152 +++++++++++++++ .../activity/TorrentVideoPlayActivity.java | 7 +- .../peertube/activity/VideoListActivity.java | 33 +++- .../peertube/activity/VideoPlayActivity.java | 176 ------------------ .../peertube/adapter/VideoAdapter.java | 9 +- .../peertube/helper/APIUrlHelper.java | 15 ++ .../helper/BottomNavigationViewHelper.java | 34 ++++ .../main/res/drawable/ic_info_black_24dp.xml | 9 + .../main/res/drawable/ic_sync_black_24dp.xml | 9 + .../main/res/layout/activity_vide_play.xml | 50 ----- .../main/res/layout/activity_video_list.xml | 2 +- app/src/main/res/menu/menu_bottom.xml | 25 +++ app/src/main/res/menu/menu_main.xml | 5 +- app/src/main/res/menu/navigation.xml | 17 -- app/src/main/res/values/strings.xml | 22 ++- app/src/main/res/xml/pref_general.xml | 13 ++ 19 files changed, 417 insertions(+), 283 deletions(-) create mode 100644 app/src/main/java/net/schueller/peertube/activity/AppCompatPreferenceActivity.java create mode 100644 app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java delete mode 100644 app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java create mode 100644 app/src/main/java/net/schueller/peertube/helper/APIUrlHelper.java create mode 100644 app/src/main/java/net/schueller/peertube/helper/BottomNavigationViewHelper.java create mode 100644 app/src/main/res/drawable/ic_info_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_sync_black_24dp.xml delete mode 100644 app/src/main/res/layout/activity_vide_play.xml create mode 100644 app/src/main/res/menu/menu_bottom.xml delete mode 100644 app/src/main/res/menu/navigation.xml create mode 100644 app/src/main/res/xml/pref_general.xml diff --git a/README.md b/README.md index 37b61f9..16e2a42 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@

- screenshot screenshot + screenshot

## Features diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bc79cb4..dc7caf1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,6 @@ - - + android:theme="@style/AppTheme" /> + \ No newline at end of file diff --git a/app/src/main/java/net/schueller/peertube/activity/AppCompatPreferenceActivity.java b/app/src/main/java/net/schueller/peertube/activity/AppCompatPreferenceActivity.java new file mode 100644 index 0000000..1ea9f48 --- /dev/null +++ b/app/src/main/java/net/schueller/peertube/activity/AppCompatPreferenceActivity.java @@ -0,0 +1,109 @@ +package net.schueller.peertube.activity; + +import android.content.res.Configuration; +import android.os.Bundle; +import android.preference.PreferenceActivity; +import android.support.annotation.LayoutRes; +import android.support.annotation.Nullable; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatDelegate; +import android.support.v7.widget.Toolbar; +import android.view.MenuInflater; +import android.view.View; +import android.view.ViewGroup; + +/** + * A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls + * to be used with AppCompat. + */ +public abstract class AppCompatPreferenceActivity extends PreferenceActivity { + + private AppCompatDelegate mDelegate; + + @Override + protected void onCreate(Bundle savedInstanceState) { + getDelegate().installViewFactory(); + getDelegate().onCreate(savedInstanceState); + super.onCreate(savedInstanceState); + } + + @Override + protected void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + getDelegate().onPostCreate(savedInstanceState); + } + + public ActionBar getSupportActionBar() { + return getDelegate().getSupportActionBar(); + } + + public void setSupportActionBar(@Nullable Toolbar toolbar) { + getDelegate().setSupportActionBar(toolbar); + } + + @Override + public MenuInflater getMenuInflater() { + return getDelegate().getMenuInflater(); + } + + @Override + public void setContentView(@LayoutRes int layoutResID) { + getDelegate().setContentView(layoutResID); + } + + @Override + public void setContentView(View view) { + getDelegate().setContentView(view); + } + + @Override + public void setContentView(View view, ViewGroup.LayoutParams params) { + getDelegate().setContentView(view, params); + } + + @Override + public void addContentView(View view, ViewGroup.LayoutParams params) { + getDelegate().addContentView(view, params); + } + + @Override + protected void onPostResume() { + super.onPostResume(); + getDelegate().onPostResume(); + } + + @Override + protected void onTitleChanged(CharSequence title, int color) { + super.onTitleChanged(title, color); + getDelegate().setTitle(title); + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + getDelegate().onConfigurationChanged(newConfig); + } + + @Override + protected void onStop() { + super.onStop(); + getDelegate().onStop(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + getDelegate().onDestroy(); + } + + public void invalidateOptionsMenu() { + getDelegate().invalidateOptionsMenu(); + } + + private AppCompatDelegate getDelegate() { + if (mDelegate == null) { + mDelegate = AppCompatDelegate.create(this, null); + } + return mDelegate; + } +} diff --git a/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java b/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java new file mode 100644 index 0000000..c35773f --- /dev/null +++ b/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java @@ -0,0 +1,152 @@ +package net.schueller.peertube.activity; + +import android.annotation.TargetApi; +import android.content.Context; +import android.content.Intent; +import android.content.res.Configuration; + +import android.os.Build; +import android.os.Bundle; +import android.preference.Preference; +import android.support.v7.app.ActionBar; +import android.preference.PreferenceFragment; +import android.preference.PreferenceManager; + +import android.view.MenuItem; + + +import net.schueller.peertube.R; + +import java.util.List; + + +public class SettingsActivity extends AppCompatPreferenceActivity { + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + this.finish(); + return true; + } + return super.onOptionsItemSelected(item); + } + + /** + * A preference value change listener that updates the preference's summary + * to reflect its new value. + */ + private static Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = (preference, value) -> { + String stringValue = value.toString(); + + preference.setSummary(stringValue); + + return true; + }; + + /** + * Helper method to determine if the device has an extra-large screen. For + * example, 10" tablets are extra-large. + */ + private static boolean isXLargeTablet(Context context) { + return (context.getResources().getConfiguration().screenLayout + & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE; + } + + /** + * Binds a preference's summary to its value. More specifically, when the + * preference's value is changed, its summary (line of text below the + * preference title) is updated to reflect the value. The summary is also + * immediately updated upon calling this method. The exact display format is + * dependent on the type of preference. + * + * @see #sBindPreferenceSummaryToValueListener + */ + private static void bindPreferenceSummaryToValue(Preference preference) { + // Set the listener to watch for value changes. + preference.setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener); + + // Trigger the listener immediately with the preference's + // current value. + sBindPreferenceSummaryToValueListener.onPreferenceChange(preference, + PreferenceManager + .getDefaultSharedPreferences(preference.getContext()) + .getString(preference.getKey(), "")); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setupActionBar(); + getFragmentManager().beginTransaction().replace(android.R.id.content, new GeneralPreferenceFragment()).commit(); + + } + + /** + * Set up the {@link android.app.ActionBar}, if the API is available. + */ + private void setupActionBar() { + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + // Show the Up button in the action bar. + actionBar.setDisplayHomeAsUpEnabled(true); + } + } + + /** + * {@inheritDoc} + */ + @Override + public boolean onIsMultiPane() { + return isXLargeTablet(this); + } + + /** + * {@inheritDoc} + */ + @Override + @TargetApi(Build.VERSION_CODES.HONEYCOMB) + public void onBuildHeaders(List
target) { + //loadHeadersFromResource(R.xml.pref_headers, target); + } + + /** + * This method stops fragment injection in malicious applications. + * Make sure to deny any unknown fragments here. + */ + protected boolean isValidFragment(String fragmentName) { + return PreferenceFragment.class.getName().equals(fragmentName) + || GeneralPreferenceFragment.class.getName().equals(fragmentName); + } + + /** + * This fragment shows general preferences only. It is used when the + * activity is showing a two-pane mainmenu UI. + */ + @TargetApi(Build.VERSION_CODES.HONEYCOMB) + public static class GeneralPreferenceFragment extends PreferenceFragment { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.pref_general); + setHasOptionsMenu(true); + + // Bind the summaries of EditText/List/Dialog/Ringtone preferences + // to their values. When their values change, their summaries are + // updated to reflect the new value, per the Android Design + // guidelines. + bindPreferenceSummaryToValue(findPreference("pref_api_base")); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int id = item.getItemId(); + if (id == android.R.id.home) { + startActivity(new Intent(getActivity(), SettingsActivity.class)); + return true; + } + return super.onOptionsItemSelected(item); + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/net/schueller/peertube/activity/TorrentVideoPlayActivity.java b/app/src/main/java/net/schueller/peertube/activity/TorrentVideoPlayActivity.java index 61d8115..97c2479 100644 --- a/app/src/main/java/net/schueller/peertube/activity/TorrentVideoPlayActivity.java +++ b/app/src/main/java/net/schueller/peertube/activity/TorrentVideoPlayActivity.java @@ -1,12 +1,12 @@ package net.schueller.peertube.activity; -import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; import android.os.Bundle; import android.os.Environment; +import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; import android.util.Log; @@ -35,6 +35,7 @@ import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import com.google.android.exoplayer2.util.Util; import net.schueller.peertube.R; +import net.schueller.peertube.helper.APIUrlHelper; import net.schueller.peertube.model.Video; import net.schueller.peertube.network.GetVideoDataService; @@ -126,9 +127,7 @@ public class TorrentVideoPlayActivity extends AppCompatActivity { }); // get video details from api - SharedPreferences sharedPref = this.getPreferences(Context.MODE_PRIVATE); - String defaultApiURL = getResources().getString(R.string.api_base_url); - String apiBaseURL = sharedPref.getString(getString(R.string.api_url_key_key), defaultApiURL); + String apiBaseURL = APIUrlHelper.getUrl(this); GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL + "/api/v1/").create(GetVideoDataService.class); Call