Format code and optimize imports

app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java

@@ -17,7 +17,11 @@ import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
 import org.mian.gitnex.databinding.ActivityAddNewAccountBinding;
-import org.mian.gitnex.helpers.*;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.PathsHelper;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.UrlHelper;
+import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.structs.Protocol;
 import java.net.URI;
 import java.util.Objects;

app/src/main/java/org/mian/gitnex/activities/AdminCronTasksActivity.java

@@ -19,13 +19,11 @@ import org.mian.gitnex.viewmodels.AdminCronTasksViewModel;
 
 public class AdminCronTasksActivity extends BaseActivity {
 
+	private final int PAGE = 1;
 	private AdminCronTasksViewModel adminCronTasksViewModel;
 	private View.OnClickListener onClickListener;
 	private AdminCronTasksAdapter adapter;
-
 	private ActivityAdminCronTasksBinding activityAdminCronTasksBinding;
-
-	private final int PAGE = 1;
 	private int resultLimit;
 
 	@Override

app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java

@@ -66,8 +66,6 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetLi
 		fetchDataAsync();
 	}
 
-	;
-
 	private void fetchDataAsync() {
 
 		AdminGetUsersViewModel adminUsersModel = new ViewModelProvider(this).get(AdminGetUsersViewModel.class);

app/src/main/java/org/mian/gitnex/activities/CodeEditorActivity.java

@@ -10,7 +10,11 @@ import com.amrdeveloper.codeview.Code;
 import org.apache.commons.lang3.EnumUtils;
 import org.mian.gitnex.R;
 import org.mian.gitnex.databinding.ActivityCodeEditorBinding;
-import org.mian.gitnex.helpers.codeeditor.*;
+import org.mian.gitnex.helpers.codeeditor.CustomCodeViewAdapter;
+import org.mian.gitnex.helpers.codeeditor.LanguageManager;
+import org.mian.gitnex.helpers.codeeditor.LanguageName;
+import org.mian.gitnex.helpers.codeeditor.SourcePositionListener;
+import org.mian.gitnex.helpers.codeeditor.ThemeName;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java

@@ -15,7 +15,12 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import org.apache.commons.io.FilenameUtils;
-import org.gitnex.tea4j.v2.models.*;
+import org.gitnex.tea4j.v2.models.Branch;
+import org.gitnex.tea4j.v2.models.CreateFileOptions;
+import org.gitnex.tea4j.v2.models.DeleteFileOptions;
+import org.gitnex.tea4j.v2.models.FileDeleteResponse;
+import org.gitnex.tea4j.v2.models.FileResponse;
+import org.gitnex.tea4j.v2.models.UpdateFileOptions;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.ActivityCreateFileBinding;

app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java

@@ -12,7 +12,11 @@ import android.widget.ArrayAdapter;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import org.gitnex.tea4j.v2.models.*;
+import org.gitnex.tea4j.v2.models.CreateIssueOption;
+import org.gitnex.tea4j.v2.models.Issue;
+import org.gitnex.tea4j.v2.models.Label;
+import org.gitnex.tea4j.v2.models.Milestone;
+import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.AssigneesActions;
 import org.mian.gitnex.actions.LabelsActions;
@@ -28,7 +32,12 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 

app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java

@@ -11,7 +11,11 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import org.gitnex.tea4j.v2.models.*;
+import org.gitnex.tea4j.v2.models.Branch;
+import org.gitnex.tea4j.v2.models.CreatePullRequestOption;
+import org.gitnex.tea4j.v2.models.Label;
+import org.gitnex.tea4j.v2.models.Milestone;
+import org.gitnex.tea4j.v2.models.PullRequest;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.LabelsActions;
 import org.mian.gitnex.adapters.LabelsListAdapter;
@@ -22,7 +26,12 @@ import org.mian.gitnex.fragments.PullRequestsFragment;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 

app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java

@@ -8,9 +8,18 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.*;
+import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ImageView;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.v2.models.*;
+import org.gitnex.tea4j.v2.models.Branch;
+import org.gitnex.tea4j.v2.models.CreateReleaseOption;
+import org.gitnex.tea4j.v2.models.CreateTagOption;
+import org.gitnex.tea4j.v2.models.Release;
+import org.gitnex.tea4j.v2.models.Tag;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.ActivityCreateReleaseBinding;

app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java

@@ -7,7 +7,12 @@ import android.os.Looper;
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.*;
+import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import org.gitnex.tea4j.v2.models.CreateRepoOption;
 import org.gitnex.tea4j.v2.models.Organization;

app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java

@@ -33,6 +33,10 @@ import retrofit2.Callback;
 
 public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClickListener {
 
+	private final String[] permissionList = {"Read", "Write", "Admin"};
+	private final String[] accessControlsList = new String[]{"Code", "Issues", "Pull Request", "Releases", "Wiki", "External Wiki", "External Issues"};
+	private final boolean[] selectedAccessControlsTrueFalse = new boolean[]{false, false, false, false, false, false, false};
+	public int permissionSelectedChoice = -1;
 	private View.OnClickListener onClickListener;
 	private TextView teamName;
 	private TextView teamDesc;
@@ -41,15 +45,8 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 	private TextView teamAccessControls;
 	private TextView teamAccessControlsArray;
 	private Button createTeamButton;
-	private final String[] permissionList = {"Read", "Write", "Admin"};
-	public int permissionSelectedChoice = -1;
-
-	private final String[] accessControlsList = new String[]{"Code", "Issues", "Pull Request", "Releases", "Wiki", "External Wiki", "External Issues"};
-
 	private List<String> pushAccessList;
 
-	private final boolean[] selectedAccessControlsTrueFalse = new boolean[]{false, false, false, false, false, false, false};
-
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 

app/src/main/java/org/mian/gitnex/activities/DeepLinksActivity.java

@@ -9,7 +9,11 @@ import android.util.Log;
 import android.view.View;
 import androidx.annotation.NonNull;
 import org.apache.commons.lang3.StringUtils;
-import org.gitnex.tea4j.v2.models.*;
+import org.gitnex.tea4j.v2.models.ContentsResponse;
+import org.gitnex.tea4j.v2.models.Organization;
+import org.gitnex.tea4j.v2.models.PullRequest;
+import org.gitnex.tea4j.v2.models.Repository;
+import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.database.api.BaseApi;

app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java

@@ -11,7 +11,12 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.*;
+import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import org.gitnex.tea4j.v2.models.EditIssueOption;
 import org.gitnex.tea4j.v2.models.Issue;
@@ -28,7 +33,12 @@ import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.IssueContext;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 

app/src/main/java/org/mian/gitnex/activities/LoginActivity.java

@@ -3,17 +3,30 @@ package org.mian.gitnex.activities;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.*;
+import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RadioGroup;
 import androidx.annotation.NonNull;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import org.gitnex.tea4j.v2.models.*;
+import org.gitnex.tea4j.v2.models.AccessToken;
+import org.gitnex.tea4j.v2.models.CreateAccessTokenOption;
+import org.gitnex.tea4j.v2.models.GeneralAPISettings;
+import org.gitnex.tea4j.v2.models.ServerVersion;
+import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
 import org.mian.gitnex.databinding.ActivityLoginBinding;
-import org.mian.gitnex.helpers.*;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.NetworkStatusObserver;
+import org.mian.gitnex.helpers.PathsHelper;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.UrlHelper;
+import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.structs.Protocol;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;

app/src/main/java/org/mian/gitnex/activities/MainActivity.java

@@ -34,8 +34,26 @@ import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
 import org.mian.gitnex.databinding.ActivityMainBinding;
-import org.mian.gitnex.fragments.*;
+import org.mian.gitnex.fragments.AdministrationFragment;
-import org.mian.gitnex.helpers.*;
+import org.mian.gitnex.fragments.BottomSheetDraftsFragment;
+import org.mian.gitnex.fragments.BottomSheetMyIssuesFilterFragment;
+import org.mian.gitnex.fragments.DraftsFragment;
+import org.mian.gitnex.fragments.ExploreFragment;
+import org.mian.gitnex.fragments.MostVisitedReposFragment;
+import org.mian.gitnex.fragments.MyIssuesFragment;
+import org.mian.gitnex.fragments.MyProfileFragment;
+import org.mian.gitnex.fragments.MyRepositoriesFragment;
+import org.mian.gitnex.fragments.NotificationsFragment;
+import org.mian.gitnex.fragments.OrganizationsFragment;
+import org.mian.gitnex.fragments.RepositoriesFragment;
+import org.mian.gitnex.fragments.SettingsFragment;
+import org.mian.gitnex.fragments.StarredRepositoriesFragment;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.ChangeLog;
+import org.mian.gitnex.helpers.ColorInverter;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.structs.BottomSheetListener;
 import org.mian.gitnex.structs.FragmentRefreshListener;
 import java.util.ArrayList;

app/src/main/java/org/mian/gitnex/activities/ProfileActivity.java

@@ -19,7 +19,12 @@ import com.google.android.material.tabs.TabLayoutMediator;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.fragments.BottomSheetUserProfileFragment;
-import org.mian.gitnex.fragments.profile.*;
+import org.mian.gitnex.fragments.profile.DetailFragment;
+import org.mian.gitnex.fragments.profile.FollowersFragment;
+import org.mian.gitnex.fragments.profile.FollowingFragment;
+import org.mian.gitnex.fragments.profile.OrganizationsFragment;
+import org.mian.gitnex.fragments.profile.RepositoriesFragment;
+import org.mian.gitnex.fragments.profile.StarredRepositoriesFragment;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.structs.BottomSheetListener;

app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java

@@ -6,7 +6,12 @@ import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.activity.result.ActivityResultLauncher;
@@ -21,10 +26,27 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.progressindicator.LinearProgressIndicator;
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
-import org.gitnex.tea4j.v2.models.*;
+import org.gitnex.tea4j.v2.models.Branch;
+import org.gitnex.tea4j.v2.models.Milestone;
+import org.gitnex.tea4j.v2.models.Organization;
+import org.gitnex.tea4j.v2.models.Repository;
+import org.gitnex.tea4j.v2.models.WatchInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.fragments.*;
+import org.mian.gitnex.fragments.BottomSheetIssuesFilterFragment;
+import org.mian.gitnex.fragments.BottomSheetMilestonesFilterFragment;
+import org.mian.gitnex.fragments.BottomSheetPullRequestFilterFragment;
+import org.mian.gitnex.fragments.BottomSheetReleasesTagsFragment;
+import org.mian.gitnex.fragments.BottomSheetRepoFragment;
+import org.mian.gitnex.fragments.CollaboratorsFragment;
+import org.mian.gitnex.fragments.FilesFragment;
+import org.mian.gitnex.fragments.IssuesFragment;
+import org.mian.gitnex.fragments.LabelsFragment;
+import org.mian.gitnex.fragments.MilestonesFragment;
+import org.mian.gitnex.fragments.PullRequestsFragment;
+import org.mian.gitnex.fragments.ReleasesFragment;
+import org.mian.gitnex.fragments.RepoInfoFragment;
+import org.mian.gitnex.fragments.WikiFragment;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
@@ -85,7 +107,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 	private FragmentRefreshListener fragmentRefreshListenerFilterIssuesByMilestone;
 	private FragmentRefreshListener fragmentRefreshListenerReleases;
 	private Dialog progressDialog;
-	private final ActivityResultLauncher<Intent> createReleaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+	private MaterialAlertDialogBuilder materialAlertDialogBuilder;	private final ActivityResultLauncher<Intent> createReleaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
 		if(result.getResultCode() == 201) {
 			assert result.getData() != null;
 			if(result.getData().getBooleanExtra("updateReleases", false)) {
@@ -97,7 +119,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 			}
 		}
 	});
-	private MaterialAlertDialogBuilder materialAlertDialogBuilder;
 	private Intent intentWiki;
 
 	@Override
@@ -859,4 +880,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 	}
 
 
+
+
 }

app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java

@@ -33,9 +33,8 @@ import retrofit2.Response;
 
 public class RepoForksActivity extends BaseActivity {
 
-	private ActivityRepoForksBinding activityRepoForksBinding;
 	private final String TAG = "RepositoryForks";
-
+	private ActivityRepoForksBinding activityRepoForksBinding;
 	private int resultLimit;
 	private int pageSize = 1;
 	private List<Repository> forksList;

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

@@ -31,11 +31,77 @@ public class AdminCronTasksAdapter extends RecyclerView.Adapter<AdminCronTasksAd
 
 	private final List<Cron> tasksList;
 
+	public AdminCronTasksAdapter(List<Cron> tasksListMain) {
+		this.tasksList = tasksListMain;
+	}
+
+	private static void runCronTask(final Context ctx, final String taskName) {
+
+		Call<Void> call = RetrofitClient.getApiInterface(ctx).adminCronRun(taskName);
+
+		call.enqueue(new Callback<>() {
+
+			@Override
+			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+
+				switch(response.code()) {
+
+					case 204:
+						Toasty.success(ctx, ctx.getString(R.string.adminCronTaskSuccessMsg, taskName));
+						break;
+
+					case 401:
+						AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						break;
+
+					case 403:
+						Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+						break;
+
+					case 404:
+						Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+						break;
+
+					default:
+						Toasty.error(ctx, ctx.getString(R.string.genericError));
+
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+
+				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+			}
+		});
+	}
+
+	@NonNull
+	@Override
+	public AdminCronTasksAdapter.CronTasksViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_admin_cron_tasks, parent, false);
+		return new AdminCronTasksAdapter.CronTasksViewHolder(v);
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull AdminCronTasksAdapter.CronTasksViewHolder holder, int position) {
+
+		Cron currentItem = tasksList.get(position);
+
+		holder.cronTasks = currentItem;
+		holder.taskName.setText(StringUtils.capitalize(currentItem.getName().replace("_", " ")));
+	}
+
+	@Override
+	public int getItemCount() {
+		return tasksList.size();
+	}
+
 	static class CronTasksViewHolder extends RecyclerView.ViewHolder {
 
-		private Cron cronTasks;
-
 		private final TextView taskName;
+		private Cron cronTasks;
 
 		private CronTasksViewHolder(View itemView) {
 
@@ -88,71 +154,4 @@ public class AdminCronTasksAdapter extends RecyclerView.Adapter<AdminCronTasksAd
 
 	}
 
-	public AdminCronTasksAdapter(List<Cron> tasksListMain) {
-		this.tasksList = tasksListMain;
-	}
-
-	@NonNull
-	@Override
-	public AdminCronTasksAdapter.CronTasksViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_admin_cron_tasks, parent, false);
-		return new AdminCronTasksAdapter.CronTasksViewHolder(v);
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull AdminCronTasksAdapter.CronTasksViewHolder holder, int position) {
-
-		Cron currentItem = tasksList.get(position);
-
-		holder.cronTasks = currentItem;
-		holder.taskName.setText(StringUtils.capitalize(currentItem.getName().replace("_", " ")));
-	}
-
-	private static void runCronTask(final Context ctx, final String taskName) {
-
-		Call<Void> call = RetrofitClient.getApiInterface(ctx).adminCronRun(taskName);
-
-		call.enqueue(new Callback<Void>() {
-
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
-
-				switch(response.code()) {
-
-					case 204:
-						Toasty.success(ctx, ctx.getString(R.string.adminCronTaskSuccessMsg, taskName));
-						break;
-
-					case 401:
-						AlertDialogs.authorizationTokenRevokedDialog(ctx);
-						break;
-
-					case 403:
-						Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-						break;
-
-					case 404:
-						Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-						break;
-
-					default:
-						Toasty.error(ctx, ctx.getString(R.string.genericError));
-
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
-	}
-
-	@Override
-	public int getItemCount() {
-		return tasksList.size();
-	}
-
 }

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

@@ -24,7 +24,13 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.*;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.ClickListener;
+import org.mian.gitnex.helpers.ColorInverter;
+import org.mian.gitnex.helpers.LabelWidthCalculator;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.IssueContext;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.ocpsoft.prettytime.PrettyTime;

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

@@ -17,7 +17,11 @@ import com.amulyakhare.textdrawable.util.ColorGenerator;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.*;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.ClickListener;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;

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

@@ -4,7 +4,11 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.*;
+import android.widget.Filter;
+import android.widget.Filterable;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.recyclerview.widget.RecyclerView;

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

@@ -26,7 +26,13 @@ import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.*;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.ClickListener;
+import org.mian.gitnex.helpers.ColorInverter;
+import org.mian.gitnex.helpers.LabelWidthCalculator;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.IssueContext;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;

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

@@ -30,54 +30,12 @@ import java.util.List;
 
 public class MostVisitedReposAdapter extends RecyclerView.Adapter<MostVisitedReposAdapter.MostVisitedViewHolder> {
 
-	private List<Repository> mostVisitedReposList;
 	private final Context ctx;
+	private List<Repository> mostVisitedReposList;
 
-	class MostVisitedViewHolder extends RecyclerView.ViewHolder {
+	public MostVisitedReposAdapter(Context ctx, List<Repository> reposListMain) {
-
+		this.ctx = ctx;
-		private Repository repository;
+		this.mostVisitedReposList = reposListMain;
-
-		private final ImageView image;
-		private final TextView repoName;
-		private final TextView orgName;
-		private final TextView mostVisited;
-		private final ImageView resetCounter;
-
-		private MostVisitedViewHolder(View itemView) {
-
-			super(itemView);
-
-			image = itemView.findViewById(R.id.image);
-			repoName = itemView.findViewById(R.id.repo_name);
-			orgName = itemView.findViewById(R.id.org_name);
-			mostVisited = itemView.findViewById(R.id.most_visited);
-			resetCounter = itemView.findViewById(R.id.reset_counter);
-
-			itemView.setOnClickListener(v -> {
-
-				Context context = v.getContext();
-				RepositoryContext repositoryContext = new RepositoryContext(repository.getRepositoryOwner(), repository.getRepositoryName(), context);
-				Intent intent = repositoryContext.getIntent(context, RepoDetailActivity.class);
-				context.startActivity(intent);
-			});
-
-			resetCounter.setOnClickListener(itemDelete -> {
-
-				MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
-
-				materialAlertDialogBuilder.setTitle(ctx.getString(R.string.reset)).setMessage(ctx.getString(R.string.resetCounterDialogMessage, repository.getRepositoryName()))
-					.setPositiveButton(R.string.reset, (dialog, whichButton) -> {
-
-						int getRepositoryId = repository.getRepositoryId();
-						resetRepositoryCounter(getBindingAdapterPosition());
-
-						RepositoriesApi repositoriesApi = BaseApi.getInstance(ctx, RepositoriesApi.class);
-						assert repositoriesApi != null;
-						repositoriesApi.updateRepositoryMostVisited(0, getRepositoryId);
-					}).setNeutralButton(R.string.cancelButton, null).show();
-			});
-		}
-
 	}
 
 	private void resetRepositoryCounter(int position) {
@@ -88,11 +46,6 @@ public class MostVisitedReposAdapter extends RecyclerView.Adapter<MostVisitedRep
 		Toasty.success(ctx, ctx.getResources().getString(R.string.resetMostReposCounter));
 	}
 
-	public MostVisitedReposAdapter(Context ctx, List<Repository> reposListMain) {
-		this.ctx = ctx;
-		this.mostVisitedReposList = reposListMain;
-	}
-
 	@NonNull
 	@Override
 	public MostVisitedViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -134,4 +87,50 @@ public class MostVisitedReposAdapter extends RecyclerView.Adapter<MostVisitedRep
 		notifyDataChanged();
 	}
 
+	class MostVisitedViewHolder extends RecyclerView.ViewHolder {
+
+		private final ImageView image;
+		private final TextView repoName;
+		private final TextView orgName;
+		private final TextView mostVisited;
+		private final ImageView resetCounter;
+		private Repository repository;
+
+		private MostVisitedViewHolder(View itemView) {
+
+			super(itemView);
+
+			image = itemView.findViewById(R.id.image);
+			repoName = itemView.findViewById(R.id.repo_name);
+			orgName = itemView.findViewById(R.id.org_name);
+			mostVisited = itemView.findViewById(R.id.most_visited);
+			resetCounter = itemView.findViewById(R.id.reset_counter);
+
+			itemView.setOnClickListener(v -> {
+
+				Context context = v.getContext();
+				RepositoryContext repositoryContext = new RepositoryContext(repository.getRepositoryOwner(), repository.getRepositoryName(), context);
+				Intent intent = repositoryContext.getIntent(context, RepoDetailActivity.class);
+				context.startActivity(intent);
+			});
+
+			resetCounter.setOnClickListener(itemDelete -> {
+
+				MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
+
+				materialAlertDialogBuilder.setTitle(ctx.getString(R.string.reset)).setMessage(ctx.getString(R.string.resetCounterDialogMessage, repository.getRepositoryName()))
+					.setPositiveButton(R.string.reset, (dialog, whichButton) -> {
+
+						int getRepositoryId = repository.getRepositoryId();
+						resetRepositoryCounter(getBindingAdapterPosition());
+
+						RepositoriesApi repositoriesApi = BaseApi.getInstance(ctx, RepositoriesApi.class);
+						assert repositoriesApi != null;
+						repositoriesApi.updateRepositoryMostVisited(0, getRepositoryId);
+					}).setNeutralButton(R.string.cancelButton, null).show();
+			});
+		}
+
+	}
+
 }

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

@@ -49,51 +49,6 @@ public class OrganizationTeamRepositoriesAdapter extends RecyclerView.Adapter<Or
 		reposArr = new ArrayList<>();
 	}
 
-	class TeamReposViewHolder extends RecyclerView.ViewHolder {
-
-		private Repository repoInfo;
-
-		private final ImageView repoAvatar;
-		private final TextView name;
-		private final ImageView addRepoButtonAdd;
-
-		private TeamReposViewHolder(View itemView) {
-
-			super(itemView);
-			repoAvatar = itemView.findViewById(R.id.userAvatar);
-			name = itemView.findViewById(R.id.userFullName);
-			itemView.findViewById(R.id.userName).setVisibility(View.GONE);
-			addRepoButtonAdd = itemView.findViewById(R.id.addCollaboratorButtonAdd);
-			ImageView addRepoButtonRemove = itemView.findViewById(R.id.addCollaboratorButtonRemove);
-			//addRepoButtonAdd.setVisibility(View.VISIBLE);
-			//addRepoButtonRemove.setVisibility(View.GONE);
-
-			new Handler(Looper.getMainLooper()).postDelayed(OrganizationTeamRepositoriesAdapter.this::getTeamRepos, 200);
-
-			new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-				if(reposArr.size() > 0) {
-					for(int i = 0; i < reposArr.size(); i++) {
-						if(!reposArr.get(i).getName().equals(repoInfo.getName())) {
-							addRepoButtonAdd.setVisibility(View.VISIBLE);
-						}
-						else {
-							addRepoButtonAdd.setVisibility(View.GONE);
-						}
-					}
-				}
-				else {
-					addRepoButtonAdd.setVisibility(View.VISIBLE);
-				}
-			}, 500);
-
-			addRepoButtonAdd.setOnClickListener(v -> AlertDialogs.addRepoDialog(context, orgName, repoInfo.getName(), Integer.parseInt(String.valueOf(teamId)), teamName));
-
-			addRepoButtonRemove.setOnClickListener(v -> AlertDialogs.removeRepoDialog(context, orgName, repoInfo.getName(), Integer.parseInt(String.valueOf(teamId)), teamName));
-		}
-
-	}
-
 	@NonNull
 	@Override
 	public OrganizationTeamRepositoriesAdapter.TeamReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -152,4 +107,48 @@ public class OrganizationTeamRepositoriesAdapter extends RecyclerView.Adapter<Or
 		}
 	}
 
+	class TeamReposViewHolder extends RecyclerView.ViewHolder {
+
+		private final ImageView repoAvatar;
+		private final TextView name;
+		private final ImageView addRepoButtonAdd;
+		private Repository repoInfo;
+
+		private TeamReposViewHolder(View itemView) {
+
+			super(itemView);
+			repoAvatar = itemView.findViewById(R.id.userAvatar);
+			name = itemView.findViewById(R.id.userFullName);
+			itemView.findViewById(R.id.userName).setVisibility(View.GONE);
+			addRepoButtonAdd = itemView.findViewById(R.id.addCollaboratorButtonAdd);
+			ImageView addRepoButtonRemove = itemView.findViewById(R.id.addCollaboratorButtonRemove);
+			//addRepoButtonAdd.setVisibility(View.VISIBLE);
+			//addRepoButtonRemove.setVisibility(View.GONE);
+
+			new Handler(Looper.getMainLooper()).postDelayed(OrganizationTeamRepositoriesAdapter.this::getTeamRepos, 200);
+
+			new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+				if(reposArr.size() > 0) {
+					for(int i = 0; i < reposArr.size(); i++) {
+						if(!reposArr.get(i).getName().equals(repoInfo.getName())) {
+							addRepoButtonAdd.setVisibility(View.VISIBLE);
+						}
+						else {
+							addRepoButtonAdd.setVisibility(View.GONE);
+						}
+					}
+				}
+				else {
+					addRepoButtonAdd.setVisibility(View.VISIBLE);
+				}
+			}, 500);
+
+			addRepoButtonAdd.setOnClickListener(v -> AlertDialogs.addRepoDialog(context, orgName, repoInfo.getName(), Integer.parseInt(String.valueOf(teamId)), teamName));
+
+			addRepoButtonRemove.setOnClickListener(v -> AlertDialogs.removeRepoDialog(context, orgName, repoInfo.getName(), Integer.parseInt(String.valueOf(teamId)), teamName));
+		}
+
+	}
+
 }

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

@@ -36,47 +36,37 @@ public class OrganizationTeamsAdapter extends RecyclerView.Adapter<OrganizationT
 	private final List<Team> teamListFull;
 	private final OrganizationPermissions permissions;
 	private final String orgName;
+	private final Filter orgTeamsFilter = new Filter() {
+		@Override
+		protected FilterResults performFiltering(CharSequence constraint) {
+			List<Team> filteredList = new ArrayList<>();
 
-	static class OrgTeamsViewHolder extends RecyclerView.ViewHolder {
+			if(constraint == null || constraint.length() == 0) {
+				filteredList.addAll(teamListFull);
+			}
+			else {
+				String filterPattern = constraint.toString().toLowerCase().trim();
 
-		private Team team;
+				for(Team item : teamListFull) {
+					if(item.getName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
+						filteredList.add(item);
+					}
+				}
+			}
 
-		private OrganizationPermissions permissions;
+			FilterResults results = new FilterResults();
-		private final TextView teamTitle;
+			results.values = filteredList;
-		private final TextView teamDescription;
-		private final LinearLayout membersPreviewFrame;
 
-		private final List<User> userInfos;
+			return results;
-		private final OrganizationTeamMembersPreviewAdapter adapter;
-		private String orgName;
-
-		private OrgTeamsViewHolder(View itemView) {
-			super(itemView);
-
-			teamTitle = itemView.findViewById(R.id.teamTitle);
-			teamDescription = itemView.findViewById(R.id.teamDescription);
-			membersPreviewFrame = itemView.findViewById(R.id.membersPreviewFrame);
-
-			RecyclerView membersPreview = itemView.findViewById(R.id.membersPreview);
-
-			userInfos = new ArrayList<>();
-			adapter = new OrganizationTeamMembersPreviewAdapter(itemView.getContext(), userInfos);
-
-			membersPreview.setLayoutManager(new LinearLayoutManager(itemView.getContext(), RecyclerView.HORIZONTAL, false));
-			membersPreview.setAdapter(adapter);
-
-			itemView.setOnClickListener(v -> {
-				Context context = v.getContext();
-
-				Intent intent = new Intent(context, OrganizationTeamInfoActivity.class);
-				intent.putExtra("team", team);
-				intent.putExtra("permissions", permissions);
-				intent.putExtra("orgName", orgName);
-				context.startActivity(intent);
-			});
 		}
 
-	}
+		@Override
+		protected void publishResults(CharSequence constraint, FilterResults results) {
+			teamList.clear();
+			teamList.addAll((List<Team>) results.values);
+			notifyDataSetChanged();
+		}
+	};
 
 	public OrganizationTeamsAdapter(Context ctx, List<Team> teamListMain, OrganizationPermissions permissions, String orgName) {
 		this.context = ctx;
@@ -144,36 +134,43 @@ public class OrganizationTeamsAdapter extends RecyclerView.Adapter<OrganizationT
 		return orgTeamsFilter;
 	}
 
-	private final Filter orgTeamsFilter = new Filter() {
+	static class OrgTeamsViewHolder extends RecyclerView.ViewHolder {
-		@Override
-		protected FilterResults performFiltering(CharSequence constraint) {
-			List<Team> filteredList = new ArrayList<>();
 
-			if(constraint == null || constraint.length() == 0) {
+		private final TextView teamTitle;
-				filteredList.addAll(teamListFull);
+		private final TextView teamDescription;
-			}
+		private final LinearLayout membersPreviewFrame;
-			else {
+		private final List<User> userInfos;
-				String filterPattern = constraint.toString().toLowerCase().trim();
+		private final OrganizationTeamMembersPreviewAdapter adapter;
+		private Team team;
+		private OrganizationPermissions permissions;
+		private String orgName;
 
-				for(Team item : teamListFull) {
+		private OrgTeamsViewHolder(View itemView) {
-					if(item.getName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
+			super(itemView);
-						filteredList.add(item);
-					}
-				}
-			}
 
-			FilterResults results = new FilterResults();
+			teamTitle = itemView.findViewById(R.id.teamTitle);
-			results.values = filteredList;
+			teamDescription = itemView.findViewById(R.id.teamDescription);
+			membersPreviewFrame = itemView.findViewById(R.id.membersPreviewFrame);
 
-			return results;
+			RecyclerView membersPreview = itemView.findViewById(R.id.membersPreview);
+
+			userInfos = new ArrayList<>();
+			adapter = new OrganizationTeamMembersPreviewAdapter(itemView.getContext(), userInfos);
+
+			membersPreview.setLayoutManager(new LinearLayoutManager(itemView.getContext(), RecyclerView.HORIZONTAL, false));
+			membersPreview.setAdapter(adapter);
+
+			itemView.setOnClickListener(v -> {
+				Context context = v.getContext();
+
+				Intent intent = new Intent(context, OrganizationTeamInfoActivity.class);
+				intent.putExtra("team", team);
+				intent.putExtra("permissions", permissions);
+				intent.putExtra("orgName", orgName);
+				context.startActivity(intent);
+			});
 		}
 
-		@Override
+	}
-		protected void publishResults(CharSequence constraint, FilterResults results) {
-			teamList.clear();
-			teamList.addAll((List<Team>) results.values);
-			notifyDataSetChanged();
-		}
-	};
 
 }

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

@@ -26,7 +26,13 @@ import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.*;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.ClickListener;
+import org.mian.gitnex.helpers.ColorInverter;
+import org.mian.gitnex.helpers.LabelWidthCalculator;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.IssueContext;
 import java.util.List;
 import java.util.Locale;

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

@@ -23,7 +23,13 @@ import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.FragmentReleasesBinding;
-import org.mian.gitnex.helpers.*;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.ClickListener;
+import org.mian.gitnex.helpers.Markdown;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.structs.FragmentRefreshListener;
 import java.util.List;
 import java.util.Locale;

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

@@ -17,7 +17,11 @@ import com.amulyakhare.textdrawable.util.ColorGenerator;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.*;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.ClickListener;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;

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

@@ -7,7 +7,11 @@ import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.*;
+import android.widget.CheckBox;
+import android.widget.Filter;
+import android.widget.Filterable;
+import android.widget.ImageView;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
@@ -15,7 +19,11 @@ import com.amulyakhare.textdrawable.util.ColorGenerator;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.*;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.ClickListener;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;

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

@@ -30,34 +30,40 @@ public class UserGridAdapter extends BaseAdapter implements Filterable {
 	private final List<User> membersList;
 	private final Context context;
 	private final List<User> membersListFull;
+	private final Filter membersFilter = new Filter() {
+		@Override
+		protected FilterResults performFiltering(CharSequence constraint) {
+			List<User> filteredList = new ArrayList<>();
 
-	private class ViewHolder {
+			if(constraint == null || constraint.length() == 0) {
 
-		private String userLoginId;
+				filteredList.addAll(membersListFull);
+			}
+			else {
 
-		private final ImageView memberAvatar;
+				String filterPattern = constraint.toString().toLowerCase().trim();
-		private final TextView memberName;
-		private final TextView userName;
 
-		ViewHolder(View v) {
+				for(User item : membersListFull) {
+					if(item.getFullName().toLowerCase().contains(filterPattern) || item.getLogin().toLowerCase().contains(filterPattern)) {
+						filteredList.add(item);
+					}
+				}
+			}
 
-			memberAvatar = v.findViewById(R.id.userAvatarImageView);
+			FilterResults results = new FilterResults();
-			memberName = v.findViewById(R.id.userNameTv);
+			results.values = filteredList;
-			userName = v.findViewById(R.id.userName);
 
-			v.setOnClickListener(loginId -> {
+			return results;
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", userLoginId);
-				context.startActivity(intent);
-			});
-
-			v.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-				return true;
-			});
 		}
 
-	}
+		@Override
+		protected void publishResults(CharSequence constraint, FilterResults results) {
+
+			membersList.clear();
+			membersList.addAll((List) results.values);
+			notifyDataSetChanged();
+		}
+	};
 
 	public UserGridAdapter(Context ctx, List<User> membersListMain) {
 
@@ -129,39 +135,31 @@ public class UserGridAdapter extends BaseAdapter implements Filterable {
 		return membersFilter;
 	}
 
-	private final Filter membersFilter = new Filter() {
+	private class ViewHolder {
-		@Override
-		protected FilterResults performFiltering(CharSequence constraint) {
-			List<User> filteredList = new ArrayList<>();
 
-			if(constraint == null || constraint.length() == 0) {
+		private final ImageView memberAvatar;
+		private final TextView memberName;
+		private final TextView userName;
+		private String userLoginId;
 
-				filteredList.addAll(membersListFull);
+		ViewHolder(View v) {
-			}
-			else {
 
-				String filterPattern = constraint.toString().toLowerCase().trim();
+			memberAvatar = v.findViewById(R.id.userAvatarImageView);
+			memberName = v.findViewById(R.id.userNameTv);
+			userName = v.findViewById(R.id.userName);
 
-				for(User item : membersListFull) {
+			v.setOnClickListener(loginId -> {
-					if(item.getFullName().toLowerCase().contains(filterPattern) || item.getLogin().toLowerCase().contains(filterPattern)) {
+				Intent intent = new Intent(context, ProfileActivity.class);
-						filteredList.add(item);
+				intent.putExtra("username", userLoginId);
-					}
+				context.startActivity(intent);
-				}
+			});
-			}
 
-			FilterResults results = new FilterResults();
+			v.setOnLongClickListener(loginId -> {
-			results.values = filteredList;
+				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-
+				return true;
-			return results;
+			});
 		}
 
-		@Override
+	}
-		protected void publishResults(CharSequence constraint, FilterResults results) {
-
-			membersList.clear();
-			membersList.addAll((List) results.values);
-			notifyDataSetChanged();
-		}
-	};
 
 }

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

@@ -13,7 +13,11 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.IssueActions;
 import org.mian.gitnex.actions.PullRequestActions;
-import org.mian.gitnex.activities.*;
+import org.mian.gitnex.activities.BaseActivity;
+import org.mian.gitnex.activities.DiffActivity;
+import org.mian.gitnex.activities.EditIssueActivity;
+import org.mian.gitnex.activities.IssueDetailActivity;
+import org.mian.gitnex.activities.MergePullRequestActivity;
 import org.mian.gitnex.databinding.BottomSheetSingleIssueBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;

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

@@ -22,7 +22,13 @@ import org.mian.gitnex.adapters.DiffFilesAdapter;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.FragmentCommitDetailsBinding;
-import org.mian.gitnex.helpers.*;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.FileDiffView;
+import org.mian.gitnex.helpers.ParseDiff;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.IssueContext;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import java.util.ArrayList;

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

@@ -3,7 +3,12 @@ package org.mian.gitnex.fragments;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;

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

@@ -4,7 +4,12 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;

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

@@ -4,7 +4,12 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;

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

@@ -4,7 +4,12 @@ import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;

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

@@ -4,7 +4,12 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

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

@@ -5,7 +5,12 @@ import android.content.res.ColorStateList;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.text.Html;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;

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

@@ -4,7 +4,12 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;

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

@@ -4,7 +4,12 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;

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

@@ -3,7 +3,12 @@ package org.mian.gitnex.fragments;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;

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

@@ -4,7 +4,12 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;

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

@@ -5,7 +5,12 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;

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

@@ -5,7 +5,12 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

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

@@ -16,10 +16,21 @@ import org.gitnex.tea4j.v2.models.Organization;
 import org.gitnex.tea4j.v2.models.Repository;
 import org.jetbrains.annotations.NotNull;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.*;
+import org.mian.gitnex.activities.OrganizationDetailActivity;
+import org.mian.gitnex.activities.ProfileActivity;
+import org.mian.gitnex.activities.RepoDetailActivity;
+import org.mian.gitnex.activities.RepoForksActivity;
+import org.mian.gitnex.activities.RepoStargazersActivity;
+import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.FragmentRepoInfoBinding;
-import org.mian.gitnex.helpers.*;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.ClickListener;
+import org.mian.gitnex.helpers.Markdown;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import java.io.IOException;
 import java.util.Locale;

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

@@ -4,7 +4,12 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;

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

@@ -13,7 +13,15 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.*;
+import org.mian.gitnex.activities.BaseActivity;
+import org.mian.gitnex.activities.MainActivity;
+import org.mian.gitnex.activities.SettingsAppearanceActivity;
+import org.mian.gitnex.activities.SettingsDraftsActivity;
+import org.mian.gitnex.activities.SettingsGeneralActivity;
+import org.mian.gitnex.activities.SettingsNotificationsActivity;
+import org.mian.gitnex.activities.SettingsReportsActivity;
+import org.mian.gitnex.activities.SettingsSecurityActivity;
+import org.mian.gitnex.activities.SettingsTranslationActivity;
 import org.mian.gitnex.databinding.CustomAboutDialogBinding;
 import org.mian.gitnex.databinding.FragmentSettingsBinding;
 import org.mian.gitnex.helpers.AppUtil;

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

@@ -4,7 +4,12 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;

app/src/main/java/org/mian/gitnex/fragments/profile/DetailFragment.java

@@ -12,7 +12,14 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.FragmentProfileDetailBinding;
-import org.mian.gitnex.helpers.*;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.ClickListener;
+import org.mian.gitnex.helpers.ColorInverter;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
 import java.util.Locale;
 import jp.wasabeef.picasso.transformations.BlurTransformation;
 import retrofit2.Call;

app/src/main/java/org/mian/gitnex/fragments/profile/FollowersFragment.java

@@ -4,7 +4,12 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

app/src/main/java/org/mian/gitnex/fragments/profile/FollowingFragment.java

@@ -4,7 +4,12 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

app/src/main/java/org/mian/gitnex/fragments/profile/OrganizationsFragment.java

@@ -4,7 +4,12 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

app/src/main/java/org/mian/gitnex/fragments/profile/RepositoriesFragment.java

@@ -4,7 +4,12 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

app/src/main/java/org/mian/gitnex/fragments/profile/StarredRepositoriesFragment.java

@@ -4,7 +4,12 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

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

@@ -1,7 +1,11 @@
 package org.mian.gitnex.helpers;
 
 import android.app.Activity;
-import android.content.*;
+import android.content.ActivityNotFoundException;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
@@ -32,7 +36,12 @@ import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

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

@@ -10,7 +10,12 @@ import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import org.commonmark.ext.gfm.tables.TableBlock;
-import org.commonmark.node.*;
+import org.commonmark.node.AbstractVisitor;
+import org.commonmark.node.FencedCodeBlock;
+import org.commonmark.node.Image;
+import org.commonmark.node.Link;
+import org.commonmark.node.Node;
+import org.commonmark.node.Text;
 import org.commonmark.parser.InlineParserFactory;
 import org.commonmark.parser.Parser;
 import org.commonmark.parser.PostProcessor;
@@ -55,7 +60,13 @@ import io.noties.markwon.recycler.SimpleEntry;
 import io.noties.markwon.recycler.table.TableEntry;
 import io.noties.markwon.recycler.table.TableEntryPlugin;
 import io.noties.prism4j.Prism4j;
-import stormpot.*;
+import stormpot.Allocator;
+import stormpot.BlazePool;
+import stormpot.Config;
+import stormpot.Pool;
+import stormpot.Poolable;
+import stormpot.Slot;
+import stormpot.Timeout;
 
 /**
  * @author opyale

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

@@ -6,7 +6,12 @@ import android.graphics.BitmapFactory;
 import android.util.Log;
 import com.squareup.picasso.Cache;
 import org.mian.gitnex.R;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;

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

@@ -1,6 +1,11 @@
 package org.mian.gitnex.helpers;
 
-import android.graphics.*;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.graphics.Shader;
 
 /**
  * @author M M Arif

app/src/main/java/org/mian/gitnex/notifications/Notifications.java

@@ -5,7 +5,11 @@ import android.app.NotificationManager;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
-import androidx.work.*;
+import androidx.work.Constraints;
+import androidx.work.ExistingPeriodicWorkPolicy;
+import androidx.work.NetworkType;
+import androidx.work.PeriodicWorkRequest;
+import androidx.work.WorkManager;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.TinyDB;

app/src/main/res/layout/activity_add_collaborator_to_repository.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
+    android:layout_width="match_parent"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
-    android:background="?attr/primaryBackgroundColor">
+    android:background="?attr/primaryBackgroundColor"
+    android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="@dimen/dimen0dp"
+        android:theme="@style/Widget.AppCompat.SearchView"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        app:elevation="@dimen/dimen0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/dimen26dp"
                 android:layout_height="@dimen/dimen26dp"
-                android:layout_marginEnd="@dimen/dimen16dp"
                 android:layout_marginStart="@dimen/dimen16dp"
-                android:gravity="center_vertical"
+                android:layout_marginEnd="@dimen/dimen16dp"
-                android:contentDescription="@string/close"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:focusable="true"
                 android:clickable="true"
-                android:src="@drawable/ic_close"/>
+                android:contentDescription="@string/close"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
+                android:maxLines="1"
                 android:text="@string/collaborator"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
+                android:textSize="@dimen/dimen20sp" />
-                android:textSize="@dimen/dimen20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -48,48 +48,48 @@
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progressBar"
+        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:indeterminate="true"
-        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
         android:visibility="gone"
-        app:indicatorColor="?attr/progressIndicatorColor"/>
+        app:indicatorColor="?attr/progressIndicatorColor" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dimen10dp"
-        android:layout_marginEnd="@dimen/dimen10dp"
         android:layout_marginTop="@dimen/dimen10dp"
+        android:layout_marginEnd="@dimen/dimen10dp"
         android:layout_marginBottom="@dimen/dimen10dp">
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/addCollaboratorSearchLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:boxBackgroundColor="?attr/inputBackgroundColor"
-            android:textColorHint="?attr/hintColor"
-            app:hintTextColor="?attr/hintColor"
-            app:boxStrokeErrorColor="@color/darkRed"
             android:layout_marginTop="@dimen/dimen8dp"
             android:layout_marginBottom="@dimen/dimen8dp"
-            app:startIconDrawable="@drawable/ic_search"
+            android:hint="@string/addCollaboratorSearchHint"
-            app:startIconTint="?attr/iconsColor"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            app:boxStrokeErrorColor="@color/darkRed"
             app:endIconMode="clear_text"
             app:endIconTint="?attr/iconsColor"
-            android:hint="@string/addCollaboratorSearchHint">
+            app:hintTextColor="?attr/hintColor"
+            app:startIconDrawable="@drawable/ic_search"
+            app:startIconTint="?attr/iconsColor">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/addCollaboratorSearch"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:imeOptions="actionSend"
+                android:inputType="text"
+                android:singleLine="true"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:singleLine="true"
+                android:textSize="@dimen/dimen16sp" />
-                android:imeOptions="actionSend"
-                android:inputType="text"
-                android:textSize="@dimen/dimen16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -104,7 +104,7 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="@dimen/dimen20sp"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -115,7 +115,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerViewUserSearch"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent" />
 
     </FrameLayout>
 

app/src/main/res/layout/activity_add_new_account.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/layoutNewAccount"
     android:layout_width="match_parent"
@@ -30,7 +29,7 @@
                 android:layout_marginEnd="@dimen/dimen16dp"
                 android:contentDescription="@string/close"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_arrow_back"/>
+                android:src="@drawable/ic_arrow_back" />
 
             <TextView
                 android:id="@+id/toolbarTitle"
@@ -43,7 +42,7 @@
                 android:singleLine="true"
                 android:text="@string/addNewAccount"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -77,7 +76,7 @@
                 android:inputType="none"
                 android:labelFor="@+id/protocolSpinner"
                 android:textColor="?attr/inputTextColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -106,7 +105,7 @@
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -135,7 +134,7 @@
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -147,7 +146,7 @@
             android:text="@string/addNewAccountText"
             android:textColor="@color/btnTextColor"
             android:textSize="@dimen/dimen16sp"
-            android:textStyle="bold"/>
+            android:textStyle="bold" />
 
     </LinearLayout>
 

app/src/main/res/layout/activity_add_new_team_member.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
+    android:layout_width="match_parent"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
-    android:background="?attr/primaryBackgroundColor">
+    android:background="?attr/primaryBackgroundColor"
+    android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="@dimen/dimen0dp"
+        android:theme="@style/Widget.AppCompat.SearchView"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        app:elevation="@dimen/dimen0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/dimen26dp"
                 android:layout_height="@dimen/dimen26dp"
-                android:layout_marginEnd="@dimen/dimen16dp"
                 android:layout_marginStart="@dimen/dimen16dp"
-                android:gravity="center_vertical"
+                android:layout_marginEnd="@dimen/dimen16dp"
-                android:contentDescription="@string/close"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:focusable="true"
                 android:clickable="true"
-                android:src="@drawable/ic_close"/>
+                android:contentDescription="@string/close"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
+                android:maxLines="1"
                 android:text="@string/addRemove"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
+                android:textSize="@dimen/dimen20sp" />
-                android:textSize="@dimen/dimen20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -48,47 +48,47 @@
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progress_bar"
+        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
         android:indeterminate="true"
-        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
+        android:visibility="gone"
-        app:indicatorColor="?attr/progressIndicatorColor"/>
+        app:indicatorColor="?attr/progressIndicatorColor" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dimen10dp"
-        android:layout_marginEnd="@dimen/dimen10dp"
         android:layout_marginTop="@dimen/dimen10dp"
+        android:layout_marginEnd="@dimen/dimen10dp"
         android:layout_marginBottom="@dimen/dimen10dp">
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/addNewTeamMemberLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:boxBackgroundColor="?attr/inputBackgroundColor"
-            android:textColorHint="?attr/hintColor"
-            app:hintTextColor="?attr/hintColor"
-            app:boxStrokeErrorColor="@color/darkRed"
             android:layout_marginTop="@dimen/dimen8dp"
             android:layout_marginBottom="@dimen/dimen8dp"
-            app:startIconDrawable="@drawable/ic_search"
+            android:hint="@string/addCollaboratorSearchHint"
-            app:startIconTint="?attr/iconsColor"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            app:boxStrokeErrorColor="@color/darkRed"
             app:endIconMode="clear_text"
             app:endIconTint="?attr/iconsColor"
-            android:hint="@string/addCollaboratorSearchHint">
+            app:hintTextColor="?attr/hintColor"
+            app:startIconDrawable="@drawable/ic_search"
+            app:startIconTint="?attr/iconsColor">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/addNewTeamMember"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:inputType="text"
+                android:singleLine="true"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:singleLine="true"
+                android:textSize="@dimen/dimen16sp" />
-                android:inputType="text"
-                android:textSize="@dimen/dimen16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -103,7 +103,7 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="@dimen/dimen20sp"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -114,7 +114,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerViewUserSearch"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent" />
 
     </FrameLayout>
 

app/src/main/res/layout/activity_admin_cron_tasks.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
@@ -10,8 +10,8 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="@dimen/dimen0dp"
+        android:theme="@style/Widget.AppCompat.SearchView"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        app:elevation="@dimen/dimen0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/dimen26dp"
                 android:layout_height="@dimen/dimen26dp"
-                android:layout_marginEnd="@dimen/dimen16dp"
                 android:layout_marginStart="@dimen/dimen16dp"
-                android:gravity="center_vertical"
+                android:layout_marginEnd="@dimen/dimen16dp"
-                android:contentDescription="@string/close"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:focusable="true"
                 android:clickable="true"
-                android:src="@drawable/ic_close"/>
+                android:contentDescription="@string/close"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbarTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
+                android:maxLines="1"
                 android:text="@string/adminCron"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
+                android:textSize="@dimen/dimen20sp" />
-                android:textSize="@dimen/dimen20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -49,8 +49,8 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/primaryBackgroundColor"
         android:layout_marginTop="@dimen/dimen56dp"
+        android:background="?attr/primaryBackgroundColor"
         android:padding="@dimen/dimen8dp">
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -61,7 +61,7 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
+                android:layout_height="match_parent" />
 
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
@@ -69,12 +69,12 @@
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progress_bar"
+        style="@style/Widget.Material3.LinearProgressIndicator"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dimen56dp"
         android:indeterminate="true"
-        style="@style/Widget.Material3.LinearProgressIndicator"
+        app:indicatorColor="?attr/progressIndicatorColor" />
-        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noData"
@@ -85,6 +85,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="@dimen/dimen20sp"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
 </RelativeLayout>

app/src/main/res/layout/activity_admin_get_users.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="?attr/primaryBackgroundColor"
-    android:orientation="vertical"
+    android:orientation="vertical">
-    android:background="?attr/primaryBackgroundColor">
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -15,13 +15,13 @@
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/pull_to_refresh"
             android:layout_width="match_parent"
-            android:layout_marginTop="@dimen/dimen56dp"
+            android:layout_height="wrap_content"
-            android:layout_height="wrap_content">
+            android:layout_marginTop="@dimen/dimen56dp">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
+                android:layout_height="match_parent" />
 
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
@@ -31,8 +31,8 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="@dimen/dimen0dp"
+        android:theme="@style/Widget.AppCompat.SearchView"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        app:elevation="@dimen/dimen0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -44,27 +44,27 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/dimen26dp"
                 android:layout_height="@dimen/dimen26dp"
-                android:layout_marginEnd="@dimen/dimen16dp"
                 android:layout_marginStart="@dimen/dimen16dp"
-                android:gravity="center_vertical"
+                android:layout_marginEnd="@dimen/dimen16dp"
-                android:contentDescription="@string/close"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:focusable="true"
                 android:clickable="true"
-                android:src="@drawable/ic_close"/>
+                android:contentDescription="@string/close"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:text="@string/adminUsers"
+                android:layout_marginEnd="@dimen/dimen20dp"
-                android:textColor="?attr/primaryTextColor"
                 android:ellipsize="none"
                 android:scrollbars="horizontal"
                 android:singleLine="true"
-                android:layout_marginEnd="@dimen/dimen20dp"
+                android:text="@string/adminUsers"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -72,12 +72,12 @@
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progress_bar"
+        style="@style/Widget.Material3.LinearProgressIndicator"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dimen56dp"
         android:indeterminate="true"
-        style="@style/Widget.Material3.LinearProgressIndicator"
+        app:indicatorColor="?attr/progressIndicatorColor" />
-        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/no_data_users"
@@ -88,6 +88,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="@dimen/dimen20sp"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
 </RelativeLayout>

app/src/main/res/layout/activity_code_editor.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -40,7 +40,7 @@
                 android:maxLines="1"
                 android:text="@string/codeEditor"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -57,7 +57,7 @@
         android:dropDownHorizontalOffset="@dimen/dimen0dp"
         android:dropDownSelector="@color/colorPrimary"
         android:gravity="top|start"
-        android:textSize="@dimen/dimen14sp"/>
+        android:textSize="@dimen/dimen14sp" />
 
     <RelativeLayout
         android:id="@+id/source_info_layout"
@@ -75,7 +75,7 @@
             android:gravity="center"
             android:textColor="@color/colorAccent"
             android:textSize="@dimen/dimen14sp"
-            tools:text="Java"/>
+            tools:text="Java" />
 
         <TextView
             android:id="@+id/source_position"
@@ -87,7 +87,7 @@
             android:textColor="@color/colorAccent"
             android:textSize="@dimen/dimen14sp"
             tools:ignore="RelativeOverlap"
-            tools:text="0:0"/>
+            tools:text="0:0" />
     </RelativeLayout>
 
 </RelativeLayout>

app/src/main/res/layout/activity_commit_details.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -8,6 +7,6 @@
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/primaryBackgroundColor"/>
+        android:background="?attr/primaryBackgroundColor" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_commits.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -43,7 +43,7 @@
                 android:singleLine="true"
                 android:text="@string/commitTitle"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -52,8 +52,8 @@
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/pullToRefresh"
         android:layout_width="match_parent"
-        android:layout_marginTop="@dimen/dimen56dp"
+        android:layout_height="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_marginTop="@dimen/dimen56dp">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -64,7 +64,7 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
+                android:layout_height="match_parent" />
 
         </RelativeLayout>
 
@@ -77,7 +77,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dimen56dp"
         android:indeterminate="true"
-        app:indicatorColor="?attr/progressIndicatorColor"/>
+        app:indicatorColor="?attr/progressIndicatorColor" />
 
     <TextView
         android:id="@+id/noDataCommits"
@@ -88,6 +88,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="@dimen/dimen20sp"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
 </RelativeLayout>

app/src/main/res/layout/activity_create_file.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbarTitle"
@@ -40,7 +40,7 @@
                 android:maxLines="1"
                 android:text="@string/pageTitleNewFile"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -83,7 +83,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -111,7 +111,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen14sp"/>
+                    android:textSize="@dimen/dimen14sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -124,7 +124,7 @@
                 android:layout_marginBottom="@dimen/dimen8dp"
                 android:text="@string/openInCodeEditor"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen14sp"/>
+                android:textSize="@dimen/dimen14sp" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/newFileBranchesLayout"
@@ -152,7 +152,7 @@
                     android:labelFor="@id/new_file_branches"
                     android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -182,7 +182,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -193,7 +193,7 @@
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newFileButtonCopy"
                 android:textColor="@color/btnTextColor"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
         </LinearLayout>
 

app/src/main/res/layout/activity_create_issue.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -40,7 +40,7 @@
                 android:maxLines="1"
                 android:text="@string/pageTitleCreateNewIssue"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -53,7 +53,7 @@
         android:layout_height="wrap_content"
         android:indeterminate="true"
         android:visibility="gone"
-        app:indicatorColor="?attr/progressIndicatorColor"/>
+        app:indicatorColor="?attr/progressIndicatorColor" />
 
     <ScrollView
         android:layout_width="match_parent"
@@ -93,7 +93,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -121,7 +121,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -144,7 +144,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -168,7 +168,7 @@
                     android:inputType="none"
                     android:labelFor="@+id/newIssueMilestoneSpinner"
                     android:textColor="?attr/inputTextColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -191,7 +191,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -218,7 +218,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -229,7 +229,7 @@
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
                 android:textColor="@color/btnTextColor"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
         </LinearLayout>
 

app/src/main/res/layout/activity_create_label.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -40,7 +40,7 @@
                 android:maxLines="1"
                 android:text="@string/pageTitleCreateLabel"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -73,7 +73,7 @@
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -92,7 +92,7 @@
                 android:gravity="center_vertical"
                 android:text="@string/labelColor"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
             <com.google.android.material.card.MaterialCardView
                 style="?attr/materialCardViewFilledStyle"
@@ -105,7 +105,7 @@
                     android:id="@+id/colorPicker"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="@color/releasePre"/>
+                    android:background="@color/releasePre" />
 
             </com.google.android.material.card.MaterialCardView>
 
@@ -118,7 +118,7 @@
             android:layout_marginTop="@dimen/dimen8dp"
             android:text="@string/newCreateButtonCopy"
             android:textColor="@color/btnTextColor"
-            android:textStyle="bold"/>
+            android:textStyle="bold" />
 
     </LinearLayout>
 

app/src/main/res/layout/activity_create_milestone.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -40,7 +40,7 @@
                 android:maxLines="1"
                 android:text="@string/pageTitleCreateMilestone"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -81,7 +81,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -112,7 +112,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -139,7 +139,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -150,7 +150,7 @@
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
                 android:textColor="@color/btnTextColor"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
         </LinearLayout>
 

app/src/main/res/layout/activity_create_new_user.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -40,7 +40,7 @@
                 android:maxLines="1"
                 android:text="@string/adminCreateNewUser"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -81,7 +81,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -108,7 +108,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -135,7 +135,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -161,7 +161,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -172,7 +172,7 @@
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
                 android:textColor="@color/btnTextColor"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
         </LinearLayout>
 

app/src/main/res/layout/activity_create_organization.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -40,7 +40,7 @@
                 android:maxLines="1"
                 android:text="@string/pageTitleCreateOrganization"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -81,7 +81,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -112,7 +112,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -123,7 +123,7 @@
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
                 android:textColor="@color/btnTextColor"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
         </LinearLayout>
 

app/src/main/res/layout/activity_create_pr.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbarTitle"
@@ -40,7 +40,7 @@
                 android:maxLines="1"
                 android:text="@string/pageTitleNewPullRequest"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -53,7 +53,7 @@
         android:layout_height="wrap_content"
         android:indeterminate="true"
         android:visibility="gone"
-        app:indicatorColor="?attr/progressIndicatorColor"/>
+        app:indicatorColor="?attr/progressIndicatorColor" />
 
     <ScrollView
         android:layout_width="match_parent"
@@ -93,7 +93,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -121,7 +121,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -145,7 +145,7 @@
                     android:inputType="none"
                     android:labelFor="@+id/mergeIntoBranchSpinner"
                     android:textColor="?attr/inputTextColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -169,7 +169,7 @@
                     android:inputType="none"
                     android:labelFor="@+id/pullFromBranchSpinner"
                     android:textColor="?attr/inputTextColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -193,7 +193,7 @@
                     android:inputType="none"
                     android:labelFor="@+id/milestonesSpinner"
                     android:textColor="?attr/inputTextColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -216,7 +216,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -243,7 +243,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -254,7 +254,7 @@
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
                 android:textColor="@color/btnTextColor"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
         </LinearLayout>
 

app/src/main/res/layout/activity_create_release.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -40,7 +40,7 @@
                 android:maxLines="1"
                 android:text="@string/createRelease"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -81,7 +81,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -109,7 +109,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -137,7 +137,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -161,7 +161,7 @@
                     android:inputType="none"
                     android:labelFor="@+id/releaseBranch"
                     android:textColor="?attr/inputTextColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -173,7 +173,7 @@
                 android:checked="false"
                 android:text="@string/releaseTypeText"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
             <CheckBox
                 android:id="@+id/releaseDraft"
@@ -183,7 +183,7 @@
                 android:checked="false"
                 android:text="@string/releaseDraftText"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/createNewRelease"
@@ -192,7 +192,7 @@
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
                 android:textColor="@color/btnTextColor"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/createNewTag"
@@ -201,7 +201,7 @@
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/create_tag"
                 android:textColor="@color/btnTextColor"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
         </LinearLayout>
 

app/src/main/res/layout/activity_create_repo.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -40,7 +40,7 @@
                 android:maxLines="1"
                 android:text="@string/pageTitleNewRepo"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -77,7 +77,7 @@
                     android:inputType="none"
                     android:labelFor="@+id/ownerSpinner"
                     android:textColor="?attr/inputTextColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -103,7 +103,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -133,7 +133,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -145,7 +145,7 @@
                 android:checked="true"
                 android:text="@string/newRepoPrivateCopy"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/createNewRepoButton"
@@ -154,7 +154,7 @@
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
                 android:textColor="@color/btnTextColor"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
         </LinearLayout>
 

app/src/main/res/layout/activity_create_team_by_org.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -40,7 +40,7 @@
                 android:maxLines="1"
                 android:text="@string/pageTitleCreateTeam"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -81,7 +81,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -111,7 +111,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -136,7 +136,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -147,7 +147,7 @@
                 android:gravity="start"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="@dimen/dimen12sp"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/teamAccessControlsLayout"
@@ -170,7 +170,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -178,7 +178,7 @@
                 android:id="@+id/teamAccessControlsArray"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/createTeamButton"
@@ -187,7 +187,7 @@
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
                 android:textColor="@color/btnTextColor"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
         </LinearLayout>
 

app/src/main/res/layout/activity_deeplinks.xml

@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:indeterminate="true"
-        app:indicatorColor="?attr/progressIndicatorColor"/>
+        app:indicatorColor="?attr/progressIndicatorColor" />
 
     <ScrollView
         android:layout_width="match_parent"
@@ -41,7 +41,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/accountDoesNotExist"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/addNewAccount"
@@ -51,7 +51,7 @@
                     android:text="@string/addNewAccountText"
                     android:textColor="@color/btnTextColor"
                     android:textSize="@dimen/dimen16sp"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/openInBrowser"
@@ -60,7 +60,7 @@
                     android:layout_marginTop="@dimen/dimen8dp"
                     android:text="@string/openWebRepo"
                     android:textColor="@color/btnTextColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/launchApp"
@@ -70,7 +70,7 @@
                     android:text="@string/launchApp"
                     android:textColor="@color/btnTextColor"
                     android:textSize="@dimen/dimen16sp"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
 
             </LinearLayout>
 
@@ -91,7 +91,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/noActionText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/repository"
@@ -101,7 +101,7 @@
                     android:text="@string/navRepos"
                     android:textColor="@color/btnTextColor"
                     android:textSize="@dimen/dimen16sp"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/organization"
@@ -111,7 +111,7 @@
                     android:text="@string/navOrg"
                     android:textColor="@color/btnTextColor"
                     android:textSize="@dimen/dimen16sp"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/notification"
@@ -121,7 +121,7 @@
                     android:text="@string/pageTitleNotifications"
                     android:textColor="@color/btnTextColor"
                     android:textSize="@dimen/dimen16sp"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/explore"
@@ -131,7 +131,7 @@
                     android:text="@string/pageTitleExplore"
                     android:textColor="@color/btnTextColor"
                     android:textSize="@dimen/dimen16sp"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/launchApp2"
@@ -141,7 +141,7 @@
                     android:text="@string/launchApp"
                     android:textColor="@color/btnTextColor"
                     android:textSize="@dimen/dimen16sp"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
 
             </LinearLayout>
 

app/src/main/res/layout/activity_diff.xml

@@ -8,6 +8,6 @@
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
 </LinearLayout>

app/src/main/res/layout/activity_edit_issue.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -40,7 +40,7 @@
                 android:maxLines="1"
                 android:text="@string/editIssueNavHeader"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -81,7 +81,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -109,7 +109,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -133,7 +133,7 @@
                     android:inputType="none"
                     android:labelFor="@+id/editIssueMilestoneSpinner"
                     android:textColor="?attr/inputTextColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -160,7 +160,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -171,7 +171,7 @@
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/saveButton"
                 android:textColor="@color/btnTextColor"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
         </LinearLayout>
 

app/src/main/res/layout/activity_file_view.xml

@@ -31,7 +31,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -44,7 +44,7 @@
                 android:singleLine="true"
                 android:text="@string/defaultFilename"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -56,7 +56,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:indeterminate="true"
-        app:indicatorColor="?attr/progressIndicatorColor"/>
+        app:indicatorColor="?attr/progressIndicatorColor" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -83,7 +83,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="?attr/primaryTextColor"
                     android:textIsSelectable="true"
-                    android:textSize="@dimen/dimen14sp"/>
+                    android:textSize="@dimen/dimen14sp" />
 
                 <TextView
                     android:id="@+id/markdownTv"
@@ -92,7 +92,7 @@
                     android:textColor="?attr/primaryTextColor"
                     android:textIsSelectable="true"
                     android:textSize="@dimen/dimen14sp"
-                    android:visibility="gone"/>
+                    android:visibility="gone" />
 
             </LinearLayout>
 
@@ -101,14 +101,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
-                tools:visibility="visible"/>
+                tools:visibility="visible" />
 
             <com.github.chrisbanes.photoview.PhotoView
                 android:id="@+id/photo_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="@dimen/dimen16dp"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
         </LinearLayout>
 

app/src/main/res/layout/activity_login.xml

@@ -23,7 +23,7 @@
             android:layout_marginBottom="@dimen/dimen20dp"
             android:baselineAligned="false"
             android:contentDescription="@string/appName"
-            android:src="@mipmap/app_logo"/>
+            android:src="@mipmap/app_logo" />
 
         <TextView
             android:layout_width="match_parent"
@@ -32,7 +32,7 @@
             android:gravity="start"
             android:text="@string/loginMethodText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen12sp"/>
+            android:textSize="@dimen/dimen12sp" />
 
         <RadioGroup
             android:id="@+id/loginMethod"
@@ -48,14 +48,14 @@
                 android:layout_height="@dimen/dimen36dp"
                 android:checked="true"
                 android:text="@string/copyToken"
-                android:textColor="?attr/primaryTextColor"/>
+                android:textColor="?attr/primaryTextColor" />
 
             <RadioButton
                 android:id="@+id/loginUsernamePassword"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dimen36dp"
                 android:text="@string/loginViaPassword"
-                android:textColor="?attr/primaryTextColor"/>
+                android:textColor="?attr/primaryTextColor" />
 
         </RadioGroup>
 
@@ -79,7 +79,7 @@
                 android:inputType="none"
                 android:labelFor="@+id/httpsSpinner"
                 android:textColor="?attr/inputTextColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -108,7 +108,7 @@
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -136,7 +136,7 @@
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -165,7 +165,7 @@
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -197,7 +197,7 @@
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -225,7 +225,7 @@
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -236,7 +236,7 @@
             android:layout_marginTop="@dimen/dimen8dp"
             android:text="@string/btnLogin"
             android:textColor="@color/btnTextColor"
-            android:textStyle="bold"/>
+            android:textStyle="bold" />
 
         <TextView
             android:layout_width="match_parent"
@@ -249,7 +249,7 @@
             android:text="@string/appRepoLink"
             android:textColor="?attr/primaryTextColor"
             android:textColorLink="@color/lightBlue"
-            android:textSize="@dimen/dimen14sp"/>
+            android:textSize="@dimen/dimen14sp" />
 
         <TextView
             android:id="@+id/appVersion"
@@ -260,7 +260,7 @@
             android:layout_weight="1"
             android:maxLines="1"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen14sp"/>
+            android:textSize="@dimen/dimen14sp" />
 
     </LinearLayout>
 

app/src/main/res/layout/activity_main.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".activities.MainActivity"
-    android:id="@+id/drawer_layout"
     tools:openDrawer="start">
 
     <LinearLayout
@@ -15,39 +14,39 @@
         android:orientation="vertical">
 
         <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/primaryBackgroundColor"
-            android:id="@+id/toolbar"
+            android:elevation="@dimen/dimen0dp"
-            app:titleTextColor="?attr/primaryTextColor"
             android:theme="@style/Widget.AppCompat.SearchView"
-            android:elevation="@dimen/dimen0dp">
+            app:titleTextColor="?attr/primaryTextColor">
 
             <TextView
+                android:id="@+id/toolbar_title"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
                 android:gravity="center_vertical"
-                android:textSize="@dimen/dimen20sp"
                 android:textColor="?attr/primaryTextColor"
-                android:id="@+id/toolbar_title"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
         <FrameLayout
             android:id="@+id/fragment_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent" />
 
     </LinearLayout>
 
     <com.google.android.material.navigation.NavigationView
+        android:id="@+id/nav_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:id="@+id/nav_view"
-        app:headerLayout="@layout/nav_header"
         android:background="?attr/primaryBackgroundColor"
-        app:menu="@menu/drawer_menu"/>
+        app:headerLayout="@layout/nav_header"
+        app:menu="@menu/drawer_menu" />
 
 </androidx.drawerlayout.widget.DrawerLayout>

app/src/main/res/layout/activity_merge_pull_request.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <HorizontalScrollView
                 android:id="@+id/replyToPRNavHeader"
@@ -49,7 +49,7 @@
                     android:layout_gravity="center_vertical"
                     android:maxLines="1"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="@dimen/dimen20sp"/>
+                    android:textSize="@dimen/dimen20sp" />
 
             </HorizontalScrollView>
 
@@ -95,7 +95,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -122,7 +122,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -146,7 +146,7 @@
                     android:inputType="none"
                     android:labelFor="@+id/mergeSpinner"
                     android:textColor="?attr/inputTextColor"
-                    android:textSize="@dimen/dimen16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -159,7 +159,7 @@
                 android:text="@string/deleteBranchAfterMerge"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="@dimen/dimen16sp"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
             <TextView
                 android:id="@+id/deleteBranchForkInfo"
@@ -169,7 +169,7 @@
                 android:gravity="start"
                 android:text="@string/deleteBranchForkInfo"
                 android:textColor="?attr/hintColor"
-                android:textSize="@dimen/dimen12sp"/>
+                android:textSize="@dimen/dimen12sp" />
 
             <TextView
                 android:id="@+id/mergeInfo"
@@ -179,7 +179,7 @@
                 android:gravity="start"
                 android:text="@string/mergeNoteText"
                 android:textColor="?attr/hintColor"
-                android:textSize="@dimen/dimen12sp"/>
+                android:textSize="@dimen/dimen12sp" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/mergeButton"
@@ -188,7 +188,7 @@
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/mergePullRequestButtonText"
                 android:textColor="@color/btnTextColor"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/mergeInfoDisabledMessage"
@@ -199,7 +199,7 @@
                 android:text="@string/mergeInfoDisabledMessage"
                 android:textColor="?attr/hintColor"
                 android:textSize="@dimen/dimen12sp"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
         </LinearLayout>
 

app/src/main/res/layout/activity_org_detail.xml

@@ -31,7 +31,7 @@
                 android:layout_gravity="center_vertical"
                 android:gravity="center_vertical"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -50,31 +50,31 @@
                 android:id="@+id/tabItemInfo"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/tabTextInfo"/>
+                android:text="@string/tabTextInfo" />
 
             <com.google.android.material.tabs.TabItem
                 android:id="@+id/tabItem_repos"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/navRepos"/>
+                android:text="@string/navRepos" />
 
             <com.google.android.material.tabs.TabItem
                 android:id="@+id/tabItem_labels"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/newIssueLabelsTitle"/>
+                android:text="@string/newIssueLabelsTitle" />
 
             <com.google.android.material.tabs.TabItem
                 android:id="@+id/tabItem_teams"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/orgTabTeams"/>
+                android:text="@string/orgTabTeams" />
 
             <com.google.android.material.tabs.TabItem
                 android:id="@+id/tabItem_members"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/orgTabMembers"/>
+                android:text="@string/orgTabMembers" />
 
         </com.google.android.material.tabs.TabLayout>
 
@@ -85,6 +85,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/activity_org_team_info.xml

@@ -30,7 +30,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -39,7 +39,7 @@
                 android:layout_gravity="center_vertical"
                 android:maxLines="1"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -52,7 +52,7 @@
             app:tabIndicatorFullWidth="true"
             app:tabMode="auto"
             app:tabTextAppearance="@style/customTabLayout"
-            app:tabTextColor="?attr/primaryTextColor"/>
+            app:tabTextColor="?attr/primaryTextColor" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -60,6 +60,6 @@
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </LinearLayout>

app/src/main/res/layout/activity_profile.xml

@@ -29,7 +29,7 @@
                 android:layout_gravity="center_vertical"
                 android:gravity="center_vertical"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -41,7 +41,7 @@
             app:tabIndicatorColor="?attr/pagerTabIndicatorColor"
             app:tabMode="scrollable"
             app:tabTextAppearance="@style/customTabLayout"
-            app:tabTextColor="?attr/primaryTextColor"/>
+            app:tabTextColor="?attr/primaryTextColor" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -49,6 +49,6 @@
         android:id="@+id/profileContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/activity_profile_email.xml

@@ -32,7 +32,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -42,7 +42,7 @@
                 android:maxLines="1"
                 android:text="@string/pageTitleAddEmail"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -75,7 +75,7 @@
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:textSize="@dimen/dimen16sp"/>
+                android:textSize="@dimen/dimen16sp" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -86,7 +86,7 @@
             android:layout_marginTop="@dimen/dimen8dp"
             android:text="@string/saveButton"
             android:textColor="@color/btnTextColor"
-            android:textStyle="bold"/>
+            android:textStyle="bold" />
 
     </LinearLayout>
 

app/src/main/res/layout/activity_repo_detail.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_content"
@@ -33,7 +32,7 @@
                 android:paddingEnd="@dimen/dimen8dp"
                 android:src="@drawable/ic_lock"
                 android:visibility="gone"
-                tools:visibility="visible"/>
+                tools:visibility="visible" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -42,7 +41,7 @@
                 android:layout_gravity="center_vertical"
                 android:gravity="center_vertical"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -50,7 +49,7 @@
             android:id="@+id/loadingIndicator"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:indeterminate="true"/>
+            android:indeterminate="true" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
@@ -69,6 +68,6 @@
         android:id="@+id/repositoryContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/activity_repo_forks.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -30,7 +29,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -43,7 +42,7 @@
                 android:singleLine="true"
                 android:text="@string/commitTitle"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -77,7 +76,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dimen56dp"
         android:indeterminate="true"
-        app:indicatorColor="?attr/progressIndicatorColor"/>
+        app:indicatorColor="?attr/progressIndicatorColor" />
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progressLoadMore"
@@ -87,7 +86,7 @@
         android:layout_marginTop="@dimen/dimen56dp"
         android:indeterminate="true"
         android:visibility="gone"
-        app:indicatorColor="?attr/progressIndicatorColor"/>
+        app:indicatorColor="?attr/progressIndicatorColor" />
 
     <TextView
         android:id="@+id/noData"
@@ -98,6 +97,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="@dimen/dimen20sp"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
 </RelativeLayout>

app/src/main/res/layout/activity_repo_stargazers.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
@@ -11,8 +10,8 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="@dimen/dimen0dp"
+        android:theme="@style/Widget.AppCompat.SearchView"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        app:elevation="@dimen/dimen0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -24,23 +23,23 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/dimen26dp"
                 android:layout_height="@dimen/dimen26dp"
-                android:layout_marginEnd="@dimen/dimen16dp"
                 android:layout_marginStart="@dimen/dimen16dp"
-                android:gravity="center_vertical"
+                android:layout_marginEnd="@dimen/dimen16dp"
-                android:contentDescription="@string/close"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:focusable="true"
                 android:clickable="true"
-                android:src="@drawable/ic_close"/>
+                android:contentDescription="@string/close"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -50,19 +49,19 @@
         android:id="@+id/gridView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:scrollbars="none"
-        android:numColumns="2"
-        android:gravity="center"
         android:background="?attr/primaryBackgroundColor"
-        android:padding="@dimen/dimen4dp"/>
+        android:gravity="center"
+        android:numColumns="2"
+        android:padding="@dimen/dimen4dp"
+        android:scrollbars="none" />
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progress_bar"
+        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:indeterminate="true"
-        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
+        app:indicatorColor="?attr/progressIndicatorColor" />
-        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noDataStargazers"
@@ -72,6 +71,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="@dimen/dimen20sp"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
 </LinearLayout>

app/src/main/res/layout/activity_repo_watchers.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
@@ -11,8 +10,8 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="@dimen/dimen0dp"
+        android:theme="@style/Widget.AppCompat.SearchView"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        app:elevation="@dimen/dimen0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -24,23 +23,23 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/dimen26dp"
                 android:layout_height="@dimen/dimen26dp"
-                android:layout_marginEnd="@dimen/dimen16dp"
                 android:layout_marginStart="@dimen/dimen16dp"
-                android:gravity="center_vertical"
+                android:layout_marginEnd="@dimen/dimen16dp"
-                android:contentDescription="@string/close"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:focusable="true"
                 android:clickable="true"
-                android:src="@drawable/ic_close"/>
+                android:contentDescription="@string/close"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -51,18 +50,18 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/primaryBackgroundColor"
-        android:padding="@dimen/dimen4dp"
+        android:gravity="center"
-        android:scrollbars="none"
         android:numColumns="2"
-        android:gravity="center"/>
+        android:padding="@dimen/dimen4dp"
+        android:scrollbars="none" />
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progress_bar"
+        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:indeterminate="true"
-        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
+        app:indicatorColor="?attr/progressIndicatorColor" />
-        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noDataWatchers"
@@ -72,6 +71,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="@dimen/dimen20sp"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
 </LinearLayout>

app/src/main/res/layout/activity_repository_settings.xml

@@ -32,7 +32,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbarTitle"
@@ -42,13 +42,14 @@
                 android:maxLines="1"
                 android:text="@string/repoSettingsTitle"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <ScrollView android:layout_width="match_parent"
+    <ScrollView
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?attr/primaryBackgroundColor">
 
@@ -70,12 +71,12 @@
                 android:text="@string/repoSettingsEditProperties"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="@dimen/dimen16sp"
-                app:drawableStartCompat="@drawable/ic_edit"/>
+                app:drawableStartCompat="@drawable/ic_edit" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dimen1dp"
-                android:background="?attr/dividerColor"/>
+                android:background="?attr/dividerColor" />
 
             <LinearLayout
                 android:id="@+id/transferOwnerFrame"
@@ -99,7 +100,7 @@
                     android:text="@string/repoSettingsTransferOwnership"
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="@dimen/dimen16sp"
-                    app:drawableStartCompat="@drawable/ic_arrow_up"/>
+                    app:drawableStartCompat="@drawable/ic_arrow_up" />
 
                 <TextView
                     android:id="@+id/transferRepositoryOwnershipHint"
@@ -111,12 +112,12 @@
                     android:paddingBottom="@dimen/dimen16dp"
                     android:text="@string/repoSettingsTransferOwnershipHint"
                     android:textColor="?attr/hintColor"
-                    android:textSize="@dimen/dimen12sp"/>
+                    android:textSize="@dimen/dimen12sp" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dimen1dp"
-                    android:background="?attr/dividerColor"/>
+                    android:background="?attr/dividerColor" />
 
             </LinearLayout>
 
@@ -142,7 +143,7 @@
                     android:text="@string/repoSettingsDelete"
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="@dimen/dimen16sp"
-                    app:drawableStartCompat="@drawable/ic_delete"/>
+                    app:drawableStartCompat="@drawable/ic_delete" />
 
                 <TextView
                     android:id="@+id/deleteRepositoryHint"
@@ -153,7 +154,7 @@
                     android:paddingEnd="@dimen/dimen16dp"
                     android:text="@string/repoSettingsDeleteHint"
                     android:textColor="?attr/hintColor"
-                    android:textSize="@dimen/dimen12sp"/>
+                    android:textSize="@dimen/dimen12sp" />
 
             </LinearLayout>
 

app/src/main/res/layout/activity_settings_appearance.xml

@@ -32,7 +32,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -42,7 +42,7 @@
                 android:maxLines="1"
                 android:text="@string/settingsAppearanceHeader"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -67,7 +67,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/themeSelectionHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <TextView
             android:id="@+id/themeSelected"
@@ -77,7 +77,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/themeSelectionSelectedText"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            android:textSize="@dimen/dimen16sp" />
 
     </LinearLayout>
 
@@ -100,7 +100,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/settingsLightThemeTimeSelectorHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <TextView
             android:id="@+id/lightThemeSelectedTime"
@@ -110,7 +110,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/settingsThemeTimeSelectedHint"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            android:textSize="@dimen/dimen16sp" />
 
     </LinearLayout>
 
@@ -133,7 +133,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/settingsDarkThemeTimeSelectorHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <TextView
             android:id="@+id/darkThemeSelectedTime"
@@ -143,7 +143,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/settingsThemeTimeSelectedHint"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            android:textSize="@dimen/dimen16sp" />
 
     </LinearLayout>
 
@@ -166,7 +166,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/settingsCustomFontHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <TextView
             android:id="@+id/customFontSelected"
@@ -176,7 +176,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/settingsCustomFontDefault"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            android:textSize="@dimen/dimen16sp" />
 
     </LinearLayout>
 
@@ -199,7 +199,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/settingsDateTimeHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <TextView
             android:id="@+id/tvDateTimeSelected"
@@ -209,7 +209,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/settingsDateTimeHeaderDefault"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            android:textSize="@dimen/dimen16sp" />
 
     </LinearLayout>
 
@@ -230,7 +230,7 @@
             android:layout_marginEnd="@dimen/dimen48dp"
             android:text="@string/settingsCounterBadges"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/switchCounterBadge"
@@ -242,7 +242,7 @@
             android:gravity="end"
             android:paddingStart="@dimen/dimen0dp"
             android:paddingEnd="@dimen/dimen24dp"
-            android:switchMinWidth="@dimen/dimen56dp"/>
+            android:switchMinWidth="@dimen/dimen56dp" />
 
     </RelativeLayout>
 
@@ -259,15 +259,15 @@
             android:id="@+id/label_title_frame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:weightSum="100"
+            android:orientation="horizontal"
-            android:orientation="horizontal">
+            android:weightSum="100">
 
             <TextView
                 android:id="@+id/tvLabelsInListHeader"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="90"
                 android:layout_marginStart="@dimen/dimen24dp"
+                android:layout_weight="90"
                 android:text="@string/settingsLabelsInListHeader"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="@dimen/dimen18sp" />

app/src/main/res/layout/activity_settings_drafts.xml

@@ -32,7 +32,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbarTitle"
@@ -42,7 +42,7 @@
                 android:maxLines="1"
                 android:text="@string/draftsHeader"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -61,17 +61,17 @@
             android:id="@+id/enableCommentsDeletionHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:weightSum="100"
+            android:orientation="horizontal"
-            android:orientation="horizontal">
+            android:weightSum="100">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="90"
                 android:layout_marginStart="@dimen/dimen24dp"
+                android:layout_weight="90"
                 android:text="@string/settingsEnableCommentsDeletionText"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen18sp"/>
+                android:textSize="@dimen/dimen18sp" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -86,7 +86,7 @@
                     android:layout_height="@dimen/dimen32dp"
                     android:paddingStart="@dimen/dimen24dp"
                     android:paddingEnd="@dimen/dimen24dp"
-                    android:switchMinWidth="@dimen/dimen56dp"/>
+                    android:switchMinWidth="@dimen/dimen56dp" />
 
             </LinearLayout>
 
@@ -100,7 +100,7 @@
             android:layout_marginEnd="@dimen/dimen72dp"
             android:text="@string/settingsEnableCommentsDeletionHintText"
             android:textColor="?attr/hintColor"
-            android:textSize="@dimen/dimen12sp"/>
+            android:textSize="@dimen/dimen12sp" />
 
     </RelativeLayout>
 

app/src/main/res/layout/activity_settings_general.xml

@@ -32,7 +32,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbarTitle"
@@ -42,7 +42,7 @@
                 android:maxLines="1"
                 android:text="@string/settingsGeneralHeader"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -67,7 +67,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/generalDeepLinkDefaultScreen"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -76,7 +76,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/generalDeepLinkDefaultScreenHintText"
             android:textColor="?attr/hintColor"
-            android:textSize="@dimen/dimen12sp"/>
+            android:textSize="@dimen/dimen12sp" />
 
         <TextView
             android:id="@+id/generalDeepLinkSelected"
@@ -86,7 +86,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/generalDeepLinkSelectedText"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            android:textSize="@dimen/dimen16sp" />
 
     </LinearLayout>
 
@@ -109,7 +109,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/settingsHomeScreenHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <TextView
             android:id="@+id/homeScreenSelected"
@@ -119,7 +119,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/settingsHomeScreenSelectedText"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            android:textSize="@dimen/dimen16sp" />
 
     </LinearLayout>
 
@@ -140,7 +140,7 @@
             android:layout_marginEnd="@dimen/dimen72dp"
             android:text="@string/useCustomTabs"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/switchTabs"
@@ -152,7 +152,7 @@
             android:gravity="end"
             android:paddingStart="@dimen/dimen0dp"
             android:paddingEnd="@dimen/dimen24dp"
-            android:switchMinWidth="@dimen/dimen56dp"/>
+            android:switchMinWidth="@dimen/dimen56dp" />
 
     </RelativeLayout>
 

app/src/main/res/layout/activity_settings_notifications.xml

@@ -34,7 +34,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -44,7 +44,7 @@
                 android:maxLines="1"
                 android:text="@string/pageTitleNotifications"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </androidx.appcompat.widget.Toolbar>
 
@@ -57,18 +57,18 @@
         android:layout_marginBottom="@dimen/dimen6dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
-        android:weightSum="100"
+        android:padding="@dimen/dimen16dp"
-        android:padding="@dimen/dimen16dp">
+        android:weightSum="100">
 
         <TextView
             android:id="@+id/enableNotificationsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="90"
             android:layout_marginStart="@dimen/dimen24dp"
+            android:layout_weight="90"
             android:text="@string/enableNotificationsHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -83,7 +83,7 @@
                 android:layout_height="@dimen/dimen32dp"
                 android:paddingStart="@dimen/dimen24dp"
                 android:paddingEnd="@dimen/dimen24dp"
-                android:switchMinWidth="@dimen/dimen56dp"/>
+                android:switchMinWidth="@dimen/dimen56dp" />
 
         </LinearLayout>
 
@@ -106,7 +106,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/notificationsPollingHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <TextView
             android:id="@+id/pollingDelaySelected"
@@ -116,7 +116,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/pollingDelaySelectedText"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            android:textSize="@dimen/dimen16sp" />
 
     </LinearLayout>
 
@@ -137,7 +137,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/enableLightsHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/enableLightsMode"
@@ -149,7 +149,7 @@
             android:gravity="end"
             android:paddingStart="@dimen/dimen0dp"
             android:paddingEnd="@dimen/dimen24dp"
-            android:switchMinWidth="@dimen/dimen56dp"/>
+            android:switchMinWidth="@dimen/dimen56dp" />
 
     </RelativeLayout>
 
@@ -170,7 +170,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/chooseColorSelectorHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/chooseColorState"
@@ -182,7 +182,7 @@
             android:layout_marginEnd="@dimen/dimen28dp"
             android:gravity="end"
             app:cardCornerRadius="@dimen/dimen16dp"
-            app:cardElevation="@dimen/dimen0dp"/>
+            app:cardElevation="@dimen/dimen0dp" />
 
     </RelativeLayout>
 
@@ -203,7 +203,7 @@
             android:layout_marginEnd="@dimen/dimen72dp"
             android:text="@string/enableVibrationHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/enableVibrationMode"
@@ -215,7 +215,7 @@
             android:gravity="end"
             android:paddingStart="@dimen/dimen0dp"
             android:paddingEnd="@dimen/dimen24dp"
-            android:switchMinWidth="@dimen/dimen56dp"/>
+            android:switchMinWidth="@dimen/dimen56dp" />
 
     </RelativeLayout>
 

app/src/main/res/layout/activity_settings_reports.xml

@@ -31,7 +31,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -41,7 +41,7 @@
                 android:maxLines="1"
                 android:text="@string/reportViewerHeader"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -54,18 +54,18 @@
         android:layout_marginBottom="@dimen/dimen6dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
-        android:weightSum="100"
+        android:padding="@dimen/dimen16dp"
-        android:padding="@dimen/dimen16dp">
+        android:weightSum="100">
 
         <TextView
             android:id="@+id/enableReportsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="90"
             android:layout_marginStart="@dimen/dimen24dp"
+            android:layout_weight="90"
             android:text="@string/settingsEnableReportsText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -80,7 +80,7 @@
                 android:layout_height="@dimen/dimen32dp"
                 android:paddingStart="@dimen/dimen24dp"
                 android:paddingEnd="@dimen/dimen24dp"
-                android:switchMinWidth="@dimen/dimen56dp"/>
+                android:switchMinWidth="@dimen/dimen56dp" />
 
         </LinearLayout>
 

app/src/main/res/layout/activity_settings_security.xml

@@ -31,7 +31,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -41,7 +41,7 @@
                 android:maxLines="1"
                 android:text="@string/settingsSecurityHeader"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -64,7 +64,7 @@
             android:layout_marginEnd="@dimen/dimen72dp"
             android:text="@string/settingsBiometricHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/switchBiometric"
@@ -76,7 +76,7 @@
             android:gravity="end"
             android:paddingStart="@dimen/dimen0dp"
             android:paddingEnd="@dimen/dimen24dp"
-            android:switchMinWidth="@dimen/dimen56dp"/>
+            android:switchMinWidth="@dimen/dimen56dp" />
 
     </RelativeLayout>
 
@@ -97,7 +97,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/settingsCertsSelectorHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp"/>
+            android:textSize="18sp" />
 
     </LinearLayout>
 
@@ -118,7 +118,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/cacheSizeDataSelectionHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <TextView
             android:id="@+id/cacheSizeDataSelected"
@@ -128,7 +128,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/cacheSizeDataSelectionSelectedText"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            android:textSize="@dimen/dimen16sp" />
 
     </LinearLayout>
 
@@ -149,7 +149,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/cacheSizeImagesSelectionHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <TextView
             android:id="@+id/cacheSizeImagesSelected"
@@ -159,7 +159,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/cacheSizeImagesSelectionSelectedText"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            android:textSize="@dimen/dimen16sp" />
 
     </LinearLayout>
 
@@ -180,7 +180,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/clearCacheSelectionHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <TextView
             android:id="@+id/clearCacheSelected"
@@ -190,7 +190,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/clearCacheSelectionSelectedText"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            android:textSize="@dimen/dimen16sp" />
 
     </LinearLayout>
 

app/src/main/res/layout/activity_settings_translation.xml

@@ -31,7 +31,7 @@
                 android:contentDescription="@string/close"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+                android:src="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/toolbar_title"
@@ -41,7 +41,7 @@
                 android:maxLines="1"
                 android:text="@string/settingsLanguageHeaderText"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
+                android:textSize="@dimen/dimen20sp" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -65,7 +65,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/settingsLanguageSelectorHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:textSize="@dimen/dimen18sp" />
 
         <TextView
             android:id="@+id/tvLanguageSelected"
@@ -75,7 +75,7 @@
             android:layout_marginEnd="@dimen/dimen24dp"
             android:text="@string/settingsLanguageSelectedHeaderDefault"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            android:textSize="@dimen/dimen16sp" />
 
     </LinearLayout>
 
@@ -91,6 +91,6 @@
         android:paddingBottom="@dimen/dimen16dp"
         android:text="@string/settingsHelpTranslateText"
         android:textColor="@color/lightBlue"
-        android:textSize="@dimen/dimen16sp"/>
+        android:textSize="@dimen/dimen16sp" />
 
 </LinearLayout>