From f4e0c51a0dbcdcaacb736008f216185d954ee08e Mon Sep 17 00:00:00 2001 From: Stefan Schueller Date: Sun, 27 Jan 2019 16:53:55 +0100 Subject: [PATCH] - Moved account to top menu - Added overview placeholder (to be implemented later) - Refactored keys --- README.md | 2 + .../peertube/activity/VideoListActivity.java | 113 ++++++++++++++---- .../main/res/menu/menu_bottom_video_list.xml | 17 ++- app/src/main/res/menu/menu_top_videolist.xml | 7 ++ app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-bn/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values/strings.xml | 8 +- 11 files changed, 122 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index cca7e40..d1d3a12 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,10 @@ Android PeerTube Client +

[![Latest release](https://img.shields.io/github/release/sschueller/peertube-android.svg)](https://github.com/sschueller/peertube-android/releases/latest) [![F-Droid](https://img.shields.io/f-droid/v/net.schueller.peertube.svg)](https://f-droid.org/de/packages/net.schueller.peertube/) +

diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java index f69700a..f851b73 100644 --- a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java +++ b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java @@ -26,18 +26,22 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.preference.PreferenceManager; import android.provider.SearchRecentSuggestions; + import androidx.annotation.NonNull; import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.bottomnavigation.LabelVisibilityMode; + import androidx.core.app.ActivityCompat; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import android.os.Bundle; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.Toolbar; + import android.util.Log; import android.view.Menu; import android.view.MenuInflater; @@ -45,8 +49,10 @@ import android.view.MenuItem; import android.view.View; import android.widget.TextView; import android.widget.Toast; + import com.mikepenz.fontawesome_typeface_library.FontAwesome; import com.mikepenz.iconics.IconicsDrawable; + import net.schueller.peertube.R; import net.schueller.peertube.adapter.VideoAdapter; import net.schueller.peertube.helper.APIUrlHelper; @@ -119,6 +125,9 @@ public class VideoListActivity extends CommonActivity { menu.findItem(R.id.action_settings).setIcon( new IconicsDrawable(this, FontAwesome.Icon.faw_cog).actionBar()); + menu.findItem(R.id.action_account).setIcon( + new IconicsDrawable(this, FontAwesome.Icon.faw_user_circle).actionBar()); + MenuItem searchMenuItem = menu.findItem(R.id.action_search); searchMenuItem.setIcon( @@ -178,10 +187,19 @@ public class VideoListActivity extends CommonActivity { return false; case R.id.action_settings: // Toast.makeText(this, "Login Selected", Toast.LENGTH_SHORT).show(); - Intent intent = new Intent(this, SettingsActivity.class); - this.startActivity(intent); + Intent intentSettings = new Intent(this, SettingsActivity.class); + this.startActivity(intentSettings); return true; + case R.id.action_account: + if (!Session.getInstance().isLoggedIn()) { + Intent intentLogin = new Intent(this, LoginActivity.class); + this.startActivity(intentLogin); + } else { + Intent intentMe = new Intent(this, MeActivity.class); + this.startActivity(intentMe); + } + return false; default: break; } @@ -350,23 +368,24 @@ public class VideoListActivity extends CommonActivity { // Add Icon font Menu navMenu = navigation.getMenu(); - navMenu.findItem(R.id.navigation_home).setIcon( - new IconicsDrawable(this, FontAwesome.Icon.faw_home)); + navMenu.findItem(R.id.navigation_overview).setIcon( + new IconicsDrawable(this, FontAwesome.Icon.faw_globe)); navMenu.findItem(R.id.navigation_trending).setIcon( new IconicsDrawable(this, FontAwesome.Icon.faw_fire)); + navMenu.findItem(R.id.navigation_recent).setIcon( + new IconicsDrawable(this, FontAwesome.Icon.faw_plus_circle)); navMenu.findItem(R.id.navigation_local).setIcon( new IconicsDrawable(this, FontAwesome.Icon.faw_home)); navMenu.findItem(R.id.navigation_subscriptions).setIcon( new IconicsDrawable(this, FontAwesome.Icon.faw_folder)); - navMenu.findItem(R.id.navigation_account).setIcon( - new IconicsDrawable(this, FontAwesome.Icon.faw_user_circle)); +// navMenu.findItem(R.id.navigation_account).setIcon( +// new IconicsDrawable(this, FontAwesome.Icon.faw_user_circle)); // Click Listener navigation.setOnNavigationItemSelectedListener(menuItem -> { switch (menuItem.getItemId()) { - case R.id.navigation_home: - //Log.v(TAG, "navigation_home"); - + case R.id.navigation_overview: + // TODO if (!isLoading) { sort = "-createdAt"; currentStart = 0; @@ -387,6 +406,16 @@ public class VideoListActivity extends CommonActivity { loadVideos(currentStart, count, sort, filter); } + return true; + case R.id.navigation_recent: + if (!isLoading) { + sort = "-createdAt"; + currentStart = 0; + filter = null; + subscriptions = false; + loadVideos(currentStart, count, sort, filter); + } + return true; case R.id.navigation_local: //Log.v(TAG, "navigation_trending"); @@ -420,23 +449,63 @@ public class VideoListActivity extends CommonActivity { } - case R.id.navigation_account: - //Log.v(TAG, "navigation_account"); - //Toast.makeText(VideoListActivity.this, "Account Not Implemented", Toast.LENGTH_SHORT).show(); - - if (!Session.getInstance().isLoggedIn()) { - Intent intent = new Intent(this, LoginActivity.class); - this.startActivity(intent); - } else { - Intent intent = new Intent(this, MeActivity.class); - this.startActivity(intent); - } - - return false; +// case R.id.navigation_account: +// //Log.v(TAG, "navigation_account"); +// //Toast.makeText(VideoListActivity.this, "Account Not Implemented", Toast.LENGTH_SHORT).show(); +// +// if (!Session.getInstance().isLoggedIn()) { +// Intent intent = new Intent(this, LoginActivity.class); +// this.startActivity(intent); +// } else { +// Intent intent = new Intent(this, MeActivity.class); +// this.startActivity(intent); +// } +// +// return false; } return false; }); + // TODO: on double click jump to top and reload +// navigation.setOnNavigationItemReselectedListener(menuItemReselected -> { +// switch (menuItemReselected.getItemId()) { +// case R.id.navigation_home: +// if (!isLoading) { +// sort = "-createdAt"; +// currentStart = 0; +// filter = null; +// subscriptions = false; +// loadVideos(currentStart, count, sort, filter); +// } +// case R.id.navigation_trending: +// if (!isLoading) { +// sort = "-trending"; +// currentStart = 0; +// filter = null; +// subscriptions = false; +// loadVideos(currentStart, count, sort, filter); +// } +// case R.id.navigation_local: +// if (!isLoading) { +// sort = "-publishedAt"; +// filter = "local"; +// currentStart = 0; +// subscriptions = false; +// loadVideos(currentStart, count, sort, filter); +// } +// case R.id.navigation_subscriptions: +// if (Session.getInstance().isLoggedIn()) { +// if (!isLoading) { +// sort = "-publishedAt"; +// filter = null; +// currentStart = 0; +// subscriptions = true; +// loadVideos(currentStart, count, sort, filter); +// } +// } +// } +// }); + } } diff --git a/app/src/main/res/menu/menu_bottom_video_list.xml b/app/src/main/res/menu/menu_bottom_video_list.xml index 2d4e290..990d2d9 100644 --- a/app/src/main/res/menu/menu_bottom_video_list.xml +++ b/app/src/main/res/menu/menu_bottom_video_list.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> + + - + + + + diff --git a/app/src/main/res/menu/menu_top_videolist.xml b/app/src/main/res/menu/menu_top_videolist.xml index b63fae3..121e62d 100644 --- a/app/src/main/res/menu/menu_top_videolist.xml +++ b/app/src/main/res/menu/menu_top_videolist.xml @@ -19,4 +19,11 @@ android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" app:showAsAction="ifRoom" /> + + \ No newline at end of file diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 37a45b8..1d8746c 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -22,7 +22,7 @@ الإعدادات - الرئيسية + الرئيسية المتصدرة الإشتراكات الحساب diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 97bc39a..264c8d8 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -25,7 +25,7 @@ " লগআউট" - হোম + হোম "Trending" Subscriptions একাউন্ট diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f31f9c9..8f4f8d4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -23,7 +23,7 @@ Paramètres - Accueil + Accueil Tendances Abonnements Compte diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c15328e..34b64a9 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -21,7 +21,7 @@ Выйти - Домашняя + Домашняя Популярные Подписки Аккаунт diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a4534ed..5e0e37e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -24,7 +24,7 @@ Çıkış yap - Ev + Ev Eğilimler Abonelikler Hesap diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0fe712e..87c7c7b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -6,7 +6,7 @@ 服务 设置 搜索 - 主页 + 主页 趋势 订阅 帐号 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9e96b61..8db3e6b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,11 +23,15 @@ Search Settings Logout + Account - Home + Overview Trending + Recent + Local Subscriptions + Account @@ -300,7 +304,6 @@ Background Playback If enabled, continues to play video in background. - Local Account Report @@ -342,5 +345,4 @@ like dislike -