From 96ec510f40ddb5e03fc1ce4c951056204ce11f35 Mon Sep 17 00:00:00 2001 From: digiwizkid Date: Sat, 8 Jan 2022 15:26:48 +0530 Subject: [PATCH] Playlist UI WIP --- app/src/main/AndroidManifest.xml | 105 ++++--- .../peertube/activity/MeActivity.java | 23 +- .../peertube/activity/PlaylistActivity.kt | 100 ++++++ .../peertube/adapter/PlaylistAdapter.kt | 63 ++++ app/src/main/res/layout/activity_me.xml | 293 +++++++++--------- app/src/main/res/layout/activity_playlist.xml | 44 +++ app/src/main/res/layout/row_playlist.xml | 43 +++ 7 files changed, 470 insertions(+), 201 deletions(-) create mode 100644 app/src/main/java/net/schueller/peertube/activity/PlaylistActivity.kt create mode 100644 app/src/main/java/net/schueller/peertube/adapter/PlaylistAdapter.kt create mode 100644 app/src/main/res/layout/activity_playlist.xml create mode 100644 app/src/main/res/layout/row_playlist.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a18f528..4e294b1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,78 +1,83 @@ + xmlns:tools="http://schemas.android.com/tools" + package="net.schueller.peertube"> - - - + + + + android:name=".application.AppApplication" + android:allowBackup="true" + android:fullBackupContent="@xml/backup_descriptor" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:supportsRtl="true" + android:theme="@style/AppTheme" + tools:ignore="GoogleAppIndexingWarning"> + android:name=".activity.ServerAddressBookActivity" + android:label="@string/title_activity_server_address_book" + android:theme="@style/AppTheme.NoActionBar"/> + android:name=".activity.VideoListActivity" + android:launchMode="singleTop" + android:theme="@style/AppTheme.NoActionBar" + android:exported="true"> - - + + - + + android:name="android.app.searchable" + android:resource="@xml/searchable"/> + android:name=".activity.VideoPlayActivity" + android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode" + android:label="@string/title_activity_video_play" + android:launchMode="singleInstance" + android:supportsPictureInPicture="true" + android:theme="@style/AppTheme.NoActionBar"/> + + + + android:name=".activity.SettingsActivity" + android:label="@string/title_activity_settings" + android:theme="@style/AppTheme.NoActionBar"/> + android:name=".activity.SearchServerActivity" + android:label="@string/title_activity_select_server" + android:theme="@style/AppTheme.NoActionBar"/> + android:name=".activity.MeActivity" + android:label="@string/title_activity_me" + android:theme="@style/AppTheme.NoActionBar"/> + android:name=".activity.AccountActivity" + android:label="@string/title_activity_account" + android:theme="@style/AppTheme.NoActionBar"/> + android:name=".provider.SearchSuggestionsProvider" + android:authorities="net.schueller.peertube.provider.SearchSuggestionsProvider" + android:enabled="true" + android:exported="false"/> - + + android:exported="true"> - + diff --git a/app/src/main/java/net/schueller/peertube/activity/MeActivity.java b/app/src/main/java/net/schueller/peertube/activity/MeActivity.java index 36388af..57bc0b4 100644 --- a/app/src/main/java/net/schueller/peertube/activity/MeActivity.java +++ b/app/src/main/java/net/schueller/peertube/activity/MeActivity.java @@ -27,7 +27,9 @@ import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; - +import androidx.annotation.NonNull; +import androidx.appcompat.widget.Toolbar; +import com.squareup.picasso.Picasso; import net.schueller.peertube.R; import net.schueller.peertube.helper.APIUrlHelper; import net.schueller.peertube.helper.ErrorHelper; @@ -36,18 +38,12 @@ import net.schueller.peertube.model.Me; import net.schueller.peertube.network.GetUserService; import net.schueller.peertube.network.RetrofitInstance; import net.schueller.peertube.network.Session; - -import androidx.annotation.NonNull; -import androidx.appcompat.widget.Toolbar; - -import com.squareup.picasso.Picasso; - -import java.util.Objects; - import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; +import java.util.Objects; + import static net.schueller.peertube.application.AppApplication.getContext; public class MeActivity extends CommonActivity { @@ -85,11 +81,16 @@ public class MeActivity extends CommonActivity { getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_baseline_close_24); LinearLayout account = findViewById(R.id.a_me_account_line); + LinearLayout playlist = findViewById(R.id.a_me_playlist); LinearLayout settings = findViewById(R.id.a_me_settings); LinearLayout help = findViewById(R.id.a_me_helpnfeedback); TextView logout = findViewById(R.id.a_me_logout); + playlist.setOnClickListener(view -> { + Intent playlistActivity = new Intent(getContext(), PlaylistActivity.class); + startActivity(playlistActivity); + }); settings.setOnClickListener(view -> { Intent settingsActivity = new Intent(getContext(), SettingsActivity.class); @@ -124,7 +125,7 @@ public class MeActivity extends CommonActivity { call.enqueue(new Callback() { - LinearLayout account = findViewById(R.id.a_me_account_line); + final LinearLayout account = findViewById(R.id.a_me_account_line); @Override public void onResponse(@NonNull Call call, @NonNull Response response) { @@ -162,7 +163,7 @@ public class MeActivity extends CommonActivity { @Override public void onFailure(@NonNull Call call, @NonNull Throwable t) { - ErrorHelper.showToastFromCommunicationError( MeActivity.this, t ); + ErrorHelper.showToastFromCommunicationError(MeActivity.this, t); account.setVisibility(View.GONE); } }); diff --git a/app/src/main/java/net/schueller/peertube/activity/PlaylistActivity.kt b/app/src/main/java/net/schueller/peertube/activity/PlaylistActivity.kt new file mode 100644 index 0000000..646b37b --- /dev/null +++ b/app/src/main/java/net/schueller/peertube/activity/PlaylistActivity.kt @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2020 Stefan Schüller + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package net.schueller.peertube.activity + +import android.app.AlertDialog +import android.content.DialogInterface +import android.os.Bundle +import android.widget.Toast +import androidx.activity.viewModels +import androidx.recyclerview.widget.ItemTouchHelper +import androidx.recyclerview.widget.RecyclerView +import net.schueller.peertube.R +import net.schueller.peertube.adapter.PlaylistAdapter +import net.schueller.peertube.database.Video +import net.schueller.peertube.database.VideoViewModel +import net.schueller.peertube.databinding.ActivityPlaylistBinding + +class PlaylistActivity : CommonActivity() { + + private val TAG = "PlaylistAct" + + private val mVideoViewModel: VideoViewModel by viewModels() + + private lateinit var mBinding: ActivityPlaylistBinding + + override fun onSupportNavigateUp(): Boolean { + finish() // close this activity as oppose to navigating up + return false + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + mBinding = ActivityPlaylistBinding.inflate(layoutInflater) + setContentView(mBinding.root) + + // Setting toolbar as the ActionBar with setSupportActionBar() call + setSupportActionBar(mBinding.toolBarServerAddressBook) + supportActionBar?.apply { + setDisplayHomeAsUpEnabled(true) + setHomeAsUpIndicator(R.drawable.ic_baseline_close_24) + } + + showServers() + } + + private fun onVideoClick(video: Video) { + Toast.makeText(this, "Clicked", Toast.LENGTH_SHORT).show() + } + + private fun showServers() { + val adapter = PlaylistAdapter(mutableListOf(), { onVideoClick(it) }).also { + mBinding.serverListRecyclerview.adapter = it + } + + // Delete items on swipe + val helper = ItemTouchHelper( + object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) { + override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean { + return false + } + + override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { + AlertDialog.Builder(this@PlaylistActivity) + .setTitle("Remove Video") + .setMessage("Are you sure you want to remove this video from playlist?") + .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int -> + val position = viewHolder.bindingAdapterPosition + val video = adapter.getVideoAtPosition(position) + // Delete the video + mVideoViewModel.delete(video) + } + .setNegativeButton(android.R.string.cancel) { _: DialogInterface?, _: Int -> adapter.notifyItemChanged(viewHolder.bindingAdapterPosition) } + .setIcon(android.R.drawable.ic_dialog_alert) + .show() + } + }) + helper.attachToRecyclerView(mBinding.serverListRecyclerview) + + // Update the cached copy of the words in the adapter. + mVideoViewModel.allVideos.observe(this, { videos: List