diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java index 4f1687536..285b933aa 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java @@ -861,7 +861,6 @@ public abstract class BaseMainActivity extends BaseActivity //Scroll to top when top bar is clicked for favourites/blocked/muted toolbarTitle.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - FragmentManager fragmentManager = getSupportFragmentManager(); Fragment fragment = (Fragment) viewPager.getAdapter().instantiateItem(viewPager, tabLayout.getSelectedTabPosition()); DisplayStatusFragment displayStatusFragment = ((DisplayStatusFragment) fragment); displayStatusFragment.scrollToTop(); @@ -2027,6 +2026,20 @@ public abstract class BaseMainActivity extends BaseActivity fragmentTag = "FAVOURITES"; fragmentManager.beginTransaction() .replace(R.id.main_app_container, statusFragment, fragmentTag).commit(); + } else if (id == R.id.nav_my_video) { + bundle = new Bundle(); + DisplayStatusFragment fragment = new DisplayStatusFragment(); + bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.USER); + bundle.putString("instanceType","PEERTUBE"); + SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); + String token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null); + SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); + Account account = new AccountDAO(getApplicationContext(), db).getAccountByToken(token); + bundle.putString("targetedid",account.getUsername()); + fragment.setArguments(bundle); + fragmentTag = "MY_VIDEOS"; + fragmentManager.beginTransaction() + .replace(R.id.main_app_container, fragment, fragmentTag).commit(); } else if (id == R.id.nav_blocked) { toot.hide(); accountsFragment = new DisplayAccountsFragment(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java index e3d24f489..658dfb4a7 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java @@ -83,6 +83,7 @@ public class RetrieveFeedsAsyncTask extends AsyncTask { POVERVIEW, PTRENDING, PRECENTLYADDED, + PMYVIDEOS, PLOCAL, CHANNEL } @@ -284,6 +285,10 @@ public class RetrieveFeedsAsyncTask extends AsyncTask { peertubeAPI = new PeertubeAPI(this.contextReference.get()); apiResponse = peertubeAPI.getLocalTL(max_id); break; + case PMYVIDEOS: + peertubeAPI = new PeertubeAPI(this.contextReference.get()); + apiResponse = peertubeAPI.getLocalTL(max_id); + break; case HASHTAG: break; } diff --git a/app/src/main/res/drawable-anydpi/ic_video_library.xml b/app/src/main/res/drawable-anydpi/ic_video_library.xml new file mode 100644 index 000000000..f808aee58 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_video_library.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index 8541bc83b..630761f70 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -61,13 +61,18 @@ android:icon="@drawable/ic_favorite_peertube_full" android:title="@string/peertube_favorites" /> + android:id="@+id/nav_my_video" + android:icon="@drawable/ic_video_library" + android:title="@string/my_videos" /> + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8f20f5467..827f8e580 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -799,6 +799,7 @@ Full screen video Mode for videos Select the file to upload + My videos