From bf8543bc77b3cd9a9deb4b91cb40468880233b40 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 25 Jan 2023 17:23:49 +0100 Subject: [PATCH] Some cleaning --- .../peertube/activities/AccountActivity.java | 3 +- .../activities/PeertubeMainActivity.java | 2 +- .../peertube/client/RetrofitPeertubeAPI.java | 2 +- .../peertube/drawer/ChannelListAdapter.java | 4 ++ .../fragment/DisplayChannelsFragment.java | 11 ++---- .../fragment/DisplayOverviewFragment.java | 28 ++++++------- .../layout/activity_account_peertube.xml | 39 +++++++++---------- .../layout/activity_all_playlist_peertube.xml | 2 +- .../activity_manage_instances_peertube.xml | 2 +- .../peertube/layout/activity_peertube.xml | 2 +- .../layout/fragment_overview_peertube.xml | 2 + .../layout/fragment_playlists_peertube.xml | 2 + .../layout/fragment_recyclerview_peertube.xml | 1 + .../layout/fragment_video_peertube.xml | 2 +- 14 files changed, 51 insertions(+), 51 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/peertube/activities/AccountActivity.java b/app/src/main/java/app/fedilab/android/peertube/activities/AccountActivity.java index 59191738..ec3aa23a 100644 --- a/app/src/main/java/app/fedilab/android/peertube/activities/AccountActivity.java +++ b/app/src/main/java/app/fedilab/android/peertube/activities/AccountActivity.java @@ -65,8 +65,7 @@ public class AccountActivity extends BaseBarActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); binding = ActivityAccountPeertubeBinding.inflate(getLayoutInflater()); - View view = binding.getRoot(); - setContentView(view); + setContentView(binding.getRoot()); if (getSupportActionBar() != null) getSupportActionBar().setDisplayHomeAsUpEnabled(true); diff --git a/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java b/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java index 0c30d991..f1c6bc2e 100644 --- a/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java +++ b/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java @@ -518,7 +518,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { account.refresh_token = token.getRefresh_token(); account.peertube_account = userMe.getAccount(); account.software = Account.API.PEERTUBE.name(); - account.user_id = userMe.getAccount().getUserId(); + account.user_id = userMe.getAccount().getId(); account.instance = userMe.getAccount().getHost(); SharedPreferences.Editor editor = sharedpreferences.edit(); editor.putString(PREF_USER_TOKEN, token.getAccess_token()); diff --git a/app/src/main/java/app/fedilab/android/peertube/client/RetrofitPeertubeAPI.java b/app/src/main/java/app/fedilab/android/peertube/client/RetrofitPeertubeAPI.java index 67c6d8f1..d89cd88d 100644 --- a/app/src/main/java/app/fedilab/android/peertube/client/RetrofitPeertubeAPI.java +++ b/app/src/main/java/app/fedilab/android/peertube/client/RetrofitPeertubeAPI.java @@ -180,7 +180,7 @@ public class RetrofitPeertubeAPI { account.api = Account.API.PEERTUBE; account.software = Account.API.PEERTUBE.name(); account.peertube_account = peertubeAccount; - account.user_id = peertubeAccount.getUserId(); + account.user_id = peertubeAccount.getId(); SharedPreferences.Editor editor = sharedpreferences.edit(); editor.putString(PREF_USER_ID, account.user_id); editor.putString(PREF_USER_INSTANCE, host); diff --git a/app/src/main/java/app/fedilab/android/peertube/drawer/ChannelListAdapter.java b/app/src/main/java/app/fedilab/android/peertube/drawer/ChannelListAdapter.java index 3d5a1082..206b9fb5 100644 --- a/app/src/main/java/app/fedilab/android/peertube/drawer/ChannelListAdapter.java +++ b/app/src/main/java/app/fedilab/android/peertube/drawer/ChannelListAdapter.java @@ -140,6 +140,10 @@ public class ChannelListAdapter extends RecyclerView.Adapter manageAlert(null)); - } + action_button = getActivity().findViewById(R.id.action_button); + if (action_button != null) { + action_button.setVisibility(View.VISIBLE); + action_button.setOnClickListener(view -> manageAlert(null)); } - binding.lvElements.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); channelListAdapter = new ChannelListAdapter(this.channels); channelListAdapter.allChannelRemoved = this; diff --git a/app/src/main/java/app/fedilab/android/peertube/fragment/DisplayOverviewFragment.java b/app/src/main/java/app/fedilab/android/peertube/fragment/DisplayOverviewFragment.java index e2303f8e..9f5c4ec0 100644 --- a/app/src/main/java/app/fedilab/android/peertube/fragment/DisplayOverviewFragment.java +++ b/app/src/main/java/app/fedilab/android/peertube/fragment/DisplayOverviewFragment.java @@ -65,8 +65,7 @@ public class DisplayOverviewFragment extends Fragment implements PeertubeAdapter private int page; private List peertubes; private boolean firstLoad; - private View rootView; - private RecyclerView lv_status; + private TimelineVM viewModelFeeds; private Map relationship; private Map> playlists; @@ -82,7 +81,6 @@ public class DisplayOverviewFragment extends Fragment implements PeertubeAdapter binding = FragmentOverviewPeertubeBinding.inflate(getLayoutInflater()); peertubes = new ArrayList<>(); - lv_status = rootView.findViewById(R.id.lv_status); page = 1; flag_loading = true; firstLoad = true; @@ -95,24 +93,24 @@ public class DisplayOverviewFragment extends Fragment implements PeertubeAdapter peertubeAdapater.playlistListener = this; peertubeAdapater.relationShipListener = this; - lv_status.setAdapter(peertubeAdapater); + binding.lvStatus.setAdapter(peertubeAdapater); if (!Helper.isTablet(requireActivity())) { mLayoutManager = new LinearLayoutManager(requireActivity()); - lv_status.setLayoutManager(mLayoutManager); + binding.lvStatus.setLayoutManager(mLayoutManager); } else { gLayoutManager = new GridLayoutManager(requireActivity(), 2); int spanCount = (int) Helper.convertDpToPixel(2, requireActivity()); int spacing = (int) Helper.convertDpToPixel(5, requireActivity()); - lv_status.addItemDecoration(new GridSpacingItemDecoration(spanCount, spacing, true)); - lv_status.setLayoutManager(gLayoutManager); + binding.lvStatus.addItemDecoration(new GridSpacingItemDecoration(spanCount, spacing, true)); + binding.lvStatus.setLayoutManager(gLayoutManager); } viewModelFeeds = new ViewModelProvider(DisplayOverviewFragment.this).get(TimelineVM.class); binding.swipeContainer.setOnRefreshListener(this::pullToRefresh); loadTimeline(page); - lv_status.addOnScrollListener(new RecyclerView.OnScrollListener() { + binding.lvStatus.addOnScrollListener(new RecyclerView.OnScrollListener() { public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { if (mLayoutManager != null) { int firstVisibleItem = mLayoutManager.findFirstVisibleItemPosition(); @@ -149,7 +147,7 @@ public class DisplayOverviewFragment extends Fragment implements PeertubeAdapter }); - return rootView; + return binding.getRoot(); } @Override @@ -289,7 +287,7 @@ public class DisplayOverviewFragment extends Fragment implements PeertubeAdapter peertubeAdapater = new PeertubeAdapter(this.peertubes); peertubeAdapater.playlistListener = DisplayOverviewFragment.this; peertubeAdapater.relationShipListener = DisplayOverviewFragment.this; - lv_status.setAdapter(peertubeAdapater); + binding.lvStatus.setAdapter(peertubeAdapater); } else peertubeAdapater.notifyItemRangeInserted(previousPosition, totalAdded); //remove handlers @@ -306,14 +304,12 @@ public class DisplayOverviewFragment extends Fragment implements PeertubeAdapter @Override public void onDestroyView() { - if (lv_status != null) { - try { - lv_status.setAdapter(null); - } catch (Exception ignored) { - } + try { + binding.lvStatus.setAdapter(null); + } catch (Exception ignored) { } super.onDestroyView(); - rootView = null; + binding = null; } @Override diff --git a/app/src/main/res/layouts/peertube/layout/activity_account_peertube.xml b/app/src/main/res/layouts/peertube/layout/activity_account_peertube.xml index bfa030cd..6235f99e 100644 --- a/app/src/main/res/layouts/peertube/layout/activity_account_peertube.xml +++ b/app/src/main/res/layouts/peertube/layout/activity_account_peertube.xml @@ -25,13 +25,13 @@ + android:fitsSystemWindows="true"> @@ -41,6 +41,10 @@ android:layout_height="wrap_content" android:orientation="vertical"> + + @@ -76,34 +82,27 @@ android:ellipsize="end" android:singleLine="true" android:textSize="14sp" + app:layout_constraintRight_toLeftOf="@+id/edit_button" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintRight_toLeftOf="@+id/button_container" + tools:text="@tools:sample/full_names" app:layout_constraintStart_toEndOf="@+id/profile_picture" app:layout_constraintTop_toTopOf="@+id/displayname" /> - - + app:layout_constraintTop_toTopOf="parent" /> - - - + + android:textSize="20sp" /> + android:textSize="20sp" /> + android:textSize="20sp" /> diff --git a/app/src/main/res/layouts/peertube/layout/fragment_overview_peertube.xml b/app/src/main/res/layouts/peertube/layout/fragment_overview_peertube.xml index 25d2ad58..c1fb6b32 100644 --- a/app/src/main/res/layouts/peertube/layout/fragment_overview_peertube.xml +++ b/app/src/main/res/layouts/peertube/layout/fragment_overview_peertube.xml @@ -58,6 +58,8 @@ android:layout_height="match_parent" android:layout_gravity="center" android:gravity="center" + android:padding="10dp" + android:textSize="20sp" android:text="@string/no_videos" /> diff --git a/app/src/main/res/layouts/peertube/layout/fragment_playlists_peertube.xml b/app/src/main/res/layouts/peertube/layout/fragment_playlists_peertube.xml index b7ab3031..849444c1 100644 --- a/app/src/main/res/layouts/peertube/layout/fragment_playlists_peertube.xml +++ b/app/src/main/res/layouts/peertube/layout/fragment_playlists_peertube.xml @@ -39,6 +39,8 @@ android:layout_height="match_parent" android:layout_gravity="center" android:gravity="center" + android:padding="10dp" + android:textSize="20sp" android:text="@string/action_playlist_add" /> diff --git a/app/src/main/res/layouts/peertube/layout/fragment_recyclerview_peertube.xml b/app/src/main/res/layouts/peertube/layout/fragment_recyclerview_peertube.xml index ad9301fe..291a8580 100644 --- a/app/src/main/res/layouts/peertube/layout/fragment_recyclerview_peertube.xml +++ b/app/src/main/res/layouts/peertube/layout/fragment_recyclerview_peertube.xml @@ -46,6 +46,7 @@ android:layout_gravity="center" android:gravity="center" android:padding="10dp" + android:textSize="20sp" android:text="@string/no_channels" /> diff --git a/app/src/main/res/layouts/peertube/layout/fragment_video_peertube.xml b/app/src/main/res/layouts/peertube/layout/fragment_video_peertube.xml index c9190734..1d5f9728 100644 --- a/app/src/main/res/layouts/peertube/layout/fragment_video_peertube.xml +++ b/app/src/main/res/layouts/peertube/layout/fragment_video_peertube.xml @@ -90,7 +90,7 @@ android:gravity="center" android:padding="10dp" android:text="@string/no_videos" - android:textSize="25sp" /> + android:textSize="20sp" />