Prefer Runnables over local interfaces (#1047)

Prefer the `Runnable` interface instead of interfaces without any parameters. Addresses #1000

Co-authored-by: qwerty287 <ndev@web.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1047
Reviewed-by: 6543 <6543@noreply.codeberg.org>
Co-authored-by: qwerty287 <qwerty287@noreply.codeberg.org>
Co-committed-by: qwerty287 <qwerty287@noreply.codeberg.org>

app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java

@@ -27,7 +27,7 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
     private final Context context;
     private final int TYPE_LOAD = 0;
     private List<Commits> 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<RecyclerView.ViewHolder
 
         if(position >= 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<RecyclerView.ViewHolder
         isLoading = false;
     }
 
-    public interface OnLoadMoreListener {
+    public void setLoadMoreListener(Runnable loadMoreListener) {
-        void onLoadMore();
-    }
-
-    public void setLoadMoreListener(CommitsAdapter.OnLoadMoreListener loadMoreListener) {
         this.loadMoreListener = loadMoreListener;
     }
 

app/src/main/java/org/mian/gitnex/adapters/ExploreIssuesAdapter.java

@@ -40,7 +40,7 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
 	private final Context context;
 	private final int TYPE_LOAD = 0;
 	private List<Issues> 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<RecyclerView.View
 	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) {
@@ -211,11 +211,7 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
 		isLoading = false;
 	}
 
-	public interface OnLoadMoreListener {
+	public void setLoadMoreListener(Runnable loadMoreListener) {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
 		this.loadMoreListener = loadMoreListener;
 	}
 

app/src/main/java/org/mian/gitnex/adapters/ExplorePublicOrganizationsAdapter.java

@@ -28,7 +28,7 @@ public class ExplorePublicOrganizationsAdapter extends RecyclerView.Adapter<Recy
 	private final Context context;
 	private final int TYPE_LOAD = 0;
 	private List<Organization> organizationsList;
-	private OnLoadMoreListener loadMoreListener;
+	private Runnable loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
 	public ExplorePublicOrganizationsAdapter(Context ctx, List<Organization> organizationsListMain) {
@@ -52,7 +52,7 @@ public class ExplorePublicOrganizationsAdapter extends RecyclerView.Adapter<Recy
 	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) {
@@ -139,11 +139,7 @@ public class ExplorePublicOrganizationsAdapter extends RecyclerView.Adapter<Recy
 		isLoading = false;
 	}
 
-	public interface OnLoadMoreListener {
+	public void setLoadMoreListener(Runnable loadMoreListener) {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
 		this.loadMoreListener = loadMoreListener;
 	}
 

app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java

@@ -46,7 +46,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 	private final Context context;
 	private final int TYPE_LOAD = 0;
 	private List<UserRepositories> 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<RecyclerVie
 	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) {
@@ -286,11 +286,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 		isLoading = false;
 	}
 
-	public interface OnLoadMoreListener {
+	public void setLoadMoreListener(Runnable loadMoreListener) {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
 		this.loadMoreListener = loadMoreListener;
 	}
 

app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java

@@ -52,10 +52,10 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 	private final Bundle bundle;
 	private final List<IssueComments> 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<IssueComments> issuesCommentsMain, FragmentManager fragmentManager, BottomSheetReplyFragment.OnInteractedListener onInteractedListener) {
+	public IssueCommentsAdapter(Context ctx, Bundle bundle, List<IssueComments> issuesCommentsMain, FragmentManager fragmentManager, Runnable onInteractedListener) {
 
 		this.context = ctx;
 		this.bundle = bundle;
@@ -136,7 +136,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 				reactionSpinner.setOnInteractedListener(() -> {
 					tinyDB.putBoolean("commentEdited", true);
 
-					onInteractedListener.onInteracted();
+					onInteractedListener.run();
 					dialog.dismiss();
 				});
 

app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java

@@ -38,7 +38,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 	private final Context context;
 	private final int TYPE_LOAD = 0;
 	private List<Issues> issuesList;
-	private OnLoadMoreListener loadMoreListener;
+	private Runnable loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
 	public IssuesAdapter(Context ctx, List<Issues> issuesListMain) {
@@ -67,7 +67,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		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<RecyclerView.ViewHolder>
 		isLoading = false;
 	}
 
-	public interface OnLoadMoreListener {
+	public void setLoadMoreListener(Runnable loadMoreListener) {
-
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
 
 		this.loadMoreListener = loadMoreListener;
 	}

app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java

@@ -38,7 +38,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 	private final Context context;
 	private final int TYPE_LOAD = 0;
 	private List<Milestones> 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<RecyclerView.ViewHol
 		if(position >= 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<RecyclerView.ViewHol
 		isLoading = false;
 	}
 
-	public interface OnLoadMoreListener {
+	public void setLoadMoreListener(Runnable loadMoreListener) {
-
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
 
 		this.loadMoreListener = loadMoreListener;
 	}

app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java

@@ -36,7 +36,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
 	private List<NotificationThread> 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<RecyclerView.View
 	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) {
@@ -212,11 +212,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
 		isLoading = false;
 	}
 
-	public interface OnLoadMoreListener {
+	public void setLoadMoreListener(Runnable loadMoreListener) {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
 		this.loadMoreListener = loadMoreListener;
 	}
 

app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java

@@ -35,7 +35,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 	private final Context context;
 	private final int TYPE_LOAD = 0;
 	private List<PullRequests> prList;
-	private PullRequestsAdapter.OnLoadMoreListener loadMoreListener;
+	private Runnable loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
 	public PullRequestsAdapter(Context context, List<PullRequests> prListMain) {
@@ -63,7 +63,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 		if(position >= 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<RecyclerView.ViewH
 		isLoading = false;
 	}
 
-	public interface OnLoadMoreListener {
+	public void setLoadMoreListener(Runnable loadMoreListener) {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(PullRequestsAdapter.OnLoadMoreListener loadMoreListener) {
 		this.loadMoreListener = loadMoreListener;
 	}
 

app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java

@@ -47,7 +47,7 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 	private final Context context;
 	private final int TYPE_LOAD = 0;
 	private List<UserRepositories> 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<RecyclerView.ViewHold
 		if(position >= 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<RecyclerView.ViewHold
 		isLoading = false;
 	}
 
-	public interface OnLoadMoreListener {
+	public void setLoadMoreListener(Runnable loadMoreListener) {
-
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(RepoForksAdapter.OnLoadMoreListener loadMoreListener) {
 
 		this.loadMoreListener = loadMoreListener;
 	}

app/src/main/java/org/mian/gitnex/adapters/UsersAdapter.java

@@ -28,7 +28,7 @@ public class UsersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 	private final Context context;
 	private final int TYPE_LOAD = 0;
 	private List<UserInfo> followersList;
-	private OnLoadMoreListener loadMoreListener;
+	private Runnable loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
 	public UsersAdapter(List<UserInfo> dataList, Context ctx) {
@@ -52,7 +52,7 @@ public class UsersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 	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<RecyclerView.ViewHolder>
 		isLoading = false;
 	}
 
-	public interface OnLoadMoreListener {
+	public void setLoadMoreListener(Runnable loadMoreListener) {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
 		this.loadMoreListener = loadMoreListener;
 	}
 

app/src/main/java/org/mian/gitnex/adapters/profile/OrganizationsAdapter.java

@@ -25,7 +25,7 @@ public class OrganizationsAdapter extends RecyclerView.Adapter<RecyclerView.View
 	private final Context context;
 	private final int TYPE_LOAD = 0;
 	private List<UserOrganizations> organizationsList;
-	private RepositoriesAdapter.OnLoadMoreListener loadMoreListener;
+	private Runnable loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
 	public OrganizationsAdapter(Context ctx, List<UserOrganizations> organizationsListMain) {
@@ -52,7 +52,7 @@ public class OrganizationsAdapter extends RecyclerView.Adapter<RecyclerView.View
 
 		if(position >= 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<RecyclerView.View
 		isLoading = false;
 	}
 
-	public interface OnLoadMoreListener {
+	public void setLoadMoreListener(Runnable loadMoreListener) {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(RepositoriesAdapter.OnLoadMoreListener loadMoreListener) {
 		this.loadMoreListener = loadMoreListener;
 	}
 

app/src/main/java/org/mian/gitnex/adapters/profile/RepositoriesAdapter.java

@@ -33,7 +33,7 @@ public class RepositoriesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 	private final Context context;
 	private final int TYPE_LOAD = 0;
 	private List<UserRepositories> reposList;
-	private OnLoadMoreListener loadMoreListener;
+	private Runnable loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
 	public RepositoriesAdapter(Context ctx, List<UserRepositories> reposListMain) {
@@ -60,7 +60,7 @@ public class RepositoriesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
 		if(position >= 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<RecyclerView.ViewH
 		isLoading = false;
 	}
 
-	public interface OnLoadMoreListener {
+	public void setLoadMoreListener(Runnable loadMoreListener) {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
 		this.loadMoreListener = loadMoreListener;
 	}
 

app/src/main/java/org/mian/gitnex/adapters/profile/StarredRepositoriesAdapter.java

@@ -33,7 +33,7 @@ public class StarredRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 	private final Context context;
 	private final int TYPE_LOAD = 0;
 	private List<UserRepositories> reposList;
-	private OnLoadMoreListener loadMoreListener;
+	private Runnable loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
 	public StarredRepositoriesAdapter(Context ctx, List<UserRepositories> reposListMain) {
@@ -60,7 +60,7 @@ public class StarredRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 
 		if(position >= 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<RecyclerVie
 		isLoading = false;
 	}
 
-	public interface OnLoadMoreListener {
+	public void setLoadMoreListener(Runnable loadMoreListener) {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
 		this.loadMoreListener = loadMoreListener;
 	}
 

app/src/main/java/org/mian/gitnex/fragments/BottomSheetNotificationsFilterFragment.java

@@ -18,7 +18,7 @@ import org.mian.gitnex.helpers.TinyDB;
 public class BottomSheetNotificationsFilterFragment extends BottomSheetDialogFragment {
 
 	private TinyDB tinyDB;
-	private OnDismissedListener onDismissedListener;
+	private Runnable onDismissedListener;
 
 	@Override
 	public void onAttach(@NonNull Context context) {
@@ -58,21 +58,16 @@ public class BottomSheetNotificationsFilterFragment extends BottomSheetDialogFra
 
 		if(onDismissedListener != null) {
 
-			onDismissedListener.onDismissed();
+			onDismissedListener.run();
 		}
 
 		super.dismiss();
 
 	}
 
-	public void setOnDismissedListener(OnDismissedListener onDismissedListener) {
+	public void setOnDismissedListener(Runnable onDismissedListener) {
 
 		this.onDismissedListener = onDismissedListener;
 	}
 
-	public interface OnDismissedListener {
-
-		void onDismissed();
-	}
-
 }

app/src/main/java/org/mian/gitnex/fragments/BottomSheetNotificationsFragment.java

@@ -26,9 +26,9 @@ public class BottomSheetNotificationsFragment extends BottomSheetDialogFragment
 
 	private Context context;
 	private NotificationThread notificationThread;
-	private OnOptionSelectedListener onOptionSelectedListener;
+	private Runnable onOptionSelectedListener;
 
-	public void onAttach(Context context, NotificationThread notificationThread, OnOptionSelectedListener onOptionSelectedListener) {
+	public void onAttach(Context context, NotificationThread notificationThread, Runnable onOptionSelectedListener) {
 
 		super.onAttach(context);
 
@@ -62,7 +62,7 @@ public class BottomSheetNotificationsFragment extends BottomSheetDialogFragment
 				.enqueue((SimpleCallback<Void>) (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<Void>) (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<Void>) (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();
-	}
-
 }

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(); }
-
 }

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);

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);
-	}
 }

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); }
-
 }

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);

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);
-    }
 }

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);
-    }
 }

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);
-    }
 }

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<NotificationThread> 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);
-	}
 }

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);
-    }
 }

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);

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);

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) {

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);
-    }
 }

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);
-    }
 }

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);
-    }
 }

app/src/main/java/org/mian/gitnex/helpers/Path.java

@@ -15,7 +15,7 @@ import java.util.StringJoiner;
 public class Path {
 
 	private final List<String> segments;
-	private final List<OnChangedListener> onChangedListeners;
+	private final List<Runnable> onChangedListeners;
 
 	public Path(String... segments) {
 
@@ -24,16 +24,14 @@ public class Path {
 
 	}
 
-	public interface OnChangedListener { void onChanged(); }
+	public Path addListener(Runnable onChangedListener) {
-
-	public Path addListener(OnChangedListener 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) {
+		for(Runnable onChangedListener : onChangedListeners) {
-			onChangedListener.onChanged();
+			onChangedListener.run();
 		}
 	}
 

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(); }
 }

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;
 	}