diff --git a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java index ca223ff3..96d7831a 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java @@ -27,7 +27,7 @@ public class CommitsAdapter extends RecyclerView.Adapter commitsList; - private CommitsAdapter.OnLoadMoreListener loadMoreListener; + private Runnable loadMoreListener; private boolean isLoading = false; private boolean isMoreDataAvailable = true; @@ -55,7 +55,7 @@ public class CommitsAdapter extends RecyclerView.Adapter= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) { isLoading = true; - loadMoreListener.onLoadMore(); + loadMoreListener.run(); } if(getItemViewType(position) == TYPE_LOAD) { @@ -192,11 +192,7 @@ public class CommitsAdapter extends RecyclerView.Adapter searchedList; - private OnLoadMoreListener loadMoreListener; + private Runnable loadMoreListener; private boolean isLoading = false, isMoreDataAvailable = true; private final TinyDB tinyDb; @@ -66,7 +66,7 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) { isLoading = true; - loadMoreListener.onLoadMore(); + loadMoreListener.run(); } if(getItemViewType(position) == TYPE_LOAD) { @@ -211,11 +211,7 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter organizationsList; - private OnLoadMoreListener loadMoreListener; + private Runnable loadMoreListener; private boolean isLoading = false, isMoreDataAvailable = true; public ExplorePublicOrganizationsAdapter(Context ctx, List organizationsListMain) { @@ -52,7 +52,7 @@ public class ExplorePublicOrganizationsAdapter extends RecyclerView.Adapter= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) { isLoading = true; - loadMoreListener.onLoadMore(); + loadMoreListener.run(); } if(getItemViewType(position) == TYPE_LOAD) { @@ -139,11 +139,7 @@ public class ExplorePublicOrganizationsAdapter extends RecyclerView.Adapter reposList; - private OnLoadMoreListener loadMoreListener; + private Runnable loadMoreListener; private boolean isLoading = false, isMoreDataAvailable = true; private final TinyDB tinyDb; @@ -72,7 +72,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) { isLoading = true; - loadMoreListener.onLoadMore(); + loadMoreListener.run(); } if(getItemViewType(position) == TYPE_LOAD) { @@ -286,11 +286,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter issuesComments; private final FragmentManager fragmentManager; - private final BottomSheetReplyFragment.OnInteractedListener onInteractedListener; + private final Runnable onInteractedListener; private final Locale locale; - public IssueCommentsAdapter(Context ctx, Bundle bundle, List issuesCommentsMain, FragmentManager fragmentManager, BottomSheetReplyFragment.OnInteractedListener onInteractedListener) { + public IssueCommentsAdapter(Context ctx, Bundle bundle, List issuesCommentsMain, FragmentManager fragmentManager, Runnable onInteractedListener) { this.context = ctx; this.bundle = bundle; @@ -136,7 +136,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter { tinyDB.putBoolean("commentEdited", true); - onInteractedListener.onInteracted(); + onInteractedListener.run(); dialog.dismiss(); }); diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java index 252fa561..32089913 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java @@ -38,7 +38,7 @@ public class IssuesAdapter extends RecyclerView.Adapter private final Context context; private final int TYPE_LOAD = 0; private List issuesList; - private OnLoadMoreListener loadMoreListener; + private Runnable loadMoreListener; private boolean isLoading = false, isMoreDataAvailable = true; public IssuesAdapter(Context ctx, List issuesListMain) { @@ -67,7 +67,7 @@ public class IssuesAdapter extends RecyclerView.Adapter if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) { isLoading = true; - loadMoreListener.onLoadMore(); + loadMoreListener.run(); } if(getItemViewType(position) == TYPE_LOAD) { @@ -200,12 +200,7 @@ public class IssuesAdapter extends RecyclerView.Adapter isLoading = false; } - public interface OnLoadMoreListener { - - void onLoadMore(); - } - - public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) { + public void setLoadMoreListener(Runnable loadMoreListener) { this.loadMoreListener = loadMoreListener; } diff --git a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java index 78b01de3..463b0276 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java @@ -38,7 +38,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter dataList; - private OnLoadMoreListener loadMoreListener; + private Runnable loadMoreListener; private boolean isLoading = false; private boolean isMoreDataAvailable = true; @@ -68,7 +68,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) { isLoading = true; - loadMoreListener.onLoadMore(); + loadMoreListener.run(); } if(getItemViewType(position) == TYPE_LOAD) { @@ -285,12 +285,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter notificationThreads; private final OnMoreClickedListener onMoreClickedListener; private final OnNotificationClickedListener onNotificationClickedListener; - private OnLoadMoreListener loadMoreListener; + private Runnable loadMoreListener; private boolean isLoading = false, isMoreDataAvailable = true; private final TinyDB tinyDb; @@ -64,7 +64,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) { isLoading = true; - loadMoreListener.onLoadMore(); + loadMoreListener.run(); } if(getItemViewType(position) == TYPE_LOAD) { @@ -212,11 +212,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter prList; - private PullRequestsAdapter.OnLoadMoreListener loadMoreListener; + private Runnable loadMoreListener; private boolean isLoading = false, isMoreDataAvailable = true; public PullRequestsAdapter(Context context, List prListMain) { @@ -63,7 +63,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) { isLoading = true; - loadMoreListener.onLoadMore(); + loadMoreListener.run(); } if(getItemViewType(position) == TYPE_LOAD) { @@ -189,11 +189,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter forksList; - private OnLoadMoreListener loadMoreListener; + private Runnable loadMoreListener; private boolean isLoading = false; private boolean isMoreDataAvailable = true; @@ -76,7 +76,7 @@ public class RepoForksAdapter extends RecyclerView.Adapter= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) { isLoading = true; - loadMoreListener.onLoadMore(); + loadMoreListener.run(); } if(getItemViewType(position) == TYPE_LOAD) { @@ -296,12 +296,7 @@ public class RepoForksAdapter extends RecyclerView.Adapter private final Context context; private final int TYPE_LOAD = 0; private List followersList; - private OnLoadMoreListener loadMoreListener; + private Runnable loadMoreListener; private boolean isLoading = false, isMoreDataAvailable = true; public UsersAdapter(List dataList, Context ctx) { @@ -52,7 +52,7 @@ public class UsersAdapter extends RecyclerView.Adapter public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) { isLoading = true; - loadMoreListener.onLoadMore(); + loadMoreListener.run(); } if(getItemViewType(position) == TYPE_LOAD) { @@ -134,11 +134,7 @@ public class UsersAdapter extends RecyclerView.Adapter isLoading = false; } - public interface OnLoadMoreListener { - void onLoadMore(); - } - - public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) { + public void setLoadMoreListener(Runnable loadMoreListener) { this.loadMoreListener = loadMoreListener; } diff --git a/app/src/main/java/org/mian/gitnex/adapters/profile/OrganizationsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/profile/OrganizationsAdapter.java index 86d218a9..4314e04b 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/profile/OrganizationsAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/profile/OrganizationsAdapter.java @@ -25,7 +25,7 @@ public class OrganizationsAdapter extends RecyclerView.Adapter organizationsList; - private RepositoriesAdapter.OnLoadMoreListener loadMoreListener; + private Runnable loadMoreListener; private boolean isLoading = false, isMoreDataAvailable = true; public OrganizationsAdapter(Context ctx, List organizationsListMain) { @@ -52,7 +52,7 @@ public class OrganizationsAdapter extends RecyclerView.Adapter= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) { isLoading = true; - loadMoreListener.onLoadMore(); + loadMoreListener.run(); } if(getItemViewType(position) == TYPE_LOAD) { @@ -122,11 +122,7 @@ public class OrganizationsAdapter extends RecyclerView.Adapter reposList; - private OnLoadMoreListener loadMoreListener; + private Runnable loadMoreListener; private boolean isLoading = false, isMoreDataAvailable = true; public RepositoriesAdapter(Context ctx, List reposListMain) { @@ -60,7 +60,7 @@ public class RepositoriesAdapter extends RecyclerView.Adapter= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) { isLoading = true; - loadMoreListener.onLoadMore(); + loadMoreListener.run(); } if(getItemViewType(position) == TYPE_LOAD) { @@ -181,11 +181,7 @@ public class RepositoriesAdapter extends RecyclerView.Adapter reposList; - private OnLoadMoreListener loadMoreListener; + private Runnable loadMoreListener; private boolean isLoading = false, isMoreDataAvailable = true; public StarredRepositoriesAdapter(Context ctx, List reposListMain) { @@ -60,7 +60,7 @@ public class StarredRepositoriesAdapter extends RecyclerView.Adapter= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) { isLoading = true; - loadMoreListener.onLoadMore(); + loadMoreListener.run(); } if(getItemViewType(position) == TYPE_LOAD) { @@ -182,11 +182,7 @@ public class StarredRepositoriesAdapter extends RecyclerView.Adapter) (call, voidResponse) -> { if(voidResponse.isPresent() && voidResponse.get().isSuccessful()) { - onOptionSelectedListener.onSelected(); + onOptionSelectedListener.run(); } else { Toasty.error(context, getString(R.string.genericError)); } @@ -76,7 +76,7 @@ public class BottomSheetNotificationsFragment extends BottomSheetDialogFragment .enqueue((SimpleCallback) (call, voidResponse) -> { if(voidResponse.isPresent() && voidResponse.get().isSuccessful()) { - onOptionSelectedListener.onSelected(); + onOptionSelectedListener.run(); } else { Toasty.error(context, getString(R.string.genericError)); } @@ -90,7 +90,7 @@ public class BottomSheetNotificationsFragment extends BottomSheetDialogFragment .enqueue((SimpleCallback) (call, voidResponse) -> { if(voidResponse.isPresent() && voidResponse.get().isSuccessful()) { - onOptionSelectedListener.onSelected(); + onOptionSelectedListener.run(); } else { Toasty.error(context, getString(R.string.genericError)); } @@ -102,9 +102,4 @@ public class BottomSheetNotificationsFragment extends BottomSheetDialogFragment } - public interface OnOptionSelectedListener { - - void onSelected(); - } - } diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java index 7fc9a84a..bfaf8934 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java @@ -49,7 +49,7 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment { private int issueNumber; private long draftId; - private OnInteractedListener onInteractedListener; + private Runnable onInteractedListener; private TextView draftsHint; @Override @@ -195,7 +195,7 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment { tinyDB.putBoolean("resumePullRequests", true); if(onInteractedListener != null) { - onInteractedListener.onInteracted(); + onInteractedListener.run(); } } else { @@ -221,7 +221,7 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment { tinyDB.putBoolean("commentEdited", true); if(onInteractedListener != null) { - onInteractedListener.onInteracted(); + onInteractedListener.run(); } } else { @@ -298,11 +298,9 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment { return fragment; } - public void setOnInteractedListener(OnInteractedListener onInteractedListener) { + public void setOnInteractedListener(Runnable onInteractedListener) { this.onInteractedListener = onInteractedListener; } - public interface OnInteractedListener { void onInteracted(); } - } diff --git a/app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java index 34756db0..cf8bbea1 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java @@ -36,8 +36,6 @@ public class CollaboratorsFragment extends Fragment { private String repoName; private String repoOwner; - private OnFragmentInteractionListener mListener; - public CollaboratorsFragment() { } @@ -74,22 +72,6 @@ public class CollaboratorsFragment extends Fragment { } - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - public interface OnFragmentInteractionListener { - void onFragmentInteraction(Uri uri); - } - private void fetchDataAsync(String instanceToken, String owner, String repo) { CollaboratorsViewModel collaboratorsModel = new ViewModelProvider(this).get(CollaboratorsViewModel.class); diff --git a/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java index 64c906d1..4279e545 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java @@ -252,13 +252,4 @@ public class ExploreRepositoriesFragment extends Fragment { dialogFilterOptions.show(); } - - @Override - public void onDetach() { - super.onDetach(); - } - - public interface OnFragmentInteractionListener { - void onFragmentInteraction(Uri uri); - } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java index 482949ec..93e0881c 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java @@ -64,8 +64,6 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter private FilesAdapter filesAdapter; - private OnFragmentInteractionListener mListener; - public FilesFragment() {} public static FilesFragment newInstance(String param1, String param2, String param3) { @@ -393,19 +391,4 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter } - public void onButtonPressed(Uri uri) { - - if(mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - public interface OnFragmentInteractionListener { void onFragmentInteraction(Uri uri); } - } diff --git a/app/src/main/java/org/mian/gitnex/fragments/LabelsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/LabelsFragment.java index e490227b..eaffe210 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/LabelsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/LabelsFragment.java @@ -39,8 +39,6 @@ public class LabelsFragment extends Fragment { private String repoName; private String repoOwner; - private OnFragmentInteractionListener mListener; - public LabelsFragment() { } @@ -114,26 +112,6 @@ public class LabelsFragment extends Fragment { } } - public void onButtonPressed(Uri uri) { - - if (mListener != null) { - - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onDetach() { - - super.onDetach(); - mListener = null; - } - - public interface OnFragmentInteractionListener { - - void onFragmentInteraction(Uri uri); - } - private void fetchDataAsync(String instanceToken, String owner, String repo) { LabelsViewModel labelsModel = new ViewModelProvider(this).get(LabelsViewModel.class); diff --git a/app/src/main/java/org/mian/gitnex/fragments/MembersByOrgFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MembersByOrgFragment.java index cd7f30a5..ef58cfba 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/MembersByOrgFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/MembersByOrgFragment.java @@ -34,8 +34,6 @@ import java.util.Objects; public class MembersByOrgFragment extends Fragment { - private RepositoriesByOrgFragment.OnFragmentInteractionListener mListener; - private TextView noDataMembers; private static String orgNameF = "param2"; private String orgName; @@ -109,7 +107,7 @@ public class MembersByOrgFragment extends Fragment { @Override public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) { - boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext())); + boolean connToInternet = AppUtil.hasNetworkConnection(requireContext()); inflater.inflate(R.menu.search_menu, menu); super.onCreateOptionsMenu(menu, inflater); @@ -139,20 +137,4 @@ public class MembersByOrgFragment extends Fragment { }); } - - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - public interface OnFragmentInteractionListener { - void onFragmentInteraction(Uri uri); - } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java index e310e0aa..b4cf50c3 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java @@ -40,8 +40,6 @@ public class MyProfileEmailsFragment extends Fragment { private String repoName; private String repoOwner; - private OnFragmentInteractionListener mListener; - public MyProfileEmailsFragment() { } @@ -117,20 +115,4 @@ public class MyProfileEmailsFragment extends Fragment { }); } - - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - public interface OnFragmentInteractionListener { - void onFragmentInteraction(Uri uri); - } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java index d2f2e6af..ba214ddd 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java @@ -51,8 +51,6 @@ public class MyRepositoriesFragment extends Fragment { private String mParam1; private String mParam2; - private OnFragmentInteractionListener mListener; - public MyRepositoriesFragment() { } @@ -204,20 +202,4 @@ public class MyRepositoriesFragment extends Fragment { }); } - - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - public interface OnFragmentInteractionListener { - void onFragmentInteraction(Uri uri); - } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java index d211528a..e749f95f 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java @@ -41,7 +41,7 @@ import java.util.List; * Modified M M Arif */ -public class NotificationsFragment extends Fragment implements NotificationsAdapter.OnNotificationClickedListener, NotificationsAdapter.OnMoreClickedListener, BottomSheetNotificationsFragment.OnOptionSelectedListener { +public class NotificationsFragment extends Fragment implements NotificationsAdapter.OnNotificationClickedListener, NotificationsAdapter.OnMoreClickedListener { private FragmentNotificationsBinding viewBinding; private final List notificationThreads = new ArrayList<>(); @@ -268,13 +268,10 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap @Override public void onMoreClicked(NotificationThread notificationThread) { BottomSheetNotificationsFragment bottomSheetNotificationsFragment = new BottomSheetNotificationsFragment(); - bottomSheetNotificationsFragment.onAttach(context, notificationThread, this); + bottomSheetNotificationsFragment.onAttach(context, notificationThread, () -> { + pageCurrentIndex = 1; + loadNotifications(false); + }); bottomSheetNotificationsFragment.show(getChildFragmentManager(), "notificationsBottomSheet"); } - - @Override - public void onSelected() { - pageCurrentIndex = 1; - loadNotifications(false); - } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java index 05990a2e..ae9e448f 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java @@ -41,8 +41,6 @@ public class OrganizationInfoFragment extends Fragment { private TextView orgLocationInfo; private LinearLayout orgInfoLayout; - private RepoInfoFragment.OnFragmentInteractionListener mListener; - public OrganizationInfoFragment() { } @@ -154,20 +152,4 @@ public class OrganizationInfoFragment extends Fragment { }); } - - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - public interface OnFragmentInteractionListener { - void onFragmentInteraction(Uri uri); - } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationLabelsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationLabelsFragment.java index 3a89655f..fe457f72 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationLabelsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationLabelsFragment.java @@ -37,8 +37,6 @@ public class OrganizationLabelsFragment extends Fragment { private String repoOwner; - private OnFragmentInteractionListener mListener; - public static OrganizationLabelsFragment newInstance(String param1) { OrganizationLabelsFragment fragment = new OrganizationLabelsFragment(); @@ -104,26 +102,6 @@ public class OrganizationLabelsFragment extends Fragment { } } - public void onButtonPressed(Uri uri) { - - if (mListener != null) { - - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onDetach() { - - super.onDetach(); - mListener = null; - } - - public interface OnFragmentInteractionListener { - - void onFragmentInteraction(Uri uri); - } - private void fetchDataAsync(String instanceToken, String owner) { OrganizationLabelsViewModel organizationLabelsViewModel = new ViewModelProvider(this).get(OrganizationLabelsViewModel.class); diff --git a/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java index c1fff529..76575e02 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java @@ -53,8 +53,6 @@ public class ReleasesFragment extends Fragment { private int page = 1; private int pageReleases = 1; - private OnFragmentInteractionListener mListener; - public ReleasesFragment() { } @@ -145,22 +143,6 @@ public class ReleasesFragment extends Fragment { } } - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - public interface OnFragmentInteractionListener { - void onFragmentInteraction(Uri uri); - } - private void fetchDataAsync(String instanceToken, String owner, String repo) { ReleasesViewModel releasesModel = new ViewModelProvider(this).get(ReleasesViewModel.class); diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java index 2c95c9af..9ba5491e 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java @@ -49,8 +49,6 @@ public class RepoInfoFragment extends Fragment { private String repoName; private String repoOwner; - private OnFragmentInteractionListener mListener; - public RepoInfoFragment() {} public static RepoInfoFragment newInstance(String param1, String param2) { @@ -124,22 +122,6 @@ public class RepoInfoFragment extends Fragment { return binding.getRoot(); } - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - public interface OnFragmentInteractionListener { - void onFragmentInteraction(Uri uri); - } - private void toggleExpandView() { if (binding.repoFileContents.getVisibility() == View.GONE) { diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java index f79a32c0..1fe46002 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java @@ -38,8 +38,6 @@ import java.util.List; public class RepositoriesByOrgFragment extends Fragment { - private OnFragmentInteractionListener mListener; - private ProgressBar mProgressBar; private RepositoriesByOrgAdapter adapter; private RecyclerView mRecyclerView; @@ -170,20 +168,4 @@ public class RepositoriesByOrgFragment extends Fragment { }); } - - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - public interface OnFragmentInteractionListener { - void onFragmentInteraction(Uri uri); - } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java index e03a23b0..cef0fd7b 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java @@ -47,8 +47,6 @@ public class StarredRepositoriesFragment extends Fragment { private int pageSize = 1; private int resultLimit = 50; - private OnFragmentInteractionListener mListener; - public StarredRepositoriesFragment() { } @@ -195,20 +193,4 @@ public class StarredRepositoriesFragment extends Fragment { }); } - - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - public interface OnFragmentInteractionListener { - void onFragmentInteraction(Uri uri); - } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/TeamsByOrgFragment.java b/app/src/main/java/org/mian/gitnex/fragments/TeamsByOrgFragment.java index d4192cf7..f897261c 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/TeamsByOrgFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/TeamsByOrgFragment.java @@ -35,8 +35,6 @@ import org.mian.gitnex.viewmodels.TeamsByOrgViewModel; public class TeamsByOrgFragment extends Fragment { - private RepositoriesByOrgFragment.OnFragmentInteractionListener mListener; - private ProgressBar mProgressBar; private RecyclerView mRecyclerView; private TextView noDataTeams; @@ -160,20 +158,4 @@ public class TeamsByOrgFragment extends Fragment { }); } - - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - public interface OnFragmentInteractionListener { - void onFragmentInteraction(Uri uri); - } } diff --git a/app/src/main/java/org/mian/gitnex/helpers/Path.java b/app/src/main/java/org/mian/gitnex/helpers/Path.java index 06567592..d148e9f9 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/Path.java +++ b/app/src/main/java/org/mian/gitnex/helpers/Path.java @@ -15,7 +15,7 @@ import java.util.StringJoiner; public class Path { private final List segments; - private final List onChangedListeners; + private final List onChangedListeners; public Path(String... segments) { @@ -24,16 +24,14 @@ public class Path { } - public interface OnChangedListener { void onChanged(); } - - public Path addListener(OnChangedListener onChangedListener) { + public Path addListener(Runnable onChangedListener) { onChangedListeners.add(onChangedListener); return this; } - public Path removeListener(OnChangedListener onChangedListener) { + public Path removeListener(Runnable onChangedListener) { onChangedListeners.remove(onChangedListener); return this; @@ -42,8 +40,8 @@ public class Path { private void pathChanged() { - for(OnChangedListener onChangedListener : onChangedListeners) { - onChangedListener.onChanged(); + for(Runnable onChangedListener : onChangedListeners) { + onChangedListener.run(); } } diff --git a/app/src/main/java/org/mian/gitnex/views/ReactionList.java b/app/src/main/java/org/mian/gitnex/views/ReactionList.java index f4800055..f06eeb0a 100644 --- a/app/src/main/java/org/mian/gitnex/views/ReactionList.java +++ b/app/src/main/java/org/mian/gitnex/views/ReactionList.java @@ -40,7 +40,7 @@ import retrofit2.Response; public class ReactionList extends HorizontalScrollView { private enum ReactionType { COMMENT, ISSUE } - private OnReactionAddedListener onReactionAddedListener; + private Runnable onReactionAddedListener; @SuppressLint("SetTextI18n") public ReactionList(Context context, Bundle bundle) { @@ -161,7 +161,7 @@ public class ReactionList extends HorizontalScrollView { }); root.post(() -> root.addView(reactionBadge)); - onReactionAddedListener.reactionAdded(); + onReactionAddedListener.run(); } } @@ -172,9 +172,7 @@ public class ReactionList extends HorizontalScrollView { } - public void setOnReactionAddedListener(OnReactionAddedListener onReactionAddedListener) { + public void setOnReactionAddedListener(Runnable onReactionAddedListener) { this.onReactionAddedListener = onReactionAddedListener; } - - public interface OnReactionAddedListener { void reactionAdded(); } } diff --git a/app/src/main/java/org/mian/gitnex/views/ReactionSpinner.java b/app/src/main/java/org/mian/gitnex/views/ReactionSpinner.java index 84118d5b..4077e4e3 100644 --- a/app/src/main/java/org/mian/gitnex/views/ReactionSpinner.java +++ b/app/src/main/java/org/mian/gitnex/views/ReactionSpinner.java @@ -38,7 +38,7 @@ public class ReactionSpinner extends HorizontalScrollView { private enum ReactionType { COMMENT, ISSUE } private enum ReactionAction { REMOVE, ADD } - private OnInteractedListener onInteractedListener; + private Runnable onInteractedListener; private Runnable onLoadingFinishedListener; public ReactionSpinner(Context context, Bundle bundle) { @@ -105,7 +105,7 @@ public class ReactionSpinner extends HorizontalScrollView { try { if(react(repoOwner, repoName, reactionType, reactionAction, new IssueReaction(allowedReaction), id)) { - v.post(() -> onInteractedListener.onInteracted()); + v.post(() -> onInteractedListener.run()); } } catch(IOException ignored) {} @@ -237,12 +237,10 @@ public class ReactionSpinner extends HorizontalScrollView { } - public void setOnInteractedListener(OnInteractedListener onInteractedListener) { + public void setOnInteractedListener(Runnable onInteractedListener) { this.onInteractedListener = onInteractedListener; } - public interface OnInteractedListener { void onInteracted(); } - public void setOnLoadingFinishedListener(Runnable onLoadingFinishedListener) { this.onLoadingFinishedListener = onLoadingFinishedListener; }