diff --git a/.editorconfig b/.editorconfig
index 9a28ee19..c8ba226b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,7 +13,7 @@ line_comment = //
 block_comment_start = /*
 block_comment = *
 block_comment_end = */
-max_line_length = off
+max_line_length = 220
 
 [*.json]
 indent_size = 2
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 5b49261c..f4bebc70 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -16,6 +16,9 @@
         </value>
       </option>
     </JavaCodeStyleSettings>
+    <XML>
+      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
+    </XML>
     <codeStyleSettings language="JAVA">
       <option name="RIGHT_MARGIN" value="220" />
       <option name="KEEP_LINE_BREAKS" value="false" />
@@ -23,7 +26,6 @@
       <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
       <option name="BLANK_LINES_AROUND_FIELD_IN_INTERFACE" value="1" />
       <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
-      <option name="BLANK_LINES_AFTER_ANONYMOUS_CLASS_HEADER" value="1" />
       <option name="BLANK_LINES_BEFORE_CLASS_END" value="1" />
       <option name="ELSE_ON_NEW_LINE" value="true" />
       <option name="CATCH_ON_NEW_LINE" value="true" />
diff --git a/.woodpecker/finish.yml b/.woodpecker/finish.yml
index b6bdcf3b..7202f32d 100644
--- a/.woodpecker/finish.yml
+++ b/.woodpecker/finish.yml
@@ -1,22 +1,22 @@
 depends_on:
-    - build
-    - locale
-    - check
+  - build
+  - locale
+  - check
 
 run_on: [ success, failure ]
 skip_clone: true
 
 pipeline:
-    discord:
-        image: appleboy/drone-discord
-        settings:
-            message: "{{#success build.status}} ✅  Build #{{build.number}} of `{{repo.name}}` succeeded.\n\n📝 Commit by {{commit.author}}:\n``` {{commit.message}} ```\n\n🌐 {{ build.link }} {{else}} ❌  Build #{{build.number}} of `{{repo.name}}` failed.\n\n📝 Commit by {{commit.author}}:\n``` {{commit.message}} ```\n\n🌐 {{ build.link }} {{/success}}\n"
-            webhook_id:
-                from_secret:
-                    DISCORD_BOT_ID
-            webhook_token:
-                from_secret:
-                    DISCORD_BOT_SECRET
-        when:
-            event: [ push ]
-            branch: main
+  discord:
+    image: appleboy/drone-discord
+    settings:
+      message: "{{#success build.status}} ✅  Build #{{build.number}} of `{{repo.name}}` succeeded.\n\n📝 Commit by {{commit.author}}:\n``` {{commit.message}} ```\n\n🌐 {{ build.link }} {{else}} ❌  Build #{{build.number}} of `{{repo.name}}` failed.\n\n📝 Commit by {{commit.author}}:\n``` {{commit.message}} ```\n\n🌐 {{ build.link }} {{/success}}\n"
+      webhook_id:
+        from_secret:
+          DISCORD_BOT_ID
+      webhook_token:
+        from_secret:
+          DISCORD_BOT_SECRET
+    when:
+      event: [ push ]
+      branch: main
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 04b4da36..2aaa6ec5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,10 +3,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.mian.gitnex">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
 
     <application
         android:name=".core.MainApplication"
@@ -20,183 +20,183 @@
         tools:targetApi="n">
         <activity
             android:name=".activities.MergePullRequestActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.FileViewActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".activities.CreateFileActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".activities.RepoWatchersActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".activities.RepoStargazersActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".activities.AdminGetUsersActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.AdminUnadoptedReposActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.CreateReleaseActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.EditIssueActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.CreateNewUserActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.MyProfileEmailActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.AddCollaboratorToRepositoryActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.CreateTeamByOrgActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.OrganizationTeamInfoActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.OrganizationDetailActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".activities.CreateLabelActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.CreateIssueActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.CreateMilestoneActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.IssueDetailActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
-            android:windowSoftInputMode="adjustNothing" />
+            android:windowSoftInputMode="adjustNothing"/>
         <activity
             android:name=".activities.RepoDetailActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".activities.MainActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
-            android:theme="@android:style/Theme.NoTitleBar"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@android:style/Theme.NoTitleBar">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity
             android:name=".activities.LoginActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
             android:launchMode="singleTask"
-            android:theme="@android:style/Theme.NoTitleBar" />
+            android:theme="@android:style/Theme.NoTitleBar"/>
         <activity
             android:name=".activities.CreateRepoActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.CreateOrganizationActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.DiffActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
-            android:theme="@android:style/Theme.NoTitleBar" />
+            android:theme="@android:style/Theme.NoTitleBar"/>
         <activity
             android:name=".activities.CommitsActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.CommitDetailActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
-            android:theme="@android:style/Theme.NoTitleBar" />
+            android:theme="@android:style/Theme.NoTitleBar"/>
         <activity
             android:name=".activities.SettingsAppearanceActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.ProfileActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.SettingsSecurityActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.SettingsTranslationActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.SettingsReportsActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.AddNewTeamMemberActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.AddNewTeamRepoActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.SettingsDraftsActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.RepoForksActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.AddNewAccountActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.RepositorySettingsActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.CreatePullRequestActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.SettingsGeneralActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.SettingsNotificationsActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.AdminCronTasksActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
             android:name=".activities.WikiActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"/>
         <activity
-            android:windowSoftInputMode="adjustResize"
             android:name=".activities.CodeEditorActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
+            android:windowSoftInputMode="adjustResize"/>
 
         <meta-data
             android:name="com.samsung.android.keepalive.density"
-            android:value="true" /> <!-- Version >= 3.0. DeX Dual Mode support -->
+            android:value="true"/> <!-- Version >= 3.0. DeX Dual Mode support -->
         <meta-data
             android:name="com.samsung.android.multidisplay.keep_process_alive"
-            android:value="true" /> <!-- deep links -->
+            android:value="true"/> <!-- deep links -->
         <activity
             android:name=".activities.DeepLinksActivity"
+            android:exported="true"
             android:launchMode="singleTask"
             android:noHistory="true"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:exported="true">
+            android:theme="@android:style/Theme.Translucent.NoTitleBar">
 
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.VIEW"/>
 
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
 
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="codeberg.org" />
-                <data android:host="gitea.com" />
-                <data android:host="try.gitea.io" />
-                <data android:host="code.obermui.de" />
-                <data android:host="git.fsfe.org" />
-                <data android:host="opendev.org" />
+                <data android:scheme="http"/>
+                <data android:scheme="https"/>
+                <data android:host="codeberg.org"/>
+                <data android:host="gitea.com"/>
+                <data android:host="try.gitea.io"/>
+                <data android:host="code.obermui.de"/>
+                <data android:host="git.fsfe.org"/>
+                <data android:host="opendev.org"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/app/src/main/java/org/mian/gitnex/actions/ActionResult.java b/app/src/main/java/org/mian/gitnex/actions/ActionResult.java
index 29bad72c..3fe1077d 100644
--- a/app/src/main/java/org/mian/gitnex/actions/ActionResult.java
+++ b/app/src/main/java/org/mian/gitnex/actions/ActionResult.java
@@ -14,11 +14,8 @@ import java.util.concurrent.TimeUnit;
 
 public class ActionResult<R> {
 
-	public enum Status {SUCCESS, FAILED}
-
 	private final BlockingQueue<Boolean> blockingQueue;
 	private final List<OnFinishedListener<R>> onFinishedListeners;
-
 	private boolean invalidated = false;
 
 	public ActionResult() {
@@ -74,9 +71,7 @@ public class ActionResult<R> {
 
 	}
 
-	public static class None {
-
-	}
+	public enum Status {SUCCESS, FAILED}
 
 	public interface OnFinishedListener<R> {
 
@@ -84,4 +79,8 @@ public class ActionResult<R> {
 
 	}
 
+	public static class None {
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java b/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java
index 75bcf5b3..a25ac868 100644
--- a/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java
@@ -60,8 +60,8 @@ public class AssigneesActions {
 		});
 	}
 
-	public static void getRepositoryAssignees(Context ctx, String repoOwner, String repoName, List<User> assigneesList, Dialog dialogAssignees,
-		AssigneesListAdapter assigneesAdapter, CustomAssigneesSelectionDialogBinding assigneesBinding) {
+	public static void getRepositoryAssignees(Context ctx, String repoOwner, String repoName, List<User> assigneesList, Dialog dialogAssignees, AssigneesListAdapter assigneesAdapter,
+		CustomAssigneesSelectionDialogBinding assigneesBinding) {
 
 		Call<List<User>> call = RetrofitClient.getApiInterface(ctx).repoGetAssignees(repoOwner, repoName);
 
diff --git a/app/src/main/java/org/mian/gitnex/actions/CollaboratorActions.java b/app/src/main/java/org/mian/gitnex/actions/CollaboratorActions.java
index cf44b1ad..bccf8195 100644
--- a/app/src/main/java/org/mian/gitnex/actions/CollaboratorActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/CollaboratorActions.java
@@ -68,8 +68,7 @@ public class CollaboratorActions {
 		AddCollaboratorOption permissionString = new AddCollaboratorOption();
 		permissionString.setPermission(permission);
 
-		Call<Void> call = RetrofitClient.getApiInterface(context)
-			.repoAddCollaborator(repository.getOwner(), repository.getName(), userName, permissionString);
+		Call<Void> call = RetrofitClient.getApiInterface(context).repoAddCollaborator(repository.getOwner(), repository.getName(), userName, permissionString);
 
 		call.enqueue(new Callback<>() {
 
diff --git a/app/src/main/java/org/mian/gitnex/actions/IssueActions.java b/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
index 76163647..ff8fbe1a 100644
--- a/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
@@ -35,8 +35,7 @@ public class IssueActions {
 		EditIssueCommentOption commentObj = new EditIssueCommentOption();
 		commentObj.setBody(comment);
 
-		Call<Comment> call = RetrofitClient.getApiInterface(context)
-			.issueEditComment(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) commentId, commentObj);
+		Call<Comment> call = RetrofitClient.getApiInterface(context).issueEditComment(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) commentId, commentObj);
 
 		call.enqueue(new Callback<>() {
 
@@ -75,8 +74,7 @@ public class IssueActions {
 
 		EditIssueOption issueStatJson = new EditIssueOption();
 		issueStatJson.setState(issueState);
-		Call<Issue> call = RetrofitClient.getApiInterface(ctx)
-			.issueEditIssue(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(), issueStatJson);
+		Call<Issue> call = RetrofitClient.getApiInterface(ctx).issueEditIssue(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(), issueStatJson);
 
 		call.enqueue(new Callback<>() {
 
@@ -109,8 +107,7 @@ public class IssueActions {
 
 						IssueDetailActivity.singleIssueUpdate = true;
 						((IssueDetailActivity) ctx).onResume();
-						if(((Activity) ctx).getIntent().getStringExtra("openedFromLink") == null || !((Activity) ctx).getIntent()
-							.getStringExtra("openedFromLink").equals("true")) {
+						if(((Activity) ctx).getIntent().getStringExtra("openedFromLink") == null || !((Activity) ctx).getIntent().getStringExtra("openedFromLink").equals("true")) {
 							RepoDetailActivity.updateRepo = true;
 						}
 					}
@@ -147,8 +144,7 @@ public class IssueActions {
 		Call<Void> call;
 
 		call = RetrofitClient.getApiInterface(ctx)
-			.issueAddSubscription(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(),
-				((BaseActivity) ctx).getAccount().getAccount().getUserName());
+			.issueAddSubscription(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(), ((BaseActivity) ctx).getAccount().getAccount().getUserName());
 
 		call.enqueue(new Callback<>() {
 
@@ -189,8 +185,7 @@ public class IssueActions {
 		Call<Void> call;
 
 		call = RetrofitClient.getApiInterface(ctx)
-			.issueDeleteSubscription(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(),
-				((BaseActivity) ctx).getAccount().getAccount().getUserName());
+			.issueDeleteSubscription(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(), ((BaseActivity) ctx).getAccount().getAccount().getUserName());
 
 		call.enqueue(new Callback<>() {
 
@@ -233,8 +228,7 @@ public class IssueActions {
 		CreateIssueCommentOption issueComment = new CreateIssueCommentOption();
 		issueComment.setBody(comment);
 
-		Call<Comment> call = RetrofitClient.getApiInterface(context)
-			.issueCreateComment(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(), issueComment);
+		Call<Comment> call = RetrofitClient.getApiInterface(context).issueCreateComment(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(), issueComment);
 
 		call.enqueue(new Callback<>() {
 
diff --git a/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java b/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java
index 792466d1..9613ae3f 100644
--- a/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java
@@ -56,8 +56,7 @@ public class LabelsActions {
 		});
 	}
 
-	public static void getRepositoryLabels(Context ctx, String repoOwner, String repoName, List<Label> labelsList, Dialog dialogLabels,
-		LabelsListAdapter labelsAdapter, CustomLabelsSelectionDialogBinding labelsBinding) {
+	public static void getRepositoryLabels(Context ctx, String repoOwner, String repoName, List<Label> labelsList, Dialog dialogLabels, LabelsListAdapter labelsAdapter, CustomLabelsSelectionDialogBinding labelsBinding) {
 
 		Call<List<Label>> call = RetrofitClient.getApiInterface(ctx).issueListLabels(repoOwner, repoName, null, null);
 
diff --git a/app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java b/app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
index 31596e67..f1cc3da7 100644
--- a/app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
@@ -32,8 +32,7 @@ public class MilestoneActions {
 
 		EditMilestoneOption milestoneStateJson = new EditMilestoneOption();
 		milestoneStateJson.setState(state);
-		Call<Milestone> call = RetrofitClient.getApiInterface(ctx)
-			.issueEditMilestone(repository.getOwner(), repository.getName(), String.valueOf(milestoneId_), milestoneStateJson);
+		Call<Milestone> call = RetrofitClient.getApiInterface(ctx).issueEditMilestone(repository.getOwner(), repository.getName(), String.valueOf(milestoneId_), milestoneStateJson);
 
 		call.enqueue(new Callback<>() {
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
index 02a050a8..f2dde4f2 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
@@ -44,8 +44,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityAddCollaboratorToRepositoryBinding activityAddCollaboratorToRepositoryBinding = ActivityAddCollaboratorToRepositoryBinding.inflate(
-			getLayoutInflater());
+		ActivityAddCollaboratorToRepositoryBinding activityAddCollaboratorToRepositoryBinding = ActivityAddCollaboratorToRepositoryBinding.inflate(getLayoutInflater());
 		setContentView(activityAddCollaboratorToRepositoryBinding.getRoot());
 
 		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
diff --git a/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
index a367db7b..13a53ed4 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
@@ -70,8 +70,7 @@ public class AddNewAccountActivity extends BaseActivity {
 		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(ctx, R.layout.list_spinner_items, Protocol.values());
 
 		viewBinding.protocolSpinner.setAdapter(adapterProtocols);
-		viewBinding.protocolSpinner.setOnItemClickListener(
-			(parent, view1, position, id) -> spinnerSelectedValue = String.valueOf(parent.getItemAtPosition(position)));
+		viewBinding.protocolSpinner.setOnItemClickListener((parent, view1, position, id) -> spinnerSelectedValue = String.valueOf(parent.getItemAtPosition(position)));
 		viewBinding.addNewAccount.setOnClickListener(login -> {
 
 			boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
@@ -116,8 +115,7 @@ public class AddNewAccountActivity extends BaseActivity {
 
 			URI rawInstanceUrl = UrlBuilder.fromString(UrlHelper.fixScheme(instanceUrlET, "http")).toUri();
 
-			URI instanceUrl = UrlBuilder.fromUri(rawInstanceUrl).withScheme(protocol.toLowerCase())
-				.withPath(PathsHelper.join(rawInstanceUrl.getPath(), "/api/v1/")).toUri();
+			URI instanceUrl = UrlBuilder.fromUri(rawInstanceUrl).withScheme(protocol.toLowerCase()).withPath(PathsHelper.join(rawInstanceUrl.getPath(), "/api/v1/")).toUri();
 
 			versionCheck(instanceUrl.toString(), loginToken);
 			serverPageLimitSettings();
@@ -155,8 +153,7 @@ public class AddNewAccountActivity extends BaseActivity {
 					if(giteaVersion.less(getString(R.string.versionLow))) {
 
 						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx).setTitle(getString(R.string.versionAlertDialogHeader))
-							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setIcon(R.drawable.ic_warning)
-							.setCancelable(true);
+							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setIcon(R.drawable.ic_warning).setCancelable(true);
 
 						alertDialogBuilder.setNeutralButton(getString(R.string.cancelButton), (dialog, which) -> {
 
@@ -208,8 +205,7 @@ public class AddNewAccountActivity extends BaseActivity {
 		generalAPISettings.enqueue(new Callback<>() {
 
 			@Override
-			public void onResponse(@NonNull final Call<GeneralAPISettings> generalAPISettings,
-				@NonNull retrofit2.Response<GeneralAPISettings> response) {
+			public void onResponse(@NonNull final Call<GeneralAPISettings> generalAPISettings, @NonNull retrofit2.Response<GeneralAPISettings> response) {
 
 				if(response.code() == 200 && response.body() != null) {
 
@@ -251,8 +247,7 @@ public class AddNewAccountActivity extends BaseActivity {
 
 						if(!userAccountExists) {
 
-							long id = userAccountsApi.createNewAccount(accountName, instanceUrl, userDetails.getLogin(), loginToken,
-								giteaVersion.toString(), maxResponseItems, defaultPagingNumber);
+							long id = userAccountsApi.createNewAccount(accountName, instanceUrl, userDetails.getLogin(), loginToken, giteaVersion.toString(), maxResponseItems, defaultPagingNumber);
 							UserAccount account = userAccountsApi.getAccountById((int) id);
 							AppUtil.switchToAccount(AddNewAccountActivity.this, account);
 							Toasty.success(ctx, getResources().getString(R.string.accountAddedMessage));
diff --git a/app/src/main/java/org/mian/gitnex/activities/AddNewTeamRepoActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddNewTeamRepoActivity.java
index e2935d02..eb43171f 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddNewTeamRepoActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddNewTeamRepoActivity.java
@@ -51,8 +51,7 @@ public class AddNewTeamRepoActivity extends BaseActivity {
 		addNewTeamRepositoryBinding.recyclerViewTeamRepos.setHasFixedSize(true);
 		addNewTeamRepositoryBinding.recyclerViewTeamRepos.setLayoutManager(new LinearLayoutManager(ctx));
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(addNewTeamRepositoryBinding.recyclerViewTeamRepos.getContext(),
-			DividerItemDecoration.VERTICAL);
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(addNewTeamRepositoryBinding.recyclerViewTeamRepos.getContext(), DividerItemDecoration.VERTICAL);
 		addNewTeamRepositoryBinding.recyclerViewTeamRepos.addItemDecoration(dividerItemDecoration);
 
 		dataList = new ArrayList<>();
@@ -79,8 +78,7 @@ public class AddNewTeamRepoActivity extends BaseActivity {
 						dataList.clear();
 						dataList.addAll(response.body());
 
-						adapter = new TeamRepositoriesAdapter(dataList, ctx, Math.toIntExact(teamId), getIntent().getStringExtra("orgName"),
-							teamName);
+						adapter = new TeamRepositoriesAdapter(dataList, ctx, Math.toIntExact(teamId), getIntent().getStringExtra("orgName"), teamName);
 
 						addNewTeamRepositoryBinding.recyclerViewTeamRepos.setAdapter(adapter);
 						addNewTeamRepositoryBinding.noData.setVisibility(View.GONE);
diff --git a/app/src/main/java/org/mian/gitnex/activities/AdminCronTasksActivity.java b/app/src/main/java/org/mian/gitnex/activities/AdminCronTasksActivity.java
index a8c71374..3f3d3ac1 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AdminCronTasksActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AdminCronTasksActivity.java
@@ -20,13 +20,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
@@ -48,8 +46,7 @@ public class AdminCronTasksActivity extends BaseActivity {
 		activityAdminCronTasksBinding.recyclerView.setHasFixedSize(true);
 		activityAdminCronTasksBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(activityAdminCronTasksBinding.recyclerView.getContext(),
-			DividerItemDecoration.VERTICAL);
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(activityAdminCronTasksBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
 		activityAdminCronTasksBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 
 		activityAdminCronTasksBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
diff --git a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java
index 9a5d3bf1..c3358cca 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java
@@ -55,8 +55,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetLi
 
 		activityAdminGetUsersBinding.recyclerView.setHasFixedSize(true);
 		activityAdminGetUsersBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(activityAdminGetUsersBinding.recyclerView.getContext(),
-			DividerItemDecoration.VERTICAL);
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(activityAdminGetUsersBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
 		activityAdminGetUsersBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 
 		activityAdminGetUsersBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
@@ -70,8 +69,6 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetLi
 		fetchDataAsync();
 	}
 
-	;
-
 	private void fetchDataAsync() {
 
 		AdminGetUsersViewModel adminUsersModel = new ViewModelProvider(this).get(AdminGetUsersViewModel.class);
diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index 4f557e23..63f5c619 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -45,8 +45,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 				break;
 			case 2:
 
-				if(TimeHelper.timeBetweenHours(tinyDB.getInt("darkThemeTimeHour", 18), tinyDB.getInt("lightThemeTimeHour", 6),
-					tinyDB.getInt("darkThemeTimeMinute", 0), tinyDB.getInt("lightThemeTimeMinute", 0))) {
+				if(TimeHelper.timeBetweenHours(tinyDB.getInt("darkThemeTimeHour", 18), tinyDB.getInt("lightThemeTimeHour", 6), tinyDB.getInt("darkThemeTimeMinute", 0), tinyDB.getInt("lightThemeTimeMinute", 0))) {
 
 					setTheme(R.style.AppTheme);
 				}
@@ -60,8 +59,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 				setTheme(R.style.AppThemeRetro);
 				break;
 			case 4:
-				if(TimeHelper.timeBetweenHours(tinyDB.getInt("darkThemeTimeHour", 18), tinyDB.getInt("lightThemeTimeHour", 6),
-					tinyDB.getInt("darkThemeTimeMinute", 0), tinyDB.getInt("lightThemeTimeMinute", 0))) {
+				if(TimeHelper.timeBetweenHours(tinyDB.getInt("darkThemeTimeHour", 18), tinyDB.getInt("lightThemeTimeHour", 6), tinyDB.getInt("darkThemeTimeMinute", 0), tinyDB.getInt("lightThemeTimeMinute", 0))) {
 
 					setTheme(R.style.AppTheme);
 				}
@@ -126,8 +124,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 
 			});
 
-			BiometricPrompt.PromptInfo biometricPromptBuilder = new BiometricPrompt.PromptInfo.Builder().setTitle(
-					getString(R.string.biometricAuthTitle)).setSubtitle(getString(R.string.biometricAuthSubTitle))
+			BiometricPrompt.PromptInfo biometricPromptBuilder = new BiometricPrompt.PromptInfo.Builder().setTitle(getString(R.string.biometricAuthTitle)).setSubtitle(getString(R.string.biometricAuthSubTitle))
 				.setNegativeButtonText(getString(R.string.cancelButton)).build();
 
 			biometricPrompt.authenticate(biometricPromptBuilder);
diff --git a/app/src/main/java/org/mian/gitnex/activities/CodeEditorActivity.java b/app/src/main/java/org/mian/gitnex/activities/CodeEditorActivity.java
index d7b23185..467e2fae 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CodeEditorActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CodeEditorActivity.java
@@ -23,10 +23,10 @@ import java.util.Map;
 
 public class CodeEditorActivity extends BaseActivity {
 
-	private ActivityCodeEditorBinding binding;
-	private LanguageManager languageManager;
 	private final LanguageName currentLanguage = LanguageName.JAVA;
 	private final ThemeName currentTheme = ThemeName.FIVE_COLOR;
+	private ActivityCodeEditorBinding binding;
+	private LanguageManager languageManager;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
index e822d021..3e870922 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
@@ -38,17 +38,16 @@ import retrofit2.Response;
 
 public class CommitsActivity extends BaseActivity {
 
+	private final String TAG = "CommitsActivity";
+	public RepositoryContext repository;
 	private View.OnClickListener onClickListener;
 	private TextView noData;
 	private ProgressBar progressBar;
-	private final String TAG = "CommitsActivity";
 	private int resultLimit;
 	private int pageSize = 1;
-
 	private RecyclerView recyclerView;
 	private List<Commit> commitsList;
 	private CommitsAdapter adapter;
-	public RepositoryContext repository;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
index af07353b..ca7b6d09 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
@@ -36,19 +36,14 @@ import retrofit2.Callback;
 
 public class CreateFileActivity extends BaseActivity {
 
-	private ActivityCreateFileBinding binding;
-
 	public static final int FILE_ACTION_CREATE = 0;
 	public static final int FILE_ACTION_DELETE = 1;
 	public static final int FILE_ACTION_EDIT = 2;
-
+	private final List<String> branches = new ArrayList<>();
+	private ActivityCreateFileBinding binding;
 	private int fileAction = FILE_ACTION_CREATE;
-
 	private String filePath;
 	private String fileSha;
-
-	private final List<String> branches = new ArrayList<>();
-
 	private RepositoryContext repository;
 
 	@SuppressLint("ClickableViewAccessibility")
@@ -121,8 +116,7 @@ public class CreateFileActivity extends BaseActivity {
 		disableProcessButton();
 
 		NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.getInstance(ctx);
-		networkStatusObserver.registerNetworkStatusListener(
-			hasNetworkConnection -> runOnUiThread(() -> binding.newFileCreate.setEnabled(hasNetworkConnection)));
+		networkStatusObserver.registerNetworkStatusListener(hasNetworkConnection -> runOnUiThread(() -> binding.newFileCreate.setEnabled(hasNetworkConnection)));
 
 		binding.newFileCreate.setOnClickListener(v -> processNewFile());
 
@@ -160,8 +154,7 @@ public class CreateFileActivity extends BaseActivity {
 		switch(fileAction) {
 
 			case FILE_ACTION_CREATE:
-				createNewFile(repository.getOwner(), repository.getName(), newFileName, AppUtil.encodeBase64(newFileContent), newFileCommitMessage,
-					newFileBranchName);
+				createNewFile(repository.getOwner(), repository.getName(), newFileName, AppUtil.encodeBase64(newFileContent), newFileCommitMessage, newFileBranchName);
 				break;
 
 			case FILE_ACTION_DELETE:
@@ -169,8 +162,7 @@ public class CreateFileActivity extends BaseActivity {
 				break;
 
 			case FILE_ACTION_EDIT:
-				editFile(repository.getOwner(), repository.getName(), filePath, AppUtil.encodeBase64(newFileContent), newFileCommitMessage,
-					newFileBranchName, fileSha);
+				editFile(repository.getOwner(), repository.getName(), filePath, AppUtil.encodeBase64(newFileContent), newFileCommitMessage, newFileBranchName, fileSha);
 				break;
 
 		}
@@ -295,8 +287,7 @@ public class CreateFileActivity extends BaseActivity {
 
 	}
 
-	private void editFile(String repoOwner, String repoName, String fileName, String fileContent, String fileCommitMessage, String branchName,
-		String fileSha) {
+	private void editFile(String repoOwner, String repoName, String fileName, String fileContent, String fileCommitMessage, String branchName, String fileSha) {
 
 		UpdateFileOptions editFileJsonStr = new UpdateFileOptions();
 		editFileJsonStr.setContent(fileContent);
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
index 5b937cd6..428b698f 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
@@ -49,6 +49,9 @@ import retrofit2.Callback;
 
 public class CreateIssueActivity extends BaseActivity implements View.OnClickListener, LabelsListAdapter.LabelsListAdapterListener, AssigneesListAdapter.AssigneesListAdapterListener {
 
+	private final List<Label> labelsList = new ArrayList<>();
+	private final LinkedHashMap<String, Milestone> milestonesList = new LinkedHashMap<>();
+	private final List<User> assigneesList = new ArrayList<>();
 	private ActivityCreateIssueBinding viewBinding;
 	private CustomLabelsSelectionDialogBinding labelsBinding;
 	private CustomAssigneesSelectionDialogBinding assigneesBinding;
@@ -60,16 +63,10 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 	private String assigneesSetter;
 	private int milestoneId;
 	private Date currentDate = null;
-
 	private RepositoryContext repository;
-
 	private LabelsListAdapter labelsAdapter;
 	private AssigneesListAdapter assigneesAdapter;
-
 	private List<Integer> labelsIds = new ArrayList<>();
-	private final List<Label> labelsList = new ArrayList<>();
-	private final LinkedHashMap<String, Milestone> milestonesList = new LinkedHashMap<>();
-	private final List<User> assigneesList = new ArrayList<>();
 	private List<String> assigneesListData = new ArrayList<>();
 
 	@SuppressLint("ClickableViewAccessibility")
@@ -178,8 +175,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 		assigneesBinding.save.setOnClickListener(assigneesBinding_ -> dialogAssignees.dismiss());
 
 		dialogAssignees.show();
-		AssigneesActions.getRepositoryAssignees(ctx, repository.getOwner(), repository.getName(), assigneesList, dialogAssignees, assigneesAdapter,
-			assigneesBinding);
+		AssigneesActions.getRepositoryAssignees(ctx, repository.getOwner(), repository.getName(), assigneesList, dialogAssignees, assigneesAdapter, assigneesBinding);
 	}
 
 	private void showLabels() {
@@ -226,8 +222,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 		createNewIssueFunc(repository.getOwner(), repository.getName(), newIssueDescriptionForm, milestoneId, newIssueTitleForm);
 	}
 
-	private void createNewIssueFunc(String repoOwner, String repoName, String newIssueDescriptionForm, int newIssueMilestoneIdForm,
-		String newIssueTitleForm) {
+	private void createNewIssueFunc(String repoOwner, String repoName, String newIssueDescriptionForm, int newIssueMilestoneIdForm, String newIssueTitleForm) {
 
 		ArrayList<Long> labelIds = new ArrayList<>();
 		for(Integer i : labelsIds) {
@@ -319,8 +314,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 							}
 						}
 
-						ArrayAdapter<String> adapter = new ArrayAdapter<>(CreateIssueActivity.this, R.layout.list_spinner_items,
-							new ArrayList<>(milestonesList.keySet()));
+						ArrayAdapter<String> adapter = new ArrayAdapter<>(CreateIssueActivity.this, R.layout.list_spinner_items, new ArrayList<>(milestonesList.keySet()));
 
 						viewBinding.newIssueMilestoneSpinner.setAdapter(adapter);
 						enableProcessButton();
@@ -330,8 +324,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 								milestoneId = 0;
 							}
 							else if(view instanceof TextView) {
-								milestoneId = Math.toIntExact(
-									Objects.requireNonNull(milestonesList.get(((TextView) view).getText().toString())).getId());
+								milestoneId = Math.toIntExact(Objects.requireNonNull(milestonesList.get(((TextView) view).getText().toString())).getId());
 							}
 						});
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
index 574b52ce..86a48887 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
@@ -47,7 +47,9 @@ public class CreateLabelActivity extends BaseActivity {
 
 	private RepositoryContext repository;
 	private String labelColor = "";
+	private final View.OnClickListener createLabelListener = v -> processCreateLabel();
 	private String labelColorDefault = "";
+	private final View.OnClickListener updateLabelListener = v -> processUpdateLabel();
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -121,10 +123,6 @@ public class CreateLabelActivity extends BaseActivity {
 
 	}
 
-	private final View.OnClickListener createLabelListener = v -> processCreateLabel();
-
-	private final View.OnClickListener updateLabelListener = v -> processUpdateLabel();
-
 	private void processUpdateLabel() {
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
index 79264b49..5e82990d 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
@@ -41,6 +41,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 	private RepositoryContext repository;
 
 	private Date currentDate = null;
+	private final View.OnClickListener createMilestoneListener = v -> processNewMilestone();
 
 	@SuppressLint("ClickableViewAccessibility")
 	@Override
@@ -92,8 +93,6 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
 	}
 
-	private final View.OnClickListener createMilestoneListener = v -> processNewMilestone();
-
 	private void processNewMilestone() {
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
index ea3fa424..cde022a3 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
@@ -33,6 +33,7 @@ public class CreateNewUserActivity extends BaseActivity {
 	private EditText userEmail;
 	private EditText userPassword;
 	private Button createUserButton;
+	private final View.OnClickListener createNewUserListener = v -> processCreateNewUser();
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -172,8 +173,6 @@ public class CreateNewUserActivity extends BaseActivity {
 
 	}
 
-	private final View.OnClickListener createNewUserListener = v -> processCreateNewUser();
-
 	private void initCloseListener() {
 
 		onClickListener = view -> finish();
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java
index 109fa6c0..e8707827 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java
@@ -35,6 +35,7 @@ public class CreateOrganizationActivity extends BaseActivity {
 
 	private EditText orgName;
 	private EditText orgDesc;
+	private final View.OnClickListener createOrgListener = v -> processNewOrganization();
 
 	@SuppressLint("ClickableViewAccessibility")
 	@Override
@@ -89,8 +90,6 @@ public class CreateOrganizationActivity extends BaseActivity {
 		onClickListener = view -> finish();
 	}
 
-	private final View.OnClickListener createOrgListener = v -> processNewOrganization();
-
 	private void processNewOrganization() {
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java
index 001f7faa..d4d87839 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java
@@ -43,23 +43,20 @@ import retrofit2.Callback;
 
 public class CreatePullRequestActivity extends BaseActivity implements LabelsListAdapter.LabelsListAdapterListener {
 
+	private final List<String> assignees = new ArrayList<>();
+	LinkedHashMap<String, Milestone> milestonesList = new LinkedHashMap<>();
+	List<String> branchesList = new ArrayList<>();
+	List<Label> labelsList = new ArrayList<>();
 	private View.OnClickListener onClickListener;
 	private ActivityCreatePrBinding viewBinding;
 	private int resultLimit;
 	private Dialog dialogLabels;
 	private List<Integer> labelsIds = new ArrayList<>();
-	private final List<String> assignees = new ArrayList<>();
 	private int milestoneId;
 	private Date currentDate = null;
-
 	private RepositoryContext repository;
-
 	private LabelsListAdapter labelsAdapter;
 
-	LinkedHashMap<String, Milestone> milestonesList = new LinkedHashMap<>();
-	List<String> branchesList = new ArrayList<>();
-	List<Label> labelsList = new ArrayList<>();
-
 	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -162,8 +159,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 		createPullRequest.setLabels(labelIds);
 		createPullRequest.setDueDate(currentDate);
 
-		Call<PullRequest> transferCall = RetrofitClient.getApiInterface(ctx)
-			.repoCreatePullRequest(repository.getOwner(), repository.getName(), createPullRequest);
+		Call<PullRequest> transferCall = RetrofitClient.getApiInterface(ctx).repoCreatePullRequest(repository.getOwner(), repository.getName(), createPullRequest);
 
 		transferCall.enqueue(new Callback<>() {
 
@@ -228,8 +224,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 			dialogLabels.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
 		}
 
-		org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding labelsBinding = CustomLabelsSelectionDialogBinding.inflate(
-			LayoutInflater.from(ctx));
+		org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding labelsBinding = CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
 
 		View view = labelsBinding.getRoot();
 		dialogLabels.setContentView(view);
@@ -293,8 +288,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 
 					List<Milestone> milestonesList_ = response.body();
 
-					milestonesList.put(getString(R.string.issueCreatedNoMilestone),
-						new Milestone().id(0L).title(getString(R.string.issueCreatedNoMilestone)));
+					milestonesList.put(getString(R.string.issueCreatedNoMilestone), new Milestone().id(0L).title(getString(R.string.issueCreatedNoMilestone)));
 					assert milestonesList_ != null;
 
 					if(milestonesList_.size() > 0) {
@@ -308,8 +302,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 						}
 					}
 
-					ArrayAdapter<String> adapter = new ArrayAdapter<>(CreatePullRequestActivity.this, R.layout.list_spinner_items,
-						new ArrayList<>(milestonesList.keySet()));
+					ArrayAdapter<String> adapter = new ArrayAdapter<>(CreatePullRequestActivity.this, R.layout.list_spinner_items, new ArrayList<>(milestonesList.keySet()));
 
 					viewBinding.milestonesSpinner.setAdapter(adapter);
 					enableProcessButton();
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
index fd2ef6df..8fa49cb9 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
@@ -38,8 +38,9 @@ import retrofit2.Callback;
 
 public class CreateReleaseActivity extends BaseActivity {
 
-	private View.OnClickListener onClickListener;
 	public ImageView closeActivity;
+	List<String> branchesList = new ArrayList<>();
+	private View.OnClickListener onClickListener;
 	private EditText releaseTagName;
 	private AutoCompleteTextView releaseBranch;
 	private EditText releaseTitle;
@@ -49,10 +50,8 @@ public class CreateReleaseActivity extends BaseActivity {
 	private Button createNewRelease;
 	private String selectedBranch;
 	private Button createNewTag;
-
 	private RepositoryContext repository;
-
-	List<String> branchesList = new ArrayList<>();
+	private final View.OnClickListener createReleaseListener = v -> processNewRelease();
 
 	@SuppressLint("ClickableViewAccessibility")
 	@Override
@@ -182,8 +181,6 @@ public class CreateReleaseActivity extends BaseActivity {
 		});
 	}
 
-	private final View.OnClickListener createReleaseListener = v -> processNewRelease();
-
 	private void processNewRelease() {
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
@@ -220,12 +217,11 @@ public class CreateReleaseActivity extends BaseActivity {
 		}
 
 		disableProcessButton();
-		createNewReleaseFunc(repository.getOwner(), repository.getName(), newReleaseTagName, newReleaseTitle, newReleaseContent, selectedBranch,
-			newReleaseType, newReleaseDraft);
+		createNewReleaseFunc(repository.getOwner(), repository.getName(), newReleaseTagName, newReleaseTitle, newReleaseContent, selectedBranch, newReleaseType, newReleaseDraft);
 	}
 
-	private void createNewReleaseFunc(String repoOwner, String repoName, String newReleaseTagName, String newReleaseTitle, String newReleaseContent,
-		String selectedBranch, boolean newReleaseType, boolean newReleaseDraft) {
+	private void createNewReleaseFunc(String repoOwner, String repoName, String newReleaseTagName, String newReleaseTitle, String newReleaseContent, String selectedBranch, boolean newReleaseType,
+		boolean newReleaseDraft) {
 
 		CreateReleaseOption createReleaseJson = new CreateReleaseOption();
 		createReleaseJson.setName(newReleaseTitle);
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
index 9c49ab28..46431ecb 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
@@ -36,23 +36,20 @@ import retrofit2.Callback;
 
 public class CreateRepoActivity extends BaseActivity {
 
+	//https://github.com/go-gitea/gitea/blob/52cfd2743c0e85b36081cf80a850e6a5901f1865/models/repo.go#L964-L967
+	final List<String> reservedRepoNames = Arrays.asList(".", "..");
+	final Pattern reservedRepoPatterns = Pattern.compile("\\.(git|wiki)$");
 	public ImageView closeActivity;
+	List<String> organizationsList = new ArrayList<>();
 	private View.OnClickListener onClickListener;
 	private AutoCompleteTextView spinner;
 	private Button createRepo;
 	private EditText repoName;
 	private EditText repoDesc;
 	private CheckBox repoAccess;
-
 	private String loginUid;
-
 	private String selectedOwner;
-
-	List<String> organizationsList = new ArrayList<>();
-
-	//https://github.com/go-gitea/gitea/blob/52cfd2743c0e85b36081cf80a850e6a5901f1865/models/repo.go#L964-L967
-	final List<String> reservedRepoNames = Arrays.asList(".", "..");
-	final Pattern reservedRepoPatterns = Pattern.compile("\\.(git|wiki)$");
+	private final View.OnClickListener createRepoListener = v -> processNewRepo();
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -96,8 +93,6 @@ public class CreateRepoActivity extends BaseActivity {
 		}
 	}
 
-	private final View.OnClickListener createRepoListener = v -> processNewRepo();
-
 	private void processNewRepo() {
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
index 5f910ccb..5c2ed2ee 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
+++ b/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,16 +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) {
 
@@ -161,10 +157,8 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
 					if(value) {
 
-						teamAccessControls.setText(
-							getString(R.string.newTeamPermissionValues, teamAccessControls.getText(), pushAccessList.get(selectedVal)));
-						teamAccessControlsArray.setText(
-							getString(R.string.newTeamPermissionValuesFinal, teamAccessControlsArray.getText(), repoCode));
+						teamAccessControls.setText(getString(R.string.newTeamPermissionValues, teamAccessControls.getText(), pushAccessList.get(selectedVal)));
+						teamAccessControlsArray.setText(getString(R.string.newTeamPermissionValuesFinal, teamAccessControlsArray.getText(), repoCode));
 					}
 
 					selectedVal++;
@@ -264,8 +258,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 		createNewTeamCall(orgName, newTeamName, newTeamDesc, newTeamPermission, newTeamAccessControls_);
 	}
 
-	private void createNewTeamCall(String orgName, String newTeamName, String newTeamDesc, String newTeamPermission,
-		List<String> newTeamAccessControls) {
+	private void createNewTeamCall(String orgName, String newTeamName, String newTeamDesc, String newTeamPermission, List<String> newTeamAccessControls) {
 
 		CreateTeamOption createNewTeamJson = new CreateTeamOption();
 		createNewTeamJson.setName(newTeamName);
diff --git a/app/src/main/java/org/mian/gitnex/activities/DeepLinksActivity.java b/app/src/main/java/org/mian/gitnex/activities/DeepLinksActivity.java
index f0adf8bd..f3b2d2bb 100644
--- a/app/src/main/java/org/mian/gitnex/activities/DeepLinksActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/DeepLinksActivity.java
@@ -174,9 +174,7 @@ public class DeepLinksActivity extends BaseActivity {
 							issueIntent.putExtra("issueComment", urlSplitted[1]);
 						}
 
-						IssueContext issue = new IssueContext(
-							new RepositoryContext(data.getPathSegments().get(0), data.getPathSegments().get(1), ctx),
-							Integer.parseInt(data.getLastPathSegment()), "Issue");
+						IssueContext issue = new IssueContext(new RepositoryContext(data.getPathSegments().get(0), data.getPathSegments().get(1), ctx), Integer.parseInt(data.getLastPathSegment()), "Issue");
 
 						issue.getRepository().saveToDB(ctx);
 
@@ -186,12 +184,10 @@ public class DeepLinksActivity extends BaseActivity {
 						finish();
 					}
 					else if(Objects.requireNonNull(data.getLastPathSegment()).contains("issues")) {
-						new Handler(Looper.getMainLooper()).postDelayed(
-							() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "issue"), 500);
+						new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "issue"), 500);
 					}
 					else if(data.getLastPathSegment().equals("new")) {
-						new Handler(Looper.getMainLooper()).postDelayed(
-							() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "issueNew"), 500);
+						new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "issueNew"), 500);
 					}
 					else {
 						ctx.startActivity(mainIntent);
@@ -214,14 +210,12 @@ public class DeepLinksActivity extends BaseActivity {
 
 					}
 					else if(Objects.requireNonNull(data.getLastPathSegment()).contains("pulls")) {
-						new Handler(Looper.getMainLooper()).postDelayed(
-							() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "pull"), 500);
+						new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "pull"), 500);
 					}
 					else if(data.getLastPathSegment().equals("files")) { // pr diff
 						new Handler(Looper.getMainLooper()).postDelayed(() -> {
 							issueIntent.putExtra("openPrDiff", "true");
-							getPullRequest(data.getPathSegments().get(0), data.getPathSegments().get(1),
-								Integer.parseInt(data.getPathSegments().get(3)));
+							getPullRequest(data.getPathSegments().get(0), data.getPathSegments().get(1), Integer.parseInt(data.getPathSegments().get(3)));
 						}, 500);
 					}
 					else {
@@ -231,36 +225,29 @@ public class DeepLinksActivity extends BaseActivity {
 				}
 
 				else if(data.getPathSegments().get(2).equals("compare")) { // new pull request
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "pullNew"), 500);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "pullNew"), 500);
 				}
 				else if(data.getPathSegments().get(2).equals("commit")) {
 					repoIntent.putExtra("sha", data.getLastPathSegment());
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "commit"), 500);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "commit"), 500);
 				}
 				else if(data.getPathSegments().get(2).equals("commits")) { // commits list
 					String branch = data.getLastPathSegment();
 					repoIntent.putExtra("branchName", branch);
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "commitsList"), 500);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "commitsList"), 500);
 				}
 				else if(data.getPathSegments().get(2).equals("milestones") && data.getLastPathSegment().equals("new")) { // new milestone
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "milestonesNew"), 500);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "milestonesNew"), 500);
 				}
 				else if(data.getPathSegments().get(2).equals("milestones")) { // milestones
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "milestones"), 500);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "milestones"), 500);
 				}
 				else if(data.getPathSegments().get(2).equals("milestone")) { // milestone
 					repoIntent.putExtra("milestoneId", data.getLastPathSegment());
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "milestones"), 500);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "milestones"), 500);
 				}
 				else if(data.getPathSegments().get(2).equals("releases") && data.getLastPathSegment().equals("new")) { // new release
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "newRelease"), 500);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "newRelease"), 500);
 				}
 				else if(data.getPathSegments().get(2).equals("releases")) { // releases
 					if(data.getPathSegments().size() == 5) {
@@ -268,26 +255,20 @@ public class DeepLinksActivity extends BaseActivity {
 							repoIntent.putExtra("releaseTagName", data.getLastPathSegment());
 						}
 					}
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "releases"), 500);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "releases"), 500);
 				}
 				else if(data.getPathSegments().get(2).equals("labels")) { // labels
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "labels"), 500);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "labels"), 500);
 				}
 				else if(data.getPathSegments().get(2).equals("settings")) { // repo settings
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "settings"), 500);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "settings"), 500);
 				}
 				else if(data.getLastPathSegment().equals("branches")) { // branches list
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "branchesList"), 500);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "branchesList"), 500);
 				}
-				else if(data.getPathSegments().size() == 5 && data.getPathSegments().get(2).equals("src") && data.getPathSegments().get(3)
-					.equals("branch")) { // branch
+				else if(data.getPathSegments().size() == 5 && data.getPathSegments().get(2).equals("src") && data.getPathSegments().get(3).equals("branch")) { // branch
 					repoIntent.putExtra("selectedBranch", data.getLastPathSegment());
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "branch"), 500);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "branch"), 500);
 				}
 				else if(data.getPathSegments().get(2).equals("src") && data.getPathSegments().get(3).equals("branch")) { // file/dir
 					StringBuilder filePath = new StringBuilder();
@@ -298,9 +279,7 @@ public class DeepLinksActivity extends BaseActivity {
 						filePath.append("/");
 					}
 					filePath.deleteCharAt(filePath.toString().length() - 1);
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> getFile(data.getPathSegments().get(0), data.getPathSegments().get(1), filePath.toString(),
-							data.getPathSegments().get(4)), 500);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> getFile(data.getPathSegments().get(0), data.getPathSegments().get(1), filePath.toString(), data.getPathSegments().get(4)), 500);
 				}
 				else { // no action, show options
 					showNoActionButtons();
diff --git a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
index 5070465b..5eca3497 100644
--- a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
@@ -48,20 +48,18 @@ import retrofit2.Callback;
 
 public class EditIssueActivity extends BaseActivity implements View.OnClickListener {
 
+	private final String msState = "open";
 	private View.OnClickListener onClickListener;
 	private int resultLimit;
-
 	private EditText editIssueTitle;
 	private EditText editIssueDescription;
 	private TextView editIssueDueDate;
 	private Button editIssueButton;
 	private AutoCompleteTextView editIssueMilestoneSpinner;
-
-	private final String msState = "open";
 	private int milestoneId = 0;
 	private Date currentDate = null;
 
-	private LinkedHashMap<String, Milestone> milestonesList = new LinkedHashMap<>();
+	private final LinkedHashMap<String, Milestone> milestonesList = new LinkedHashMap<>();
 
 	private IssueContext issue;
 
@@ -152,8 +150,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 		}
 
 		disableProcessButton();
-		editIssue(issue.getRepository().getOwner(), issue.getRepository().getName(), issue.getIssueIndex(), editIssueTitleForm,
-			editIssueDescriptionForm, milestoneId);
+		editIssue(issue.getRepository().getOwner(), issue.getRepository().getName(), issue.getIssueIndex(), editIssueTitleForm, editIssueDescriptionForm, milestoneId);
 	}
 
 	private void editIssue(String repoOwner, String repoName, int issueIndex, String title, String description, int milestoneId) {
@@ -254,8 +251,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 					// get milestones list
 					if(response.body().getId() > 0) {
 
-						Call<List<Milestone>> call_ = RetrofitClient.getApiInterface(ctx)
-							.issueGetMilestonesList(repoOwner, repoName, msState, null, 1, resultLimit);
+						Call<List<Milestone>> call_ = RetrofitClient.getApiInterface(ctx).issueGetMilestonesList(repoOwner, repoName, msState, null, 1, resultLimit);
 
 						call_.enqueue(new Callback<>() {
 
@@ -284,8 +280,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 										}
 									}
 
-									ArrayAdapter<String> adapter = new ArrayAdapter<>(EditIssueActivity.this, R.layout.list_spinner_items,
-										new ArrayList<>(milestonesList.keySet()));
+									ArrayAdapter<String> adapter = new ArrayAdapter<>(EditIssueActivity.this, R.layout.list_spinner_items, new ArrayList<>(milestonesList.keySet()));
 
 									editIssueMilestoneSpinner.setAdapter(adapter);
 
@@ -294,8 +289,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 											milestoneId = 0;
 										}
 										else if(view instanceof TextView) {
-											milestoneId = Math.toIntExact(
-												Objects.requireNonNull(milestonesList.get(((TextView) view).getText().toString())).getId());
+											milestoneId = Math.toIntExact(Objects.requireNonNull(milestonesList.get(((TextView) view).getText().toString())).getId());
 										}
 									});
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
index 94d5ece5..b82c1dd0 100644
--- a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
@@ -48,25 +48,82 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
 	private ActivityFileViewBinding binding;
 	private ContentsResponse file;
 	private RepositoryContext repository;
+	ActivityResultLauncher<Intent> activityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+
+		if(result.getResultCode() == Activity.RESULT_OK) {
+
+			assert result.getData() != null;
+
+			try {
+
+				OutputStream outputStream = getContentResolver().openOutputStream(result.getData().getData());
+
+				NotificationCompat.Builder builder = new NotificationCompat.Builder(ctx, ctx.getPackageName()).setContentTitle(getString(R.string.fileViewerNotificationTitleStarted))
+					.setContentText(getString(R.string.fileViewerNotificationDescriptionStarted, file.getName())).setSmallIcon(R.drawable.gitnex_transparent).setPriority(NotificationCompat.PRIORITY_LOW)
+					.setChannelId(Constants.downloadNotificationChannelId).setProgress(100, 0, false).setOngoing(true);
+
+				int notificationId = Notifications.uniqueNotificationId(ctx);
+
+				NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+				notificationManager.notify(notificationId, builder.build());
+
+				Thread thread = new Thread(() -> {
+
+					try {
+
+						Call<ResponseBody> call = RetrofitClient.getWebInterface(ctx).getFileContents(repository.getOwner(), repository.getName(), repository.getBranchRef(), file.getPath());
+
+						Response<ResponseBody> response = call.execute();
+
+						assert response.body() != null;
+
+						AppUtil.copyProgress(response.body().byteStream(), outputStream, file.getSize(), progress -> {
+							builder.setProgress(100, progress, false);
+							notificationManager.notify(notificationId, builder.build());
+						});
+
+						builder.setContentTitle(getString(R.string.fileViewerNotificationTitleFinished)).setContentText(getString(R.string.fileViewerNotificationDescriptionFinished, file.getName()));
+
+					}
+					catch(IOException ignored) {
+
+						builder.setContentTitle(getString(R.string.fileViewerNotificationTitleFailed)).setContentText(getString(R.string.fileViewerNotificationDescriptionFailed, file.getName()));
+
+					}
+					finally {
+
+						builder.setProgress(0, 0, false).setOngoing(false);
+
+						notificationManager.notify(notificationId, builder.build());
+
+					}
+				});
+
+				thread.start();
+
+			}
+			catch(IOException ignored) {
+			}
+		}
+
+	});
 	private boolean renderMd = false;
 	private boolean processable = false;
-
-	public ActivityResultLauncher<Intent> editFileLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
-		result -> {
-			if(result.getResultCode() == 200) {
-				assert result.getData() != null;
-				if(result.getData().getBooleanExtra("fileModified", false)) {
-					switch(result.getData().getIntExtra("fileAction", CreateFileActivity.FILE_ACTION_EDIT)) {
-						case CreateFileActivity.FILE_ACTION_CREATE:
-						case CreateFileActivity.FILE_ACTION_EDIT:
-							getSingleFileContents(repository.getOwner(), repository.getName(), file.getPath(), repository.getBranchRef());
-							break;
-						default:
-							finish();
-					}
+	public ActivityResultLauncher<Intent> editFileLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+		if(result.getResultCode() == 200) {
+			assert result.getData() != null;
+			if(result.getData().getBooleanExtra("fileModified", false)) {
+				switch(result.getData().getIntExtra("fileAction", CreateFileActivity.FILE_ACTION_EDIT)) {
+					case CreateFileActivity.FILE_ACTION_CREATE:
+					case CreateFileActivity.FILE_ACTION_EDIT:
+						getSingleFileContents(repository.getOwner(), repository.getName(), file.getPath(), repository.getBranchRef());
+						break;
+					default:
+						finish();
 				}
 			}
-		});
+		}
+	});
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -328,73 +385,6 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
 
 	}
 
-	ActivityResultLauncher<Intent> activityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
-		result -> {
-
-			if(result.getResultCode() == Activity.RESULT_OK) {
-
-				assert result.getData() != null;
-
-				try {
-
-					OutputStream outputStream = getContentResolver().openOutputStream(result.getData().getData());
-
-					NotificationCompat.Builder builder = new NotificationCompat.Builder(ctx, ctx.getPackageName()).setContentTitle(
-							getString(R.string.fileViewerNotificationTitleStarted))
-						.setContentText(getString(R.string.fileViewerNotificationDescriptionStarted, file.getName()))
-						.setSmallIcon(R.drawable.gitnex_transparent).setPriority(NotificationCompat.PRIORITY_LOW)
-						.setChannelId(Constants.downloadNotificationChannelId).setProgress(100, 0, false).setOngoing(true);
-
-					int notificationId = Notifications.uniqueNotificationId(ctx);
-
-					NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-					;
-					notificationManager.notify(notificationId, builder.build());
-
-					Thread thread = new Thread(() -> {
-
-						try {
-
-							Call<ResponseBody> call = RetrofitClient.getWebInterface(ctx)
-								.getFileContents(repository.getOwner(), repository.getName(), repository.getBranchRef(), file.getPath());
-
-							Response<ResponseBody> response = call.execute();
-
-							assert response.body() != null;
-
-							AppUtil.copyProgress(response.body().byteStream(), outputStream, file.getSize(), progress -> {
-								builder.setProgress(100, progress, false);
-								notificationManager.notify(notificationId, builder.build());
-							});
-
-							builder.setContentTitle(getString(R.string.fileViewerNotificationTitleFinished))
-								.setContentText(getString(R.string.fileViewerNotificationDescriptionFinished, file.getName()));
-
-						}
-						catch(IOException ignored) {
-
-							builder.setContentTitle(getString(R.string.fileViewerNotificationTitleFailed))
-								.setContentText(getString(R.string.fileViewerNotificationDescriptionFailed, file.getName()));
-
-						}
-						finally {
-
-							builder.setProgress(0, 0, false).setOngoing(false);
-
-							notificationManager.notify(notificationId, builder.build());
-
-						}
-					});
-
-					thread.start();
-
-				}
-				catch(IOException ignored) {
-				}
-			}
-
-		});
-
 	@Override
 	public void onResume() {
 		super.onResume();
diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
index f03a5ca2..a994ffdf 100644
--- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
@@ -89,53 +89,49 @@ import retrofit2.Response;
 
 public class IssueDetailActivity extends BaseActivity implements LabelsListAdapter.LabelsListAdapterListener, AssigneesListAdapter.AssigneesListAdapterListener, BottomSheetListener {
 
+	public static boolean singleIssueUpdate = false;
+	public static boolean commentPosted = false;
+	private final List<Label> labelsList = new ArrayList<>();
+	private final List<User> assigneesList = new ArrayList<>();
+	public boolean commentEdited = false;
 	private IssueCommentsAdapter adapter;
-
 	private String repoOwner;
 	private String repoName;
 	private int issueIndex;
 	private String issueCreator;
 	private IssueContext issue;
-
 	private LabelsListAdapter labelsAdapter;
 	private AssigneesListAdapter assigneesAdapter;
-
 	private List<Integer> currentLabelsIds = new ArrayList<>();
 	private List<Integer> labelsIds = new ArrayList<>();
-	private final List<Label> labelsList = new ArrayList<>();
-	private final List<User> assigneesList = new ArrayList<>();
 	private List<String> assigneesListData = new ArrayList<>();
 	private List<String> currentAssignees = new ArrayList<>();
-
 	private Dialog dialogLabels;
 	private Dialog dialogAssignees;
-
 	private CustomLabelsSelectionDialogBinding labelsBinding;
 	private CustomAssigneesSelectionDialogBinding assigneesBinding;
 	private ActivityIssueDetailBinding viewBinding;
-
-	public static boolean singleIssueUpdate = false;
-	public boolean commentEdited = false;
-	public static boolean commentPosted = false;
-
 	private IssueCommentsViewModel issueCommentsModel;
+	private Runnable showMenu = () -> {
+	};
+	private boolean loadingFinishedIssue = false;
+	private boolean loadingFinishedPr = false;
+	private boolean loadingFinishedRepo = false;
+	public ActivityResultLauncher<Intent> editIssueLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+		if(result.getResultCode() == 200) {
+			assert result.getData() != null;
+			if(result.getData().getBooleanExtra("issueEdited", false)) {
+				new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
-	public ActivityResultLauncher<Intent> editIssueLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
-		result -> {
-			if(result.getResultCode() == 200) {
-				assert result.getData() != null;
-				if(result.getData().getBooleanExtra("issueEdited", false)) {
-					new Handler(Looper.getMainLooper()).postDelayed(() -> {
+					viewBinding.frameAssignees.removeAllViews();
+					viewBinding.frameLabels.removeAllViews();
+					issue.setIssue(null);
+					getSingleIssue(repoOwner, repoName, issueIndex);
 
-						viewBinding.frameAssignees.removeAllViews();
-						viewBinding.frameLabels.removeAllViews();
-						issue.setIssue(null);
-						getSingleIssue(repoOwner, repoName, issueIndex);
-
-					}, 500);
-				}
+				}, 500);
 			}
-		});
+		}
+	});
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -325,8 +321,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 					issue.setIssue(response2.body());
 					getSingleIssue(repoOwner, repoName, issueIndex);
 					currentAssignees.clear();
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> AssigneesActions.getCurrentIssueAssignees(ctx, repoOwner, repoName, issueIndex, currentAssignees), 1000);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> AssigneesActions.getCurrentIssueAssignees(ctx, repoOwner, repoName, issueIndex, currentAssignees), 1000);
 				}
 				else if(response2.code() == 401) {
 
@@ -381,8 +376,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 					issue.setIssue(null);
 					getSingleIssue(repoOwner, repoName, issueIndex);
 					currentLabelsIds.clear();
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> LabelsActions.getCurrentIssueLabels(ctx, repoOwner, repoName, issueIndex, currentLabelsIds), 1000);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> LabelsActions.getCurrentIssueLabels(ctx, repoOwner, repoName, issueIndex, currentLabelsIds), 1000);
 					IssuesFragment.resumeIssues = true;
 				}
 				else if(response.code() == 401) {
@@ -412,12 +406,6 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 		});
 	}
 
-	private Runnable showMenu = () -> {
-	};
-	private boolean loadingFinishedIssue = false;
-	private boolean loadingFinishedPr = false;
-	private boolean loadingFinishedRepo = false;
-
 	private void updateMenuState() {
 		if(loadingFinishedIssue && loadingFinishedPr && loadingFinishedRepo) {
 			showMenu.run();
@@ -449,8 +437,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 
 		if(id == android.R.id.home) {
 
-			if(issue.hasIssue() && getIntent().getStringExtra("openedFromLink") != null && getIntent().getStringExtra("openedFromLink")
-				.equals("true")) {
+			if(issue.hasIssue() && getIntent().getStringExtra("openedFromLink") != null && getIntent().getStringExtra("openedFromLink").equals("true")) {
 				Intent intent = issue.getRepository().getIntent(ctx, RepoDetailActivity.class);
 				intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 				startActivity(intent);
@@ -502,8 +489,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 
 			viewBinding.scrollViewComments.post(() -> {
 
-				issueCommentsModel.loadIssueComments(repoOwner, repoName, issueIndex, ctx,
-					() -> viewBinding.scrollViewComments.fullScroll(ScrollView.FOCUS_DOWN));
+				issueCommentsModel.loadIssueComments(repoOwner, repoName, issueIndex, ctx, () -> viewBinding.scrollViewComments.fullScroll(ScrollView.FOCUS_DOWN));
 
 				commentPosted = false;
 			});
@@ -645,14 +631,12 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 			if(issue.getIssue().getPullRequest().isMerged()) { // merged
 
 				viewBinding.issuePrState.setImageResource(R.drawable.ic_pull_request);
-				ImageViewCompat.setImageTintList(viewBinding.issuePrState,
-					ColorStateList.valueOf(ctx.getResources().getColor(R.color.iconPrMergedColor)));
+				ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.iconPrMergedColor)));
 			}
 			else if(!issue.getIssue().getPullRequest().isMerged() && issue.getIssue().getState().equals("closed")) { // closed
 
 				viewBinding.issuePrState.setImageResource(R.drawable.ic_pull_request);
-				ImageViewCompat.setImageTintList(viewBinding.issuePrState,
-					ColorStateList.valueOf(ctx.getResources().getColor(R.color.iconIssuePrClosedColor)));
+				ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.iconIssuePrClosedColor)));
 			}
 			else { // open
 
@@ -664,8 +648,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 			loadingFinishedPr = true;
 			updateMenuState();
 			viewBinding.issuePrState.setImageResource(R.drawable.ic_issue);
-			ImageViewCompat.setImageTintList(viewBinding.issuePrState,
-				ColorStateList.valueOf(ctx.getResources().getColor(R.color.iconIssuePrClosedColor)));
+			ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.iconIssuePrClosedColor)));
 		}
 		else {
 			loadingFinishedPr = true;
@@ -679,12 +662,10 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 		final String timeFormat = tinyDb.getString("dateFormat", "pretty");
 		issueCreator = issue.getIssue().getUser().getLogin();
 
-		PicassoService.getInstance(ctx).get().load(issue.getIssue().getUser().getAvatarUrl()).placeholder(R.drawable.loader_animated)
-			.transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(viewBinding.assigneeAvatar);
-		String issueNumber_ = "<font color='" + ResourcesCompat.getColor(getResources(), R.color.lightGray, null) + "'>" + appCtx.getResources()
-			.getString(R.string.hash) + issue.getIssue().getNumber() + "</font>";
-		viewBinding.issueTitle.setText(
-			HtmlCompat.fromHtml(issueNumber_ + " " + EmojiParser.parseToUnicode(issue.getIssue().getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
+		PicassoService.getInstance(ctx).get().load(issue.getIssue().getUser().getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop()
+			.into(viewBinding.assigneeAvatar);
+		String issueNumber_ = "<font color='" + ResourcesCompat.getColor(getResources(), R.color.lightGray, null) + "'>" + appCtx.getResources().getString(R.string.hash) + issue.getIssue().getNumber() + "</font>";
+		viewBinding.issueTitle.setText(HtmlCompat.fromHtml(issueNumber_ + " " + EmojiParser.parseToUnicode(issue.getIssue().getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
 		String cleanIssueDescription = issue.getIssue().getBody().trim();
 
 		viewBinding.assigneeAvatar.setOnClickListener(loginId -> {
@@ -694,8 +675,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 		});
 
 		viewBinding.assigneeAvatar.setOnLongClickListener(loginId -> {
-			AppUtil.copyToClipboard(ctx, issue.getIssue().getUser().getLogin(),
-				ctx.getString(R.string.copyLoginIdToClipBoard, issue.getIssue().getUser().getLogin()));
+			AppUtil.copyToClipboard(ctx, issue.getIssue().getUser().getLogin(), ctx.getString(R.string.copyLoginIdToClipBoard, issue.getIssue().getUser().getLogin()));
 			return true;
 		});
 
@@ -714,9 +694,8 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 
 				ImageView assigneesView = new ImageView(ctx);
 
-				PicassoService.getInstance(ctx).get().load(issue.getIssue().getAssignees().get(i).getAvatarUrl())
-					.placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(100, 100).centerCrop()
-					.into(assigneesView);
+				PicassoService.getInstance(ctx).get().load(issue.getIssue().getAssignees().get(i).getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(100, 100)
+					.centerCrop().into(assigneesView);
 
 				viewBinding.frameAssignees.addView(assigneesView);
 				assigneesView.setLayoutParams(params1);
@@ -729,8 +708,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 				});
 
 				assigneesView.setOnLongClickListener(loginId -> {
-					AppUtil.copyToClipboard(ctx, issue.getIssue().getAssignees().get(finalI).getLogin(),
-						ctx.getString(R.string.copyLoginIdToClipBoard, issue.getIssue().getAssignees().get(finalI).getLogin()));
+					AppUtil.copyToClipboard(ctx, issue.getIssue().getAssignees().get(finalI).getLogin(), ctx.getString(R.string.copyLoginIdToClipBoard, issue.getIssue().getAssignees().get(finalI).getLogin()));
 					return true;
 				});
 
@@ -751,8 +729,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 			viewBinding.assigneesScrollView.setVisibility(View.GONE);
 		}
 
-		LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
-			LinearLayout.LayoutParams.WRAP_CONTENT);
+		LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
 		params.setMargins(0, 0, 15, 0);
 
 		if(issue.getIssue().getLabels() != null) {
@@ -773,10 +750,9 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 				int height = AppUtil.getPixelsFromDensity(ctx, 20);
 				int textSize = AppUtil.getPixelsFromScaledDensity(ctx, 12);
 
-				TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT)
-					.textColor(new ColorInverter().getContrastColor(color)).fontSize(textSize)
-					.width(LabelWidthCalculator.calculateLabelWidth(labelName, Typeface.DEFAULT, textSize, AppUtil.getPixelsFromDensity(ctx, 10)))
-					.height(height).endConfig().buildRoundRect(labelName, color, AppUtil.getPixelsFromDensity(ctx, 18));
+				TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).textColor(new ColorInverter().getContrastColor(color)).fontSize(textSize)
+					.width(LabelWidthCalculator.calculateLabelWidth(labelName, Typeface.DEFAULT, textSize, AppUtil.getPixelsFromDensity(ctx, 10))).height(height).endConfig()
+					.buildRoundRect(labelName, color, AppUtil.getPixelsFromDensity(ctx, 18));
 
 				labelsView.setImageDrawable(drawable);
 				viewBinding.frameLabels.addView(labelsView);
@@ -795,8 +771,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 				DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", locale);
 				String dueDate = formatter.format(issue.getIssue().getDueDate());
 				viewBinding.issueDueDate.setText(dueDate);
-				viewBinding.issueDueDate.setOnClickListener(
-					new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issue.getIssue().getDueDate()), ctx));
+				viewBinding.issueDueDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issue.getIssue().getDueDate()), ctx));
 			}
 			else if(timeFormat.equals("normal1")) {
 
@@ -817,8 +792,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 			edited = getString(R.string.colorfulBulletSpan) + getString(R.string.modifiedText);
 			viewBinding.issueModified.setVisibility(View.VISIBLE);
 			viewBinding.issueModified.setText(edited);
-			viewBinding.issueModified.setOnClickListener(
-				new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issue.getIssue().getUpdatedAt()), ctx));
+			viewBinding.issueModified.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issue.getIssue().getUpdatedAt()), ctx));
 		}
 		else {
 
@@ -851,8 +825,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 
 		if(timeFormat.equals("pretty")) {
 
-			viewBinding.issueCreatedTime.setOnClickListener(
-				new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issue.getIssue().getCreatedAt()), ctx));
+			viewBinding.issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issue.getIssue().getCreatedAt()), ctx));
 		}
 
 		Bundle bundle = new Bundle();
diff --git a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
index 27d4d399..3aa34835 100644
--- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
@@ -43,15 +43,12 @@ import retrofit2.Callback;
 
 public class LoginActivity extends BaseActivity {
 
-	private enum LoginType {BASIC, TOKEN}
-
 	private Button loginButton;
 	private EditText instanceUrlET, loginUidET, loginPassword, otpCode, loginTokenCode;
 	private AutoCompleteTextView protocolSpinner;
 	private RadioGroup loginMethod;
 	private String device_id = "token";
 	private String selectedProtocol;
-
 	private URI instanceUrl;
 	private Version giteaVersion;
 	private int maxResponseItems = 50;
@@ -94,25 +91,21 @@ public class LoginActivity extends BaseActivity {
 		});
 
 		if(R.id.loginToken == loginMethod.getCheckedRadioButtonId()) {
-			AppUtil.setMultiVisibility(View.GONE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout),
-				findViewById(R.id.otpCodeLayout));
+			AppUtil.setMultiVisibility(View.GONE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
 			findViewById(R.id.loginTokenCodeLayout).setVisibility(View.VISIBLE);
 		}
 		else {
-			AppUtil.setMultiVisibility(View.VISIBLE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout),
-				findViewById(R.id.otpCodeLayout));
+			AppUtil.setMultiVisibility(View.VISIBLE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
 			findViewById(R.id.loginTokenCodeLayout).setVisibility(View.GONE);
 		}
 
 		loginMethod.setOnCheckedChangeListener((group, checkedId) -> {
 			if(checkedId == R.id.loginToken) {
-				AppUtil.setMultiVisibility(View.GONE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout),
-					findViewById(R.id.otpCodeLayout));
+				AppUtil.setMultiVisibility(View.GONE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
 				findViewById(R.id.loginTokenCodeLayout).setVisibility(View.VISIBLE);
 			}
 			else {
-				AppUtil.setMultiVisibility(View.VISIBLE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout),
-					findViewById(R.id.otpCodeLayout));
+				AppUtil.setMultiVisibility(View.VISIBLE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
 				findViewById(R.id.loginTokenCodeLayout).setVisibility(View.GONE);
 			}
 		});
@@ -153,11 +146,9 @@ public class LoginActivity extends BaseActivity {
 
 			LoginType loginType = (loginMethod.getCheckedRadioButtonId() == R.id.loginUsernamePassword) ? LoginType.BASIC : LoginType.TOKEN;
 
-			URI rawInstanceUrl = UrlBuilder.fromString(
-				UrlHelper.fixScheme(instanceUrlET.getText().toString().replaceAll("[\\uFEFF|#]", "").trim(), "http")).toUri();
+			URI rawInstanceUrl = UrlBuilder.fromString(UrlHelper.fixScheme(instanceUrlET.getText().toString().replaceAll("[\\uFEFF|#]", "").trim(), "http")).toUri();
 
-			instanceUrl = UrlBuilder.fromUri(rawInstanceUrl).withScheme(selectedProtocol.toLowerCase())
-				.withPath(PathsHelper.join(rawInstanceUrl.getPath(), "/api/v1/")).toUri();
+			instanceUrl = UrlBuilder.fromUri(rawInstanceUrl).withScheme(selectedProtocol.toLowerCase()).withPath(PathsHelper.join(rawInstanceUrl.getPath(), "/api/v1/")).toUri();
 
 			// cache values to make them available the next time the user wants to log in
 			tinyDB.putString("loginType", loginType.name().toLowerCase());
@@ -223,8 +214,7 @@ public class LoginActivity extends BaseActivity {
 		generalAPISettings.enqueue(new Callback<>() {
 
 			@Override
-			public void onResponse(@NonNull final Call<GeneralAPISettings> generalAPISettings,
-				@NonNull retrofit2.Response<GeneralAPISettings> response) {
+			public void onResponse(@NonNull final Call<GeneralAPISettings> generalAPISettings, @NonNull retrofit2.Response<GeneralAPISettings> response) {
 
 				if(response.code() == 200 && response.body() != null) {
 
@@ -287,8 +277,7 @@ public class LoginActivity extends BaseActivity {
 					if(giteaVersion.less(getString(R.string.versionLow))) {
 
 						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx).setTitle(getString(R.string.versionAlertDialogHeader))
-							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setIcon(R.drawable.ic_warning)
-							.setCancelable(true);
+							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setIcon(R.drawable.ic_warning).setCancelable(true);
 
 						alertDialogBuilder.setNeutralButton(getString(R.string.cancelButton), (dialog, which) -> {
 
@@ -371,8 +360,7 @@ public class LoginActivity extends BaseActivity {
 						boolean userAccountExists = userAccountsApi.userAccountExists(accountName);
 						UserAccount account;
 						if(!userAccountExists) {
-							long accountId = userAccountsApi.createNewAccount(accountName, instanceUrl.toString(), userDetails.getLogin(), loginToken,
-								giteaVersion.toString(), maxResponseItems, defaultPagingNumber);
+							long accountId = userAccountsApi.createNewAccount(accountName, instanceUrl.toString(), userDetails.getLogin(), loginToken, giteaVersion.toString(), maxResponseItems, defaultPagingNumber);
 							account = userAccountsApi.getAccountById((int) accountId);
 						}
 						else {
@@ -445,13 +433,11 @@ public class LoginActivity extends BaseActivity {
 							Call<Void> delToken;
 							if(loginOTP != 0) {
 
-								delToken = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null)
-									.userDeleteAccessToken(loginOTP, loginUid, String.valueOf(t.getId()));
+								delToken = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null).userDeleteAccessToken(loginOTP, loginUid, String.valueOf(t.getId()));
 							}
 							else {
 
-								delToken = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null)
-									.userDeleteAccessToken(loginUid, String.valueOf(t.getId()));
+								delToken = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null).userDeleteAccessToken(loginUid, String.valueOf(t.getId()));
 							}
 
 							delToken.enqueue(new Callback<>() {
@@ -509,13 +495,11 @@ public class LoginActivity extends BaseActivity {
 
 		if(loginOTP != 0) {
 
-			callCreateToken = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null)
-				.userCreateToken(loginOTP, loginUid, createUserToken);
+			callCreateToken = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null).userCreateToken(loginOTP, loginUid, createUserToken);
 		}
 		else {
 
-			callCreateToken = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null)
-				.userCreateToken(loginUid, createUserToken);
+			callCreateToken = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null).userCreateToken(loginUid, createUserToken);
 		}
 
 		callCreateToken.enqueue(new Callback<>() {
@@ -530,8 +514,7 @@ public class LoginActivity extends BaseActivity {
 
 					if(!newToken.getSha1().equals("")) {
 
-						Call<User> call = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), "token " + newToken.getSha1(), null)
-							.userGetCurrent();
+						Call<User> call = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), "token " + newToken.getSha1(), null).userGetCurrent();
 
 						call.enqueue(new Callback<>() {
 
@@ -554,8 +537,7 @@ public class LoginActivity extends BaseActivity {
 
 										UserAccount account;
 										if(!userAccountExists) {
-											long accountId = userAccountsApi.createNewAccount(accountName, instanceUrl.toString(),
-												userDetails.getLogin(), newToken.getSha1(), giteaVersion.toString(), maxResponseItems,
+											long accountId = userAccountsApi.createNewAccount(accountName, instanceUrl.toString(), userDetails.getLogin(), newToken.getSha1(), giteaVersion.toString(), maxResponseItems,
 												defaultPagingNumber);
 											account = userAccountsApi.getAccountById((int) accountId);
 										}
@@ -605,7 +587,6 @@ public class LoginActivity extends BaseActivity {
 		});
 	}
 
-
 	private void loadDefaults() {
 
 		if(tinyDB.getString("loginType").equals(LoginType.BASIC.name().toLowerCase())) {
@@ -649,4 +630,6 @@ public class LoginActivity extends BaseActivity {
 		loginButton.setEnabled(true);
 	}
 
+	private enum LoginType {BASIC, TOKEN}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
index f34ad1bd..cb1e8ac0 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
@@ -97,8 +97,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		Handler handler = new Handler();
 
 		// DO NOT MOVE
-		if(mainIntent.hasExtra("switchAccountId") && AppUtil.switchToAccount(ctx,
-			BaseApi.getInstance(ctx, UserAccountsApi.class).getAccountById(mainIntent.getIntExtra("switchAccountId", 0)))) {
+		if(mainIntent.hasExtra("switchAccountId") && AppUtil.switchToAccount(ctx, BaseApi.getInstance(ctx, UserAccountsApi.class).getAccountById(mainIntent.getIntExtra("switchAccountId", 0)))) {
 
 			mainIntent.removeExtra("switchAccountId");
 			recreate();
@@ -164,8 +163,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		Menu menu = navigationView.getMenu();
 		navNotifications = menu.findItem(R.id.nav_notifications);
 
-		ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigationDrawerOpen,
-			R.string.navigationDrawerClose);
+		ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigationDrawerOpen, R.string.navigationDrawerClose);
 
 		drawer.addDrawerListener(toggle);
 		drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
@@ -221,26 +219,25 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 						int avatarRadius = AppUtil.getPixelsFromDensity(ctx, 3);
 
-						PicassoService.getInstance(ctx).get().load(userAvatarNav).placeholder(R.drawable.loader_animated)
-							.transform(new RoundedTransformation(avatarRadius, 0)).resize(160, 160).centerCrop().into(userAvatar);
+						PicassoService.getInstance(ctx).get().load(userAvatarNav).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(avatarRadius, 0)).resize(160, 160).centerCrop()
+							.into(userAvatar);
 
-						PicassoService.getInstance(ctx).get().load(userAvatarNav).transform(new BlurTransformation(ctx))
-							.into(userAvatarBackground, new com.squareup.picasso.Callback() {
+						PicassoService.getInstance(ctx).get().load(userAvatarNav).transform(new BlurTransformation(ctx)).into(userAvatarBackground, new com.squareup.picasso.Callback() {
 
-								@Override
-								public void onSuccess() {
+							@Override
+							public void onSuccess() {
 
-									int textColor = new ColorInverter().getImageViewContrastColor(userAvatarBackground);
+								int textColor = new ColorInverter().getImageViewContrastColor(userAvatarBackground);
 
-									userFullName.setTextColor(textColor);
-									userEmail.setTextColor(textColor);
-								}
+								userFullName.setTextColor(textColor);
+								userEmail.setTextColor(textColor);
+							}
 
-								@Override
-								public void onError(Exception e) {
+							@Override
+							public void onError(Exception e) {
 
-								}
-							});
+							}
+						});
 					}
 				}
 
@@ -475,8 +472,8 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 					if(frag != null) {
 
-						new AlertDialog.Builder(ctx).setTitle(R.string.deleteAllDrafts).setIcon(R.drawable.ic_delete).setCancelable(false)
-							.setMessage(R.string.deleteAllDraftsDialogMessage).setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
+						new AlertDialog.Builder(ctx).setTitle(R.string.deleteAllDrafts).setIcon(R.drawable.ic_delete).setCancelable(false).setMessage(R.string.deleteAllDraftsDialogMessage)
+							.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
 
 								frag.deleteAllDrafts(currentActiveAccountId);
 								dialog.dismiss();
@@ -623,8 +620,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		generalAPISettings.enqueue(new Callback<>() {
 
 			@Override
-			public void onResponse(@NonNull final Call<GeneralAPISettings> generalAPISettings,
-				@NonNull retrofit2.Response<GeneralAPISettings> response) {
+			public void onResponse(@NonNull final Call<GeneralAPISettings> generalAPISettings, @NonNull retrofit2.Response<GeneralAPISettings> response) {
 
 				if(response.code() == 200 && response.body() != null) {
 
@@ -638,8 +634,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 						defaultPagingNumber = Math.toIntExact(response.body().getDefaultPagingNum());
 					}
 
-					BaseApi.getInstance(ctx, UserAccountsApi.class)
-						.updateServerPagingLimit(maxResponseItems, defaultPagingNumber, tinyDB.getInt("currentActiveAccountId"));
+					BaseApi.getInstance(ctx, UserAccountsApi.class).updateServerPagingLimit(maxResponseItems, defaultPagingNumber, tinyDB.getInt("currentActiveAccountId"));
 				}
 			}
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
index a459d59e..6f8d20a2 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
@@ -34,6 +34,7 @@ public class MergePullRequestActivity extends BaseActivity {
 	private IssueContext issue;
 	private ActivityMergePullRequestBinding viewBinding;
 	private String Do;
+	private final View.OnClickListener mergePullRequest = v -> processMergePullRequest();
 
 	@SuppressLint("SetTextI18n")
 	@Override
@@ -132,8 +133,6 @@ public class MergePullRequestActivity extends BaseActivity {
 		onClickListener = view -> finish();
 	}
 
-	private final View.OnClickListener mergePullRequest = v -> processMergePullRequest();
-
 	private void processMergePullRequest() {
 
 		String mergePRDesc = Objects.requireNonNull(viewBinding.mergeDescription.getText()).toString();
@@ -180,8 +179,7 @@ public class MergePullRequestActivity extends BaseActivity {
 				break;
 		}
 
-		Call<Void> call = RetrofitClient.getApiInterface(ctx)
-			.repoMergePullRequest(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(), mergePR);
+		Call<Void> call = RetrofitClient.getApiInterface(ctx).repoMergePullRequest(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(), mergePR);
 
 		call.enqueue(new Callback<>() {
 
@@ -201,8 +199,7 @@ public class MergePullRequestActivity extends BaseActivity {
 							PullRequestActions.deleteHeadBranch(ctx, repoOwner, repoName, issue.getPullRequest().getHead().getRef(), false);
 						}
 						else {
-							PullRequestActions.deleteHeadBranch(ctx, issue.getRepository().getOwner(), issue.getRepository().getName(),
-								issue.getPullRequest().getHead().getRef(), false);
+							PullRequestActions.deleteHeadBranch(ctx, issue.getRepository().getOwner(), issue.getRepository().getName(), issue.getPullRequest().getHead().getRef(), false);
 						}
 
 					}
diff --git a/app/src/main/java/org/mian/gitnex/activities/MyProfileEmailActivity.java b/app/src/main/java/org/mian/gitnex/activities/MyProfileEmailActivity.java
index 8ef324c7..b48a6cdb 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MyProfileEmailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MyProfileEmailActivity.java
@@ -34,6 +34,7 @@ public class MyProfileEmailActivity extends BaseActivity {
 	private View.OnClickListener onClickListener;
 	private EditText userEmail;
 	private Button addEmailButton;
+	private final View.OnClickListener addEmailListener = v -> processAddNewEmail();
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -69,8 +70,6 @@ public class MyProfileEmailActivity extends BaseActivity {
 
 	}
 
-	private final View.OnClickListener addEmailListener = v -> processAddNewEmail();
-
 	private void processAddNewEmail() {
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
diff --git a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java
index 83ef35ab..aa0d63e5 100644
--- a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java
@@ -105,8 +105,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 	}
 
 	public void init() {
-		OrganizationDetailActivity.SectionsPagerAdapter mSectionsPagerAdapter = new OrganizationDetailActivity.SectionsPagerAdapter(
-			getSupportFragmentManager());
+		OrganizationDetailActivity.SectionsPagerAdapter mSectionsPagerAdapter = new OrganizationDetailActivity.SectionsPagerAdapter(getSupportFragmentManager());
 
 		ViewPager mViewPager = findViewById(R.id.container);
 		mViewPager.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/org/mian/gitnex/activities/ProfileActivity.java b/app/src/main/java/org/mian/gitnex/activities/ProfileActivity.java
index d6026c19..50f88ede 100644
--- a/app/src/main/java/org/mian/gitnex/activities/ProfileActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/ProfileActivity.java
@@ -74,9 +74,8 @@ public class ProfileActivity extends BaseActivity implements BottomSheetListener
 
 		viewPager.setAdapter(new ViewPagerAdapter(this));
 
-		String[] tabTitles = {ctx.getResources().getString(R.string.tabTextInfo), ctx.getResources().getString(R.string.navRepos),
-			ctx.getResources().getString(R.string.navStarredRepos), ctx.getResources().getString(R.string.navOrg),
-			ctx.getResources().getString(R.string.profileTabFollowers), ctx.getResources().getString(R.string.profileTabFollowing)};
+		String[] tabTitles = {ctx.getResources().getString(R.string.tabTextInfo), ctx.getResources().getString(R.string.navRepos), ctx.getResources().getString(R.string.navStarredRepos),
+			ctx.getResources().getString(R.string.navOrg), ctx.getResources().getString(R.string.profileTabFollowers), ctx.getResources().getString(R.string.profileTabFollowing)};
 		new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> tab.setText(tabTitles[position])).attach();
 
 		ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
@@ -174,6 +173,32 @@ public class ProfileActivity extends BaseActivity implements BottomSheetListener
 		});
 	}
 
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+
+		int id = item.getItemId();
+
+		if(id == android.R.id.home) {
+			finish();
+			return true;
+		}
+		else if(id == R.id.genericMenu) {
+			new BottomSheetUserProfileFragment(following).show(getSupportFragmentManager(), "userProfileBottomSheet");
+			return true;
+		}
+		else {
+			return super.onOptionsItemSelected(item);
+		}
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		if(!username.equals(getAccount().getAccount().getUserName())) {
+			getMenuInflater().inflate(R.menu.generic_nav_dotted_menu, menu);
+		}
+		return super.onCreateOptionsMenu(menu);
+	}
+
 	public class ViewPagerAdapter extends FragmentStateAdapter {
 
 		public ViewPagerAdapter(@NonNull FragmentActivity fa) {
@@ -207,30 +232,4 @@ public class ProfileActivity extends BaseActivity implements BottomSheetListener
 
 	}
 
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-
-		int id = item.getItemId();
-
-		if(id == android.R.id.home) {
-			finish();
-			return true;
-		}
-		else if(id == R.id.genericMenu) {
-			new BottomSheetUserProfileFragment(following).show(getSupportFragmentManager(), "userProfileBottomSheet");
-			return true;
-		}
-		else {
-			return super.onOptionsItemSelected(item);
-		}
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		if(!username.equals(getAccount().getAccount().getUserName())) {
-			getMenuInflater().inflate(R.menu.generic_nav_dotted_menu, menu);
-		}
-		return super.onCreateOptionsMenu(menu);
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
index da698fb8..43aaa39e 100644
--- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
@@ -64,72 +64,59 @@ import retrofit2.Response;
 
 public class RepoDetailActivity extends BaseActivity implements BottomSheetListener {
 
+	public static boolean updateRepo = false;
+	private final ActivityResultLauncher<Intent> settingsLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+		if(result.getResultCode() == 200) {
+			assert result.getData() != null;
+			if(result.getData().getBooleanExtra("nameChanged", false)) {
+				recreate();
+			}
+		}
+	});
+	public ViewPager2 viewPager;
+	public RepositoryContext repository;
 	private TextView textViewBadgeIssue;
 	private TextView textViewBadgePull;
 	private TextView textViewBadgeRelease;
 	private Typeface myTypeface;
-
 	private FragmentRefreshListener fragmentRefreshListener;
 	private FragmentRefreshListener fragmentRefreshListenerPr;
 	private FragmentRefreshListener fragmentRefreshListenerMilestone;
+	private final ActivityResultLauncher<Intent> createMilestoneLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+		if(result.getResultCode() == 201) {
+			assert result.getData() != null;
+			if(result.getData().getBooleanExtra("milestoneCreated", false)) {
+				if(fragmentRefreshListenerMilestone != null) {
+					fragmentRefreshListenerMilestone.onRefresh(repository.getMilestoneState().toString());
+				}
+			}
+		}
+	});
 	private FragmentRefreshListener fragmentRefreshListenerFiles;
+	private final ActivityResultLauncher<Intent> editFileLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+		if(result.getResultCode() == 200) {
+			assert result.getData() != null;
+			if(result.getData().getBooleanExtra("fileModified", false)) {
+				if(fragmentRefreshListenerFiles != null) {
+					fragmentRefreshListenerFiles.onRefresh(repository.getBranchRef());
+				}
+			}
+		}
+	});
 	private FragmentRefreshListener fragmentRefreshListenerFilterIssuesByMilestone;
 	private FragmentRefreshListener fragmentRefreshListenerReleases;
-
-	public ViewPager2 viewPager;
-
-	public RepositoryContext repository;
-
-	public static boolean updateRepo = false;
-	private Dialog progressDialog;
-
-	private final ActivityResultLauncher<Intent> createReleaseLauncher = registerForActivityResult(
-		new ActivityResultContracts.StartActivityForResult(), result -> {
-			if(result.getResultCode() == 201) {
-				assert result.getData() != null;
-				if(result.getData().getBooleanExtra("updateReleases", false)) {
-					if(fragmentRefreshListenerReleases != null) {
-						fragmentRefreshListenerReleases.onRefresh(null);
-					}
-					repository.removeRepository();
-					getRepoInfo(repository.getOwner(), repository.getName());
+	private Dialog progressDialog;	private final ActivityResultLauncher<Intent> createReleaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+		if(result.getResultCode() == 201) {
+			assert result.getData() != null;
+			if(result.getData().getBooleanExtra("updateReleases", false)) {
+				if(fragmentRefreshListenerReleases != null) {
+					fragmentRefreshListenerReleases.onRefresh(null);
 				}
+				repository.removeRepository();
+				getRepoInfo(repository.getOwner(), repository.getName());
 			}
-		});
-
-	private final ActivityResultLauncher<Intent> createMilestoneLauncher = registerForActivityResult(
-		new ActivityResultContracts.StartActivityForResult(), result -> {
-			if(result.getResultCode() == 201) {
-				assert result.getData() != null;
-				if(result.getData().getBooleanExtra("milestoneCreated", false)) {
-					if(fragmentRefreshListenerMilestone != null) {
-						fragmentRefreshListenerMilestone.onRefresh(repository.getMilestoneState().toString());
-					}
-				}
-			}
-		});
-
-	private final ActivityResultLauncher<Intent> editFileLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
-		result -> {
-			if(result.getResultCode() == 200) {
-				assert result.getData() != null;
-				if(result.getData().getBooleanExtra("fileModified", false)) {
-					if(fragmentRefreshListenerFiles != null) {
-						fragmentRefreshListenerFiles.onRefresh(repository.getBranchRef());
-					}
-				}
-			}
-		});
-
-	private final ActivityResultLauncher<Intent> settingsLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
-		result -> {
-			if(result.getResultCode() == 200) {
-				assert result.getData() != null;
-				if(result.getData().getBooleanExtra("nameChanged", false)) {
-					recreate();
-				}
-			}
-		});
+		}
+	});
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -367,8 +354,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 		progressDialog.setContentView(R.layout.custom_progress_loader);
 		progressDialog.show();
 
-		Call<List<Milestone>> call = RetrofitClient.getApiInterface(ctx)
-			.issueGetMilestonesList(repository.getOwner(), repository.getName(), "open", null, 1, 50);
+		Call<List<Milestone>> call = RetrofitClient.getApiInterface(ctx).issueGetMilestonesList(repository.getOwner(), repository.getName(), "open", null, 1, 50);
 
 		call.enqueue(new Callback<>() {
 
@@ -486,52 +472,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 		});
 	}
 
-	public class ViewPagerAdapter extends FragmentStateAdapter {
-
-		public ViewPagerAdapter(@NonNull FragmentActivity fa) {
-			super(fa);
-		}
-
-		@NonNull
-		@Override
-		public Fragment createFragment(int position) {
-
-			Fragment fragment = null;
-
-			switch(position) {
-				case 0: // Repository details
-					return RepoInfoFragment.newInstance(repository);
-				case 1: // Files
-					return FilesFragment.newInstance(repository);
-				case 2: // Issues
-					fragment = IssuesFragment.newInstance(repository);
-					break;
-				case 3: // Pull requests
-					fragment = PullRequestsFragment.newInstance(repository);
-					break;
-				case 4: // Releases
-					return ReleasesFragment.newInstance(repository);
-				case 5: // Wiki
-					return WikiFragment.newInstance(repository);
-				case 6: // Milestones
-					fragment = MilestonesFragment.newInstance(repository);
-					break;
-				case 7: // Labels
-					return LabelsFragment.newInstance(repository);
-				case 8: // Collaborators
-					return CollaboratorsFragment.newInstance(repository);
-			}
-			assert fragment != null;
-			return fragment;
-		}
-
-		@Override
-		public int getItemCount() {
-			return 9;
-		}
-
-	}
-
 	private void getRepoInfo(final String owner, String repo) {
 
 		LinearProgressIndicator loading = findViewById(R.id.loadingIndicator);
@@ -590,11 +530,9 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 
 			viewPager.setAdapter(new ViewPagerAdapter(this));
 
-			String[] tabTitles = {ctx.getResources().getString(R.string.tabTextInfo), ctx.getResources().getString(R.string.tabTextFiles),
-				ctx.getResources().getString(R.string.pageTitleIssues), ctx.getResources().getString(R.string.tabPullRequests),
-				ctx.getResources().getString(R.string.tabTextReleases), ctx.getResources().getString(R.string.wiki),
-				ctx.getResources().getString(R.string.tabTextMl), ctx.getResources().getString(R.string.newIssueLabelsTitle),
-				ctx.getResources().getString(R.string.tabTextCollaborators)};
+			String[] tabTitles = {ctx.getResources().getString(R.string.tabTextInfo), ctx.getResources().getString(R.string.tabTextFiles), ctx.getResources().getString(R.string.pageTitleIssues),
+				ctx.getResources().getString(R.string.tabPullRequests), ctx.getResources().getString(R.string.tabTextReleases), ctx.getResources().getString(R.string.wiki),
+				ctx.getResources().getString(R.string.tabTextMl), ctx.getResources().getString(R.string.newIssueLabelsTitle), ctx.getResources().getString(R.string.tabTextCollaborators)};
 			new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> tab.setText(tabTitles[position])).attach();
 
 			ViewGroup viewGroup = (ViewGroup) tabLayout.getChildAt(0);
@@ -869,4 +807,53 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 		this.fragmentRefreshListenerReleases = fragmentRefreshListener;
 	}
 
+	public class ViewPagerAdapter extends FragmentStateAdapter {
+
+		public ViewPagerAdapter(@NonNull FragmentActivity fa) {
+			super(fa);
+		}
+
+		@NonNull
+		@Override
+		public Fragment createFragment(int position) {
+
+			Fragment fragment = null;
+
+			switch(position) {
+				case 0: // Repository details
+					return RepoInfoFragment.newInstance(repository);
+				case 1: // Files
+					return FilesFragment.newInstance(repository);
+				case 2: // Issues
+					fragment = IssuesFragment.newInstance(repository);
+					break;
+				case 3: // Pull requests
+					fragment = PullRequestsFragment.newInstance(repository);
+					break;
+				case 4: // Releases
+					return ReleasesFragment.newInstance(repository);
+				case 5: // Wiki
+					return WikiFragment.newInstance(repository);
+				case 6: // Milestones
+					fragment = MilestonesFragment.newInstance(repository);
+					break;
+				case 7: // Labels
+					return LabelsFragment.newInstance(repository);
+				case 8: // Collaborators
+					return CollaboratorsFragment.newInstance(repository);
+			}
+			assert fragment != null;
+			return fragment;
+		}
+
+		@Override
+		public int getItemCount() {
+			return 9;
+		}
+
+	}
+
+
+
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java
index 180c7e45..351eaef8 100644
--- a/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java
@@ -39,9 +39,9 @@ import retrofit2.Response;
 
 public class RepoForksActivity extends BaseActivity {
 
+	private final String TAG = "RepositoryForks";
 	private TextView noData;
 	private ProgressBar progressBar;
-	private final String TAG = "RepositoryForks";
 	private int resultLimit;
 	private int pageSize = 1;
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java
index 0421256c..bd834ff9 100644
--- a/app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java
@@ -110,8 +110,7 @@ public class RepositorySettingsActivity extends BaseActivity {
 		TransferRepoOption repositoryTransfer = new TransferRepoOption();
 		repositoryTransfer.setNewOwner(newOwner);
 
-		Call<Repository> transferCall = RetrofitClient.getApiInterface(ctx)
-			.repoTransfer(repositoryTransfer, repository.getOwner(), repository.getName());
+		Call<Repository> transferCall = RetrofitClient.getApiInterface(ctx).repoTransfer(repositoryTransfer, repository.getOwner(), repository.getName());
 
 		transferCall.enqueue(new Callback<Repository>() {
 
@@ -285,20 +284,18 @@ public class RepositorySettingsActivity extends BaseActivity {
 		propBinding.repoEnableSquash.setChecked(repoInfo.isAllowSquashMerge());
 		propBinding.repoEnableForceMerge.setChecked(repoInfo.isAllowRebaseExplicit());
 
-		propBinding.save.setOnClickListener(saveProperties -> saveRepositoryProperties(String.valueOf(propBinding.repoName.getText()),
-			String.valueOf(propBinding.repoWebsite.getText()), String.valueOf(propBinding.repoDescription.getText()),
-			propBinding.repoPrivate.isChecked(), propBinding.repoAsTemplate.isChecked(), propBinding.repoEnableIssues.isChecked(),
-			propBinding.repoEnableWiki.isChecked(), propBinding.repoEnablePr.isChecked(), propBinding.repoEnableTimer.isChecked(),
-			propBinding.repoEnableMerge.isChecked(), propBinding.repoEnableRebase.isChecked(), propBinding.repoEnableSquash.isChecked(),
-			propBinding.repoEnableForceMerge.isChecked()));
+		propBinding.save.setOnClickListener(
+			saveProperties -> saveRepositoryProperties(String.valueOf(propBinding.repoName.getText()), String.valueOf(propBinding.repoWebsite.getText()), String.valueOf(propBinding.repoDescription.getText()),
+				propBinding.repoPrivate.isChecked(), propBinding.repoAsTemplate.isChecked(), propBinding.repoEnableIssues.isChecked(), propBinding.repoEnableWiki.isChecked(), propBinding.repoEnablePr.isChecked(),
+				propBinding.repoEnableTimer.isChecked(), propBinding.repoEnableMerge.isChecked(), propBinding.repoEnableRebase.isChecked(), propBinding.repoEnableSquash.isChecked(),
+				propBinding.repoEnableForceMerge.isChecked()));
 
 		dialogProp.setCancelable(false);
 		dialogProp.show();
 	}
 
-	private void saveRepositoryProperties(String repoName, String repoWebsite, String repoDescription, boolean repoPrivate, boolean repoAsTemplate,
-		boolean repoEnableIssues, boolean repoEnableWiki, boolean repoEnablePr, boolean repoEnableTimer, boolean repoEnableMerge,
-		boolean repoEnableRebase, boolean repoEnableSquash, boolean repoEnableForceMerge) {
+	private void saveRepositoryProperties(String repoName, String repoWebsite, String repoDescription, boolean repoPrivate, boolean repoAsTemplate, boolean repoEnableIssues, boolean repoEnableWiki, boolean repoEnablePr,
+		boolean repoEnableTimer, boolean repoEnableMerge, boolean repoEnableRebase, boolean repoEnableSquash, boolean repoEnableForceMerge) {
 
 		EditRepoOption repoProps = new EditRepoOption();
 		repoProps.setName(repoName);
@@ -333,8 +330,7 @@ public class RepositorySettingsActivity extends BaseActivity {
 					repository.setRepository(response.body());
 
 					if(!repository.getName().equals(repoName)) {
-						Objects.requireNonNull(BaseApi.getInstance(ctx, RepositoriesApi.class))
-							.updateRepositoryOwnerAndName(repository.getOwner(), repoName, repository.getRepositoryId());
+						Objects.requireNonNull(BaseApi.getInstance(ctx, RepositoriesApi.class)).updateRepositoryOwnerAndName(repository.getOwner(), repoName, repository.getRepositoryId());
 						Intent result = new Intent();
 						result.putExtra("nameChanged", true);
 						setResult(200, result);
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
index 20b23ad6..00336fda 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
@@ -25,16 +25,13 @@ import org.mian.gitnex.helpers.Toasty;
 
 public class SettingsAppearanceActivity extends BaseActivity {
 
-	private View.OnClickListener onClickListener;
-
 	private static String[] timeList;
 	private static int timeSelectedChoice = 0;
-
 	private static String[] customFontList;
 	private static int customFontSelectedChoice = 0;
-
 	private static String[] themeList;
 	private static int themeSelectedChoice = 0;
+	private View.OnClickListener onClickListener;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -83,10 +80,8 @@ public class SettingsAppearanceActivity extends BaseActivity {
 		customFontSelectedChoice = tinyDB.getInt("customFontId", 1);
 		themeSelectedChoice = tinyDB.getInt("themeId", 6); // use system theme as default
 
-		activitySettingsAppearanceBinding.lightThemeSelectedTime.setText(
-			ctx.getResources().getString(R.string.settingsThemeTimeSelectedHint, lightHour, lightMinute));
-		activitySettingsAppearanceBinding.darkThemeSelectedTime.setText(
-			ctx.getResources().getString(R.string.settingsThemeTimeSelectedHint, darkHour, darkMinute));
+		activitySettingsAppearanceBinding.lightThemeSelectedTime.setText(ctx.getResources().getString(R.string.settingsThemeTimeSelectedHint, lightHour, lightMinute));
+		activitySettingsAppearanceBinding.darkThemeSelectedTime.setText(ctx.getResources().getString(R.string.settingsThemeTimeSelectedHint, darkHour, darkMinute));
 		activitySettingsAppearanceBinding.tvDateTimeSelected.setText(timeList[timeSelectedChoice]);
 		activitySettingsAppearanceBinding.customFontSelected.setText(customFontList[customFontSelectedChoice]);
 		activitySettingsAppearanceBinding.themeSelected.setText(themeList[themeSelectedChoice]);
@@ -119,8 +114,7 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
 		});
 		activitySettingsAppearanceBinding.labelsInListFrame.setOnClickListener(
-			v -> activitySettingsAppearanceBinding.switchLabelsInListBadge.setChecked(
-				!activitySettingsAppearanceBinding.switchLabelsInListBadge.isChecked()));
+			v -> activitySettingsAppearanceBinding.switchLabelsInListBadge.setChecked(!activitySettingsAppearanceBinding.switchLabelsInListBadge.isChecked()));
 
 		// theme selection dialog
 		themeFrame.setOnClickListener(view -> {
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
index b735f66c..458358ea 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
@@ -16,14 +16,12 @@ import java.util.List;
 
 public class SettingsGeneralActivity extends BaseActivity {
 
+	private static int homeScreenSelectedChoice = 0;
+	private static int defaultLinkHandlerScreenSelectedChoice = 0;
 	private ActivitySettingsGeneralBinding viewBinding;
 	private View.OnClickListener onClickListener;
-
 	private List<String> homeScreenList;
-	private static int homeScreenSelectedChoice = 0;
-
 	private List<String> linkHandlerDefaultScreen;
-	private static int defaultLinkHandlerScreenSelectedChoice = 0;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java
index c0e78c9a..ed811b77 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java
@@ -35,8 +35,7 @@ public class SettingsNotificationsActivity extends BaseActivity {
 
 		viewBinding.close.setOnClickListener(onClickListener);
 
-		viewBinding.pollingDelaySelected.setText(
-			String.format(getString(R.string.pollingDelaySelectedText), tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay)));
+		viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay)));
 		viewBinding.chooseColorState.setCardBackgroundColor(tinyDB.getInt("notificationsLightColor", Color.GREEN));
 
 		viewBinding.enableNotificationsMode.setChecked(tinyDB.getBoolean("notificationsEnabled", true));
@@ -44,8 +43,7 @@ public class SettingsNotificationsActivity extends BaseActivity {
 		viewBinding.enableVibrationMode.setChecked(tinyDB.getBoolean("notificationsEnableVibration", true));
 
 		if(!viewBinding.enableNotificationsMode.isChecked()) {
-			AppUtil.setMultiVisibility(View.GONE, viewBinding.chooseColorFrame, viewBinding.enableLightsFrame, viewBinding.enableVibrationFrame,
-				viewBinding.pollingDelayFrame);
+			AppUtil.setMultiVisibility(View.GONE, viewBinding.chooseColorFrame, viewBinding.enableLightsFrame, viewBinding.enableVibrationFrame, viewBinding.pollingDelayFrame);
 		}
 
 		if(!viewBinding.enableLightsMode.isChecked()) {
@@ -58,20 +56,17 @@ public class SettingsNotificationsActivity extends BaseActivity {
 
 			if(isChecked) {
 				Notifications.startWorker(ctx);
-				AppUtil.setMultiVisibility(View.VISIBLE, viewBinding.chooseColorFrame, viewBinding.enableLightsFrame,
-					viewBinding.enableVibrationFrame, viewBinding.pollingDelayFrame);
+				AppUtil.setMultiVisibility(View.VISIBLE, viewBinding.chooseColorFrame, viewBinding.enableLightsFrame, viewBinding.enableVibrationFrame, viewBinding.pollingDelayFrame);
 			}
 			else {
 				Notifications.stopWorker(ctx);
-				AppUtil.setMultiVisibility(View.GONE, viewBinding.chooseColorFrame, viewBinding.enableLightsFrame, viewBinding.enableVibrationFrame,
-					viewBinding.pollingDelayFrame);
+				AppUtil.setMultiVisibility(View.GONE, viewBinding.chooseColorFrame, viewBinding.enableLightsFrame, viewBinding.enableVibrationFrame, viewBinding.pollingDelayFrame);
 			}
 
 			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
 
 		});
-		viewBinding.enableNotificationsFrame.setOnClickListener(
-			v -> viewBinding.enableNotificationsMode.setChecked(!viewBinding.enableNotificationsMode.isChecked()));
+		viewBinding.enableNotificationsFrame.setOnClickListener(v -> viewBinding.enableNotificationsMode.setChecked(!viewBinding.enableNotificationsMode.isChecked()));
 
 		// polling delay
 		viewBinding.pollingDelayFrame.setOnClickListener(v -> {
@@ -144,8 +139,7 @@ public class SettingsNotificationsActivity extends BaseActivity {
 			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
 
 		});
-		viewBinding.enableVibrationFrame.setOnClickListener(
-			v -> viewBinding.enableVibrationMode.setChecked(!viewBinding.enableVibrationMode.isChecked()));
+		viewBinding.enableVibrationFrame.setOnClickListener(v -> viewBinding.enableVibrationMode.setChecked(!viewBinding.enableVibrationMode.isChecked()));
 
 	}
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java
index 22d408fd..782f9b66 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java
@@ -36,8 +36,7 @@ public class SettingsReportsActivity extends BaseActivity {
 			tinyDB.putBoolean("crashReportingEnabled", isChecked);
 			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
 		});
-		activitySettingsReportsBinding.enableSendReports.setOnClickListener(
-			v -> activitySettingsReportsBinding.crashReportsSwitch.setChecked(!activitySettingsReportsBinding.crashReportsSwitch.isChecked()));
+		activitySettingsReportsBinding.enableSendReports.setOnClickListener(v -> activitySettingsReportsBinding.crashReportsSwitch.setChecked(!activitySettingsReportsBinding.crashReportsSwitch.isChecked()));
 	}
 
 	private void initCloseListener() {
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
index 044a70c3..14dbb584 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
@@ -29,13 +29,11 @@ import static androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTI
 
 public class SettingsSecurityActivity extends BaseActivity {
 
-	private View.OnClickListener onClickListener;
-
 	private static String[] cacheSizeDataList;
 	private static int cacheSizeDataSelectedChoice = 0;
-
 	private static String[] cacheSizeImagesList;
 	private static int cacheSizeImagesSelectedChoice = 0;
+	private View.OnClickListener onClickListener;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -229,8 +227,7 @@ public class SettingsSecurityActivity extends BaseActivity {
 			builder.setMessage(getResources().getString(R.string.settingsCertsPopupMessage));
 			builder.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
 
-				appCtx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE).edit()
-					.remove(MemorizingTrustManager.KEYSTORE_KEY).apply();
+				appCtx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE).edit().remove(MemorizingTrustManager.KEYSTORE_KEY).apply();
 				AppUtil.logout(this);
 			});
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
index 265f029f..2cfb0027 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
@@ -20,9 +20,14 @@ import java.util.Locale;
 
 public class SettingsTranslationActivity extends BaseActivity {
 
+	private static int langSelectedChoice = 0;
 	private View.OnClickListener onClickListener;
 
-	private static int langSelectedChoice = 0;
+	private static String getLanguageDisplayName(String langCode) {
+		Locale english = new Locale("en");
+		Locale translated = new Locale(langCode);
+		return String.format("%s (%s)", translated.getDisplayName(translated), translated.getDisplayName(english));
+	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -88,10 +93,4 @@ public class SettingsTranslationActivity extends BaseActivity {
 		onClickListener = view -> finish();
 	}
 
-	private static String getLanguageDisplayName(String langCode) {
-		Locale english = new Locale("en");
-		Locale translated = new Locale(langCode);
-		return String.format("%s (%s)", translated.getDisplayName(translated), translated.getDisplayName(english));
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/activities/WikiActivity.java b/app/src/main/java/org/mian/gitnex/activities/WikiActivity.java
index 27e165dc..e9f39904 100644
--- a/app/src/main/java/org/mian/gitnex/activities/WikiActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/WikiActivity.java
@@ -105,8 +105,7 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
 		createWikiPageOptions.setTitle(wikiTitle);
 		createWikiPageOptions.setContentBase64(AppUtil.encodeBase64(wikiContent));
 
-		Call<WikiPage> call = RetrofitClient.getApiInterface(ctx)
-			.repoCreateWikiPage(repository.getOwner(), repository.getName(), createWikiPageOptions);
+		Call<WikiPage> call = RetrofitClient.getApiInterface(ctx).repoCreateWikiPage(repository.getOwner(), repository.getName(), createWikiPageOptions);
 
 		call.enqueue(new Callback<>() {
 
@@ -154,8 +153,7 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
 		createWikiPageOptions.setTitle(wikiTitle);
 		createWikiPageOptions.setContentBase64(AppUtil.encodeBase64(wikiContent));
 
-		Call<WikiPage> call = RetrofitClient.getApiInterface(ctx)
-			.repoEditWikiPage(repository.getOwner(), repository.getName(), pageName, createWikiPageOptions);
+		Call<WikiPage> call = RetrofitClient.getApiInterface(ctx).repoEditWikiPage(repository.getOwner(), repository.getName(), pageName, createWikiPageOptions);
 
 		call.enqueue(new Callback<>() {
 
@@ -265,33 +263,31 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
 
 	private void deleteWiki(final String owner, final String repo, final String pageName) {
 
-		new AlertDialog.Builder(ctx).setTitle(String.format(ctx.getString(R.string.deleteGenericTitle), pageName))
-			.setMessage(ctx.getString(R.string.deleteWikiPageMessage, pageName)).setIcon(R.drawable.ic_delete)
-			.setPositiveButton(R.string.menuDeleteText,
-				(dialog, whichButton) -> RetrofitClient.getApiInterface(ctx).repoDeleteWikiPage(owner, repo, pageName).enqueue(new Callback<>() {
+		new AlertDialog.Builder(ctx).setTitle(String.format(ctx.getString(R.string.deleteGenericTitle), pageName)).setMessage(ctx.getString(R.string.deleteWikiPageMessage, pageName)).setIcon(R.drawable.ic_delete)
+			.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> RetrofitClient.getApiInterface(ctx).repoDeleteWikiPage(owner, repo, pageName).enqueue(new Callback<>() {
 
-					@Override
-					public void onResponse(@NonNull Call<Void> call, @NonNull Response<Void> response) {
+				@Override
+				public void onResponse(@NonNull Call<Void> call, @NonNull Response<Void> response) {
 
-						if(response.isSuccessful()) {
-							Toasty.success(ctx, getString(R.string.wikiPageDeleted));
-							WikiFragment.resumeWiki = true;
-							finish();
-						}
-						else if(response.code() == 403) {
-							Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-						}
-						else {
-							Toasty.error(ctx, ctx.getString(R.string.genericError));
-						}
+					if(response.isSuccessful()) {
+						Toasty.success(ctx, getString(R.string.wikiPageDeleted));
+						WikiFragment.resumeWiki = true;
+						finish();
 					}
-
-					@Override
-					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
+					else if(response.code() == 403) {
+						Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+					}
+					else {
 						Toasty.error(ctx, ctx.getString(R.string.genericError));
 					}
-				})).setNeutralButton(R.string.cancelButton, null).show();
+				}
+
+				@Override
+				public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+
+					Toasty.error(ctx, ctx.getString(R.string.genericError));
+				}
+			})).setNeutralButton(R.string.cancelButton, null).show();
 	}
 
 	@Override
@@ -354,9 +350,7 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
 
 			if(action.equalsIgnoreCase("edit") || action.equalsIgnoreCase("add")) {
 				if(renderMd) {
-					Markdown.render(ctx,
-						EmojiParser.parseToUnicode(String.valueOf(Objects.requireNonNull(binding.contentLayout.getEditText()).getText())),
-						binding.markdownPreview, repository);
+					Markdown.render(ctx, EmojiParser.parseToUnicode(String.valueOf(Objects.requireNonNull(binding.contentLayout.getEditText()).getText())), binding.markdownPreview, repository);
 
 					binding.markdownPreview.setVisibility(View.VISIBLE);
 					binding.contentLayout.setVisibility(View.GONE);
diff --git a/app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java
index 462084fc..fcbd234e 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java
+++ b/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<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));
+			}
+		});
+	}
+
+	@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) {
 
@@ -91,71 +157,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();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
index 70d506d7..521b2859 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
@@ -30,11 +30,44 @@ import java.util.List;
 
 public class AdminGetUsersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable {
 
-	private List<User> usersList;
 	private final List<User> usersListFull;
 	private final Context context;
+	private List<User> usersList;
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
+	private final Filter usersFilter = new Filter() {
+
+		@Override
+		protected FilterResults performFiltering(CharSequence constraint) {
+			List<User> filteredList = new ArrayList<>();
+
+			if(constraint == null || constraint.length() == 0) {
+				filteredList.addAll(usersListFull);
+			}
+			else {
+				String filterPattern = constraint.toString().toLowerCase().trim();
+
+				for(User item : usersListFull) {
+					if(item.getEmail().toLowerCase().contains(filterPattern) || item.getFullName().toLowerCase().contains(filterPattern) || item.getLogin().toLowerCase().contains(filterPattern)) {
+						filteredList.add(item);
+					}
+				}
+			}
+
+			FilterResults results = new FilterResults();
+			results.values = filteredList;
+
+			return results;
+		}
+
+		@Override
+		protected void publishResults(CharSequence constraint, FilterResults results) {
+
+			usersList.clear();
+			usersList.addAll((List) results.values);
+			notifyDataChanged();
+		}
+	};
 
 	public AdminGetUsersAdapter(List<User> usersListMain, Context ctx) {
 		this.context = ctx;
@@ -69,14 +102,50 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<RecyclerView.View
 		return usersList.size();
 	}
 
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+		if(!isMoreDataAvailable) {
+			loadMoreListener.onLoadFinished();
+		}
+	}
+
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+		loadMoreListener.onLoadFinished();
+	}
+
+	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
+		this.loadMoreListener = loadMoreListener;
+	}
+
+	public void updateList(List<User> list) {
+		usersList = list;
+		notifyDataChanged();
+	}
+
+	@Override
+	public Filter getFilter() {
+		return usersFilter;
+	}
+
+	public interface OnLoadMoreListener {
+
+		void onLoadMore();
+
+		void onLoadFinished();
+
+	}
+
 	class ReposHolder extends RecyclerView.ViewHolder {
 
-		private String userLoginId;
 		private final ImageView userAvatar;
 		private final TextView userFullName;
 		private final TextView userEmail;
 		private final ImageView userRole;
 		private final TextView userName;
+		private String userLoginId;
 
 		ReposHolder(View itemView) {
 
@@ -126,10 +195,8 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<RecyclerView.View
 			if(users.isIsAdmin()) {
 
 				userRole.setVisibility(View.VISIBLE);
-				TextDrawable drawable = TextDrawable.builder().beginConfig()
-					.textColor(ResourcesCompat.getColor(context.getResources(), R.color.colorWhite, null)).fontSize(44).width(180).height(60)
-					.endConfig().buildRoundRect(context.getResources().getString(R.string.userRoleAdmin).toLowerCase(),
-						ResourcesCompat.getColor(context.getResources(), R.color.releasePre, null), 8);
+				TextDrawable drawable = TextDrawable.builder().beginConfig().textColor(ResourcesCompat.getColor(context.getResources(), R.color.colorWhite, null)).fontSize(44).width(180).height(60).endConfig()
+					.buildRoundRect(context.getResources().getString(R.string.userRoleAdmin).toLowerCase(), ResourcesCompat.getColor(context.getResources(), R.color.releasePre, null), 8);
 				userRole.setImageDrawable(drawable);
 			}
 			else {
@@ -137,81 +204,9 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<RecyclerView.View
 				userRole.setVisibility(View.GONE);
 			}
 
-			PicassoService.getInstance(context).get().load(users.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(userAvatar);
+			PicassoService.getInstance(context).get().load(users.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(userAvatar);
 		}
 
 	}
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
-			loadMoreListener.onLoadFinished();
-		}
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-		loadMoreListener.onLoadFinished();
-	}
-
-	public interface OnLoadMoreListener {
-
-		void onLoadMore();
-
-		void onLoadFinished();
-
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<User> list) {
-		usersList = list;
-		notifyDataChanged();
-	}
-
-	@Override
-	public Filter getFilter() {
-		return usersFilter;
-	}
-
-	private final Filter usersFilter = new Filter() {
-
-		@Override
-		protected FilterResults performFiltering(CharSequence constraint) {
-			List<User> filteredList = new ArrayList<>();
-
-			if(constraint == null || constraint.length() == 0) {
-				filteredList.addAll(usersListFull);
-			}
-			else {
-				String filterPattern = constraint.toString().toLowerCase().trim();
-
-				for(User item : usersListFull) {
-					if(item.getEmail().toLowerCase().contains(filterPattern) || item.getFullName().toLowerCase()
-						.contains(filterPattern) || item.getLogin().toLowerCase().contains(filterPattern)) {
-						filteredList.add(item);
-					}
-				}
-			}
-
-			FilterResults results = new FilterResults();
-			results.values = filteredList;
-
-			return results;
-		}
-
-		@Override
-		protected void publishResults(CharSequence constraint, FilterResults results) {
-
-			usersList.clear();
-			usersList.addAll((List) results.values);
-			notifyDataChanged();
-		}
-	};
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/AdminUnadoptedReposAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/AdminUnadoptedReposAdapter.java
index ad8f2b79..373cca9b 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/AdminUnadoptedReposAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/AdminUnadoptedReposAdapter.java
@@ -25,36 +25,13 @@ import retrofit2.Callback;
 
 public class AdminUnadoptedReposAdapter extends RecyclerView.Adapter<AdminUnadoptedReposAdapter.UnadoptedViewHolder> {
 
-	private List<String> repos;
 	private final Runnable updateList;
 	private final Runnable loadMoreListener;
-	private boolean isLoading = false, hasMore = true;
 	private final ActivityAdminCronTasksBinding activityAdminCronTasksBinding;
+	private List<String> repos;
+	private boolean isLoading = false, hasMore = true;
 
-	class UnadoptedViewHolder extends RecyclerView.ViewHolder {
-
-		private String repoName;
-		private final TextView name;
-
-		private UnadoptedViewHolder(View itemView) {
-
-			super(itemView);
-			Context ctx = itemView.getContext();
-
-			name = itemView.findViewById(R.id.repo_name);
-
-			itemView.setOnClickListener(taskInfo -> {
-				String[] repoSplit = repoName.split("/");
-				new AlertDialog.Builder(ctx).setTitle(repoName).setMessage(ctx.getString(R.string.unadoptedReposMessage, repoSplit[1], repoSplit[0]))
-					.setNeutralButton(R.string.close, null).setPositiveButton(R.string.menuDeleteText, ((dialog, which) -> delete(ctx, repoName)))
-					.setNegativeButton(R.string.adoptRepo, ((dialog, which) -> adopt(ctx, repoName, getBindingAdapterPosition()))).show();
-			});
-		}
-
-	}
-
-	public AdminUnadoptedReposAdapter(List<String> list, Runnable updateList, Runnable loadMore,
-		ActivityAdminCronTasksBinding activityAdminCronTasksBinding) {
+	public AdminUnadoptedReposAdapter(List<String> list, Runnable updateList, Runnable loadMore, ActivityAdminCronTasksBinding activityAdminCronTasksBinding) {
 		this.repos = list;
 		this.updateList = updateList;
 		this.loadMoreListener = loadMore;
@@ -195,4 +172,26 @@ public class AdminUnadoptedReposAdapter extends RecyclerView.Adapter<AdminUnadop
 		isLoading = false;
 	}
 
+	class UnadoptedViewHolder extends RecyclerView.ViewHolder {
+
+		private final TextView name;
+		private String repoName;
+
+		private UnadoptedViewHolder(View itemView) {
+
+			super(itemView);
+			Context ctx = itemView.getContext();
+
+			name = itemView.findViewById(R.id.repo_name);
+
+			itemView.setOnClickListener(taskInfo -> {
+				String[] repoSplit = repoName.split("/");
+				new AlertDialog.Builder(ctx).setTitle(repoName).setMessage(ctx.getString(R.string.unadoptedReposMessage, repoSplit[1], repoSplit[0])).setNeutralButton(R.string.close, null)
+					.setPositiveButton(R.string.menuDeleteText, ((dialog, which) -> delete(ctx, repoName))).setNegativeButton(R.string.adoptRepo, ((dialog, which) -> adopt(ctx, repoName, getBindingAdapterPosition())))
+					.show();
+			});
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java
index 3b1c0788..3712f28a 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java
@@ -28,17 +28,10 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 
 	private final Context context;
 	private final List<User> assigneesList;
+	private final AssigneesListAdapterListener assigneesListener;
 	private List<String> assigneesStrings = new ArrayList<>();
 	private List<String> currentAssignees;
 
-	private final AssigneesListAdapterListener assigneesListener;
-
-	public interface AssigneesListAdapterListener {
-
-		void assigneesInterface(List<String> data);
-
-	}
-
 	public AssigneesListAdapter(Context ctx, List<User> dataMain, AssigneesListAdapterListener assigneesListener, List<String> currentAssignees) {
 
 		this.context = ctx;
@@ -47,24 +40,6 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 		this.currentAssignees = currentAssignees;
 	}
 
-	static class AssigneesViewHolder extends RecyclerView.ViewHolder {
-
-		private final CheckBox assigneesSelection;
-		private final TextView assigneesName;
-		private final ImageView assigneesAvatar;
-
-		private AssigneesViewHolder(View itemView) {
-
-			super(itemView);
-			this.setIsRecyclable(false);
-
-			assigneesSelection = itemView.findViewById(R.id.assigneesSelection);
-			assigneesName = itemView.findViewById(R.id.assigneesName);
-			assigneesAvatar = itemView.findViewById(R.id.assigneesAvatar);
-		}
-
-	}
-
 	@NonNull
 	@Override
 	public AssigneesListAdapter.AssigneesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -87,8 +62,8 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 
 			holder.assigneesName.setText(Html.fromHtml(currentItem.getFullName()));
 		}
-		PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-			.transform(new RoundedTransformation(imgRadius, 0)).resize(180, 180).centerCrop().into(holder.assigneesAvatar);
+		PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(180, 180).centerCrop()
+			.into(holder.assigneesAvatar);
 
 		for(int i = 0; i < assigneesList.size(); i++) {
 
@@ -141,4 +116,28 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 		notifyDataSetChanged();
 	}
 
+	public interface AssigneesListAdapterListener {
+
+		void assigneesInterface(List<String> data);
+
+	}
+
+	static class AssigneesViewHolder extends RecyclerView.ViewHolder {
+
+		private final CheckBox assigneesSelection;
+		private final TextView assigneesName;
+		private final ImageView assigneesAvatar;
+
+		private AssigneesViewHolder(View itemView) {
+
+			super(itemView);
+			this.setIsRecyclable(false);
+
+			assigneesSelection = itemView.findViewById(R.id.assigneesSelection);
+			assigneesName = itemView.findViewById(R.id.assigneesName);
+			assigneesAvatar = itemView.findViewById(R.id.assigneesAvatar);
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/CollaboratorSearchAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/CollaboratorSearchAdapter.java
index f18e53e1..c2b32c2d 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/CollaboratorSearchAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CollaboratorSearchAdapter.java
@@ -45,61 +45,6 @@ public class CollaboratorSearchAdapter extends RecyclerView.Adapter<Collaborator
 		this.repository = repository;
 	}
 
-	class CollaboratorSearchViewHolder extends RecyclerView.ViewHolder {
-
-		private User userInfo;
-
-		private final ImageView userAvatar;
-		private final TextView userFullName;
-		private final TextView userName;
-		private final ImageView addCollaboratorButtonAdd;
-		private final ImageView addCollaboratorButtonRemove;
-
-		private final String[] permissionList = {"Read", "Write", "Admin"};
-		final private int permissionSelectedChoice = 0;
-
-		private CollaboratorSearchViewHolder(View itemView) {
-
-			super(itemView);
-			userAvatar = itemView.findViewById(R.id.userAvatar);
-			userFullName = itemView.findViewById(R.id.userFullName);
-			userName = itemView.findViewById(R.id.userName);
-			addCollaboratorButtonAdd = itemView.findViewById(R.id.addCollaboratorButtonAdd);
-			addCollaboratorButtonRemove = itemView.findViewById(R.id.addCollaboratorButtonRemove);
-
-			addCollaboratorButtonAdd.setOnClickListener(v -> {
-				AlertDialog.Builder pBuilder = new AlertDialog.Builder(context);
-
-				pBuilder.setTitle(R.string.newTeamPermission);
-				pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, null).setCancelable(false)
-					.setNeutralButton(R.string.cancelButton, null).setPositiveButton(R.string.addButton, (dialog, which) -> {
-
-						ListView lw = ((AlertDialog) dialog).getListView();
-						Object checkedItem = lw.getAdapter().getItem(lw.getCheckedItemPosition());
-
-						CollaboratorActions.addCollaborator(context, String.valueOf(checkedItem).toLowerCase(), userInfo.getLogin(), repository);
-					});
-
-				AlertDialog pDialog = pBuilder.create();
-				pDialog.show();
-			});
-
-			addCollaboratorButtonRemove.setOnClickListener(v -> AlertDialogs.collaboratorRemoveDialog(context, userInfo.getLogin(), repository));
-
-			userAvatar.setOnClickListener(loginId -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", userInfo.getLogin());
-				context.startActivity(intent);
-			});
-
-			userAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, userInfo.getLogin(), context.getString(R.string.copyLoginIdToClipBoard, userInfo.getLogin()));
-				return true;
-			});
-		}
-
-	}
-
 	@NonNull
 	@Override
 	public CollaboratorSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -126,16 +71,15 @@ public class CollaboratorSearchAdapter extends RecyclerView.Adapter<Collaborator
 		holder.userName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
 
 		if(!currentItem.getAvatarUrl().equals("")) {
-			PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+			PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+				.into(holder.userAvatar);
 		}
 
 		if(getItemCount() > 0) {
 
 			final String loginUid = ((BaseActivity) context).getAccount().getAccount().getUserName();
 
-			Call<Void> call = RetrofitClient.getApiInterface(context)
-				.repoCheckCollaborator(repository.getOwner(), repository.getName(), currentItem.getLogin());
+			Call<Void> call = RetrofitClient.getApiInterface(context).repoCheckCollaborator(repository.getOwner(), repository.getName(), currentItem.getLogin());
 
 			call.enqueue(new Callback<Void>() {
 
@@ -181,4 +125,56 @@ public class CollaboratorSearchAdapter extends RecyclerView.Adapter<Collaborator
 		return usersSearchList.size();
 	}
 
+	class CollaboratorSearchViewHolder extends RecyclerView.ViewHolder {
+
+		private final ImageView userAvatar;
+		private final TextView userFullName;
+		private final TextView userName;
+		private final ImageView addCollaboratorButtonAdd;
+		private final ImageView addCollaboratorButtonRemove;
+		private final String[] permissionList = {"Read", "Write", "Admin"};
+		final private int permissionSelectedChoice = 0;
+		private User userInfo;
+
+		private CollaboratorSearchViewHolder(View itemView) {
+
+			super(itemView);
+			userAvatar = itemView.findViewById(R.id.userAvatar);
+			userFullName = itemView.findViewById(R.id.userFullName);
+			userName = itemView.findViewById(R.id.userName);
+			addCollaboratorButtonAdd = itemView.findViewById(R.id.addCollaboratorButtonAdd);
+			addCollaboratorButtonRemove = itemView.findViewById(R.id.addCollaboratorButtonRemove);
+
+			addCollaboratorButtonAdd.setOnClickListener(v -> {
+				AlertDialog.Builder pBuilder = new AlertDialog.Builder(context);
+
+				pBuilder.setTitle(R.string.newTeamPermission);
+				pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, null).setCancelable(false).setNeutralButton(R.string.cancelButton, null).setPositiveButton(R.string.addButton, (dialog, which) -> {
+
+					ListView lw = ((AlertDialog) dialog).getListView();
+					Object checkedItem = lw.getAdapter().getItem(lw.getCheckedItemPosition());
+
+					CollaboratorActions.addCollaborator(context, String.valueOf(checkedItem).toLowerCase(), userInfo.getLogin(), repository);
+				});
+
+				AlertDialog pDialog = pBuilder.create();
+				pDialog.show();
+			});
+
+			addCollaboratorButtonRemove.setOnClickListener(v -> AlertDialogs.collaboratorRemoveDialog(context, userInfo.getLogin(), repository));
+
+			userAvatar.setOnClickListener(loginId -> {
+				Intent intent = new Intent(context, ProfileActivity.class);
+				intent.putExtra("username", userInfo.getLogin());
+				context.startActivity(intent);
+			});
+
+			userAvatar.setOnLongClickListener(loginId -> {
+				AppUtil.copyToClipboard(context, userInfo.getLogin(), context.getString(R.string.copyLoginIdToClipBoard, userInfo.getLogin()));
+				return true;
+			});
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
index ac3cea75..c9e05d53 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
@@ -27,32 +27,6 @@ public class CollaboratorsAdapter extends BaseAdapter {
 	private final List<User> collaboratorsList;
 	private final Context context;
 
-	private class ViewHolder {
-
-		private String userLoginId;
-
-		private final ImageView collaboratorAvatar;
-		private final TextView collaboratorName;
-
-		ViewHolder(View v) {
-
-			collaboratorAvatar = v.findViewById(R.id.collaboratorAvatar);
-			collaboratorName = v.findViewById(R.id.collaboratorName);
-
-			collaboratorAvatar.setOnClickListener(loginId -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", userLoginId);
-				context.startActivity(intent);
-			});
-
-			collaboratorAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-				return true;
-			});
-		}
-
-	}
-
 	public CollaboratorsAdapter(Context ctx, List<User> collaboratorsListMain) {
 
 		this.context = ctx;
@@ -100,8 +74,8 @@ public class CollaboratorsAdapter extends BaseAdapter {
 		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
 		User currentItem = collaboratorsList.get(position);
-		PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-			.transform(new RoundedTransformation(imgRadius, 0)).resize(180, 180).centerCrop().into(viewHolder.collaboratorAvatar);
+		PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(180, 180).centerCrop()
+			.into(viewHolder.collaboratorAvatar);
 
 		viewHolder.userLoginId = currentItem.getLogin();
 
@@ -116,4 +90,29 @@ public class CollaboratorsAdapter extends BaseAdapter {
 
 	}
 
+	private class ViewHolder {
+
+		private final ImageView collaboratorAvatar;
+		private final TextView collaboratorName;
+		private String userLoginId;
+
+		ViewHolder(View v) {
+
+			collaboratorAvatar = v.findViewById(R.id.collaboratorAvatar);
+			collaboratorName = v.findViewById(R.id.collaboratorName);
+
+			collaboratorAvatar.setOnClickListener(loginId -> {
+				Intent intent = new Intent(context, ProfileActivity.class);
+				intent.putExtra("username", userLoginId);
+				context.startActivity(intent);
+			});
+
+			collaboratorAvatar.setOnLongClickListener(loginId -> {
+				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
+				return true;
+			});
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
index 35d1184d..a5e7aedb 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
@@ -71,6 +71,25 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 		return commitsList.size();
 	}
 
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+	}
+
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+	}
+
+	public void setLoadMoreListener(Runnable loadMoreListener) {
+		this.loadMoreListener = loadMoreListener;
+	}
+
+	public void updateList(List<Commit> list) {
+		commitsList = list;
+		notifyDataChanged();
+	}
+
 	class CommitsHolder extends RecyclerView.ViewHolder {
 
 		View rootView;
@@ -104,27 +123,24 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 
 			if(!Objects.equals(commitsModel.getCommit().getCommitter().getEmail(), commitsModel.getCommit().getAuthor().getEmail())) {
 				commitAuthorAndCommitter.setText(HtmlCompat.fromHtml(
-					context.getString(R.string.commitAuthoredByAndCommittedByWhen, commitsModel.getCommit().getAuthor().getName(),
-						commitsModel.getCommit().getCommitter().getName(),
-						TimeHelper.formatTime(TimeHelper.parseIso8601(commitsModel.getCommit().getCommitter().getDate()),
-							context.getResources().getConfiguration().locale, "pretty", context)), HtmlCompat.FROM_HTML_MODE_COMPACT));
+					context.getString(R.string.commitAuthoredByAndCommittedByWhen, commitsModel.getCommit().getAuthor().getName(), commitsModel.getCommit().getCommitter().getName(),
+						TimeHelper.formatTime(TimeHelper.parseIso8601(commitsModel.getCommit().getCommitter().getDate()), context.getResources().getConfiguration().locale, "pretty", context)),
+					HtmlCompat.FROM_HTML_MODE_COMPACT));
 			}
 			else {
-				commitAuthorAndCommitter.setText(HtmlCompat.fromHtml(
-					context.getString(R.string.commitCommittedByWhen, commitsModel.getCommit().getCommitter().getName(),
-						TimeHelper.formatTime(TimeHelper.parseIso8601(commitsModel.getCommit().getCommitter().getDate()),
-							context.getResources().getConfiguration().locale, "pretty", context)), HtmlCompat.FROM_HTML_MODE_COMPACT));
+				commitAuthorAndCommitter.setText(HtmlCompat.fromHtml(context.getString(R.string.commitCommittedByWhen, commitsModel.getCommit().getCommitter().getName(),
+						TimeHelper.formatTime(TimeHelper.parseIso8601(commitsModel.getCommit().getCommitter().getDate()), context.getResources().getConfiguration().locale, "pretty", context)),
+					HtmlCompat.FROM_HTML_MODE_COMPACT));
 			}
 
-			if(commitsModel.getAuthor() != null && commitsModel.getAuthor().getAvatarUrl() != null && !commitsModel.getAuthor().getAvatarUrl()
-				.isEmpty()) {
+			if(commitsModel.getAuthor() != null && commitsModel.getAuthor().getAvatarUrl() != null && !commitsModel.getAuthor().getAvatarUrl().isEmpty()) {
 
 				commitAuthorAvatar.setVisibility(View.VISIBLE);
 
 				int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-				PicassoService.getInstance(context).get().load(commitsModel.getAuthor().getAvatarUrl()).placeholder(R.drawable.loader_animated)
-					.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(commitAuthorAvatar);
+				PicassoService.getInstance(context).get().load(commitsModel.getAuthor().getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120)
+					.centerCrop().into(commitAuthorAvatar);
 
 			}
 			else {
@@ -132,16 +148,15 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 				commitAuthorAvatar.setVisibility(View.GONE);
 			}
 
-			if(commitsModel.getCommitter() != null && (commitsModel.getAuthor() == null || !commitsModel.getAuthor().getLogin()
-				.equals(commitsModel.getCommitter().getLogin())) && commitsModel.getCommitter().getAvatarUrl() != null && !commitsModel.getCommitter()
-				.getAvatarUrl().isEmpty()) {
+			if(commitsModel.getCommitter() != null && (commitsModel.getAuthor() == null || !commitsModel.getAuthor().getLogin().equals(commitsModel.getCommitter().getLogin())) && commitsModel.getCommitter()
+				.getAvatarUrl() != null && !commitsModel.getCommitter().getAvatarUrl().isEmpty()) {
 
 				commitCommitterAvatar.setVisibility(View.VISIBLE);
 
 				int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-				PicassoService.getInstance(context).get().load(commitsModel.getCommitter().getAvatarUrl()).placeholder(R.drawable.loader_animated)
-					.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(commitCommitterAvatar);
+				PicassoService.getInstance(context).get().load(commitsModel.getCommitter().getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120)
+					.centerCrop().into(commitCommitterAvatar);
 
 			}
 			else {
@@ -156,8 +171,7 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 					intent = ((CommitsActivity) context).repository.getIntent(context, CommitDetailActivity.class);
 				}
 				else {
-					intent = IssueContext.fromIntent(((DiffActivity) context).getIntent()).getRepository()
-						.getIntent(context, CommitDetailActivity.class);
+					intent = IssueContext.fromIntent(((DiffActivity) context).getIntent()).getRepository().getIntent(context, CommitDetailActivity.class);
 				}
 				intent.putExtra("sha", commitsModel.getSha());
 				context.startActivity(intent);
@@ -167,23 +181,4 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 
 	}
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public void setLoadMoreListener(Runnable loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<Commit> list) {
-		commitsList = list;
-		notifyDataChanged();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/DiffAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/DiffAdapter.java
index af804a41..b9c42860 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/DiffAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/DiffAdapter.java
@@ -23,20 +23,18 @@ import java.util.stream.Collectors;
 
 public class DiffAdapter extends BaseAdapter {
 
-	private final Context context;
-	private final FragmentManager fragmentManager;
-	private final List<String> lines;
-	private final IssueContext issue;
-
-	private final List<Integer> selectedLines;
-	private final Typeface typeface;
-	private final String type;
-
 	private static int COLOR_ADDED;
 	private static int COLOR_REMOVED;
 	private static int COLOR_NORMAL;
 	private static int COLOR_SELECTED;
 	private static int COLOR_FONT;
+	private final Context context;
+	private final FragmentManager fragmentManager;
+	private final List<String> lines;
+	private final IssueContext issue;
+	private final List<Integer> selectedLines;
+	private final Typeface typeface;
+	private final String type;
 
 	public DiffAdapter(Context context, FragmentManager fragmentManager, List<String> lines, IssueContext issue, String type) {
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/DiffFilesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/DiffFilesAdapter.java
index 726b9c3d..13f9b8b0 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/DiffFilesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/DiffFilesAdapter.java
@@ -28,9 +28,9 @@ public class DiffFilesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 	private static final Pattern statisticsPattern = Pattern.compile("(\\d+).*?,.*?(\\d+)");
 
 	private final Context context;
-	private List<FileDiffView> fileDiffViews;
 	private final IssueContext issue;
 	private final String fragmentType;
+	private List<FileDiffView> fileDiffViews;
 
 	public DiffFilesAdapter(Context context, List<FileDiffView> fileDiffViews, IssueContext issue, String fragmentType) {
 
@@ -53,6 +53,25 @@ public class DiffFilesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 		((DiffFilesAdapter.FilesHolder) holder).bindData(fileDiffViews.get(position));
 	}
 
+	@Override
+	public int getItemViewType(int position) {
+		return position;
+	}
+
+	@Override
+	public int getItemCount() {
+		return fileDiffViews.size();
+	}
+
+	public void updateList(List<FileDiffView> list) {
+		fileDiffViews = list;
+	}
+
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+	}
+
 	class FilesHolder extends RecyclerView.ViewHolder {
 
 		FileDiffView diffFilesObject;
@@ -70,12 +89,10 @@ public class DiffFilesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 
 			main_frame.setOnClickListener(v -> {
 				if(fragmentType.equalsIgnoreCase("commit")) {
-					((CommitDetailActivity) context).getSupportFragmentManager().beginTransaction()
-						.replace(R.id.fragment_container, DiffFragment.newInstance(diffFilesObject, fragmentType)).commit();
+					((CommitDetailActivity) context).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, DiffFragment.newInstance(diffFilesObject, fragmentType)).commit();
 				}
 				else {
-					((DiffActivity) context).getSupportFragmentManager().beginTransaction()
-						.replace(R.id.fragment_container, DiffFragment.newInstance(diffFilesObject, issue)).commit();
+					((DiffActivity) context).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, DiffFragment.newInstance(diffFilesObject, issue)).commit();
 				}
 
 			});
@@ -98,23 +115,4 @@ public class DiffFilesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 
 	}
 
-	@Override
-	public int getItemViewType(int position) {
-		return position;
-	}
-
-	@Override
-	public int getItemCount() {
-		return fileDiffViews.size();
-	}
-
-	public void updateList(List<FileDiffView> list) {
-		fileDiffViews = list;
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java
index 47fad19f..ffb28813 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java
@@ -33,70 +33,9 @@ import java.util.List;
 
 public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsViewHolder> {
 
-	private List<DraftWithRepository> draftsList;
 	private final FragmentManager fragmentManager;
 	private final Context context;
-
-	class DraftsViewHolder extends RecyclerView.ViewHolder {
-
-		private DraftWithRepository draftWithRepository;
-
-		private final TextView draftText;
-		private final TextView repoInfo;
-		private final ImageView editCommentStatus;
-
-		private DraftsViewHolder(View itemView) {
-
-			super(itemView);
-
-			draftText = itemView.findViewById(R.id.draftText);
-			repoInfo = itemView.findViewById(R.id.repoInfo);
-			ImageView deleteDraft = itemView.findViewById(R.id.deleteDraft);
-			editCommentStatus = itemView.findViewById(R.id.editCommentStatus);
-
-			deleteDraft.setOnClickListener(itemDelete -> {
-
-				int getDraftId = draftWithRepository.getDraftId();
-				deleteDraft(getBindingAdapterPosition());
-
-				DraftsApi draftsApi = BaseApi.getInstance(context, DraftsApi.class);
-				assert draftsApi != null;
-				draftsApi.deleteSingleDraft(getDraftId);
-
-			});
-
-			itemView.setOnClickListener(itemEdit -> {
-
-				RepositoryContext repository = new RepositoryContext(draftWithRepository.getRepositoryOwner(),
-					draftWithRepository.getRepositoryName(), context);
-				repository.setRepositoryId(draftWithRepository.getRepositoryId());
-				IssueContext issue = new IssueContext(repository, draftWithRepository.getIssueId(), draftWithRepository.getIssueType());
-				Bundle bundle = issue.getBundle();
-
-				bundle.putString("commentBody", draftWithRepository.getDraftText());
-				bundle.putString("issueNumber", String.valueOf(draftWithRepository.getIssueId()));
-				bundle.putString("draftTitle", repoInfo.getText().toString());
-				bundle.putString("commentId", draftWithRepository.getCommentId());
-				bundle.putString("draftId", String.valueOf(draftWithRepository.getDraftId()));
-
-				if(!draftWithRepository.getCommentId().isEmpty()) {
-					bundle.putString("commentAction", "edit");
-				}
-
-				BottomSheetReplyFragment bottomSheetReplyFragment = BottomSheetReplyFragment.newInstance(bundle, issue);
-				bottomSheetReplyFragment.setOnInteractedListener(() -> {
-					Intent i = new IssueContext(
-						new RepositoryContext(draftWithRepository.getRepositoryOwner(), draftWithRepository.getRepositoryName(), context),
-						draftWithRepository.getIssueId(), draftWithRepository.getIssueType()).getIntent(context, IssueDetailActivity.class);
-					i.putExtra("openedFromLink", "true");
-					context.startActivity(i);
-				});
-				bottomSheetReplyFragment.show(fragmentManager, "replyBottomSheet");
-			});
-
-		}
-
-	}
+	private List<DraftWithRepository> draftsList;
 
 	public DraftsAdapter(Context ctx, FragmentManager fragmentManager, List<DraftWithRepository> draftsListMain) {
 		this.context = ctx;
@@ -125,10 +64,8 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 
 		DraftWithRepository currentItem = draftsList.get(position);
 
-		String issueNumber = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray,
-			null) + "'>" + context.getResources().getString(R.string.hash) + currentItem.getIssueId() + "</font>";
-		Spanned headTitle = HtmlCompat.fromHtml(issueNumber + " " + currentItem.getRepositoryOwner() + " / " + currentItem.getRepositoryName(),
-			HtmlCompat.FROM_HTML_MODE_LEGACY);
+		String issueNumber = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources().getString(R.string.hash) + currentItem.getIssueId() + "</font>";
+		Spanned headTitle = HtmlCompat.fromHtml(issueNumber + " " + currentItem.getRepositoryOwner() + " / " + currentItem.getRepositoryName(), HtmlCompat.FROM_HTML_MODE_LEGACY);
 
 		holder.repoInfo.setText(headTitle);
 		holder.draftWithRepository = currentItem;
@@ -154,4 +91,62 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 		notifyDataSetChanged();
 	}
 
+	class DraftsViewHolder extends RecyclerView.ViewHolder {
+
+		private final TextView draftText;
+		private final TextView repoInfo;
+		private final ImageView editCommentStatus;
+		private DraftWithRepository draftWithRepository;
+
+		private DraftsViewHolder(View itemView) {
+
+			super(itemView);
+
+			draftText = itemView.findViewById(R.id.draftText);
+			repoInfo = itemView.findViewById(R.id.repoInfo);
+			ImageView deleteDraft = itemView.findViewById(R.id.deleteDraft);
+			editCommentStatus = itemView.findViewById(R.id.editCommentStatus);
+
+			deleteDraft.setOnClickListener(itemDelete -> {
+
+				int getDraftId = draftWithRepository.getDraftId();
+				deleteDraft(getBindingAdapterPosition());
+
+				DraftsApi draftsApi = BaseApi.getInstance(context, DraftsApi.class);
+				assert draftsApi != null;
+				draftsApi.deleteSingleDraft(getDraftId);
+
+			});
+
+			itemView.setOnClickListener(itemEdit -> {
+
+				RepositoryContext repository = new RepositoryContext(draftWithRepository.getRepositoryOwner(), draftWithRepository.getRepositoryName(), context);
+				repository.setRepositoryId(draftWithRepository.getRepositoryId());
+				IssueContext issue = new IssueContext(repository, draftWithRepository.getIssueId(), draftWithRepository.getIssueType());
+				Bundle bundle = issue.getBundle();
+
+				bundle.putString("commentBody", draftWithRepository.getDraftText());
+				bundle.putString("issueNumber", String.valueOf(draftWithRepository.getIssueId()));
+				bundle.putString("draftTitle", repoInfo.getText().toString());
+				bundle.putString("commentId", draftWithRepository.getCommentId());
+				bundle.putString("draftId", String.valueOf(draftWithRepository.getDraftId()));
+
+				if(!draftWithRepository.getCommentId().isEmpty()) {
+					bundle.putString("commentAction", "edit");
+				}
+
+				BottomSheetReplyFragment bottomSheetReplyFragment = BottomSheetReplyFragment.newInstance(bundle, issue);
+				bottomSheetReplyFragment.setOnInteractedListener(() -> {
+					Intent i = new IssueContext(new RepositoryContext(draftWithRepository.getRepositoryOwner(), draftWithRepository.getRepositoryName(), context), draftWithRepository.getIssueId(),
+						draftWithRepository.getIssueType()).getIntent(context, IssueDetailActivity.class);
+					i.putExtra("openedFromLink", "true");
+					context.startActivity(i);
+				});
+				bottomSheetReplyFragment.show(fragmentManager, "replyBottomSheet");
+			});
+
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ExploreIssuesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ExploreIssuesAdapter.java
index 8457a0c1..4ef961e0 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreIssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreIssuesAdapter.java
@@ -46,10 +46,10 @@ import java.util.Locale;
 public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
+	private final TinyDB tinyDb;
 	private List<Issue> searchedList;
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
-	private final TinyDB tinyDb;
 
 	public ExploreIssuesAdapter(List<Issue> dataList, Context ctx) {
 		this.context = ctx;
@@ -84,9 +84,38 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
 		return searchedList.size();
 	}
 
-	class IssuesHolder extends RecyclerView.ViewHolder {
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+		if(!isMoreDataAvailable) {
+			loadMoreListener.onLoadFinished();
+		}
+	}
 
-		private Issue issue;
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+		loadMoreListener.onLoadFinished();
+	}
+
+	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
+		this.loadMoreListener = loadMoreListener;
+	}
+
+	public void updateList(List<Issue> list) {
+		searchedList = list;
+		notifyDataChanged();
+	}
+
+	public interface OnLoadMoreListener {
+
+		void onLoadMore();
+
+		void onLoadFinished();
+
+	}
+
+	class IssuesHolder extends RecyclerView.ViewHolder {
 
 		private final ImageView issueAssigneeAvatar;
 		private final TextView issueTitle;
@@ -96,6 +125,7 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
 		private final LinearLayout frameLabels;
 		private final HorizontalScrollView labelsScrollViewDots;
 		private final LinearLayout frameLabelsDots;
+		private Issue issue;
 
 		IssuesHolder(View itemView) {
 
@@ -134,8 +164,7 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
 			});
 
 			issueAssigneeAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, issue.getUser().getLogin(),
-					context.getString(R.string.copyLoginIdToClipBoard, issue.getUser().getLogin()));
+				AppUtil.copyToClipboard(context, issue.getUser().getLogin(), context.getString(R.string.copyLoginIdToClipBoard, issue.getUser().getLogin()));
 				return true;
 			});
 		}
@@ -148,17 +177,16 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
 			Locale locale = context.getResources().getConfiguration().locale;
 			String timeFormat = tinyDb.getString("dateFormat", "pretty");
 
-			PicassoService.getInstance(context).get().load(issue.getUser().getAvatarUrl()).placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
+			PicassoService.getInstance(context).get().load(issue.getUser().getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+				.into(issueAssigneeAvatar);
 
-			String issueNumber_ = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray,
-				null) + "'>" + issue.getRepository().getFullName() + context.getResources().getString(R.string.hash) + issue.getNumber() + "</font>";
+			String issueNumber_ = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + issue.getRepository().getFullName() + context.getResources()
+				.getString(R.string.hash) + issue.getNumber() + "</font>";
 
 			issueTitle.setText(HtmlCompat.fromHtml(issueNumber_ + " " + issue.getTitle(), HtmlCompat.FROM_HTML_MODE_LEGACY));
 			issueCommentsCount.setText(String.valueOf(issue.getComments()));
 
-			LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
-				LinearLayout.LayoutParams.WRAP_CONTENT);
+			LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
 			params.setMargins(0, 0, 15, 0);
 
 			if(issue.getLabels() != null) {
@@ -179,8 +207,7 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
 						frameLabelsDots.setGravity(Gravity.START | Gravity.TOP);
 						labelsView.setLayoutParams(params);
 
-						TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).width(54).height(54).endConfig()
-							.buildRound("", color);
+						TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).width(54).height(54).endConfig().buildRound("", color);
 
 						labelsView.setImageDrawable(drawable);
 						frameLabelsDots.addView(labelsView);
@@ -206,10 +233,8 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
 						int height = AppUtil.getPixelsFromDensity(context, 20);
 						int textSize = AppUtil.getPixelsFromScaledDensity(context, 12);
 
-						TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT)
-							.textColor(new ColorInverter().getContrastColor(color)).fontSize(textSize).width(
-								LabelWidthCalculator.calculateLabelWidth(labelName, Typeface.DEFAULT, textSize,
-									AppUtil.getPixelsFromDensity(context, 8))).height(height).endConfig()
+						TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).textColor(new ColorInverter().getContrastColor(color)).fontSize(textSize)
+							.width(LabelWidthCalculator.calculateLabelWidth(labelName, Typeface.DEFAULT, textSize, AppUtil.getPixelsFromDensity(context, 8))).height(height).endConfig()
 							.buildRoundRect(labelName, color, AppUtil.getPixelsFromDensity(context, 18));
 
 						labelsView.setImageDrawable(drawable);
@@ -227,20 +252,17 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
 					PrettyTime prettyTime = new PrettyTime(locale);
 					String createdTime = prettyTime.format(issue.getCreatedAt());
 					issueCreatedTime.setText(createdTime);
-					issueCreatedTime.setOnClickListener(
-						new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issue.getCreatedAt()), context));
+					issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issue.getCreatedAt()), context));
 					break;
 				}
 				case "normal": {
-					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm",
-						locale);
+					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
 					String createdTime = formatter.format(issue.getCreatedAt());
 					issueCreatedTime.setText(createdTime);
 					break;
 				}
 				case "normal1": {
-					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm",
-						locale);
+					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
 					String createdTime = formatter.format(issue.getCreatedAt());
 					issueCreatedTime.setText(createdTime);
 					break;
@@ -251,35 +273,4 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
 
 	}
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
-			loadMoreListener.onLoadFinished();
-		}
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-		loadMoreListener.onLoadFinished();
-	}
-
-	public interface OnLoadMoreListener {
-
-		void onLoadMore();
-
-		void onLoadFinished();
-
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<Issue> list) {
-		searchedList = list;
-		notifyDataChanged();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
index e7dafec5..db0e145b 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
@@ -36,10 +36,10 @@ import java.util.Locale;
 public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
+	private final TinyDB tinyDb;
 	private List<org.gitnex.tea4j.v2.models.Repository> reposList;
 	private Runnable loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
-	private final TinyDB tinyDb;
 
 	public ExploreRepositoriesAdapter(List<org.gitnex.tea4j.v2.models.Repository> dataList, Context ctx) {
 		this.context = ctx;
@@ -73,18 +73,36 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 		return reposList.size();
 	}
 
-	class RepositoriesHolder extends RecyclerView.ViewHolder {
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+	}
 
-		private org.gitnex.tea4j.v2.models.Repository userRepositories;
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+	}
+
+	public void setLoadMoreListener(Runnable loadMoreListener) {
+		this.loadMoreListener = loadMoreListener;
+	}
+
+	public void updateList(List<org.gitnex.tea4j.v2.models.Repository> list) {
+		reposList = list;
+		notifyDataChanged();
+	}
+
+	class RepositoriesHolder extends RecyclerView.ViewHolder {
 
 		private final ImageView image;
 		private final TextView repoName;
 		private final TextView orgName;
 		private final TextView repoDescription;
-		private CheckBox isRepoAdmin;
 		private final TextView repoStars;
 		private final TextView repoLastUpdated;
 		private final View spacerView;
+		private org.gitnex.tea4j.v2.models.Repository userRepositories;
+		private CheckBox isRepoAdmin;
 
 		RepositoriesHolder(View itemView) {
 			super(itemView);
@@ -123,13 +141,12 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 			int color = generator.getColor(userRepositories.getName());
 			String firstCharacter = String.valueOf(userRepositories.getFullName().charAt(0));
 
-			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28)
-				.endConfig().buildRoundRect(firstCharacter, color, 3);
+			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
 
 			if(userRepositories.getAvatarUrl() != null) {
 				if(!userRepositories.getAvatarUrl().equals("")) {
-					PicassoService.getInstance(context).get().load(userRepositories.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-						.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(image);
+					PicassoService.getInstance(context).get().load(userRepositories.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+						.into(image);
 				}
 				else {
 					image.setImageDrawable(drawable);
@@ -146,20 +163,17 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 						PrettyTime prettyTime = new PrettyTime(locale);
 						String createdTime = prettyTime.format(userRepositories.getUpdatedAt());
 						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						repoLastUpdated.setOnClickListener(
-							new ClickListener(TimeHelper.customDateFormatForToastDateFormat(userRepositories.getUpdatedAt()), context));
+						repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(userRepositories.getUpdatedAt()), context));
 						break;
 					}
 					case "normal": {
-						DateFormat formatter = new SimpleDateFormat(
-							"yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+						DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
 						String createdTime = formatter.format(userRepositories.getUpdatedAt());
 						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
 						break;
 					}
 					case "normal1": {
-						DateFormat formatter = new SimpleDateFormat(
-							"dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+						DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
 						String createdTime = formatter.format(userRepositories.getUpdatedAt());
 						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
 						break;
@@ -188,23 +202,4 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 
 	}
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public void setLoadMoreListener(Runnable loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<org.gitnex.tea4j.v2.models.Repository> list) {
-		reposList = list;
-		notifyDataChanged();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
index 72296383..12531975 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
@@ -30,6 +30,116 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 	private final Context context;
 
 	private final FilesAdapterListener filesListener;
+	private final Filter filesFilter = new Filter() {
+
+		@Override
+		protected FilterResults performFiltering(CharSequence constraint) {
+
+			List<ContentsResponse> filteredList = new ArrayList<>();
+
+			if(constraint == null || constraint.length() == 0) {
+				filteredList.addAll(originalFiles);
+			}
+			else {
+				String filterPattern = constraint.toString().toLowerCase().trim();
+
+				for(ContentsResponse item : originalFiles) {
+					if(item.getName().toLowerCase().contains(filterPattern) || item.getPath().toLowerCase().contains(filterPattern)) {
+						filteredList.add(item);
+					}
+				}
+			}
+
+			FilterResults results = new FilterResults();
+			results.values = filteredList;
+
+			return results;
+
+		}
+
+		@Override
+		protected void publishResults(CharSequence constraint, FilterResults results) {
+
+			alteredFiles.clear();
+			alteredFiles.addAll((List) results.values);
+
+			notifyDataSetChanged();
+
+		}
+
+	};
+
+	public FilesAdapter(Context ctx, FilesAdapterListener filesListener) {
+
+		this.context = ctx;
+		this.filesListener = filesListener;
+	}
+
+	public List<ContentsResponse> getOriginalFiles() {
+		return originalFiles;
+	}
+
+	public void notifyOriginalDataSetChanged() {
+
+		alteredFiles.clear();
+		alteredFiles.addAll(originalFiles);
+
+		notifyDataSetChanged();
+	}
+
+	@NonNull
+	@Override
+	public FilesAdapter.FilesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_files, parent, false);
+		return new FilesAdapter.FilesViewHolder(v);
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull FilesAdapter.FilesViewHolder holder, int position) {
+
+		ContentsResponse currentItem = alteredFiles.get(position);
+
+		holder.file = currentItem;
+		holder.fileName.setText(currentItem.getName());
+
+		switch(currentItem.getType()) {
+
+			case "file":
+				holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_file));
+				holder.fileInfo.setVisibility(View.VISIBLE);
+				holder.fileInfo.setText(FileUtils.byteCountToDisplaySize(Math.toIntExact(currentItem.getSize())));
+				break;
+
+			case "dir":
+				holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_directory));
+				holder.fileInfo.setVisibility(View.GONE);
+				break;
+
+			case "submodule":
+				holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_submodule));
+				holder.fileInfo.setVisibility(View.GONE);
+				break;
+
+			case "symlink":
+				holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_symlink));
+				holder.fileInfo.setVisibility(View.GONE);
+				break;
+
+			default:
+				holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_question));
+
+		}
+	}
+
+	@Override
+	public int getItemCount() {
+		return alteredFiles.size();
+	}
+
+	@Override
+	public Filter getFilter() {
+		return filesFilter;
+	}
 
 	public interface FilesAdapterListener {
 
@@ -39,11 +149,10 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 
 	class FilesViewHolder extends RecyclerView.ViewHolder {
 
-		private ContentsResponse file;
-
 		private final ImageView fileTypeIs;
 		private final TextView fileName;
 		private final TextView fileInfo;
+		private ContentsResponse file;
 
 		private FilesViewHolder(View itemView) {
 
@@ -125,115 +234,4 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 
 	}
 
-	public FilesAdapter(Context ctx, FilesAdapterListener filesListener) {
-
-		this.context = ctx;
-		this.filesListener = filesListener;
-	}
-
-	public List<ContentsResponse> getOriginalFiles() {
-		return originalFiles;
-	}
-
-	public void notifyOriginalDataSetChanged() {
-
-		alteredFiles.clear();
-		alteredFiles.addAll(originalFiles);
-
-		notifyDataSetChanged();
-	}
-
-	@NonNull
-	@Override
-	public FilesAdapter.FilesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_files, parent, false);
-		return new FilesAdapter.FilesViewHolder(v);
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull FilesAdapter.FilesViewHolder holder, int position) {
-
-		ContentsResponse currentItem = alteredFiles.get(position);
-
-		holder.file = currentItem;
-		holder.fileName.setText(currentItem.getName());
-
-		switch(currentItem.getType()) {
-
-			case "file":
-				holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_file));
-				holder.fileInfo.setVisibility(View.VISIBLE);
-				holder.fileInfo.setText(FileUtils.byteCountToDisplaySize(Math.toIntExact(currentItem.getSize())));
-				break;
-
-			case "dir":
-				holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_directory));
-				holder.fileInfo.setVisibility(View.GONE);
-				break;
-
-			case "submodule":
-				holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_submodule));
-				holder.fileInfo.setVisibility(View.GONE);
-				break;
-
-			case "symlink":
-				holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_symlink));
-				holder.fileInfo.setVisibility(View.GONE);
-				break;
-
-			default:
-				holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_question));
-
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return alteredFiles.size();
-	}
-
-	@Override
-	public Filter getFilter() {
-		return filesFilter;
-	}
-
-	private final Filter filesFilter = new Filter() {
-
-		@Override
-		protected FilterResults performFiltering(CharSequence constraint) {
-
-			List<ContentsResponse> filteredList = new ArrayList<>();
-
-			if(constraint == null || constraint.length() == 0) {
-				filteredList.addAll(originalFiles);
-			}
-			else {
-				String filterPattern = constraint.toString().toLowerCase().trim();
-
-				for(ContentsResponse item : originalFiles) {
-					if(item.getName().toLowerCase().contains(filterPattern) || item.getPath().toLowerCase().contains(filterPattern)) {
-						filteredList.add(item);
-					}
-				}
-			}
-
-			FilterResults results = new FilterResults();
-			results.values = filteredList;
-
-			return results;
-
-		}
-
-		@Override
-		protected void publishResults(CharSequence constraint, FilterResults results) {
-
-			alteredFiles.clear();
-			alteredFiles.addAll((List) results.values);
-
-			notifyDataSetChanged();
-
-		}
-
-	};
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
index ecb99b71..0f91681b 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
@@ -57,8 +57,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 	private final Locale locale;
 	private final IssueContext issue;
 
-	public IssueCommentsAdapter(Context ctx, Bundle bundle, List<Comment> issuesCommentsMain, FragmentManager fragmentManager,
-		Runnable onInteractedListener, IssueContext issue) {
+	public IssueCommentsAdapter(Context ctx, Bundle bundle, List<Comment> issuesCommentsMain, FragmentManager fragmentManager, Runnable onInteractedListener, IssueContext issue) {
 
 		this.context = ctx;
 		this.bundle = bundle;
@@ -70,16 +69,131 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 		this.issue = issue;
 	}
 
-	class IssueCommentViewHolder extends RecyclerView.ViewHolder {
+	private void updateAdapter(int position) {
 
-		private String userLoginId;
-		private Comment issueComment;
+		issuesComments.remove(position);
+		notifyItemRemoved(position);
+		notifyItemRangeChanged(position, issuesComments.size());
+	}
+
+	private void deleteIssueComment(final Context ctx, final int commentId, int position) {
+
+		Call<Void> call = RetrofitClient.getApiInterface(ctx).issueDeleteComment(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) commentId);
+
+		call.enqueue(new Callback<Void>() {
+
+			@Override
+			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+
+				switch(response.code()) {
+
+					case 204:
+						updateAdapter(position);
+						Toasty.success(ctx, ctx.getResources().getString(R.string.deleteCommentSuccess));
+						IssuesFragment.resumeIssues = true;
+						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.getResources().getString(R.string.genericServerResponseError));
+			}
+		});
+	}
+
+	@NonNull
+	@Override
+	public IssueCommentsAdapter.IssueCommentViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_issue_comments, parent, false);
+		return new IssueCommentsAdapter.IssueCommentViewHolder(v);
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull IssueCommentsAdapter.IssueCommentViewHolder holder, int position) {
+
+		String timeFormat = tinyDB.getString("dateFormat", "pretty");
+		Comment issueComment = issuesComments.get(position);
+		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+
+		holder.userLoginId = issueComment.getUser().getLogin();
+
+		holder.issueComment = issueComment;
+		holder.author.setText(issueComment.getUser().getLogin());
+
+		PicassoService.getInstance(context).get().load(issueComment.getUser().getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0))
+			.resize(AppUtil.getPixelsFromDensity(context, 35), AppUtil.getPixelsFromDensity(context, 35)).centerCrop().into(holder.avatar);
+
+		Markdown.render(context, EmojiParser.parseToUnicode(issueComment.getBody()), holder.comment, issue.getRepository());
+
+		StringBuilder informationBuilder = null;
+		if(issueComment.getCreatedAt() != null) {
+
+			if(timeFormat.equals("pretty")) {
+				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreatedAt(), locale, "pretty", context));
+				holder.information.setOnClickListener(v -> TimeHelper.customDateFormatForToastDateFormat(issueComment.getCreatedAt()));
+			}
+			else if(timeFormat.equals("normal")) {
+				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreatedAt(), locale, "normal", context));
+			}
+
+			if(!issueComment.getCreatedAt().equals(issueComment.getUpdatedAt())) {
+				if(informationBuilder != null) {
+					informationBuilder.append(context.getString(R.string.colorfulBulletSpan)).append(context.getString(R.string.modifiedText));
+				}
+			}
+		}
+
+		holder.information.setText(informationBuilder);
+
+		Bundle bundle1 = new Bundle();
+		bundle1.putAll(bundle);
+		bundle1.putInt("commentId", Math.toIntExact(issueComment.getId()));
+
+		ReactionList reactionList = new ReactionList(context, bundle1);
+
+		holder.commentReactionBadges.addView(reactionList);
+		reactionList.setOnReactionAddedListener(() -> {
+
+			if(holder.commentReactionBadges.getVisibility() != View.VISIBLE) {
+				holder.commentReactionBadges.post(() -> holder.commentReactionBadges.setVisibility(View.VISIBLE));
+			}
+		});
+
+	}
+
+	@Override
+	public int getItemCount() {
+		return issuesComments.size();
+	}
+
+	class IssueCommentViewHolder extends RecyclerView.ViewHolder {
 
 		private final ImageView avatar;
 		private final TextView author;
 		private final TextView information;
 		private final RecyclerView comment;
 		private final LinearLayout commentReactionBadges;
+		private String userLoginId;
+		private Comment issueComment;
 
 		private IssueCommentViewHolder(View view) {
 
@@ -236,122 +350,4 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 	}
 
-	private void updateAdapter(int position) {
-
-		issuesComments.remove(position);
-		notifyItemRemoved(position);
-		notifyItemRangeChanged(position, issuesComments.size());
-	}
-
-	private void deleteIssueComment(final Context ctx, final int commentId, int position) {
-
-		Call<Void> call = RetrofitClient.getApiInterface(ctx)
-			.issueDeleteComment(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) commentId);
-
-		call.enqueue(new Callback<Void>() {
-
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
-
-				switch(response.code()) {
-
-					case 204:
-						updateAdapter(position);
-						Toasty.success(ctx, ctx.getResources().getString(R.string.deleteCommentSuccess));
-						IssuesFragment.resumeIssues = true;
-						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.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
-	}
-
-	@NonNull
-	@Override
-	public IssueCommentsAdapter.IssueCommentViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_issue_comments, parent, false);
-		return new IssueCommentsAdapter.IssueCommentViewHolder(v);
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull IssueCommentsAdapter.IssueCommentViewHolder holder, int position) {
-
-		String timeFormat = tinyDB.getString("dateFormat", "pretty");
-		Comment issueComment = issuesComments.get(position);
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-		holder.userLoginId = issueComment.getUser().getLogin();
-
-		holder.issueComment = issueComment;
-		holder.author.setText(issueComment.getUser().getLogin());
-
-		PicassoService.getInstance(context).get().load(issueComment.getUser().getAvatarUrl()).placeholder(R.drawable.loader_animated)
-			.transform(new RoundedTransformation(imgRadius, 0))
-			.resize(AppUtil.getPixelsFromDensity(context, 35), AppUtil.getPixelsFromDensity(context, 35)).centerCrop().into(holder.avatar);
-
-		Markdown.render(context, EmojiParser.parseToUnicode(issueComment.getBody()), holder.comment, issue.getRepository());
-
-		StringBuilder informationBuilder = null;
-		if(issueComment.getCreatedAt() != null) {
-
-			if(timeFormat.equals("pretty")) {
-				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreatedAt(), locale, "pretty", context));
-				holder.information.setOnClickListener(v -> TimeHelper.customDateFormatForToastDateFormat(issueComment.getCreatedAt()));
-			}
-			else if(timeFormat.equals("normal")) {
-				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreatedAt(), locale, "normal", context));
-			}
-
-			if(!issueComment.getCreatedAt().equals(issueComment.getUpdatedAt())) {
-				if(informationBuilder != null) {
-					informationBuilder.append(context.getString(R.string.colorfulBulletSpan)).append(context.getString(R.string.modifiedText));
-				}
-			}
-		}
-
-		holder.information.setText(informationBuilder);
-
-		Bundle bundle1 = new Bundle();
-		bundle1.putAll(bundle);
-		bundle1.putInt("commentId", Math.toIntExact(issueComment.getId()));
-
-		ReactionList reactionList = new ReactionList(context, bundle1);
-
-		holder.commentReactionBadges.addView(reactionList);
-		reactionList.setOnReactionAddedListener(() -> {
-
-			if(holder.commentReactionBadges.getVisibility() != View.VISIBLE) {
-				holder.commentReactionBadges.post(() -> holder.commentReactionBadges.setVisibility(View.VISIBLE));
-			}
-		});
-
-	}
-
-	@Override
-	public int getItemCount() {
-		return issuesComments.size();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
index 7652a9a3..c7f8ce40 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
@@ -46,10 +46,10 @@ import java.util.Locale;
 public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
+	TinyDB tinyDb;
 	private List<Issue> issuesList;
 	private Runnable loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
-	TinyDB tinyDb;
 
 	public IssuesAdapter(Context ctx, List<Issue> issuesListMain) {
 
@@ -87,9 +87,26 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		return issuesList.size();
 	}
 
-	class IssuesHolder extends RecyclerView.ViewHolder {
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+	}
 
-		private Issue issueObject;
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+	}
+
+	public void setLoadMoreListener(Runnable loadMoreListener) {
+		this.loadMoreListener = loadMoreListener;
+	}
+
+	public void updateList(List<Issue> list) {
+		issuesList = list;
+		notifyDataChanged();
+	}
+
+	class IssuesHolder extends RecyclerView.ViewHolder {
 
 		private final ImageView issueAssigneeAvatar;
 		private final TextView issueTitle;
@@ -99,6 +116,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		private final LinearLayout frameLabels;
 		private final HorizontalScrollView labelsScrollViewDots;
 		private final LinearLayout frameLabelsDots;
+		private Issue issueObject;
 
 		IssuesHolder(View itemView) {
 
@@ -113,8 +131,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 			frameLabelsDots = itemView.findViewById(R.id.frameLabelsDots);
 
 			issueAssigneeAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, issueObject.getUser().getLogin(),
-					context.getString(R.string.copyLoginIdToClipBoard, issueObject.getUser().getLogin()));
+				AppUtil.copyToClipboard(context, issueObject.getUser().getLogin(), context.getString(R.string.copyLoginIdToClipBoard, issueObject.getUser().getLogin()));
 				return true;
 			});
 
@@ -133,26 +150,22 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
 			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-			PicassoService.getInstance(context).get().load(issue.getUser().getAvatarUrl()).placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
+			PicassoService.getInstance(context).get().load(issue.getUser().getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+				.into(issueAssigneeAvatar);
 
-			String issueNumber_ = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray,
-				null) + "'>" + context.getResources().getString(R.string.hash) + issue.getNumber() + "</font>";
-			issueTitle.setText(
-				HtmlCompat.fromHtml(issueNumber_ + " " + EmojiParser.parseToUnicode(issue.getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
+			String issueNumber_ = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources().getString(R.string.hash) + issue.getNumber() + "</font>";
+			issueTitle.setText(HtmlCompat.fromHtml(issueNumber_ + " " + EmojiParser.parseToUnicode(issue.getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
 
 			this.issueObject = issue;
 			this.issueCommentsCount.setText(String.valueOf(issue.getComments()));
 
-			Intent intentIssueDetail = new IssueContext(issueObject, ((RepoDetailActivity) context).repository).getIntent(context,
-				IssueDetailActivity.class);
+			Intent intentIssueDetail = new IssueContext(issueObject, ((RepoDetailActivity) context).repository).getIntent(context, IssueDetailActivity.class);
 
 			itemView.setOnClickListener(layoutView -> context.startActivity(intentIssueDetail));
 			frameLabels.setOnClickListener(v -> context.startActivity(intentIssueDetail));
 			frameLabelsDots.setOnClickListener(v -> context.startActivity(intentIssueDetail));
 
-			LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
-				LinearLayout.LayoutParams.WRAP_CONTENT);
+			LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
 			params.setMargins(0, 0, 15, 0);
 
 			if(issue.getLabels() != null) {
@@ -173,8 +186,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 						frameLabelsDots.setGravity(Gravity.START | Gravity.TOP);
 						labelsView.setLayoutParams(params);
 
-						TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).width(54).height(54).endConfig()
-							.buildRound("", color);
+						TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).width(54).height(54).endConfig().buildRound("", color);
 
 						labelsView.setImageDrawable(drawable);
 						frameLabelsDots.addView(labelsView);
@@ -200,10 +212,8 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 						int height = AppUtil.getPixelsFromDensity(context, 20);
 						int textSize = AppUtil.getPixelsFromScaledDensity(context, 12);
 
-						TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT)
-							.textColor(new ColorInverter().getContrastColor(color)).fontSize(textSize).width(
-								LabelWidthCalculator.calculateLabelWidth(labelName, Typeface.DEFAULT, textSize,
-									AppUtil.getPixelsFromDensity(context, 8))).height(height).endConfig()
+						TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).textColor(new ColorInverter().getContrastColor(color)).fontSize(textSize)
+							.width(LabelWidthCalculator.calculateLabelWidth(labelName, Typeface.DEFAULT, textSize, AppUtil.getPixelsFromDensity(context, 8))).height(height).endConfig()
 							.buildRoundRect(labelName, color, AppUtil.getPixelsFromDensity(context, 18));
 
 						labelsView.setImageDrawable(drawable);
@@ -217,20 +227,17 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 					PrettyTime prettyTime = new PrettyTime(locale);
 					String createdTime = prettyTime.format(issue.getCreatedAt());
 					this.issueCreatedTime.setText(createdTime);
-					this.issueCreatedTime.setOnClickListener(
-						new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issue.getCreatedAt()), context));
+					this.issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issue.getCreatedAt()), context));
 					break;
 				}
 				case "normal": {
-					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm",
-						locale);
+					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
 					String createdTime = formatter.format(issue.getCreatedAt());
 					this.issueCreatedTime.setText(createdTime);
 					break;
 				}
 				case "normal1": {
-					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm",
-						locale);
+					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
 					String createdTime = formatter.format(issue.getCreatedAt());
 					this.issueCreatedTime.setText(createdTime);
 					break;
@@ -241,23 +248,4 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
 	}
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public void setLoadMoreListener(Runnable loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<Issue> list) {
-		issuesList = list;
-		notifyDataChanged();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
index 571820be..a67e6e08 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
@@ -35,13 +35,50 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
 	private final String type;
 	private final String orgName;
 
-	class LabelsViewHolder extends RecyclerView.ViewHolder {
+	public LabelsAdapter(Context ctx, List<Label> labelsMain, String type, String orgName) {
 
-		private Label labels;
+		this.labelsList = labelsMain;
+		this.type = type;
+		this.orgName = orgName;
+	}
+
+	@NonNull
+	@Override
+	public LabelsAdapter.LabelsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_labels, parent, false);
+		return new LabelsAdapter.LabelsViewHolder(v);
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull LabelsAdapter.LabelsViewHolder holder, int position) {
+
+		Label currentItem = labelsList.get(position);
+		holder.labels = currentItem;
+
+		String labelColor = currentItem.getColor();
+		String labelName = currentItem.getName();
+
+		int color = Color.parseColor("#" + labelColor);
+		int contrastColor = new ColorInverter().getContrastColor(color);
+
+		ImageViewCompat.setImageTintList(holder.labelIcon, ColorStateList.valueOf(contrastColor));
+
+		holder.labelName.setTextColor(contrastColor);
+		holder.labelName.setText(labelName);
+		holder.labelView.setCardBackgroundColor(color);
+	}
+
+	@Override
+	public int getItemCount() {
+		return labelsList.size();
+	}
+
+	class LabelsViewHolder extends RecyclerView.ViewHolder {
 
 		private final CardView labelView;
 		private final ImageView labelIcon;
 		private final TextView labelName;
+		private Label labels;
 
 		private LabelsViewHolder(View itemView) {
 			super(itemView);
@@ -105,42 +142,4 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
 
 	}
 
-	public LabelsAdapter(Context ctx, List<Label> labelsMain, String type, String orgName) {
-
-		this.labelsList = labelsMain;
-		this.type = type;
-		this.orgName = orgName;
-	}
-
-	@NonNull
-	@Override
-	public LabelsAdapter.LabelsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_labels, parent, false);
-		return new LabelsAdapter.LabelsViewHolder(v);
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull LabelsAdapter.LabelsViewHolder holder, int position) {
-
-		Label currentItem = labelsList.get(position);
-		holder.labels = currentItem;
-
-		String labelColor = currentItem.getColor();
-		String labelName = currentItem.getName();
-
-		int color = Color.parseColor("#" + labelColor);
-		int contrastColor = new ColorInverter().getContrastColor(color);
-
-		ImageViewCompat.setImageTintList(holder.labelIcon, ColorStateList.valueOf(contrastColor));
-
-		holder.labelName.setTextColor(contrastColor);
-		holder.labelName.setText(labelName);
-		holder.labelView.setCardBackgroundColor(color);
-	}
-
-	@Override
-	public int getItemCount() {
-		return labelsList.size();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/LabelsListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/LabelsListAdapter.java
index b454f4d9..8b73fd47 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/LabelsListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/LabelsListAdapter.java
@@ -21,20 +21,11 @@ import java.util.List;
 
 public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.LabelsViewHolder> {
 
-	private List<Integer> currentLabelsIds;
 	private final List<Label> labels;
 	private final List<String> labelsStrings = new ArrayList<>();
-	private List<Integer> labelsIds = new ArrayList<>();
-
 	private final LabelsListAdapterListener labelsListener;
-
-	public interface LabelsListAdapterListener {
-
-		void labelsInterface(List<String> data);
-
-		void labelsIdsInterface(List<Integer> data);
-
-	}
+	private List<Integer> currentLabelsIds;
+	private List<Integer> labelsIds = new ArrayList<>();
 
 	public LabelsListAdapter(List<Label> labelsMain, LabelsListAdapterListener labelsListener, List<Integer> currentLabelsIds) {
 
@@ -43,24 +34,6 @@ public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.La
 		this.currentLabelsIds = currentLabelsIds;
 	}
 
-	static class LabelsViewHolder extends RecyclerView.ViewHolder {
-
-		private final CheckBox labelSelection;
-		private final TextView labelText;
-		private final ImageView labelColor;
-
-		private LabelsViewHolder(View itemView) {
-
-			super(itemView);
-			this.setIsRecyclable(false);
-
-			labelSelection = itemView.findViewById(R.id.labelSelection);
-			labelText = itemView.findViewById(R.id.labelText);
-			labelColor = itemView.findViewById(R.id.labelColor);
-		}
-
-	}
-
 	@NonNull
 	@Override
 	public LabelsListAdapter.LabelsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -133,4 +106,30 @@ public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.La
 		notifyDataSetChanged();
 	}
 
+	public interface LabelsListAdapterListener {
+
+		void labelsInterface(List<String> data);
+
+		void labelsIdsInterface(List<Integer> data);
+
+	}
+
+	static class LabelsViewHolder extends RecyclerView.ViewHolder {
+
+		private final CheckBox labelSelection;
+		private final TextView labelText;
+		private final ImageView labelColor;
+
+		private LabelsViewHolder(View itemView) {
+
+			super(itemView);
+			this.setIsRecyclable(false);
+
+			labelSelection = itemView.findViewById(R.id.labelSelection);
+			labelText = itemView.findViewById(R.id.labelText);
+			labelColor = itemView.findViewById(R.id.labelColor);
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
index 8bfa0245..7db45307 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
@@ -35,10 +35,10 @@ import java.util.Locale;
 public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
+	private final RepositoryContext repository;
 	private List<Milestone> dataList;
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
-	private final RepositoryContext repository;
 
 	public MilestonesAdapter(Context ctx, List<Milestone> dataListMain, RepositoryContext repository) {
 		this.repository = repository;
@@ -64,9 +64,54 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 		((MilestonesAdapter.DataHolder) holder).bindData(dataList.get(position));
 	}
 
-	class DataHolder extends RecyclerView.ViewHolder {
+	@Override
+	public int getItemViewType(int position) {
+		return position;
+	}
 
-		private Milestone milestones;
+	@Override
+	public int getItemCount() {
+		return dataList.size();
+	}
+
+	private void updateAdapter(int position) {
+		dataList.remove(position);
+		notifyItemRemoved(position);
+		notifyItemRangeChanged(position, dataList.size());
+	}
+
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+		if(!isMoreDataAvailable) {
+			loadMoreListener.onLoadFinished();
+		}
+	}
+
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+		loadMoreListener.onLoadFinished();
+	}
+
+	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
+		this.loadMoreListener = loadMoreListener;
+	}
+
+	public void updateList(List<Milestone> list) {
+		dataList = list;
+		notifyDataChanged();
+	}
+
+	public interface OnLoadMoreListener {
+
+		void onLoadMore();
+
+		void onLoadFinished();
+
+	}
+
+	class DataHolder extends RecyclerView.ViewHolder {
 
 		private final TextView msTitle;
 		private final TextView msDescription;
@@ -74,6 +119,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 		private final TextView msClosedIssues;
 		private final TextView msDueDate;
 		private final ProgressBar msProgress;
+		private Milestone milestones;
 
 		DataHolder(View itemView) {
 
@@ -165,8 +211,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 				else {
 
 					int msCompletion = (int) (100 * dataModel.getClosedIssues() / (dataModel.getOpenIssues() + dataModel.getClosedIssues()));
-					msProgress.setOnClickListener(
-						new ClickListener(context.getResources().getString(R.string.milestoneCompletion, msCompletion), context));
+					msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, msCompletion), context));
 					msProgress.setProgress(msCompletion);
 				}
 
@@ -215,51 +260,4 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
 	}
 
-	@Override
-	public int getItemViewType(int position) {
-		return position;
-	}
-
-	@Override
-	public int getItemCount() {
-		return dataList.size();
-	}
-
-	private void updateAdapter(int position) {
-		dataList.remove(position);
-		notifyItemRemoved(position);
-		notifyItemRangeChanged(position, dataList.size());
-	}
-
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
-			loadMoreListener.onLoadFinished();
-		}
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-		loadMoreListener.onLoadFinished();
-	}
-
-	public interface OnLoadMoreListener {
-
-		void onLoadMore();
-
-		void onLoadFinished();
-
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<Milestone> list) {
-		dataList = list;
-		notifyDataChanged();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/MyProfileEmailsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MyProfileEmailsAdapter.java
index d3fa9b21..558f56a9 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MyProfileEmailsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyProfileEmailsAdapter.java
@@ -23,21 +23,6 @@ public class MyProfileEmailsAdapter extends RecyclerView.Adapter<MyProfileEmails
 	private final List<Email> emailsList;
 	private final Context context;
 
-	static class EmailsViewHolder extends RecyclerView.ViewHolder {
-
-		private final ImageView emailPrimary;
-		private final TextView userEmail;
-
-		private EmailsViewHolder(View itemView) {
-			super(itemView);
-
-			emailPrimary = itemView.findViewById(R.id.emailPrimary);
-			userEmail = itemView.findViewById(R.id.userEmail);
-
-		}
-
-	}
-
 	public MyProfileEmailsAdapter(Context ctx, List<Email> emailsListMain) {
 		this.context = ctx;
 		this.emailsList = emailsListMain;
@@ -58,10 +43,8 @@ public class MyProfileEmailsAdapter extends RecyclerView.Adapter<MyProfileEmails
 		holder.userEmail.setText(currentItem.getEmail());
 
 		if(currentItem.isPrimary()) {
-			TextDrawable drawable = TextDrawable.builder().beginConfig()
-				.textColor(ResourcesCompat.getColor(context.getResources(), R.color.colorWhite, null)).fontSize(36).width(220).height(60).endConfig()
-				.buildRoundRect(context.getResources().getString(R.string.emailTypeText),
-					ResourcesCompat.getColor(context.getResources(), R.color.tooltipBackground, null), 8);
+			TextDrawable drawable = TextDrawable.builder().beginConfig().textColor(ResourcesCompat.getColor(context.getResources(), R.color.colorWhite, null)).fontSize(36).width(220).height(60).endConfig()
+				.buildRoundRect(context.getResources().getString(R.string.emailTypeText), ResourcesCompat.getColor(context.getResources(), R.color.tooltipBackground, null), 8);
 			holder.emailPrimary.setImageDrawable(drawable);
 		}
 		else {
@@ -75,4 +58,19 @@ public class MyProfileEmailsAdapter extends RecyclerView.Adapter<MyProfileEmails
 		return emailsList.size();
 	}
 
+	static class EmailsViewHolder extends RecyclerView.ViewHolder {
+
+		private final ImageView emailPrimary;
+		private final TextView userEmail;
+
+		private EmailsViewHolder(View itemView) {
+			super(itemView);
+
+			emailPrimary = itemView.findViewById(R.id.emailPrimary);
+			userEmail = itemView.findViewById(R.id.userEmail);
+
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
index 32cd61a3..e226da13 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
@@ -27,13 +27,12 @@ import java.util.List;
 public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
-	private List<NotificationThread> notificationThreads;
 	private final OnMoreClickedListener onMoreClickedListener;
 	private final OnNotificationClickedListener onNotificationClickedListener;
+	private List<NotificationThread> notificationThreads;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
-	public NotificationsAdapter(Context context, List<NotificationThread> notificationThreads, OnMoreClickedListener onMoreClickedListener,
-		OnNotificationClickedListener onNotificationClickedListener) {
+	public NotificationsAdapter(Context context, List<NotificationThread> notificationThreads, OnMoreClickedListener onMoreClickedListener, OnNotificationClickedListener onNotificationClickedListener) {
 
 		this.context = context;
 		this.notificationThreads = notificationThreads;
@@ -66,14 +65,41 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
 		return notificationThreads.size();
 	}
 
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+	}
+
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+	}
+
+	public void updateList(List<NotificationThread> list) {
+		notificationThreads = list;
+		notifyDataChanged();
+	}
+
+	public interface OnNotificationClickedListener {
+
+		void onNotificationClicked(NotificationThread notificationThread);
+
+	}
+
+	public interface OnMoreClickedListener {
+
+		void onMoreClicked(NotificationThread notificationThread);
+
+	}
+
 	class NotificationsHolder extends RecyclerView.ViewHolder {
 
 		private final LinearLayout frame;
 		private final TextView subject;
 		private final TextView repository;
 		private final ImageView type;
-		private ImageView pinned;
 		private final ImageView more;
+		private ImageView pinned;
 
 		NotificationsHolder(View itemView) {
 
@@ -93,8 +119,8 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
 			String subjectId = "";
 
 			if(StringUtils.containsAny(notificationThread.getSubject().getType().toLowerCase(), "pull", "issue")) {
-				subjectId = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray,
-					null) + "'>" + context.getResources().getString(R.string.hash) + url.substring(url.lastIndexOf("/") + 1) + "</font>";
+				subjectId = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources().getString(R.string.hash) + url.substring(
+					url.lastIndexOf("/") + 1) + "</font>";
 			}
 
 			subject.setText(HtmlCompat.fromHtml(subjectId + " " + notificationThread.getSubject().getTitle(), HtmlCompat.FROM_HTML_MODE_LEGACY));
@@ -157,31 +183,4 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
 
 	}
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public void updateList(List<NotificationThread> list) {
-		notificationThreads = list;
-		notifyDataChanged();
-	}
-
-	public interface OnNotificationClickedListener {
-
-		void onNotificationClicked(NotificationThread notificationThread);
-
-	}
-
-	public interface OnMoreClickedListener {
-
-		void onMoreClicked(NotificationThread notificationThread);
-
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
index dfd5fd87..4a50b3ba 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
@@ -28,125 +28,10 @@ import java.util.List;
 public class OrganizationsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable {
 
 	private final Context context;
-	private List<Organization> orgList;
 	private final List<Organization> orgListFull;
+	private List<Organization> orgList;
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
-
-	public OrganizationsListAdapter(Context ctx, List<Organization> orgListMain) {
-		this.context = ctx;
-		this.orgList = orgListMain;
-		orgListFull = new ArrayList<>(orgList);
-	}
-
-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		LayoutInflater inflater = LayoutInflater.from(context);
-		return new OrganizationsListAdapter.OrgHolder(inflater.inflate(R.layout.list_organizations, parent, false));
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
-			isLoading = true;
-			loadMoreListener.onLoadMore();
-		}
-
-		((OrganizationsListAdapter.OrgHolder) holder).bindData(orgList.get(position));
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		return position;
-	}
-
-	@Override
-	public int getItemCount() {
-		return orgList.size();
-	}
-
-	class OrgHolder extends RecyclerView.ViewHolder {
-
-		private Organization userOrganizations;
-
-		private final ImageView image;
-		private final TextView orgName;
-		private final TextView orgDescription;
-
-		OrgHolder(View itemView) {
-
-			super(itemView);
-			orgName = itemView.findViewById(R.id.orgName);
-			orgDescription = itemView.findViewById(R.id.orgDescription);
-			image = itemView.findViewById(R.id.imageAvatar);
-
-			itemView.setOnClickListener(v -> {
-				Context context = v.getContext();
-				Intent intent = new Intent(context, OrganizationDetailActivity.class);
-				intent.putExtra("orgName", userOrganizations.getUsername());
-				context.startActivity(intent);
-			});
-		}
-
-		void bindData(Organization org) {
-
-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-			this.userOrganizations = org;
-			orgName.setText(org.getUsername());
-
-			PicassoService.getInstance(context).get().load(org.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(image);
-
-			if(!org.getDescription().equals("")) {
-				orgDescription.setVisibility(View.VISIBLE);
-				orgDescription.setText(org.getDescription());
-			}
-			else {
-				orgDescription.setVisibility(View.GONE);
-			}
-		}
-
-	}
-
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
-			loadMoreListener.onLoadFinished();
-		}
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-		loadMoreListener.onLoadFinished();
-	}
-
-	public abstract static class OnLoadMoreListener {
-
-		protected abstract void onLoadMore();
-
-		public void onLoadFinished() {
-		}
-
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<Organization> list) {
-		orgList = list;
-		notifyDataChanged();
-	}
-
-	@Override
-	public Filter getFilter() {
-		return orgFilter;
-	}
-
 	private final Filter orgFilter = new Filter() {
 
 		@Override
@@ -184,4 +69,116 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<RecyclerView.
 		}
 	};
 
+	public OrganizationsListAdapter(Context ctx, List<Organization> orgListMain) {
+		this.context = ctx;
+		this.orgList = orgListMain;
+		orgListFull = new ArrayList<>(orgList);
+	}
+
+	@NonNull
+	@Override
+	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+		LayoutInflater inflater = LayoutInflater.from(context);
+		return new OrganizationsListAdapter.OrgHolder(inflater.inflate(R.layout.list_organizations, parent, false));
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+			isLoading = true;
+			loadMoreListener.onLoadMore();
+		}
+
+		((OrganizationsListAdapter.OrgHolder) holder).bindData(orgList.get(position));
+	}
+
+	@Override
+	public int getItemViewType(int position) {
+		return position;
+	}
+
+	@Override
+	public int getItemCount() {
+		return orgList.size();
+	}
+
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+		if(!isMoreDataAvailable) {
+			loadMoreListener.onLoadFinished();
+		}
+	}
+
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+		loadMoreListener.onLoadFinished();
+	}
+
+	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
+		this.loadMoreListener = loadMoreListener;
+	}
+
+	public void updateList(List<Organization> list) {
+		orgList = list;
+		notifyDataChanged();
+	}
+
+	@Override
+	public Filter getFilter() {
+		return orgFilter;
+	}
+
+	public abstract static class OnLoadMoreListener {
+
+		protected abstract void onLoadMore();
+
+		public void onLoadFinished() {
+		}
+
+	}
+
+	class OrgHolder extends RecyclerView.ViewHolder {
+
+		private final ImageView image;
+		private final TextView orgName;
+		private final TextView orgDescription;
+		private Organization userOrganizations;
+
+		OrgHolder(View itemView) {
+
+			super(itemView);
+			orgName = itemView.findViewById(R.id.orgName);
+			orgDescription = itemView.findViewById(R.id.orgDescription);
+			image = itemView.findViewById(R.id.imageAvatar);
+
+			itemView.setOnClickListener(v -> {
+				Context context = v.getContext();
+				Intent intent = new Intent(context, OrganizationDetailActivity.class);
+				intent.putExtra("orgName", userOrganizations.getUsername());
+				context.startActivity(intent);
+			});
+		}
+
+		void bindData(Organization org) {
+
+			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+
+			this.userOrganizations = org;
+			orgName.setText(org.getUsername());
+
+			PicassoService.getInstance(context).get().load(org.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(image);
+
+			if(!org.getDescription().equals("")) {
+				orgDescription.setVisibility(View.VISIBLE);
+				orgDescription.setText(org.getDescription());
+			}
+			else {
+				orgDescription.setVisibility(View.GONE);
+			}
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
index 135de401..11a56c52 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
@@ -79,9 +79,26 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 		return prList.size();
 	}
 
-	class PullRequestsHolder extends RecyclerView.ViewHolder {
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+	}
 
-		private PullRequest pullRequestObject;
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+	}
+
+	public void setLoadMoreListener(Runnable loadMoreListener) {
+		this.loadMoreListener = loadMoreListener;
+	}
+
+	public void updateList(List<PullRequest> list) {
+		prList = list;
+		notifyDataChanged();
+	}
+
+	class PullRequestsHolder extends RecyclerView.ViewHolder {
 
 		private final ImageView assigneeAvatar;
 		private final TextView prTitle;
@@ -91,6 +108,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 		private final LinearLayout frameLabels;
 		private final HorizontalScrollView labelsScrollViewDots;
 		private final LinearLayout frameLabelsDots;
+		private PullRequest pullRequestObject;
 
 		PullRequestsHolder(View itemView) {
 
@@ -105,8 +123,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 			frameLabelsDots = itemView.findViewById(R.id.frameLabelsDots);
 
 			View.OnClickListener openPr = v -> {
-				Intent intentPrDetail = new IssueContext(pullRequestObject, ((RepoDetailActivity) context).repository).getIntent(context,
-					IssueDetailActivity.class);
+				Intent intentPrDetail = new IssueContext(pullRequestObject, ((RepoDetailActivity) context).repository).getIntent(context, IssueDetailActivity.class);
 				context.startActivity(intentPrDetail);
 			};
 
@@ -121,8 +138,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 			});
 
 			assigneeAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, pullRequestObject.getUser().getLogin(),
-					context.getString(R.string.copyLoginIdToClipBoard, pullRequestObject.getUser().getLogin()));
+				AppUtil.copyToClipboard(context, pullRequestObject.getUser().getLogin(), context.getString(R.string.copyLoginIdToClipBoard, pullRequestObject.getUser().getLogin()));
 				return true;
 			});
 		}
@@ -135,13 +151,12 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 			String timeFormat = tinyDb.getString("dateFormat", "pretty");
 			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-			PicassoService.getInstance(context).get().load(pullRequest.getUser().getAvatarUrl()).placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(this.assigneeAvatar);
+			PicassoService.getInstance(context).get().load(pullRequest.getUser().getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+				.into(this.assigneeAvatar);
 
 			this.pullRequestObject = pullRequest;
 
-			LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
-				LinearLayout.LayoutParams.WRAP_CONTENT);
+			LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
 			params.setMargins(0, 0, 15, 0);
 
 			if(pullRequest.getLabels() != null) {
@@ -162,8 +177,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 						frameLabelsDots.setGravity(Gravity.START | Gravity.TOP);
 						labelsView.setLayoutParams(params);
 
-						TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).width(54).height(54).endConfig()
-							.buildRound("", color);
+						TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).width(54).height(54).endConfig().buildRound("", color);
 
 						labelsView.setImageDrawable(drawable);
 						frameLabelsDots.addView(labelsView);
@@ -189,10 +203,8 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 						int height = AppUtil.getPixelsFromDensity(context, 20);
 						int textSize = AppUtil.getPixelsFromScaledDensity(context, 12);
 
-						TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT)
-							.textColor(new ColorInverter().getContrastColor(color)).fontSize(textSize).width(
-								LabelWidthCalculator.calculateLabelWidth(labelName, Typeface.DEFAULT, textSize,
-									AppUtil.getPixelsFromDensity(context, 8))).height(height).endConfig()
+						TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).textColor(new ColorInverter().getContrastColor(color)).fontSize(textSize)
+							.width(LabelWidthCalculator.calculateLabelWidth(labelName, Typeface.DEFAULT, textSize, AppUtil.getPixelsFromDensity(context, 8))).height(height).endConfig()
 							.buildRoundRect(labelName, color, AppUtil.getPixelsFromDensity(context, 18));
 
 						labelsView.setImageDrawable(drawable);
@@ -205,39 +217,17 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 				labelsScrollViewWithText.setVisibility(View.GONE);
 			}
 
-			String prNumber_ = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray,
-				null) + "'>" + context.getResources().getString(R.string.hash) + pullRequest.getNumber() + "</font>";
+			String prNumber_ = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources().getString(R.string.hash) + pullRequest.getNumber() + "</font>";
 
-			this.prTitle.setText(
-				HtmlCompat.fromHtml(prNumber_ + " " + EmojiParser.parseToUnicode(pullRequest.getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
+			this.prTitle.setText(HtmlCompat.fromHtml(prNumber_ + " " + EmojiParser.parseToUnicode(pullRequest.getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
 			this.prCommentsCount.setText(String.valueOf(pullRequest.getComments()));
 			this.prCreatedTime.setText(TimeHelper.formatTime(pullRequest.getCreatedAt(), locale, timeFormat, context));
 
 			if(timeFormat.equals("pretty")) {
-				this.prCreatedTime.setOnClickListener(
-					new ClickListener(TimeHelper.customDateFormatForToastDateFormat(pullRequest.getCreatedAt()), context));
+				this.prCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(pullRequest.getCreatedAt()), context));
 			}
 		}
 
 	}
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public void setLoadMoreListener(Runnable loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<PullRequest> list) {
-		prList = list;
-		notifyDataChanged();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReactionAuthorsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReactionAuthorsAdapter.java
index 0d04df47..972bd230 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReactionAuthorsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReactionAuthorsAdapter.java
@@ -39,8 +39,8 @@ public class ReactionAuthorsAdapter extends RecyclerView.Adapter<ReactionAuthors
 	public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
 		User userInfo = userInfos.get(position);
 
-		PicassoService.getInstance(context).get().load(userInfo.getAvatarUrl()).placeholder(R.drawable.loader_animated).resize(240, 240)
-			.transform(new RoundedTransformation(AppUtil.getPixelsFromDensity(context, 6), 0)).centerCrop().into(holder.authorAvatar);
+		PicassoService.getInstance(context).get().load(userInfo.getAvatarUrl()).placeholder(R.drawable.loader_animated).resize(240, 240).transform(new RoundedTransformation(AppUtil.getPixelsFromDensity(context, 6), 0))
+			.centerCrop().into(holder.authorAvatar);
 
 		if(userInfo.getFullName() == null || userInfo.getFullName().isEmpty()) {
 			holder.authorFullName.setVisibility(View.GONE);
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
index 20c5b544..9181692b 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
@@ -42,89 +42,16 @@ import retrofit2.Response;
 
 public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.ReleasesViewHolder> {
 
-	private List<Release> releasesList;
 	private final Context context;
 	private final String repoOwner;
 	private final String repoName;
-
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
 	private final FragmentRefreshListener startDownload;
 	private final FragmentReleasesBinding fragmentReleasesBinding;
+	private List<Release> releasesList;
+	private OnLoadMoreListener loadMoreListener;
+	private boolean isLoading = false, isMoreDataAvailable = true;
 
-	protected class ReleasesViewHolder extends RecyclerView.ViewHolder {
-
-		private Release releases;
-
-		private final TextView releaseType;
-		private final TextView releaseName;
-		private final ImageView authorAvatar;
-		private final TextView authorName;
-		private final TextView releaseTag;
-		private final TextView releaseDate;
-		private final TextView releaseBodyContent;
-		private final LinearLayout downloadCopyFrame;
-		private final LinearLayout downloads;
-		private final LinearLayout releaseZipDownloadFrame;
-		private final LinearLayout releaseTarDownloadFrame;
-		private final ImageView downloadDropdownIcon;
-		private final RecyclerView downloadList;
-		private final ImageView optionsMenu;
-
-		private ReleasesViewHolder(View itemView) {
-
-			super(itemView);
-
-			releaseType = itemView.findViewById(R.id.releaseType);
-			releaseName = itemView.findViewById(R.id.releaseName);
-			authorAvatar = itemView.findViewById(R.id.authorAvatar);
-			authorName = itemView.findViewById(R.id.authorName);
-			releaseTag = itemView.findViewById(R.id.releaseTag);
-			TextView releaseCommitSha = itemView.findViewById(R.id.releaseCommitSha);
-			releaseDate = itemView.findViewById(R.id.releaseDate);
-			releaseBodyContent = itemView.findViewById(R.id.releaseBodyContent);
-			downloadCopyFrame = itemView.findViewById(R.id.downloadCopyFrame);
-			downloads = itemView.findViewById(R.id.downloads);
-			releaseZipDownloadFrame = itemView.findViewById(R.id.releaseZipDownloadFrame);
-			releaseTarDownloadFrame = itemView.findViewById(R.id.releaseTarDownloadFrame);
-			downloadDropdownIcon = itemView.findViewById(R.id.downloadDropdownIcon);
-			downloadList = itemView.findViewById(R.id.downloadList);
-			optionsMenu = itemView.findViewById(R.id.releasesOptionsMenu);
-
-			downloadList.setHasFixedSize(true);
-			downloadList.setLayoutManager(new LinearLayoutManager(itemView.getContext()));
-
-			authorAvatar.setOnClickListener(loginId -> {
-				Context context = loginId.getContext();
-
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", releases.getAuthor().getLogin());
-				context.startActivity(intent);
-			});
-
-			optionsMenu.setOnClickListener(v -> {
-				final Context context = v.getContext();
-
-				View view = LayoutInflater.from(context)
-					.inflate(R.layout.bottom_sheet_release_in_list, itemView.findViewById(android.R.id.content), false);
-
-				TextView deleteRelease = view.findViewById(R.id.deleteRelease);
-
-				BottomSheetDialog dialog = new BottomSheetDialog(context);
-				dialog.setContentView(view);
-				dialog.show();
-
-				deleteRelease.setOnClickListener(v1 -> {
-					deleteRelease(context, releases.getName(), releases.getId(), repoOwner, repoName, getBindingAdapterPosition());
-					dialog.dismiss();
-				});
-			});
-		}
-
-	}
-
-	public ReleasesAdapter(Context ctx, List<Release> releasesMain, FragmentRefreshListener startDownload, String repoOwner, String repoName,
-		FragmentReleasesBinding fragmentReleasesBinding) {
+	public ReleasesAdapter(Context ctx, List<Release> releasesMain, FragmentRefreshListener startDownload, String repoOwner, String repoName, FragmentReleasesBinding fragmentReleasesBinding) {
 		this.context = ctx;
 		this.releasesList = releasesMain;
 		this.startDownload = startDownload;
@@ -167,8 +94,8 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 		}
 
 		if(currentItem.getAuthor().getAvatarUrl() != null) {
-			PicassoService.getInstance(context).get().load(currentItem.getAuthor().getAvatarUrl()).placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.authorAvatar);
+			PicassoService.getInstance(context).get().load(currentItem.getAuthor().getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+				.into(holder.authorAvatar);
 		}
 
 		holder.authorName.setText(context.getResources().getString(R.string.releasePublishedBy, currentItem.getAuthor().getLogin()));
@@ -182,8 +109,7 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 		}
 
 		if(timeFormat.equals("pretty")) {
-			holder.releaseDate.setOnClickListener(
-				new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getPublishedAt()), context));
+			holder.releaseDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getPublishedAt()), context));
 		}
 
 		if(!currentItem.getBody().equals("")) {
@@ -243,14 +169,6 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 		loadMoreListener.onLoadFinished();
 	}
 
-	public interface OnLoadMoreListener {
-
-		void onLoadMore();
-
-		void onLoadFinished();
-
-	}
-
 	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
 		this.loadMoreListener = loadMoreListener;
 	}
@@ -266,38 +184,113 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 		notifyItemRangeChanged(position, releasesList.size());
 	}
 
-	private void deleteRelease(final Context context, final String releaseName, final Long releaseId, final String owner, final String repo,
-		int position) {
+	private void deleteRelease(final Context context, final String releaseName, final Long releaseId, final String owner, final String repo, int position) {
 
-		new AlertDialog.Builder(context).setTitle(String.format(context.getString(R.string.deleteGenericTitle), releaseName))
-			.setMessage(R.string.deleteReleaseConfirmation).setIcon(R.drawable.ic_delete).setPositiveButton(R.string.menuDeleteText,
-				(dialog, whichButton) -> RetrofitClient.getApiInterface(context).repoDeleteRelease(owner, repo, releaseId).enqueue(new Callback<>() {
+		new AlertDialog.Builder(context).setTitle(String.format(context.getString(R.string.deleteGenericTitle), releaseName)).setMessage(R.string.deleteReleaseConfirmation).setIcon(R.drawable.ic_delete)
+			.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> RetrofitClient.getApiInterface(context).repoDeleteRelease(owner, repo, releaseId).enqueue(new Callback<>() {
 
-					@Override
-					public void onResponse(@NonNull Call<Void> call, @NonNull Response<Void> response) {
+				@Override
+				public void onResponse(@NonNull Call<Void> call, @NonNull Response<Void> response) {
 
-						if(response.isSuccessful()) {
-							updateAdapter(position);
-							Toasty.success(context, context.getString(R.string.releaseDeleted));
-							MainActivity.reloadRepos = true;
-							if(getItemCount() == 0) {
-								fragmentReleasesBinding.noDataReleases.setVisibility(View.VISIBLE);
-							}
-						}
-						else if(response.code() == 403) {
-							Toasty.error(context, context.getString(R.string.authorizeError));
-						}
-						else {
-							Toasty.error(context, context.getString(R.string.genericError));
+					if(response.isSuccessful()) {
+						updateAdapter(position);
+						Toasty.success(context, context.getString(R.string.releaseDeleted));
+						MainActivity.reloadRepos = true;
+						if(getItemCount() == 0) {
+							fragmentReleasesBinding.noDataReleases.setVisibility(View.VISIBLE);
 						}
 					}
-
-					@Override
-					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
+					else if(response.code() == 403) {
+						Toasty.error(context, context.getString(R.string.authorizeError));
+					}
+					else {
 						Toasty.error(context, context.getString(R.string.genericError));
 					}
-				})).setNeutralButton(R.string.cancelButton, null).show();
+				}
+
+				@Override
+				public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+
+					Toasty.error(context, context.getString(R.string.genericError));
+				}
+			})).setNeutralButton(R.string.cancelButton, null).show();
+	}
+
+	public interface OnLoadMoreListener {
+
+		void onLoadMore();
+
+		void onLoadFinished();
+
+	}
+
+	protected class ReleasesViewHolder extends RecyclerView.ViewHolder {
+
+		private final TextView releaseType;
+		private final TextView releaseName;
+		private final ImageView authorAvatar;
+		private final TextView authorName;
+		private final TextView releaseTag;
+		private final TextView releaseDate;
+		private final TextView releaseBodyContent;
+		private final LinearLayout downloadCopyFrame;
+		private final LinearLayout downloads;
+		private final LinearLayout releaseZipDownloadFrame;
+		private final LinearLayout releaseTarDownloadFrame;
+		private final ImageView downloadDropdownIcon;
+		private final RecyclerView downloadList;
+		private final ImageView optionsMenu;
+		private Release releases;
+
+		private ReleasesViewHolder(View itemView) {
+
+			super(itemView);
+
+			releaseType = itemView.findViewById(R.id.releaseType);
+			releaseName = itemView.findViewById(R.id.releaseName);
+			authorAvatar = itemView.findViewById(R.id.authorAvatar);
+			authorName = itemView.findViewById(R.id.authorName);
+			releaseTag = itemView.findViewById(R.id.releaseTag);
+			TextView releaseCommitSha = itemView.findViewById(R.id.releaseCommitSha);
+			releaseDate = itemView.findViewById(R.id.releaseDate);
+			releaseBodyContent = itemView.findViewById(R.id.releaseBodyContent);
+			downloadCopyFrame = itemView.findViewById(R.id.downloadCopyFrame);
+			downloads = itemView.findViewById(R.id.downloads);
+			releaseZipDownloadFrame = itemView.findViewById(R.id.releaseZipDownloadFrame);
+			releaseTarDownloadFrame = itemView.findViewById(R.id.releaseTarDownloadFrame);
+			downloadDropdownIcon = itemView.findViewById(R.id.downloadDropdownIcon);
+			downloadList = itemView.findViewById(R.id.downloadList);
+			optionsMenu = itemView.findViewById(R.id.releasesOptionsMenu);
+
+			downloadList.setHasFixedSize(true);
+			downloadList.setLayoutManager(new LinearLayoutManager(itemView.getContext()));
+
+			authorAvatar.setOnClickListener(loginId -> {
+				Context context = loginId.getContext();
+
+				Intent intent = new Intent(context, ProfileActivity.class);
+				intent.putExtra("username", releases.getAuthor().getLogin());
+				context.startActivity(intent);
+			});
+
+			optionsMenu.setOnClickListener(v -> {
+				final Context context = v.getContext();
+
+				View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_release_in_list, itemView.findViewById(android.R.id.content), false);
+
+				TextView deleteRelease = view.findViewById(R.id.deleteRelease);
+
+				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				dialog.setContentView(view);
+				dialog.show();
+
+				deleteRelease.setOnClickListener(v1 -> {
+					deleteRelease(context, releases.getName(), releases.getId(), repoOwner, repoName, getBindingAdapterPosition());
+					dialog.dismiss();
+				});
+			});
+		}
+
 	}
 
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReleasesDownloadsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReleasesDownloadsAdapter.java
index edf09d7a..ae4d9264 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesDownloadsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReleasesDownloadsAdapter.java
@@ -20,18 +20,6 @@ public class ReleasesDownloadsAdapter extends RecyclerView.Adapter<ReleasesDownl
 	private final List<Attachment> releasesDownloadsList;
 	private final FragmentRefreshListener startDownload;
 
-	static class ReleasesDownloadsViewHolder extends RecyclerView.ViewHolder {
-
-		private final TextView downloadName;
-
-		private ReleasesDownloadsViewHolder(View itemView) {
-
-			super(itemView);
-			downloadName = itemView.findViewById(R.id.downloadName);
-		}
-
-	}
-
 	ReleasesDownloadsAdapter(List<Attachment> releasesDownloadsMain, FragmentRefreshListener startDownload) {
 
 		this.releasesDownloadsList = releasesDownloadsMain;
@@ -63,4 +51,16 @@ public class ReleasesDownloadsAdapter extends RecyclerView.Adapter<ReleasesDownl
 		return releasesDownloadsList.size();
 	}
 
+	static class ReleasesDownloadsViewHolder extends RecyclerView.ViewHolder {
+
+		private final TextView downloadName;
+
+		private ReleasesDownloadsViewHolder(View itemView) {
+
+			super(itemView);
+			downloadName = itemView.findViewById(R.id.downloadName);
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java
index fb1dcb29..c72914ea 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java
@@ -74,17 +74,35 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 		return forksList.size();
 	}
 
-	class ForksHolder extends RecyclerView.ViewHolder {
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+	}
 
-		private org.gitnex.tea4j.v2.models.Repository userRepositories;
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+	}
+
+	public void setLoadMoreListener(Runnable loadMoreListener) {
+		this.loadMoreListener = loadMoreListener;
+	}
+
+	public void updateList(List<org.gitnex.tea4j.v2.models.Repository> list) {
+		forksList = list;
+		notifyDataChanged();
+	}
+
+	class ForksHolder extends RecyclerView.ViewHolder {
 
 		private final ImageView image;
 		private final TextView repoName;
 		private final TextView orgName;
 		private final TextView repoDescription;
-		private CheckBox isRepoAdmin;
 		private final TextView repoStars;
 		private final TextView repoLastUpdated;
+		private org.gitnex.tea4j.v2.models.Repository userRepositories;
+		private CheckBox isRepoAdmin;
 
 		ForksHolder(View itemView) {
 
@@ -115,13 +133,12 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 			int color = generator.getColor(forksModel.getName());
 			String firstCharacter = String.valueOf(forksModel.getFullName().charAt(0));
 
-			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28)
-				.endConfig().buildRoundRect(firstCharacter, color, 3);
+			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
 
 			if(forksModel.getAvatarUrl() != null) {
 				if(!forksModel.getAvatarUrl().equals("")) {
-					PicassoService.getInstance(context).get().load(forksModel.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-						.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(image);
+					PicassoService.getInstance(context).get().load(forksModel.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+						.into(image);
 				}
 				else {
 					image.setImageDrawable(drawable);
@@ -138,20 +155,17 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 						PrettyTime prettyTime = new PrettyTime(locale);
 						String createdTime = prettyTime.format(forksModel.getUpdatedAt());
 						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						repoLastUpdated.setOnClickListener(
-							new ClickListener(TimeHelper.customDateFormatForToastDateFormat(forksModel.getUpdatedAt()), context));
+						repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(forksModel.getUpdatedAt()), context));
 						break;
 					}
 					case "normal": {
-						DateFormat formatter = new SimpleDateFormat(
-							"yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+						DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
 						String createdTime = formatter.format(forksModel.getUpdatedAt());
 						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
 						break;
 					}
 					case "normal1": {
-						DateFormat formatter = new SimpleDateFormat(
-							"dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+						DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
 						String createdTime = formatter.format(forksModel.getUpdatedAt());
 						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
 						break;
@@ -190,23 +204,4 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 
 	}
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public void setLoadMoreListener(Runnable loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<org.gitnex.tea4j.v2.models.Repository> list) {
-		forksList = list;
-		notifyDataChanged();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
index 2bb3478a..867f9e98 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@@ -39,11 +39,45 @@ import java.util.Locale;
 public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable {
 
 	private final Context context;
-	private List<org.gitnex.tea4j.v2.models.Repository> reposList;
 	private final List<org.gitnex.tea4j.v2.models.Repository> reposListFull;
+	private final TinyDB tinyDb;
+	private List<org.gitnex.tea4j.v2.models.Repository> reposList;
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
-	private final TinyDB tinyDb;
+	private final Filter reposFilter = new Filter() {
+
+		@Override
+		protected FilterResults performFiltering(CharSequence constraint) {
+
+			List<org.gitnex.tea4j.v2.models.Repository> filteredList = new ArrayList<>();
+
+			if(constraint == null || constraint.length() == 0) {
+				filteredList.addAll(reposListFull);
+			}
+			else {
+				String filterPattern = constraint.toString().toLowerCase().trim();
+
+				for(org.gitnex.tea4j.v2.models.Repository item : reposListFull) {
+					if(item.getFullName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
+						filteredList.add(item);
+					}
+				}
+			}
+
+			FilterResults results = new FilterResults();
+			results.values = filteredList;
+
+			return results;
+		}
+
+		@Override
+		protected void publishResults(CharSequence constraint, FilterResults results) {
+
+			reposList.clear();
+			reposList.addAll((List) results.values);
+			notifyDataChanged();
+		}
+	};
 
 	public ReposListAdapter(List<org.gitnex.tea4j.v2.models.Repository> reposListMain, Context ctx) {
 		this.context = ctx;
@@ -79,18 +113,53 @@ public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 		return reposList.size();
 	}
 
-	class ReposHolder extends RecyclerView.ViewHolder {
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+		if(!isMoreDataAvailable) {
+			loadMoreListener.onLoadFinished();
+		}
+	}
 
-		private org.gitnex.tea4j.v2.models.Repository userRepositories;
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+		loadMoreListener.onLoadFinished();
+	}
+
+	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
+		this.loadMoreListener = loadMoreListener;
+	}
+
+	public void updateList(List<org.gitnex.tea4j.v2.models.Repository> list) {
+		reposList = list;
+		notifyDataChanged();
+	}
+
+	@Override
+	public Filter getFilter() {
+		return reposFilter;
+	}
+
+	public interface OnLoadMoreListener {
+
+		void onLoadMore();
+
+		void onLoadFinished();
+
+	}
+
+	class ReposHolder extends RecyclerView.ViewHolder {
 
 		private final ImageView image;
 		private final TextView repoName;
 		private final TextView orgName;
 		private final TextView repoDescription;
-		private CheckBox isRepoAdmin;
 		private final TextView repoStars;
 		private final TextView repoLastUpdated;
 		private final View spacerView;
+		private org.gitnex.tea4j.v2.models.Repository userRepositories;
+		private CheckBox isRepoAdmin;
 
 		ReposHolder(View itemView) {
 
@@ -130,13 +199,12 @@ public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 			int color = generator.getColor(repositories.getName());
 			String firstCharacter = String.valueOf(repositories.getFullName().charAt(0));
 
-			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28)
-				.endConfig().buildRoundRect(firstCharacter, color, 3);
+			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
 
 			if(repositories.getAvatarUrl() != null) {
 				if(!repositories.getAvatarUrl().equals("")) {
-					PicassoService.getInstance(context).get().load(repositories.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-						.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(image);
+					PicassoService.getInstance(context).get().load(repositories.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+						.into(image);
 				}
 				else {
 					image.setImageDrawable(drawable);
@@ -153,20 +221,17 @@ public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 						PrettyTime prettyTime = new PrettyTime(locale);
 						String createdTime = prettyTime.format(repositories.getUpdatedAt());
 						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						repoLastUpdated.setOnClickListener(
-							new ClickListener(TimeHelper.customDateFormatForToastDateFormat(repositories.getUpdatedAt()), context));
+						repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(repositories.getUpdatedAt()), context));
 						break;
 					}
 					case "normal": {
-						DateFormat formatter = new SimpleDateFormat(
-							"yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+						DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
 						String createdTime = formatter.format(repositories.getUpdatedAt());
 						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
 						break;
 					}
 					case "normal1": {
-						DateFormat formatter = new SimpleDateFormat(
-							"dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+						DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
 						String createdTime = formatter.format(repositories.getUpdatedAt());
 						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
 						break;
@@ -195,75 +260,4 @@ public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 
 	}
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
-			loadMoreListener.onLoadFinished();
-		}
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-		loadMoreListener.onLoadFinished();
-	}
-
-	public interface OnLoadMoreListener {
-
-		void onLoadMore();
-
-		void onLoadFinished();
-
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<org.gitnex.tea4j.v2.models.Repository> list) {
-		reposList = list;
-		notifyDataChanged();
-	}
-
-	@Override
-	public Filter getFilter() {
-		return reposFilter;
-	}
-
-	private final Filter reposFilter = new Filter() {
-
-		@Override
-		protected FilterResults performFiltering(CharSequence constraint) {
-
-			List<org.gitnex.tea4j.v2.models.Repository> filteredList = new ArrayList<>();
-
-			if(constraint == null || constraint.length() == 0) {
-				filteredList.addAll(reposListFull);
-			}
-			else {
-				String filterPattern = constraint.toString().toLowerCase().trim();
-
-				for(org.gitnex.tea4j.v2.models.Repository item : reposListFull) {
-					if(item.getFullName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
-						filteredList.add(item);
-					}
-				}
-			}
-
-			FilterResults results = new FilterResults();
-			results.values = filteredList;
-
-			return results;
-		}
-
-		@Override
-		protected void publishResults(CharSequence constraint, FilterResults results) {
-
-			reposList.clear();
-			reposList.addAll((List) results.values);
-			notifyDataChanged();
-		}
-	};
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/TagsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/TagsAdapter.java
index 9ce220b5..da5a2b8e 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/TagsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/TagsAdapter.java
@@ -31,62 +31,16 @@ import retrofit2.Response;
 
 public class TagsAdapter extends RecyclerView.Adapter<TagsAdapter.TagsViewHolder> {
 
-	private List<Tag> tags;
 	private final Context context;
 	private final String repo;
 	private final String owner;
 	private final FragmentRefreshListener startDownload;
 	private final FragmentReleasesBinding fragmentReleasesBinding;
+	private List<Tag> tags;
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
-	protected class TagsViewHolder extends RecyclerView.ViewHolder {
-
-		private Tag tagsHolder;
-		private final TextView tagName;
-		private final TextView tagBody;
-		private final LinearLayout downloadCopyFrame;
-		private final LinearLayout downloads;
-		private final LinearLayout releaseZipDownloadFrame;
-		private final LinearLayout releaseTarDownloadFrame;
-		private final ImageView downloadDropdownIcon;
-		private final ImageView options;
-
-		private TagsViewHolder(View itemView) {
-
-			super(itemView);
-
-			tagName = itemView.findViewById(R.id.tagName);
-			tagBody = itemView.findViewById(R.id.tagBodyContent);
-			downloadCopyFrame = itemView.findViewById(R.id.downloadCopyFrame);
-			downloads = itemView.findViewById(R.id.downloads);
-			releaseZipDownloadFrame = itemView.findViewById(R.id.releaseZipDownloadFrame);
-			releaseTarDownloadFrame = itemView.findViewById(R.id.releaseTarDownloadFrame);
-			downloadDropdownIcon = itemView.findViewById(R.id.downloadDropdownIcon);
-			options = itemView.findViewById(R.id.tagsOptionsMenu);
-
-			options.setOnClickListener(v -> {
-				final Context context = v.getContext();
-
-				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_tag_in_list, null);
-
-				TextView delete = view.findViewById(R.id.tagMenuDelete);
-
-				BottomSheetDialog dialog = new BottomSheetDialog(context);
-				dialog.setContentView(view);
-				dialog.show();
-
-				delete.setOnClickListener(v1 -> {
-					tagDeleteDialog(context, tagsHolder.getName(), owner, repo, getBindingAdapterPosition());
-					dialog.dismiss();
-				});
-			});
-		}
-
-	}
-
-	public TagsAdapter(Context ctx, List<Tag> releasesMain, String repoOwner, String repoName, FragmentRefreshListener startDownload,
-		FragmentReleasesBinding fragmentReleasesBinding) {
+	public TagsAdapter(Context ctx, List<Tag> releasesMain, String repoOwner, String repoName, FragmentRefreshListener startDownload, FragmentReleasesBinding fragmentReleasesBinding) {
 		this.context = ctx;
 		this.tags = releasesMain;
 		owner = repoOwner;
@@ -163,14 +117,6 @@ public class TagsAdapter extends RecyclerView.Adapter<TagsAdapter.TagsViewHolder
 		loadMoreListener.onLoadFinished();
 	}
 
-	public interface OnLoadMoreListener {
-
-		void onLoadMore();
-
-		void onLoadFinished();
-
-	}
-
 	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
 		this.loadMoreListener = loadMoreListener;
 	}
@@ -188,37 +134,89 @@ public class TagsAdapter extends RecyclerView.Adapter<TagsAdapter.TagsViewHolder
 
 	private void tagDeleteDialog(final Context context, final String tagName, final String owner, final String repo, int position) {
 
-		new AlertDialog.Builder(context).setTitle(String.format(context.getString(R.string.deleteGenericTitle), tagName))
-			.setMessage(R.string.deleteTagConfirmation).setIcon(R.drawable.ic_delete).setPositiveButton(R.string.menuDeleteText,
-				(dialog, whichButton) -> RetrofitClient.getApiInterface(context).repoDeleteTag(owner, repo, tagName).enqueue(new Callback<>() {
+		new AlertDialog.Builder(context).setTitle(String.format(context.getString(R.string.deleteGenericTitle), tagName)).setMessage(R.string.deleteTagConfirmation).setIcon(R.drawable.ic_delete)
+			.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> RetrofitClient.getApiInterface(context).repoDeleteTag(owner, repo, tagName).enqueue(new Callback<>() {
 
-					@Override
-					public void onResponse(@NonNull Call<Void> call, @NonNull Response<Void> response) {
+				@Override
+				public void onResponse(@NonNull Call<Void> call, @NonNull Response<Void> response) {
 
-						if(response.isSuccessful()) {
-							updateAdapter(position);
-							Toasty.success(context, context.getString(R.string.tagDeleted));
-							if(getItemCount() == 0) {
-								fragmentReleasesBinding.noDataReleases.setVisibility(View.VISIBLE);
-							}
-						}
-						else if(response.code() == 403) {
-							Toasty.error(context, context.getString(R.string.authorizeError));
-						}
-						else if(response.code() == 409) {
-							Toasty.error(context, context.getString(R.string.tagDeleteError));
-						}
-						else {
-							Toasty.error(context, context.getString(R.string.genericError));
+					if(response.isSuccessful()) {
+						updateAdapter(position);
+						Toasty.success(context, context.getString(R.string.tagDeleted));
+						if(getItemCount() == 0) {
+							fragmentReleasesBinding.noDataReleases.setVisibility(View.VISIBLE);
 						}
 					}
-
-					@Override
-					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
+					else if(response.code() == 403) {
+						Toasty.error(context, context.getString(R.string.authorizeError));
+					}
+					else if(response.code() == 409) {
+						Toasty.error(context, context.getString(R.string.tagDeleteError));
+					}
+					else {
 						Toasty.error(context, context.getString(R.string.genericError));
 					}
-				})).setNeutralButton(R.string.cancelButton, null).show();
+				}
+
+				@Override
+				public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+
+					Toasty.error(context, context.getString(R.string.genericError));
+				}
+			})).setNeutralButton(R.string.cancelButton, null).show();
+	}
+
+	public interface OnLoadMoreListener {
+
+		void onLoadMore();
+
+		void onLoadFinished();
+
+	}
+
+	protected class TagsViewHolder extends RecyclerView.ViewHolder {
+
+		private final TextView tagName;
+		private final TextView tagBody;
+		private final LinearLayout downloadCopyFrame;
+		private final LinearLayout downloads;
+		private final LinearLayout releaseZipDownloadFrame;
+		private final LinearLayout releaseTarDownloadFrame;
+		private final ImageView downloadDropdownIcon;
+		private final ImageView options;
+		private Tag tagsHolder;
+
+		private TagsViewHolder(View itemView) {
+
+			super(itemView);
+
+			tagName = itemView.findViewById(R.id.tagName);
+			tagBody = itemView.findViewById(R.id.tagBodyContent);
+			downloadCopyFrame = itemView.findViewById(R.id.downloadCopyFrame);
+			downloads = itemView.findViewById(R.id.downloads);
+			releaseZipDownloadFrame = itemView.findViewById(R.id.releaseZipDownloadFrame);
+			releaseTarDownloadFrame = itemView.findViewById(R.id.releaseTarDownloadFrame);
+			downloadDropdownIcon = itemView.findViewById(R.id.downloadDropdownIcon);
+			options = itemView.findViewById(R.id.tagsOptionsMenu);
+
+			options.setOnClickListener(v -> {
+				final Context context = v.getContext();
+
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_tag_in_list, null);
+
+				TextView delete = view.findViewById(R.id.tagMenuDelete);
+
+				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				dialog.setContentView(view);
+				dialog.show();
+
+				delete.setOnClickListener(v1 -> {
+					tagDeleteDialog(context, tagsHolder.getName(), owner, repo, getBindingAdapterPosition());
+					dialog.dismiss();
+				});
+			});
+		}
+
 	}
 
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgPreviewAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgPreviewAdapter.java
index d80b88b0..800773be 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgPreviewAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgPreviewAdapter.java
@@ -39,8 +39,8 @@ public class TeamMembersByOrgPreviewAdapter extends RecyclerView.Adapter<TeamMem
 	public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
 		User userInfo = userData.get(position);
 
-		PicassoService.getInstance(context).get().load(userInfo.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-			.transform(new RoundedTransformation(AppUtil.getPixelsFromDensity(context, 3), 0)).resize(120, 120).centerCrop().into(holder.avatar);
+		PicassoService.getInstance(context).get().load(userInfo.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(AppUtil.getPixelsFromDensity(context, 3), 0)).resize(120, 120)
+			.centerCrop().into(holder.avatar);
 	}
 
 	@Override
diff --git a/app/src/main/java/org/mian/gitnex/adapters/TeamRepositoriesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/TeamRepositoriesAdapter.java
index 9b20e315..6ca281d6 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/TeamRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/TeamRepositoriesAdapter.java
@@ -49,53 +49,6 @@ public class TeamRepositoriesAdapter extends RecyclerView.Adapter<TeamRepositori
 		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(TeamRepositoriesAdapter.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 TeamRepositoriesAdapter.TeamReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -112,13 +65,12 @@ public class TeamRepositoriesAdapter extends RecyclerView.Adapter<TeamRepositori
 
 		holder.name.setText(currentItem.getName());
 
-		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28)
-			.endConfig().buildRoundRect(String.valueOf(currentItem.getFullName().charAt(0)),
-				ColorGenerator.Companion.getMATERIAL().getColor(currentItem.getName()), 3);
+		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig()
+			.buildRoundRect(String.valueOf(currentItem.getFullName().charAt(0)), ColorGenerator.Companion.getMATERIAL().getColor(currentItem.getName()), 3);
 
 		if(currentItem.getAvatarUrl() != null && !currentItem.getAvatarUrl().equals("")) {
-			PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.repoAvatar);
+			PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+				.into(holder.repoAvatar);
 		}
 		else {
 			holder.repoAvatar.setImageDrawable(drawable);
@@ -156,4 +108,48 @@ public class TeamRepositoriesAdapter extends RecyclerView.Adapter<TeamRepositori
 		}
 	}
 
+	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(TeamRepositoriesAdapter.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));
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/TeamsByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/TeamsByOrgAdapter.java
index 7114d46d..fbc54656 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/TeamsByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/TeamsByOrgAdapter.java
@@ -36,47 +36,38 @@ public class TeamsByOrgAdapter extends RecyclerView.Adapter<TeamsByOrgAdapter.Or
 	private final List<Team> teamListFull;
 	private final OrganizationPermissions permissions;
 	private final String orgName;
+	private final Filter orgTeamsFilter = new Filter() {
 
-	static class OrgTeamsViewHolder extends RecyclerView.ViewHolder {
+		@Override
+		protected FilterResults performFiltering(CharSequence constraint) {
+			List<Team> filteredList = new ArrayList<>();
 
-		private Team team;
+			if(constraint == null || constraint.length() == 0) {
+				filteredList.addAll(teamListFull);
+			}
+			else {
+				String filterPattern = constraint.toString().toLowerCase().trim();
 
-		private OrganizationPermissions permissions;
-		private final TextView teamTitle;
-		private final TextView teamDescription;
-		private final LinearLayout membersPreviewFrame;
+				for(Team item : teamListFull) {
+					if(item.getName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
+						filteredList.add(item);
+					}
+				}
+			}
 
-		private final List<User> userInfos;
-		private final TeamMembersByOrgPreviewAdapter adapter;
-		private String orgName;
+			FilterResults results = new FilterResults();
+			results.values = filteredList;
 
-		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 TeamMembersByOrgPreviewAdapter(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);
-			});
+			return results;
 		}
 
-	}
+		@Override
+		protected void publishResults(CharSequence constraint, FilterResults results) {
+			teamList.clear();
+			teamList.addAll((List<Team>) results.values);
+			notifyDataSetChanged();
+		}
+	};
 
 	public TeamsByOrgAdapter(Context ctx, List<Team> teamListMain, OrganizationPermissions permissions, String orgName) {
 		this.context = ctx;
@@ -145,37 +136,43 @@ public class TeamsByOrgAdapter extends RecyclerView.Adapter<TeamsByOrgAdapter.Or
 		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<>();
+		private final TextView teamTitle;
+		private final TextView teamDescription;
+		private final LinearLayout membersPreviewFrame;
+		private final List<User> userInfos;
+		private final TeamMembersByOrgPreviewAdapter adapter;
+		private Team team;
+		private OrganizationPermissions permissions;
+		private String orgName;
 
-			if(constraint == null || constraint.length() == 0) {
-				filteredList.addAll(teamListFull);
-			}
-			else {
-				String filterPattern = constraint.toString().toLowerCase().trim();
+		private OrgTeamsViewHolder(View itemView) {
+			super(itemView);
 
-				for(Team item : teamListFull) {
-					if(item.getName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
-						filteredList.add(item);
-					}
-				}
-			}
+			teamTitle = itemView.findViewById(R.id.teamTitle);
+			teamDescription = itemView.findViewById(R.id.teamDescription);
+			membersPreviewFrame = itemView.findViewById(R.id.membersPreviewFrame);
 
-			FilterResults results = new FilterResults();
-			results.values = filteredList;
+			RecyclerView membersPreview = itemView.findViewById(R.id.membersPreview);
 
-			return results;
+			userInfos = new ArrayList<>();
+			adapter = new TeamMembersByOrgPreviewAdapter(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();
-		}
-	};
+	}
 
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java
index 11c8bbe0..808d4a0e 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java
@@ -43,16 +43,102 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 	private final Context context;
 	private final Dialog dialog;
 
-	class UserAccountsViewHolder extends RecyclerView.ViewHolder {
+	public UserAccountsAdapter(Context ctx, Dialog dialog) {
+		this.dialog = dialog;
+		this.context = ctx;
+		this.userAccountsList = Objects.requireNonNull(BaseApi.getInstance(context, UserAccountsApi.class)).usersAccounts();
+	}
 
-		private int accountId;
-		private String accountName;
+	private void updateLayoutByPosition(int position) {
+
+		userAccountsList.remove(position);
+		notifyItemRemoved(position);
+		notifyItemRangeChanged(position, userAccountsList.size());
+		Toasty.success(context, context.getResources().getString(R.string.accountDeletedMessage));
+	}
+
+	private void getNotificationsCount() {
+
+		Call<NotificationCount> call = RetrofitClient.getApiInterface(context).notifyNewAvailable();
+
+		call.enqueue(new Callback<>() {
+
+			@Override
+			public void onResponse(@NonNull Call<NotificationCount> call, @NonNull retrofit2.Response<NotificationCount> response) {
+
+				NotificationCount notificationCount = response.body();
+
+				if(response.code() == 200) {
+
+					assert notificationCount != null;
+					if(notificationCount.getNew() > 0) {
+						String toastMsg = context.getResources().getQuantityString(R.plurals.youHaveNewNotifications, Math.toIntExact(notificationCount.getNew()), Math.toIntExact(notificationCount.getNew()));
+						new Handler().postDelayed(() -> Toasty.info(context, toastMsg), 5000);
+					}
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<NotificationCount> call, @NonNull Throwable t) {
+			}
+		});
+	}
+
+	@NonNull
+	@Override
+	public UserAccountsAdapter.UserAccountsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_user_accounts, parent, false);
+		return new UserAccountsViewHolder(v);
+	}
+
+	@SuppressLint("DefaultLocale")
+	@Override
+	public void onBindViewHolder(@NonNull UserAccountsAdapter.UserAccountsViewHolder holder, int position) {
+
+		UserAccount currentItem = userAccountsList.get(position);
+		TinyDB tinyDB = TinyDB.getInstance(context);
+
+		String url = UrlBuilder.fromString(currentItem.getInstanceUrl()).withPath("/").toString();
+
+		holder.accountId = currentItem.getAccountId();
+		holder.accountName = currentItem.getAccountName();
+
+		holder.userId.setText(currentItem.getUserName());
+		if(currentItem.isLoggedIn()) {
+			holder.accountUrl.setText(url);
+		}
+		else {
+			holder.accountUrl.setText(context.getString(R.string.notLoggedIn, url));
+		}
+
+		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+
+		PicassoService.getInstance(context).get().load(url + "assets/img/favicon.png").placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+			.into(holder.repoAvatar);
+
+		if(tinyDB.getInt("currentActiveAccountId") == currentItem.getAccountId()) {
+			holder.activeAccount.setVisibility(View.VISIBLE);
+		}
+		else {
+			holder.deleteAccount.setVisibility(View.VISIBLE);
+		}
+	}
+
+	@Override
+	public int getItemCount() {
+		return userAccountsList.size();
+	}
+
+	class UserAccountsViewHolder extends RecyclerView.ViewHolder {
 
 		private final TextView accountUrl;
 		private final TextView userId;
 		private final ImageView activeAccount;
 		private final ImageView deleteAccount;
 		private final ImageView repoAvatar;
+		private int accountId;
+		private String accountName;
 
 		private UserAccountsViewHolder(View itemView) {
 
@@ -66,10 +152,8 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 
 			deleteAccount.setOnClickListener(itemDelete -> {
 
-				new AlertDialog.Builder(context).setIcon(AppCompatResources.getDrawable(context, R.drawable.ic_delete))
-					.setTitle(context.getResources().getString(R.string.removeAccountPopupTitle))
-					.setMessage(context.getResources().getString(R.string.removeAccountPopupMessage))
-					.setPositiveButton(context.getResources().getString(R.string.removeButton), (dialog, which) -> {
+				new AlertDialog.Builder(context).setIcon(AppCompatResources.getDrawable(context, R.drawable.ic_delete)).setTitle(context.getResources().getString(R.string.removeAccountPopupTitle))
+					.setMessage(context.getResources().getString(R.string.removeAccountPopupMessage)).setPositiveButton(context.getResources().getString(R.string.removeButton), (dialog, which) -> {
 
 						updateLayoutByPosition(getBindingAdapterPosition());
 						UserAccountsApi userAccountsApi = BaseApi.getInstance(context, UserAccountsApi.class);
@@ -132,93 +216,4 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 
 	}
 
-	public UserAccountsAdapter(Context ctx, Dialog dialog) {
-		this.dialog = dialog;
-		this.context = ctx;
-		this.userAccountsList = Objects.requireNonNull(BaseApi.getInstance(context, UserAccountsApi.class)).usersAccounts();
-	}
-
-	private void updateLayoutByPosition(int position) {
-
-		userAccountsList.remove(position);
-		notifyItemRemoved(position);
-		notifyItemRangeChanged(position, userAccountsList.size());
-		Toasty.success(context, context.getResources().getString(R.string.accountDeletedMessage));
-	}
-
-	private void getNotificationsCount() {
-
-		Call<NotificationCount> call = RetrofitClient.getApiInterface(context).notifyNewAvailable();
-
-		call.enqueue(new Callback<>() {
-
-			@Override
-			public void onResponse(@NonNull Call<NotificationCount> call, @NonNull retrofit2.Response<NotificationCount> response) {
-
-				NotificationCount notificationCount = response.body();
-
-				if(response.code() == 200) {
-
-					assert notificationCount != null;
-					if(notificationCount.getNew() > 0) {
-						String toastMsg = context.getResources()
-							.getQuantityString(R.plurals.youHaveNewNotifications, Math.toIntExact(notificationCount.getNew()),
-								Math.toIntExact(notificationCount.getNew()));
-						new Handler().postDelayed(() -> Toasty.info(context, toastMsg), 5000);
-					}
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<NotificationCount> call, @NonNull Throwable t) {
-			}
-		});
-	}
-
-	@NonNull
-	@Override
-	public UserAccountsAdapter.UserAccountsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_user_accounts, parent, false);
-		return new UserAccountsViewHolder(v);
-	}
-
-	@SuppressLint("DefaultLocale")
-	@Override
-	public void onBindViewHolder(@NonNull UserAccountsAdapter.UserAccountsViewHolder holder, int position) {
-
-		UserAccount currentItem = userAccountsList.get(position);
-		TinyDB tinyDB = TinyDB.getInstance(context);
-
-		String url = UrlBuilder.fromString(currentItem.getInstanceUrl()).withPath("/").toString();
-
-		holder.accountId = currentItem.getAccountId();
-		holder.accountName = currentItem.getAccountName();
-
-		holder.userId.setText(currentItem.getUserName());
-		if(currentItem.isLoggedIn()) {
-			holder.accountUrl.setText(url);
-		}
-		else {
-			holder.accountUrl.setText(context.getString(R.string.notLoggedIn, url));
-		}
-
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-		PicassoService.getInstance(context).get().load(url + "assets/img/favicon.png").placeholder(R.drawable.loader_animated)
-			.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.repoAvatar);
-
-		if(tinyDB.getInt("currentActiveAccountId") == currentItem.getAccountId()) {
-			holder.activeAccount.setVisibility(View.VISIBLE);
-		}
-		else {
-			holder.deleteAccount.setVisibility(View.VISIBLE);
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return userAccountsList.size();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java
index a917871a..cd9be878 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java
@@ -41,24 +41,6 @@ public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNav
 		this.drawer = drawerLayout;
 	}
 
-	class UserAccountsViewHolder extends RecyclerView.ViewHolder {
-
-		private final ImageView userAccountAvatar;
-
-		private UserAccountsViewHolder(View itemView) {
-
-			super(itemView);
-
-			userAccountAvatar = itemView.findViewById(R.id.userAccountAvatar);
-
-			itemView.setOnClickListener(item -> {
-				customDialogUserAccountsList();
-				drawer.closeDrawers();
-			});
-		}
-
-	}
-
 	@NonNull
 	@Override
 	public UserAccountsNavAdapter.UserAccountsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -77,8 +59,8 @@ public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNav
 
 		int imageSize = AppUtil.getPixelsFromDensity(context, 35);
 
-		PicassoService.getInstance(context).get().load(url + "assets/img/favicon.png").placeholder(R.drawable.loader_animated)
-			.transform(new RoundedTransformation(8, 0)).resize(imageSize, imageSize).centerCrop().into(holder.userAccountAvatar);
+		PicassoService.getInstance(context).get().load(url + "assets/img/favicon.png").placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(imageSize, imageSize).centerCrop()
+			.into(holder.userAccountAvatar);
 	}
 
 	@Override
@@ -111,4 +93,22 @@ public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNav
 		dialog.show();
 	}
 
+	class UserAccountsViewHolder extends RecyclerView.ViewHolder {
+
+		private final ImageView userAccountAvatar;
+
+		private UserAccountsViewHolder(View itemView) {
+
+			super(itemView);
+
+			userAccountAvatar = itemView.findViewById(R.id.userAccountAvatar);
+
+			itemView.setOnClickListener(item -> {
+				customDialogUserAccountsList();
+				drawer.closeDrawers();
+			});
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/UserGridAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UserGridAdapter.java
index 04155ec9..c83d7309 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UserGridAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserGridAdapter.java
@@ -30,32 +30,41 @@ 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() {
 
-	private class ViewHolder {
+		@Override
+		protected FilterResults performFiltering(CharSequence constraint) {
+			List<User> filteredList = new ArrayList<>();
 
-		private String userLoginId;
+			if(constraint == null || constraint.length() == 0) {
 
-		private final ImageView memberAvatar;
-		private final TextView memberName;
+				filteredList.addAll(membersListFull);
+			}
+			else {
 
-		ViewHolder(View v) {
+				String filterPattern = constraint.toString().toLowerCase().trim();
 
-			memberAvatar = v.findViewById(R.id.userAvatarImageView);
-			memberName = v.findViewById(R.id.userNameTv);
+				for(User item : membersListFull) {
+					if(item.getFullName().toLowerCase().contains(filterPattern) || item.getLogin().toLowerCase().contains(filterPattern)) {
+						filteredList.add(item);
+					}
+				}
+			}
 
-			v.setOnClickListener(loginId -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", userLoginId);
-				context.startActivity(intent);
-			});
+			FilterResults results = new FilterResults();
+			results.values = filteredList;
 
-			v.setOnLongClickListener(loginId -> {
-				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();
+		}
+	};
 
 	public UserGridAdapter(Context ctx, List<User> membersListMain) {
 
@@ -105,8 +114,8 @@ public class UserGridAdapter extends BaseAdapter implements Filterable {
 		User currentItem = membersList.get(position);
 		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-		PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-			.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(viewHolder.memberAvatar);
+		PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+			.into(viewHolder.memberAvatar);
 
 		viewHolder.userLoginId = currentItem.getLogin();
 
@@ -125,40 +134,29 @@ 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<>();
+		private final ImageView memberAvatar;
+		private final TextView memberName;
+		private String userLoginId;
 
-			if(constraint == null || constraint.length() == 0) {
+		ViewHolder(View v) {
 
-				filteredList.addAll(membersListFull);
-			}
-			else {
+			memberAvatar = v.findViewById(R.id.userAvatarImageView);
+			memberName = v.findViewById(R.id.userNameTv);
 
-				String filterPattern = constraint.toString().toLowerCase().trim();
+			v.setOnClickListener(loginId -> {
+				Intent intent = new Intent(context, ProfileActivity.class);
+				intent.putExtra("username", userLoginId);
+				context.startActivity(intent);
+			});
 
-				for(User item : membersListFull) {
-					if(item.getFullName().toLowerCase().contains(filterPattern) || item.getLogin().toLowerCase().contains(filterPattern)) {
-						filteredList.add(item);
-					}
-				}
-			}
-
-			FilterResults results = new FilterResults();
-			results.values = filteredList;
-
-			return results;
+			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();
-		}
-	};
+	}
 
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/UserSearchForTeamMemberAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UserSearchForTeamMemberAdapter.java
index d05ac12c..17c7734d 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UserSearchForTeamMemberAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserSearchForTeamMemberAdapter.java
@@ -43,44 +43,6 @@ public class UserSearchForTeamMemberAdapter extends RecyclerView.Adapter<UserSea
 		this.orgName = orgName;
 	}
 
-	class UserSearchViewHolder extends RecyclerView.ViewHolder {
-
-		private User userInfo;
-
-		private final ImageView userAvatar;
-		private final TextView userFullName;
-		private final TextView userName;
-		private final ImageView addMemberButtonAdd;
-		private final ImageView addMemberButtonRemove;
-
-		private UserSearchViewHolder(View itemView) {
-
-			super(itemView);
-			userAvatar = itemView.findViewById(R.id.userAvatar);
-			userFullName = itemView.findViewById(R.id.userFullName);
-			userName = itemView.findViewById(R.id.userName);
-			addMemberButtonAdd = itemView.findViewById(R.id.addCollaboratorButtonAdd);
-			addMemberButtonRemove = itemView.findViewById(R.id.addCollaboratorButtonRemove);
-
-			addMemberButtonAdd.setOnClickListener(
-				v -> AlertDialogs.addMemberDialog(context, userInfo.getLogin(), Integer.parseInt(String.valueOf(teamId))));
-			addMemberButtonRemove.setOnClickListener(
-				v -> AlertDialogs.removeMemberDialog(context, userInfo.getLogin(), Integer.parseInt(String.valueOf(teamId))));
-
-			userAvatar.setOnClickListener(loginId -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", userInfo.getLogin());
-				context.startActivity(intent);
-			});
-
-			userAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, userInfo.getLogin(), context.getString(R.string.copyLoginIdToClipBoard, userInfo.getLogin()));
-				return true;
-			});
-		}
-
-	}
-
 	@NonNull
 	@Override
 	public UserSearchForTeamMemberAdapter.UserSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -107,8 +69,8 @@ public class UserSearchForTeamMemberAdapter extends RecyclerView.Adapter<UserSea
 		holder.userName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
 
 		if(!currentItem.getAvatarUrl().equals("")) {
-			PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+			PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+				.into(holder.userAvatar);
 		}
 
 		if(getItemCount() > 0) {
@@ -166,4 +128,39 @@ public class UserSearchForTeamMemberAdapter extends RecyclerView.Adapter<UserSea
 		return usersSearchList.size();
 	}
 
+	class UserSearchViewHolder extends RecyclerView.ViewHolder {
+
+		private final ImageView userAvatar;
+		private final TextView userFullName;
+		private final TextView userName;
+		private final ImageView addMemberButtonAdd;
+		private final ImageView addMemberButtonRemove;
+		private User userInfo;
+
+		private UserSearchViewHolder(View itemView) {
+
+			super(itemView);
+			userAvatar = itemView.findViewById(R.id.userAvatar);
+			userFullName = itemView.findViewById(R.id.userFullName);
+			userName = itemView.findViewById(R.id.userName);
+			addMemberButtonAdd = itemView.findViewById(R.id.addCollaboratorButtonAdd);
+			addMemberButtonRemove = itemView.findViewById(R.id.addCollaboratorButtonRemove);
+
+			addMemberButtonAdd.setOnClickListener(v -> AlertDialogs.addMemberDialog(context, userInfo.getLogin(), Integer.parseInt(String.valueOf(teamId))));
+			addMemberButtonRemove.setOnClickListener(v -> AlertDialogs.removeMemberDialog(context, userInfo.getLogin(), Integer.parseInt(String.valueOf(teamId))));
+
+			userAvatar.setOnClickListener(loginId -> {
+				Intent intent = new Intent(context, ProfileActivity.class);
+				intent.putExtra("username", userInfo.getLogin());
+				context.startActivity(intent);
+			});
+
+			userAvatar.setOnLongClickListener(loginId -> {
+				AppUtil.copyToClipboard(context, userInfo.getLogin(), context.getString(R.string.copyLoginIdToClipBoard, userInfo.getLogin()));
+				return true;
+			});
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/UsersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UsersAdapter.java
index 136f41b5..fa064e6d 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UsersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UsersAdapter.java
@@ -61,12 +61,31 @@ public class UsersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		return followersList.size();
 	}
 
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+	}
+
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+	}
+
+	public void setLoadMoreListener(Runnable loadMoreListener) {
+		this.loadMoreListener = loadMoreListener;
+	}
+
+	public void updateList(List<User> list) {
+		followersList = list;
+		notifyDataChanged();
+	}
+
 	class UsersHolder extends RecyclerView.ViewHolder {
 
-		private User userInfo;
 		private final ImageView userAvatar;
 		private final TextView userFullName;
 		private final TextView userName;
+		private User userInfo;
 
 		UsersHolder(View itemView) {
 			super(itemView);
@@ -101,31 +120,12 @@ public class UsersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 				userName.setVisibility(View.GONE);
 			}
 
-			PicassoService.getInstance(context).get().load(userInfo.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(userAvatar);
+			PicassoService.getInstance(context).get().load(userInfo.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+				.into(userAvatar);
 		}
 
 	}
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public void setLoadMoreListener(Runnable loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<User> list) {
-		followersList = list;
-		notifyDataChanged();
-	}
-
 }
 
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/WikiListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/WikiListAdapter.java
index a01f57e5..c0407e7b 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/WikiListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/WikiListAdapter.java
@@ -38,15 +38,14 @@ import retrofit2.Response;
 public class WikiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context ctx;
-	private List<WikiPageMetaData> wikiList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
 	private final FragmentWikiBinding fragmentWikiBinding;
 	private final String repoOwner;
 	private final String repoName;
+	private List<WikiPageMetaData> wikiList;
+	private OnLoadMoreListener loadMoreListener;
+	private boolean isLoading = false, isMoreDataAvailable = true;
 
-	public WikiListAdapter(List<WikiPageMetaData> wikiListMain, Context ctx, String repoOwner, String repoName,
-		FragmentWikiBinding fragmentWikiBinding) {
+	public WikiListAdapter(List<WikiPageMetaData> wikiListMain, Context ctx, String repoOwner, String repoName, FragmentWikiBinding fragmentWikiBinding) {
 		this.ctx = ctx;
 		this.wikiList = wikiListMain;
 		this.repoOwner = repoOwner;
@@ -81,14 +80,81 @@ public class WikiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 		return wikiList.size();
 	}
 
-	class WikisHolder extends RecyclerView.ViewHolder {
+	private void updateAdapter(int position) {
+		wikiList.remove(position);
+		notifyItemRemoved(position);
+		notifyItemRangeChanged(position, wikiList.size());
+	}
 
-		private WikiPageMetaData wikiPageMeta;
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+		if(!isMoreDataAvailable) {
+			loadMoreListener.onLoadFinished();
+		}
+	}
+
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+		loadMoreListener.onLoadFinished();
+	}
+
+	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
+		this.loadMoreListener = loadMoreListener;
+	}
+
+	public void updateList(List<WikiPageMetaData> list) {
+		wikiList = list;
+		notifyDataChanged();
+	}
+
+	private void deleteWiki(final String owner, final String repo, final String pageName, int position, final Context context) {
+
+		new AlertDialog.Builder(context).setTitle(String.format(context.getString(R.string.deleteGenericTitle), pageName)).setMessage(context.getString(R.string.deleteWikiPageMessage, pageName))
+			.setIcon(R.drawable.ic_delete).setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> RetrofitClient.getApiInterface(context).repoDeleteWikiPage(owner, repo, pageName).enqueue(new Callback<>() {
+
+				@Override
+				public void onResponse(@NonNull Call<Void> call, @NonNull Response<Void> response) {
+
+					if(response.isSuccessful()) {
+						updateAdapter(position);
+						Toasty.success(context, context.getString(R.string.wikiPageDeleted));
+						if(getItemCount() == 0) {
+							fragmentWikiBinding.noData.setVisibility(View.VISIBLE);
+						}
+					}
+					else if(response.code() == 403) {
+						Toasty.error(context, context.getString(R.string.authorizeError));
+					}
+					else {
+						Toasty.error(context, context.getString(R.string.genericError));
+					}
+				}
+
+				@Override
+				public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+
+					Toasty.error(context, context.getString(R.string.genericError));
+				}
+			})).setNeutralButton(R.string.cancelButton, null).show();
+	}
+
+	public interface OnLoadMoreListener {
+
+		void onLoadMore();
+
+		void onLoadFinished();
+
+	}
+
+	class WikisHolder extends RecyclerView.ViewHolder {
 
 		private final ImageView avatar;
 		private final TextView pageName;
 		private final TextView wikiLastUpdatedBy;
 		private final ImageView wikiMenu;
+		private WikiPageMetaData wikiPageMeta;
 
 		WikisHolder(View itemView) {
 
@@ -146,19 +212,15 @@ public class WikiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 			this.wikiPageMeta = wikiPageMetaData;
 
 			pageName.setText(wikiPageMetaData.getTitle());
-			wikiLastUpdatedBy.setText(HtmlCompat.fromHtml(ctx.getResources()
-				.getString(R.string.wikiAuthor, wikiPageMetaData.getLastCommit().getAuthor().getName(),
-					TimeHelper.formatTime(TimeHelper.parseIso8601(wikiPageMetaData.getLastCommit().getAuthor().getDate()),
-						ctx.getResources().getConfiguration().locale, "pretty", ctx)), HtmlCompat.FROM_HTML_MODE_COMPACT));
-			this.wikiLastUpdatedBy.setOnClickListener(new ClickListener(
-				TimeHelper.customDateFormatForToastDateFormat(TimeHelper.parseIso8601(wikiPageMetaData.getLastCommit().getAuthor().getDate())), ctx));
+			wikiLastUpdatedBy.setText(HtmlCompat.fromHtml(ctx.getResources().getString(R.string.wikiAuthor, wikiPageMetaData.getLastCommit().getAuthor().getName(),
+				TimeHelper.formatTime(TimeHelper.parseIso8601(wikiPageMetaData.getLastCommit().getAuthor().getDate()), ctx.getResources().getConfiguration().locale, "pretty", ctx)), HtmlCompat.FROM_HTML_MODE_COMPACT));
+			this.wikiLastUpdatedBy.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(TimeHelper.parseIso8601(wikiPageMetaData.getLastCommit().getAuthor().getDate())), ctx));
 
 			ColorGenerator generator = ColorGenerator.Companion.getMATERIAL();
 			int color = generator.getColor(wikiPageMetaData.getTitle());
 			String firstCharacter = String.valueOf(wikiPageMetaData.getTitle().charAt(0));
 
-			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28)
-				.endConfig().buildRoundRect(firstCharacter, color, 3);
+			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
 			avatar.setImageDrawable(drawable);
 
 			if(!((RepoDetailActivity) ctx).repository.getPermissions().isPush()) {
@@ -168,74 +230,4 @@ public class WikiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
 	}
 
-	private void updateAdapter(int position) {
-		wikiList.remove(position);
-		notifyItemRemoved(position);
-		notifyItemRangeChanged(position, wikiList.size());
-	}
-
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
-			loadMoreListener.onLoadFinished();
-		}
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-		loadMoreListener.onLoadFinished();
-	}
-
-	public interface OnLoadMoreListener {
-
-		void onLoadMore();
-
-		void onLoadFinished();
-
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<WikiPageMetaData> list) {
-		wikiList = list;
-		notifyDataChanged();
-	}
-
-	private void deleteWiki(final String owner, final String repo, final String pageName, int position, final Context context) {
-
-		new AlertDialog.Builder(context).setTitle(String.format(context.getString(R.string.deleteGenericTitle), pageName))
-			.setMessage(context.getString(R.string.deleteWikiPageMessage, pageName)).setIcon(R.drawable.ic_delete)
-			.setPositiveButton(R.string.menuDeleteText,
-				(dialog, whichButton) -> RetrofitClient.getApiInterface(context).repoDeleteWikiPage(owner, repo, pageName).enqueue(new Callback<>() {
-
-					@Override
-					public void onResponse(@NonNull Call<Void> call, @NonNull Response<Void> response) {
-
-						if(response.isSuccessful()) {
-							updateAdapter(position);
-							Toasty.success(context, context.getString(R.string.wikiPageDeleted));
-							if(getItemCount() == 0) {
-								fragmentWikiBinding.noData.setVisibility(View.VISIBLE);
-							}
-						}
-						else if(response.code() == 403) {
-							Toasty.error(context, context.getString(R.string.authorizeError));
-						}
-						else {
-							Toasty.error(context, context.getString(R.string.genericError));
-						}
-					}
-
-					@Override
-					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-						Toasty.error(context, context.getString(R.string.genericError));
-					}
-				})).setNeutralButton(R.string.cancelButton, null).show();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/profile/RepositoriesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/profile/RepositoriesAdapter.java
index 3155dea6..a357bb40 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/profile/RepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/profile/RepositoriesAdapter.java
@@ -71,17 +71,35 @@ public class RepositoriesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 		return reposList.size();
 	}
 
-	class RepositoriesHolder extends RecyclerView.ViewHolder {
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+	}
 
-		private Repository userRepositories;
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+	}
+
+	public void setLoadMoreListener(Runnable loadMoreListener) {
+		this.loadMoreListener = loadMoreListener;
+	}
+
+	public void updateList(List<Repository> list) {
+		reposList = list;
+		notifyDataChanged();
+	}
+
+	class RepositoriesHolder extends RecyclerView.ViewHolder {
 
 		private final ImageView avatar;
 		private final TextView repoName;
 		private final TextView orgName;
 		private final TextView repoDescription;
-		private CheckBox isRepoAdmin;
 		private final TextView repoStars;
 		private final TextView repoLastUpdated;
+		private Repository userRepositories;
+		private CheckBox isRepoAdmin;
 
 		RepositoriesHolder(View itemView) {
 
@@ -123,13 +141,12 @@ public class RepositoriesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 			int color = generator.getColor(userRepositories.getName());
 			String firstCharacter = String.valueOf(userRepositories.getFullName().charAt(0));
 
-			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28)
-				.endConfig().buildRoundRect(firstCharacter, color, 3);
+			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
 
 			if(userRepositories.getAvatarUrl() != null) {
 				if(!userRepositories.getAvatarUrl().equals("")) {
-					PicassoService.getInstance(context).get().load(userRepositories.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-						.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(avatar);
+					PicassoService.getInstance(context).get().load(userRepositories.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+						.into(avatar);
 				}
 				else {
 					avatar.setImageDrawable(drawable);
@@ -141,11 +158,9 @@ public class RepositoriesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
 			if(userRepositories.getUpdatedAt() != null) {
 
-				repoLastUpdated.setText(
-					context.getString(R.string.lastUpdatedAt, TimeHelper.formatTime(userRepositories.getUpdatedAt(), locale, timeFormat, context)));
+				repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, TimeHelper.formatTime(userRepositories.getUpdatedAt(), locale, timeFormat, context)));
 				if(timeFormat.equals("pretty")) {
-					repoLastUpdated.setOnClickListener(
-						new ClickListener(TimeHelper.customDateFormatForToastDateFormat(userRepositories.getUpdatedAt()), context));
+					repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(userRepositories.getUpdatedAt()), context));
 				}
 			}
 			else {
@@ -168,23 +183,4 @@ public class RepositoriesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
 	}
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public void setLoadMoreListener(Runnable loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<Repository> list) {
-		reposList = list;
-		notifyDataChanged();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/profile/StarredRepositoriesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/profile/StarredRepositoriesAdapter.java
index de455e7e..50c7d0ee 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/profile/StarredRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/profile/StarredRepositoriesAdapter.java
@@ -70,17 +70,35 @@ public class StarredRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 		return reposList.size();
 	}
 
-	class StarredRepositoriesHolder extends RecyclerView.ViewHolder {
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
+		isMoreDataAvailable = moreDataAvailable;
+	}
 
-		private org.gitnex.tea4j.v2.models.Repository userRepositories;
+	@SuppressLint("NotifyDataSetChanged")
+	public void notifyDataChanged() {
+		notifyDataSetChanged();
+		isLoading = false;
+	}
+
+	public void setLoadMoreListener(Runnable loadMoreListener) {
+		this.loadMoreListener = loadMoreListener;
+	}
+
+	public void updateList(List<org.gitnex.tea4j.v2.models.Repository> list) {
+		reposList = list;
+		notifyDataChanged();
+	}
+
+	class StarredRepositoriesHolder extends RecyclerView.ViewHolder {
 
 		private final ImageView avatar;
 		private final TextView repoName;
 		private final TextView orgName;
 		private final TextView repoDescription;
-		private CheckBox isRepoAdmin;
 		private final TextView repoStars;
 		private final TextView repoLastUpdated;
+		private org.gitnex.tea4j.v2.models.Repository userRepositories;
+		private CheckBox isRepoAdmin;
 
 		StarredRepositoriesHolder(View itemView) {
 
@@ -121,13 +139,12 @@ public class StarredRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 			int color = generator.getColor(userRepositories.getName());
 			String firstCharacter = String.valueOf(userRepositories.getFullName().charAt(0));
 
-			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28)
-				.endConfig().buildRoundRect(firstCharacter, color, 3);
+			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
 
 			if(userRepositories.getAvatarUrl() != null) {
 				if(!userRepositories.getAvatarUrl().equals("")) {
-					PicassoService.getInstance(context).get().load(userRepositories.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-						.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(avatar);
+					PicassoService.getInstance(context).get().load(userRepositories.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
+						.into(avatar);
 				}
 				else {
 					avatar.setImageDrawable(drawable);
@@ -139,11 +156,9 @@ public class StarredRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 
 			if(userRepositories.getUpdatedAt() != null) {
 
-				repoLastUpdated.setText(
-					context.getString(R.string.lastUpdatedAt, TimeHelper.formatTime(userRepositories.getUpdatedAt(), locale, timeFormat, context)));
+				repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, TimeHelper.formatTime(userRepositories.getUpdatedAt(), locale, timeFormat, context)));
 				if(timeFormat.equals("pretty")) {
-					repoLastUpdated.setOnClickListener(
-						new ClickListener(TimeHelper.customDateFormatForToastDateFormat(userRepositories.getUpdatedAt()), context));
+					repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(userRepositories.getUpdatedAt()), context));
 				}
 			}
 			else {
@@ -166,23 +181,4 @@ public class StarredRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 
 	}
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public void setLoadMoreListener(Runnable loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<org.gitnex.tea4j.v2.models.Repository> list) {
-		reposList = list;
-		notifyDataChanged();
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/clients/PicassoService.java b/app/src/main/java/org/mian/gitnex/clients/PicassoService.java
index 7bd76156..364474bb 100644
--- a/app/src/main/java/org/mian/gitnex/clients/PicassoService.java
+++ b/app/src/main/java/org/mian/gitnex/clients/PicassoService.java
@@ -56,13 +56,6 @@ public class PicassoService {
 		}
 	}
 
-	public Picasso get() {
-
-		cachePath.mkdirs();
-		return picasso;
-
-	}
-
 	public static synchronized PicassoService getInstance(Context context) {
 
 		if(picassoService == null) {
@@ -77,4 +70,11 @@ public class PicassoService {
 
 	}
 
+	public Picasso get() {
+
+		cachePath.mkdirs();
+		return picasso;
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java b/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java
index e2261a29..f12b5324 100644
--- a/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java
+++ b/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java
@@ -77,8 +77,7 @@ public class RetrofitClient {
 
 			if(cacheEnabled && cacheFile != null) {
 
-				int cacheSize = FilesData.returnOnlyNumberFileSize(
-					tinyDB.getString("cacheSizeStr", context.getString(R.string.cacheSizeDataSelectionSelectedText))) * 1024 * 1024;
+				int cacheSize = FilesData.returnOnlyNumberFileSize(tinyDB.getString("cacheSizeStr", context.getString(R.string.cacheSizeDataSelectionSelectedText))) * 1024 * 1024;
 				Cache cache = new Cache(cacheFile, cacheSize);
 
 				okHttpClient.cache(cache).addInterceptor(chain -> {
@@ -94,8 +93,7 @@ public class RetrofitClient {
 			}
 
 			return new Retrofit.Builder().baseUrl(instanceUrl).client(okHttpClient.build()).addConverterFactory(ScalarsConverterFactory.create())
-				.addConverterFactory(GsonConverterFactory.create(new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").create()))
-				.addConverterFactory(DateQueryConverterFactory.create()).build();
+				.addConverterFactory(GsonConverterFactory.create(new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").create())).addConverterFactory(DateQueryConverterFactory.create()).build();
 
 		}
 		catch(Exception e) {
@@ -107,8 +105,8 @@ public class RetrofitClient {
 	}
 
 	public static ApiInterface getApiInterface(Context context) {
-		return getApiInterface(context, ((BaseActivity) context).getAccount().getAccount().getInstanceUrl(),
-			((BaseActivity) context).getAccount().getAuthorization(), ((BaseActivity) context).getAccount().getCacheDir(context));
+		return getApiInterface(context, ((BaseActivity) context).getAccount().getAccount().getInstanceUrl(), ((BaseActivity) context).getAccount().getAuthorization(),
+			((BaseActivity) context).getAccount().getCacheDir(context));
 	}
 
 	public static WebApi getWebInterface(Context context) {
@@ -116,8 +114,7 @@ public class RetrofitClient {
 		String instanceUrl = ((BaseActivity) context).getAccount().getAccount().getInstanceUrl();
 		instanceUrl = instanceUrl.substring(0, instanceUrl.lastIndexOf("api/v1/"));
 
-		return getWebInterface(context, instanceUrl, ((BaseActivity) context).getAccount().getWebAuthorization(),
-			((BaseActivity) context).getAccount().getCacheDir(context));
+		return getWebInterface(context, instanceUrl, ((BaseActivity) context).getAccount().getWebAuthorization(), ((BaseActivity) context).getAccount().getCacheDir(context));
 
 	}
 
@@ -128,8 +125,7 @@ public class RetrofitClient {
 			synchronized(RetrofitClient.class) {
 				if(!apiInterfaces.containsKey(key)) {
 
-					ApiInterface apiInterface = Objects.requireNonNull(createRetrofit(context, url, true, token, cacheFile))
-						.create(ApiInterface.class);
+					ApiInterface apiInterface = Objects.requireNonNull(createRetrofit(context, url, true, token, cacheFile)).create(ApiInterface.class);
 					apiInterfaces.put(key, apiInterface);
 
 					return apiInterface;
diff --git a/app/src/main/java/org/mian/gitnex/core/MainApplication.java b/app/src/main/java/org/mian/gitnex/core/MainApplication.java
index 191f9524..24d09256 100644
--- a/app/src/main/java/org/mian/gitnex/core/MainApplication.java
+++ b/app/src/main/java/org/mian/gitnex/core/MainApplication.java
@@ -24,8 +24,8 @@ import org.mian.gitnex.notifications.Notifications;
 
 public class MainApplication extends Application {
 
-	private TinyDB tinyDB;
 	public AccountContext currentAccount;
+	private TinyDB tinyDB;
 
 	@Override
 	public void onCreate() {
@@ -55,15 +55,12 @@ public class MainApplication extends Application {
 
 			CoreConfigurationBuilder ACRABuilder = new CoreConfigurationBuilder(this);
 
-			ACRABuilder.withBuildConfigClass(BuildConfig.class)
-				.withReportContent(ReportField.ANDROID_VERSION, ReportField.PHONE_MODEL, ReportField.STACK_TRACE, ReportField.AVAILABLE_MEM_SIZE,
-					ReportField.BRAND).setReportFormat(StringFormat.KEY_VALUE_LIST);
-			ACRABuilder.getPluginConfigurationBuilder(NotificationConfigurationBuilder.class).withResTitle(R.string.crashTitle)
-				.withResIcon(R.drawable.gitnex_transparent).withResChannelName(R.string.setCrashReports).withResText(R.string.crashMessage)
-				.withEnabled(true);
+			ACRABuilder.withBuildConfigClass(BuildConfig.class).withReportContent(ReportField.ANDROID_VERSION, ReportField.PHONE_MODEL, ReportField.STACK_TRACE, ReportField.AVAILABLE_MEM_SIZE, ReportField.BRAND)
+				.setReportFormat(StringFormat.KEY_VALUE_LIST);
+			ACRABuilder.getPluginConfigurationBuilder(NotificationConfigurationBuilder.class).withResTitle(R.string.crashTitle).withResIcon(R.drawable.gitnex_transparent).withResChannelName(R.string.setCrashReports)
+				.withResText(R.string.crashMessage).withEnabled(true);
 			ACRABuilder.getPluginConfigurationBuilder(MailSenderConfigurationBuilder.class).withMailTo(getResources().getString(R.string.appEmail))
-				.withSubject(getResources().getString(R.string.crashReportEmailSubject, AppUtil.getAppBuildNo(context))).withReportAsFile(true)
-				.withEnabled(true);
+				.withSubject(getResources().getString(R.string.crashReportEmailSubject, AppUtil.getAppBuildNo(context))).withReportAsFile(true).withEnabled(true);
 			ACRABuilder.getPluginConfigurationBuilder(LimiterConfigurationBuilder.class).setEnabled(true);
 
 			ACRA.init(this, ACRABuilder);
diff --git a/app/src/main/java/org/mian/gitnex/core/MainGrammarLocator.java b/app/src/main/java/org/mian/gitnex/core/MainGrammarLocator.java
index 642f4280..5d6941e5 100644
--- a/app/src/main/java/org/mian/gitnex/core/MainGrammarLocator.java
+++ b/app/src/main/java/org/mian/gitnex/core/MainGrammarLocator.java
@@ -21,6 +21,20 @@ public class MainGrammarLocator implements GrammarLocator {
 	private MainGrammarLocator() {
 	}
 
+	public static MainGrammarLocator getInstance() {
+
+		if(instance == null) {
+			synchronized(MainGrammarLocator.class) {
+				if(instance == null) {
+					instance = new MainGrammarLocator();
+				}
+			}
+		}
+
+		return instance;
+
+	}
+
 	public String fromExtension(String extension) {
 
 		switch(extension.toLowerCase()) {
@@ -118,18 +132,4 @@ public class MainGrammarLocator implements GrammarLocator {
 		return defaultGrammarLocator.languages();
 	}
 
-	public static MainGrammarLocator getInstance() {
-
-		if(instance == null) {
-			synchronized(MainGrammarLocator.class) {
-				if(instance == null) {
-					instance = new MainGrammarLocator();
-				}
-			}
-		}
-
-		return instance;
-
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/database/api/BaseApi.java b/app/src/main/java/org/mian/gitnex/database/api/BaseApi.java
index 9b20721e..9eb1df8f 100644
--- a/app/src/main/java/org/mian/gitnex/database/api/BaseApi.java
+++ b/app/src/main/java/org/mian/gitnex/database/api/BaseApi.java
@@ -15,9 +15,8 @@ import java.util.concurrent.Executors;
 
 public abstract class BaseApi {
 
-	private static final Map<Class<? extends BaseApi>, Object> instances = new HashMap<>();
-
 	protected static final ExecutorService executorService = Executors.newCachedThreadPool();
+	private static final Map<Class<? extends BaseApi>, Object> instances = new HashMap<>();
 	protected final GitnexDatabase gitnexDatabase;
 
 	protected BaseApi(Context context) {
diff --git a/app/src/main/java/org/mian/gitnex/database/api/DraftsApi.java b/app/src/main/java/org/mian/gitnex/database/api/DraftsApi.java
index ceed8fa4..65297fe3 100644
--- a/app/src/main/java/org/mian/gitnex/database/api/DraftsApi.java
+++ b/app/src/main/java/org/mian/gitnex/database/api/DraftsApi.java
@@ -20,8 +20,7 @@ public class DraftsApi extends BaseApi {
 		draftsDao = gitnexDatabase.draftsDao();
 	}
 
-	public long insertDraft(int repositoryId, int draftAccountId, int issueId, String draftText, String draftType, String commentId,
-		String issueType) {
+	public long insertDraft(int repositoryId, int draftAccountId, int issueId, String draftText, String draftType, String commentId, String issueType) {
 
 		Draft draft = new Draft();
 		draft.setDraftRepositoryId(repositoryId);
diff --git a/app/src/main/java/org/mian/gitnex/database/api/UserAccountsApi.java b/app/src/main/java/org/mian/gitnex/database/api/UserAccountsApi.java
index 7af8da92..8e654320 100644
--- a/app/src/main/java/org/mian/gitnex/database/api/UserAccountsApi.java
+++ b/app/src/main/java/org/mian/gitnex/database/api/UserAccountsApi.java
@@ -19,8 +19,7 @@ public class UserAccountsApi extends BaseApi {
 		userAccountsDao = gitnexDatabase.userAccountsDao();
 	}
 
-	public long createNewAccount(String accountName, String instanceUrl, String userName, String token, String serverVersion, int maxResponseItems,
-		int defaultPagingNumber) {
+	public long createNewAccount(String accountName, String instanceUrl, String userName, String token, String serverVersion, int maxResponseItems, int defaultPagingNumber) {
 
 		UserAccount userAccount = new UserAccount();
 		userAccount.setAccountName(accountName);
diff --git a/app/src/main/java/org/mian/gitnex/database/db/GitnexDatabase.java b/app/src/main/java/org/mian/gitnex/database/db/GitnexDatabase.java
index d2a52a56..8fb1ef9e 100644
--- a/app/src/main/java/org/mian/gitnex/database/db/GitnexDatabase.java
+++ b/app/src/main/java/org/mian/gitnex/database/db/GitnexDatabase.java
@@ -22,14 +22,6 @@ import org.mian.gitnex.database.models.UserAccount;
 public abstract class GitnexDatabase extends RoomDatabase {
 
 	private static final String DB_NAME = "gitnex";
-	private static GitnexDatabase gitnexDatabase;
-
-	public abstract DraftsDao draftsDao();
-
-	public abstract RepositoriesDao repositoriesDao();
-
-	public abstract UserAccountsDao userAccountsDao();
-
 	private static final Migration MIGRATION_1_2 = new Migration(1, 2) {
 
 		@Override
@@ -38,7 +30,6 @@ public abstract class GitnexDatabase extends RoomDatabase {
 			database.execSQL("ALTER TABLE 'Drafts' ADD COLUMN 'commentId' TEXT");
 		}
 	};
-
 	private static final Migration MIGRATION_2_3 = new Migration(2, 3) {
 
 		@Override
@@ -46,7 +37,6 @@ public abstract class GitnexDatabase extends RoomDatabase {
 			database.execSQL("ALTER TABLE 'Drafts' ADD COLUMN 'issueType' TEXT");
 		}
 	};
-
 	private static final Migration MIGRATION_3_4 = new Migration(3, 4) {
 
 		@Override
@@ -54,7 +44,6 @@ public abstract class GitnexDatabase extends RoomDatabase {
 			database.execSQL("ALTER TABLE 'userAccounts' ADD COLUMN 'isLoggedIn' INTEGER NOT NULL DEFAULT 1");
 		}
 	};
-
 	private static final Migration MIGRATION_4_5 = new Migration(4, 5) {
 
 		@Override
@@ -63,6 +52,7 @@ public abstract class GitnexDatabase extends RoomDatabase {
 			database.execSQL("ALTER TABLE 'userAccounts' ADD COLUMN 'defaultPagingNumber' INTEGER NOT NULL DEFAULT 30");
 		}
 	};
+	private static GitnexDatabase gitnexDatabase;
 
 	public static GitnexDatabase getDatabaseInstance(Context context) {
 
@@ -82,4 +72,10 @@ public abstract class GitnexDatabase extends RoomDatabase {
 
 	}
 
+	public abstract DraftsDao draftsDao();
+
+	public abstract RepositoriesDao repositoriesDao();
+
+	public abstract UserAccountsDao userAccountsDao();
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/database/models/Draft.java b/app/src/main/java/org/mian/gitnex/database/models/Draft.java
index 35f58127..d0b14f45 100644
--- a/app/src/main/java/org/mian/gitnex/database/models/Draft.java
+++ b/app/src/main/java/org/mian/gitnex/database/models/Draft.java
@@ -12,8 +12,7 @@ import static androidx.room.ForeignKey.CASCADE;
  * @author M M Arif
  */
 
-@Entity(tableName = "Drafts", foreignKeys = @ForeignKey(entity = Repository.class, parentColumns = "repositoryId", childColumns = "draftRepositoryId", onDelete = CASCADE), indices = {
-	@Index("draftRepositoryId")})
+@Entity(tableName = "Drafts", foreignKeys = @ForeignKey(entity = Repository.class, parentColumns = "repositoryId", childColumns = "draftRepositoryId", onDelete = CASCADE), indices = {@Index("draftRepositoryId")})
 public class Draft implements Serializable {
 
 	@PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/org/mian/gitnex/database/models/Repository.java b/app/src/main/java/org/mian/gitnex/database/models/Repository.java
index 5c8387fa..8b9a0692 100644
--- a/app/src/main/java/org/mian/gitnex/database/models/Repository.java
+++ b/app/src/main/java/org/mian/gitnex/database/models/Repository.java
@@ -11,8 +11,7 @@ import static androidx.room.ForeignKey.CASCADE;
  * @author M M Arif
  */
 
-@Entity(tableName = "Repositories", foreignKeys = @ForeignKey(entity = UserAccount.class, parentColumns = "accountId", childColumns = "repoAccountId", onDelete = CASCADE), indices = {
-	@Index("repoAccountId")})
+@Entity(tableName = "Repositories", foreignKeys = @ForeignKey(entity = UserAccount.class, parentColumns = "accountId", childColumns = "repoAccountId", onDelete = CASCADE), indices = {@Index("repoAccountId")})
 public class Repository implements Serializable {
 
 	@PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/org/mian/gitnex/fragments/AdministrationFragment.java b/app/src/main/java/org/mian/gitnex/fragments/AdministrationFragment.java
index 0ca330d4..213249f8 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/AdministrationFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/AdministrationFragment.java
@@ -33,8 +33,7 @@ public class AdministrationFragment extends Fragment {
 		}
 
 		fragmentAdministrationBinding.adminCronFrame.setOnClickListener(v1 -> startActivity(new Intent(getContext(), AdminCronTasksActivity.class)));
-		fragmentAdministrationBinding.unadoptedReposFrame.setOnClickListener(
-			v1 -> startActivity(new Intent(getContext(), AdminUnadoptedReposActivity.class)));
+		fragmentAdministrationBinding.unadoptedReposFrame.setOnClickListener(v1 -> startActivity(new Intent(getContext(), AdminUnadoptedReposActivity.class)));
 
 		String action = requireActivity().getIntent().getStringExtra("giteaAdminAction");
 		if(action != null) {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetDraftsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetDraftsFragment.java
index 6e4f0cf0..bec089e5 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetDraftsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetDraftsFragment.java
@@ -18,7 +18,7 @@ import org.mian.gitnex.structs.BottomSheetListener;
 
 public class BottomSheetDraftsFragment extends BottomSheetDialogFragment {
 
-	private String TAG = "BottomSheetDraftsFragment";
+	private final String TAG = "BottomSheetDraftsFragment";
 	private BottomSheetListener bmListener;
 
 	@Nullable
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMilestonesFilterFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMilestonesFilterFragment.java
index fa19fdd5..a002e1b2 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMilestonesFilterFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMilestonesFilterFragment.java
@@ -24,8 +24,7 @@ public class BottomSheetMilestonesFilterFragment extends BottomSheetDialogFragme
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-		BottomSheetMilestonesFilterBinding bottomSheetMilestonesFilterBinding = BottomSheetMilestonesFilterBinding.inflate(inflater, container,
-			false);
+		BottomSheetMilestonesFilterBinding bottomSheetMilestonesFilterBinding = BottomSheetMilestonesFilterBinding.inflate(inflater, container, false);
 
 		bottomSheetMilestonesFilterBinding.openMilestone.setOnClickListener(v1 -> {
 			bmListener.onButtonClicked("openMilestone");
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetNotificationsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetNotificationsFragment.java
index 0e3bb699..7cc1f622 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetNotificationsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetNotificationsFragment.java
@@ -56,22 +56,21 @@ public class BottomSheetNotificationsFragment extends BottomSheetDialogFragment
 		}
 
 		markPinned.setOnClickListener(
-			v12 -> RetrofitClient.getApiInterface(context).notifyReadThread(String.valueOf(notificationThread.getId()), "pinned")
-				.enqueue((SimpleCallback<NotificationThread>) (call, voidResponse) -> {
+			v12 -> RetrofitClient.getApiInterface(context).notifyReadThread(String.valueOf(notificationThread.getId()), "pinned").enqueue((SimpleCallback<NotificationThread>) (call, voidResponse) -> {
 
-					// reload without any checks, because Gitea returns a 205 and Java expects this to be empty
-					// but Gitea send a response -> results in a call of onFailure and no response is present
-					//if(voidResponse.isPresent() && voidResponse.get().isSuccessful()) {
-					onOptionSelectedListener.run();
+				// reload without any checks, because Gitea returns a 205 and Java expects this to be empty
+				// but Gitea send a response -> results in a call of onFailure and no response is present
+				//if(voidResponse.isPresent() && voidResponse.get().isSuccessful()) {
+				onOptionSelectedListener.run();
 					/*} else {
 						Toasty.error(context, getString(R.string.genericError));
 					}*/
 
-					dismiss();
-				}));
+				dismiss();
+			}));
 
-		markRead.setOnClickListener(v1 -> RetrofitClient.getApiInterface(context).notifyReadThread(String.valueOf(notificationThread.getId()), "read")
-			.enqueue((SimpleCallback<NotificationThread>) (call, voidResponse) -> {
+		markRead.setOnClickListener(
+			v1 -> RetrofitClient.getApiInterface(context).notifyReadThread(String.valueOf(notificationThread.getId()), "read").enqueue((SimpleCallback<NotificationThread>) (call, voidResponse) -> {
 
 				// reload without any checks, because Gitea returns a 205 and Java expects this to be empty
 				// but Gitea send a response -> results in a call of onFailure and no response is present
@@ -87,21 +86,20 @@ public class BottomSheetNotificationsFragment extends BottomSheetDialogFragment
 			}));
 
 		markUnread.setOnClickListener(
-			v13 -> RetrofitClient.getApiInterface(context).notifyReadThread(String.valueOf(notificationThread.getId()), "unread")
-				.enqueue((SimpleCallback<NotificationThread>) (call, voidResponse) -> {
+			v13 -> RetrofitClient.getApiInterface(context).notifyReadThread(String.valueOf(notificationThread.getId()), "unread").enqueue((SimpleCallback<NotificationThread>) (call, voidResponse) -> {
 
-					// reload without any checks, because Gitea returns a 205 and Java expects this to be empty
-					// but Gitea send a response -> results in a call of onFailure and no response is present
-					// reload without any checks, because Gitea returns a 205 and Java expects this to be empty
-					// but Gitea send a response -> results in a call of onFailure and no response is present
-					//if(voidResponse.isPresent() && voidResponse.get().isSuccessful()) {
-					onOptionSelectedListener.run();
+				// reload without any checks, because Gitea returns a 205 and Java expects this to be empty
+				// but Gitea send a response -> results in a call of onFailure and no response is present
+				// reload without any checks, because Gitea returns a 205 and Java expects this to be empty
+				// but Gitea send a response -> results in a call of onFailure and no response is present
+				//if(voidResponse.isPresent() && voidResponse.get().isSuccessful()) {
+				onOptionSelectedListener.run();
 					/*} else {
 						Toasty.error(context, getString(R.string.genericError));
 					}*/
 
-					dismiss();
-				}));
+				dismiss();
+			}));
 
 		return bottomSheetNotificationsBinding.getRoot();
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java
index 6d9ef3e9..05f03177 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java
@@ -18,8 +18,8 @@ import org.mian.gitnex.structs.BottomSheetListener;
 
 public class BottomSheetOrganizationFragment extends BottomSheetDialogFragment {
 
-	private BottomSheetListener bmListener;
 	private final OrganizationPermissions permissions;
+	private BottomSheetListener bmListener;
 
 	public BottomSheetOrganizationFragment(OrganizationPermissions org) {
 		permissions = org;
@@ -94,7 +94,7 @@ public class BottomSheetOrganizationFragment extends BottomSheetDialogFragment {
 			bmListener = (BottomSheetListener) context;
 		}
 		catch(ClassCastException e) {
-			throw new ClassCastException(context.toString() + " must implement BottomSheetListener");
+			throw new ClassCastException(context + " must implement BottomSheetListener");
 		}
 	}
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationTeamsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationTeamsFragment.java
index 0a790698..691f2d52 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationTeamsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationTeamsFragment.java
@@ -24,8 +24,7 @@ public class BottomSheetOrganizationTeamsFragment extends BottomSheetDialogFragm
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-		BottomSheetOrganizationTeamsBinding bottomSheetOrganizationTeamsBinding = BottomSheetOrganizationTeamsBinding.inflate(inflater, container,
-			false);
+		BottomSheetOrganizationTeamsBinding bottomSheetOrganizationTeamsBinding = BottomSheetOrganizationTeamsBinding.inflate(inflater, container, false);
 
 		bottomSheetOrganizationTeamsBinding.addNewMember.setOnClickListener(v1 -> {
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetPullRequestFilterFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetPullRequestFilterFragment.java
index 06cc37ba..c3d9c5ea 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetPullRequestFilterFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetPullRequestFilterFragment.java
@@ -23,8 +23,7 @@ public class BottomSheetPullRequestFilterFragment extends BottomSheetDialogFragm
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-		BottomSheetPullRequestFilterBinding bottomSheetPullRequestFilterBinding = BottomSheetPullRequestFilterBinding.inflate(inflater, container,
-			false);
+		BottomSheetPullRequestFilterBinding bottomSheetPullRequestFilterBinding = BottomSheetPullRequestFilterBinding.inflate(inflater, container, false);
 
 		bottomSheetPullRequestFilterBinding.openPr.setOnClickListener(v1 -> {
 			bmListener.onButtonClicked("openPr");
@@ -48,7 +47,7 @@ public class BottomSheetPullRequestFilterFragment extends BottomSheetDialogFragm
 			bmListener = (BottomSheetListener) context;
 		}
 		catch(ClassCastException e) {
-			throw new ClassCastException(context.toString() + " must implement BottomSheetListener");
+			throw new ClassCastException(context + " must implement BottomSheetListener");
 		}
 	}
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReleasesTagsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReleasesTagsFragment.java
index d029d154..6a7e65c7 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReleasesTagsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReleasesTagsFragment.java
@@ -28,7 +28,7 @@ public class BottomSheetReleasesTagsFragment extends BottomSheetDialogFragment {
 			bmListener = (BottomSheetListener) context;
 		}
 		catch(ClassCastException e) {
-			throw new ClassCastException(context.toString() + " must implement BottomSheetListener");
+			throw new ClassCastException(context + " must implement BottomSheetListener");
 		}
 	}
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java
index f0b9c599..a50c344a 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java
@@ -42,20 +42,24 @@ import java.util.Objects;
 
 public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 
-	private enum Mode {EDIT, SEND}
-
 	private Mode mode = Mode.SEND;
-
 	private TinyDB tinyDB;
 	private DraftsApi draftsApi;
-
 	private int currentActiveAccountId;
 	private IssueContext issue;
 	private long draftId;
-
 	private Runnable onInteractedListener;
 	private TextView draftsHint;
 
+	public static BottomSheetReplyFragment newInstance(Bundle bundle, IssueContext issue) {
+
+		BottomSheetReplyFragment fragment = new BottomSheetReplyFragment();
+		bundle.putSerializable(IssueContext.INTENT_EXTRA, issue);
+		fragment.setArguments(bundle);
+
+		return fragment;
+	}
+
 	@Override
 	public void onAttach(@NonNull Context context) {
 
@@ -283,8 +287,7 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 
 			if(draftId == 0) {
 
-				draftId = draftsApi.insertDraft(issue.getRepository().saveToDB(requireContext()), currentActiveAccountId, issue.getIssueIndex(), text,
-					draftType, "TODO", issue.getIssueType());
+				draftId = draftsApi.insertDraft(issue.getRepository().saveToDB(requireContext()), currentActiveAccountId, issue.getIssueIndex(), text, draftType, "TODO", issue.getIssueType());
 			}
 			else {
 
@@ -296,18 +299,11 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 		}
 	}
 
-	public static BottomSheetReplyFragment newInstance(Bundle bundle, IssueContext issue) {
-
-		BottomSheetReplyFragment fragment = new BottomSheetReplyFragment();
-		bundle.putSerializable(IssueContext.INTENT_EXTRA, issue);
-		fragment.setArguments(bundle);
-
-		return fragment;
-	}
-
 	public void setOnInteractedListener(Runnable onInteractedListener) {
 
 		this.onInteractedListener = onInteractedListener;
 	}
 
+	private enum Mode {EDIT, SEND}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java
index ac74d065..1f059033 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java
@@ -22,8 +22,8 @@ import org.mian.gitnex.structs.BottomSheetListener;
 
 public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
 
-	private BottomSheetListener bmListener;
 	private final RepositoryContext repository;
+	private BottomSheetListener bmListener;
 
 	public BottomSheetRepoFragment(RepositoryContext repository) {
 		this.repository = repository;
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java
index aee5caef..3f50bcb1 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java
@@ -32,9 +32,9 @@ import java.util.Objects;
 
 public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
-	private BottomSheetListener bmListener;
 	private final IssueContext issue;
 	private final String issueCreator;
+	private BottomSheetListener bmListener;
 
 	public BottomSheetSingleIssueFragment(IssueContext issue, String username) {
 		this.issue = issue;
@@ -83,8 +83,7 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
 			binding.editIssue.setText(R.string.menuEditText);
 
-			boolean canPushPullSource =
-				issue.getPullRequest().getHead().getRepo() != null ? issue.getPullRequest().getHead().getRepo().getPermissions().isPush() : false;
+			boolean canPushPullSource = issue.getPullRequest().getHead().getRepo() != null ? issue.getPullRequest().getHead().getRepo().getPermissions().isPush() : false;
 			if(issue.getPullRequest().isMerged() || issue.getIssue().getState().equals("closed")) {
 				binding.updatePullRequest.setVisibility(View.GONE);
 				binding.mergePullRequest.setVisibility(View.GONE);
@@ -130,12 +129,10 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
 		binding.updatePullRequest.setOnClickListener(v -> {
 			if(((BaseActivity) requireActivity()).getAccount().requiresVersion("1.16.0")) {
-				AlertDialogs.selectPullUpdateStrategy(requireContext(), issue.getRepository().getOwner(), issue.getRepository().getName(),
-					String.valueOf(issue.getIssueIndex()));
+				AlertDialogs.selectPullUpdateStrategy(requireContext(), issue.getRepository().getOwner(), issue.getRepository().getName(), String.valueOf(issue.getIssueIndex()));
 			}
 			else {
-				PullRequestActions.updatePr(requireContext(), issue.getRepository().getOwner(), issue.getRepository().getName(),
-					String.valueOf(issue.getIssueIndex()), null);
+				PullRequestActions.updatePr(requireContext(), issue.getRepository().getOwner(), issue.getRepository().getName(), String.valueOf(issue.getIssueIndex()), null);
 			}
 			dismiss();
 		});
@@ -148,8 +145,7 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
 		binding.deletePrHeadBranch.setOnClickListener(v -> {
 
-			PullRequestActions.deleteHeadBranch(ctx, issue.getRepository().getOwner(), issue.getRepository().getName(),
-				issue.getPullRequest().getHead().getRef(), true);
+			PullRequestActions.deleteHeadBranch(ctx, issue.getRepository().getOwner(), issue.getRepository().getName(), issue.getPullRequest().getHead().getRef(), true);
 			dismiss();
 		});
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetUserProfileFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetUserProfileFragment.java
index 367c9fcb..bbae7c7d 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetUserProfileFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetUserProfileFragment.java
@@ -19,13 +19,12 @@ import org.mian.gitnex.structs.BottomSheetListener;
 public class BottomSheetUserProfileFragment extends BottomSheetDialogFragment {
 
 	private final boolean following;
+	private BottomSheetListener bmListener;
 
 	public BottomSheetUserProfileFragment(boolean following) {
 		this.following = following;
 	}
 
-	private BottomSheetListener bmListener;
-
 	@Nullable
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
index 3ef4f411..26c60afb 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
@@ -90,8 +90,7 @@ public class CommitDetailFragment extends Fragment {
 	}
 
 	private void getDiff() {
-		Call<String> call = ((BaseActivity) requireActivity()).getAccount().requiresVersion("1.16.0") ?
-			RetrofitClient.getApiInterface(requireContext()).repoDownloadCommitDiffOrPatch(repoOwner, repoName, sha, "diff") :
+		Call<String> call = ((BaseActivity) requireActivity()).getAccount().requiresVersion("1.16.0") ? RetrofitClient.getApiInterface(requireContext()).repoDownloadCommitDiffOrPatch(repoOwner, repoName, sha, "diff") :
 			RetrofitClient.getWebInterface(requireContext()).repoDownloadCommitDiffOrPatch(repoOwner, repoName, sha, "diff");
 
 		call.enqueue(new Callback<>() {
@@ -167,28 +166,24 @@ public class CommitDetailFragment extends Fragment {
 
 				if(!Objects.equals(commitsModel.getCommit().getCommitter().getEmail(), commitsModel.getCommit().getCommitter().getEmail())) {
 					binding.commitAuthorAndCommitter.setText(HtmlCompat.fromHtml(
-						CommitDetailFragment.this.getString(R.string.commitAuthoredByAndCommittedByWhen,
-							commitsModel.getCommit().getAuthor().getName(), commitsModel.getCommit().getCommitter().getName(),
-							TimeHelper.formatTime(TimeHelper.parseIso8601(commitsModel.getCommit().getCommitter().getDate()),
-								getResources().getConfiguration().locale, "pretty", requireContext())), HtmlCompat.FROM_HTML_MODE_COMPACT));
+						CommitDetailFragment.this.getString(R.string.commitAuthoredByAndCommittedByWhen, commitsModel.getCommit().getAuthor().getName(), commitsModel.getCommit().getCommitter().getName(),
+							TimeHelper.formatTime(TimeHelper.parseIso8601(commitsModel.getCommit().getCommitter().getDate()), getResources().getConfiguration().locale, "pretty", requireContext())),
+						HtmlCompat.FROM_HTML_MODE_COMPACT));
 				}
 				else {
-					binding.commitAuthorAndCommitter.setText(HtmlCompat.fromHtml(
-						CommitDetailFragment.this.getString(R.string.commitCommittedByWhen, commitsModel.getCommit().getCommitter().getName(),
-							TimeHelper.formatTime(TimeHelper.parseIso8601(commitsModel.getCommit().getCommitter().getDate()),
-								getResources().getConfiguration().locale, "pretty", requireContext())), HtmlCompat.FROM_HTML_MODE_COMPACT));
+					binding.commitAuthorAndCommitter.setText(HtmlCompat.fromHtml(CommitDetailFragment.this.getString(R.string.commitCommittedByWhen, commitsModel.getCommit().getCommitter().getName(),
+							TimeHelper.formatTime(TimeHelper.parseIso8601(commitsModel.getCommit().getCommitter().getDate()), getResources().getConfiguration().locale, "pretty", requireContext())),
+						HtmlCompat.FROM_HTML_MODE_COMPACT));
 				}
 
-				if(commitsModel.getAuthor() != null && commitsModel.getAuthor().getAvatarUrl() != null && !commitsModel.getAuthor().getAvatarUrl()
-					.isEmpty()) {
+				if(commitsModel.getAuthor() != null && commitsModel.getAuthor().getAvatarUrl() != null && !commitsModel.getAuthor().getAvatarUrl().isEmpty()) {
 
 					binding.commitAuthorAvatar.setVisibility(View.VISIBLE);
 
 					int imgRadius = AppUtil.getPixelsFromDensity(requireContext(), 3);
 
-					PicassoService.getInstance(requireContext()).get().load(commitsModel.getAuthor().getAvatarUrl())
-						.placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
-						.into(binding.commitAuthorAvatar);
+					PicassoService.getInstance(requireContext()).get().load(commitsModel.getAuthor().getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0))
+						.resize(120, 120).centerCrop().into(binding.commitAuthorAvatar);
 
 					binding.commitAuthorAvatar.setOnClickListener((v) -> {
 						Intent intent = new Intent(requireContext(), ProfileActivity.class);
@@ -202,17 +197,15 @@ public class CommitDetailFragment extends Fragment {
 					binding.commitAuthorAvatar.setVisibility(View.GONE);
 				}
 
-				if(commitsModel.getCommitter() != null && (commitsModel.getAuthor() == null || !commitsModel.getAuthor().getLogin()
-					.equals(commitsModel.getCommitter().getLogin())) && commitsModel.getCommitter()
+				if(commitsModel.getCommitter() != null && (commitsModel.getAuthor() == null || !commitsModel.getAuthor().getLogin().equals(commitsModel.getCommitter().getLogin())) && commitsModel.getCommitter()
 					.getAvatarUrl() != null && !commitsModel.getCommitter().getAvatarUrl().isEmpty()) {
 
 					binding.commitCommitterAvatar.setVisibility(View.VISIBLE);
 
 					int imgRadius = AppUtil.getPixelsFromDensity(requireContext(), 3);
 
-					PicassoService.getInstance(requireContext()).get().load(commitsModel.getCommitter().getAvatarUrl())
-						.placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop()
-						.into(binding.commitCommitterAvatar);
+					PicassoService.getInstance(requireContext()).get().load(commitsModel.getCommitter().getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0))
+						.resize(120, 120).centerCrop().into(binding.commitCommitterAvatar);
 
 					binding.commitCommitterAvatar.setOnClickListener((v) -> {
 						Intent intent = new Intent(requireContext(), ProfileActivity.class);
diff --git a/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java
index 066ffa3d..14869922 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java
@@ -88,9 +88,8 @@ public class DiffFilesFragment extends Fragment {
 
 						int filesCount = fileDiffViews.size();
 
-						String toolbarTitleText =
-							(filesCount > 1) ? getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)) :
-								getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount));
+						String toolbarTitleText = (filesCount > 1) ? getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)) :
+							getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount));
 
 						requireActivity().runOnUiThread(() -> {
 							binding.toolbarTitle.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/org/mian/gitnex/fragments/DiffFragment.java b/app/src/main/java/org/mian/gitnex/fragments/DiffFragment.java
index 04a92058..01a18ef3 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/DiffFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/DiffFragment.java
@@ -32,15 +32,6 @@ public class DiffFragment extends Fragment {
 	public DiffFragment() {
 	}
 
-	public void setFileDiffView(FileDiffView fileDiffView) {
-		this.fileDiffView = fileDiffView;
-	}
-
-	public void setIssue(IssueContext issue) {
-
-		this.issue = issue;
-	}
-
 	public static DiffFragment newInstance(FileDiffView fileDiffView, IssueContext issue) {
 
 		DiffFragment fragment = new DiffFragment();
@@ -60,6 +51,15 @@ public class DiffFragment extends Fragment {
 
 	}
 
+	public void setFileDiffView(FileDiffView fileDiffView) {
+		this.fileDiffView = fileDiffView;
+	}
+
+	public void setIssue(IssueContext issue) {
+
+		this.issue = issue;
+	}
+
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
@@ -67,12 +67,10 @@ public class DiffFragment extends Fragment {
 		ctx = requireContext();
 
 		if(Objects.equals(type, "pull")) {
-			binding.close.setOnClickListener(v -> requireActivity().getSupportFragmentManager().beginTransaction()
-				.replace(R.id.fragment_container, ((DiffActivity) requireActivity()).fragment).commit());
+			binding.close.setOnClickListener(v -> requireActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, ((DiffActivity) requireActivity()).fragment).commit());
 		}
 		else {
-			binding.close.setOnClickListener(v -> requireActivity().getSupportFragmentManager().beginTransaction()
-				.replace(R.id.fragment_container, CommitDetailFragment.newInstance()).commit());
+			binding.close.setOnClickListener(v -> requireActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, CommitDetailFragment.newInstance()).commit());
 		}
 
 		binding.toolbarTitle.setText(fileDiffView.getFileName());
diff --git a/app/src/main/java/org/mian/gitnex/fragments/DraftsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/DraftsFragment.java
index fe65ed45..8a2bb75c 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/DraftsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/DraftsFragment.java
@@ -174,8 +174,8 @@ public class DraftsFragment extends Fragment {
 				continue;
 			}
 
-			if(d.getRepositoryOwner().toLowerCase().contains(text) || d.getRepositoryName().toLowerCase().contains(text) || d.getDraftText()
-				.toLowerCase().contains(text) || String.valueOf(d.getIssueId()).contains(text)) {
+			if(d.getRepositoryOwner().toLowerCase().contains(text) || d.getRepositoryName().toLowerCase().contains(text) || d.getDraftText().toLowerCase().contains(text) || String.valueOf(d.getIssueId())
+				.contains(text)) {
 				arr.add(d);
 			}
 		}
diff --git a/app/src/main/java/org/mian/gitnex/fragments/ExploreFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ExploreFragment.java
index bee19c96..d0e436a0 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/ExploreFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ExploreFragment.java
@@ -45,8 +45,8 @@ public class ExploreFragment extends Fragment {
 		Typeface myTypeface = AppUtil.getTypeface(requireContext());
 		viewPager.setAdapter(new ViewPagerAdapter(this));
 
-		String[] tabTitles = {getResources().getString(R.string.navRepos), getResources().getString(R.string.pageTitleIssues),
-			getResources().getString(R.string.navOrg), getResources().getString(R.string.pageTitleUsers)};
+		String[] tabTitles = {getResources().getString(R.string.navRepos), getResources().getString(R.string.pageTitleIssues), getResources().getString(R.string.navOrg),
+			getResources().getString(R.string.pageTitleUsers)};
 		new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> tab.setText(tabTitles[position])).attach();
 
 		for(int j = 0; j < tabTitles.length; j++) {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/ExplorePublicOrganizationsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ExplorePublicOrganizationsFragment.java
index be82cfa7..dfa49511 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/ExplorePublicOrganizationsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ExplorePublicOrganizationsFragment.java
@@ -32,12 +32,12 @@ import retrofit2.Response;
 
 public class ExplorePublicOrganizationsFragment extends Fragment {
 
+	private final String TAG = "PublicOrganizations";
 	private FragmentOrganizationsBinding fragmentPublicOrgBinding;
 	private List<Organization> organizationsList;
 	private OrganizationsListAdapter adapter;
 	private Context context;
 	private int pageSize;
-	private final String TAG = "PublicOrganizations";
 	private int resultLimit;
 
 	@Nullable
@@ -72,8 +72,7 @@ public class ExplorePublicOrganizationsFragment extends Fragment {
 			}
 		});
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentPublicOrgBinding.recyclerView.getContext(),
-			DividerItemDecoration.VERTICAL);
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentPublicOrgBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
 		fragmentPublicOrgBinding.recyclerView.setHasFixedSize(true);
 		fragmentPublicOrgBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 		fragmentPublicOrgBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
diff --git a/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java
index 794f53eb..a8155a3f 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java
@@ -41,13 +41,12 @@ import retrofit2.Response;
 
 public class ExploreRepositoriesFragment extends Fragment {
 
-	private FragmentExploreRepoBinding viewBinding;
-	private Context context;
-
-	private int pageSize;
 	private final boolean repoTypeInclude = true;
 	private final String sort = "updated";
 	private final String order = "desc";
+	private FragmentExploreRepoBinding viewBinding;
+	private Context context;
+	private int pageSize;
 	private int resultLimit;
 	private List<Repository> dataList;
 	private ExploreRepositoriesAdapter adapter;
@@ -100,8 +99,7 @@ public class ExploreRepositoriesFragment extends Fragment {
 	private void loadInitial(String searchKeyword, int resultLimit) {
 
 		Call<SearchResults> call = RetrofitClient.getApiInterface(context)
-			.repoSearch(searchKeyword, includeTopic, includeDescription, null, null, null, null, repoTypeInclude, null, includeTemplate, onlyArchived,
-				null, null, sort, order, 1, resultLimit);
+			.repoSearch(searchKeyword, includeTopic, includeDescription, null, null, null, null, repoTypeInclude, null, includeTemplate, onlyArchived, null, null, sort, order, 1, resultLimit);
 		call.enqueue(new Callback<>() {
 
 			@Override
@@ -141,8 +139,7 @@ public class ExploreRepositoriesFragment extends Fragment {
 
 		viewBinding.progressBar.setVisibility(View.VISIBLE);
 		Call<SearchResults> call = RetrofitClient.getApiInterface(context)
-			.repoSearch(searchKeyword, includeTopic, includeDescription, null, null, null, null, repoTypeInclude, null, includeTemplate, onlyArchived,
-				null, null, sort, order, page, resultLimit);
+			.repoSearch(searchKeyword, includeTopic, includeDescription, null, null, null, null, repoTypeInclude, null, includeTemplate, onlyArchived, null, null, sort, order, page, resultLimit);
 
 		call.enqueue(new Callback<>() {
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
index 905a9ffd..45ecb912 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
@@ -43,12 +43,9 @@ import moe.feng.common.view.breadcrumbs.model.BreadcrumbItem;
 
 public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapterListener {
 
-	private FragmentFilesBinding binding;
-
-	private RepositoryContext repository;
-
 	private final Path path = new Path();
-
+	private FragmentFilesBinding binding;
+	private RepositoryContext repository;
 	private FilesAdapter filesAdapter;
 
 	public FilesFragment() {
@@ -81,8 +78,8 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 		binding.recyclerView.setAdapter(filesAdapter);
 		binding.recyclerView.addItemDecoration(new DividerItemDecoration(binding.recyclerView.getContext(), DividerItemDecoration.VERTICAL));
 
-		binding.breadcrumbsView.setItems(new ArrayList<>(Collections.singletonList(BreadcrumbItem.createSimpleItem(
-			getResources().getString(R.string.filesBreadcrumbRoot) + getResources().getString(R.string.colonDivider) + repository.getBranchRef()))));
+		binding.breadcrumbsView.setItems(new ArrayList<>(
+			Collections.singletonList(BreadcrumbItem.createSimpleItem(getResources().getString(R.string.filesBreadcrumbRoot) + getResources().getString(R.string.colonDivider) + repository.getBranchRef()))));
 		// noinspection unchecked
 		binding.breadcrumbsView.setCallback(new DefaultBreadcrumbsCallback<BreadcrumbItem>() {
 
@@ -133,9 +130,8 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 			repository.setBranchRef(repoBranch);
 			path.clear();
-			binding.breadcrumbsView.setItems(new ArrayList<>(Collections.singletonList(BreadcrumbItem.createSimpleItem(
-				getResources().getString(R.string.filesBreadcrumbRoot) + getResources().getString(
-					R.string.colonDivider) + repository.getBranchRef()))));
+			binding.breadcrumbsView.setItems(new ArrayList<>(
+				Collections.singletonList(BreadcrumbItem.createSimpleItem(getResources().getString(R.string.filesBreadcrumbRoot) + getResources().getString(R.string.colonDivider) + repository.getBranchRef()))));
 			refresh();
 		});
 
@@ -234,27 +230,26 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 		FilesViewModel filesModel = new ViewModelProvider(this).get(FilesViewModel.class);
 
-		filesModel.getFilesList(owner, repo, ref, getContext(), binding.progressBar, binding.noDataFiles)
-			.observe(getViewLifecycleOwner(), filesListMain -> {
+		filesModel.getFilesList(owner, repo, ref, getContext(), binding.progressBar, binding.noDataFiles).observe(getViewLifecycleOwner(), filesListMain -> {
 
-				filesAdapter.getOriginalFiles().clear();
-				filesAdapter.getOriginalFiles().addAll(filesListMain);
-				filesAdapter.notifyOriginalDataSetChanged();
+			filesAdapter.getOriginalFiles().clear();
+			filesAdapter.getOriginalFiles().addAll(filesListMain);
+			filesAdapter.notifyOriginalDataSetChanged();
 
-				if(filesListMain.size() > 0) {
+			if(filesListMain.size() > 0) {
 
-					AppUtil.setMultiVisibility(View.VISIBLE, binding.recyclerView, binding.filesFrame);
-					binding.noDataFiles.setVisibility(View.GONE);
+				AppUtil.setMultiVisibility(View.VISIBLE, binding.recyclerView, binding.filesFrame);
+				binding.noDataFiles.setVisibility(View.GONE);
 
-				}
-				else {
-					AppUtil.setMultiVisibility(View.VISIBLE, binding.recyclerView, binding.filesFrame, binding.noDataFiles);
-				}
+			}
+			else {
+				AppUtil.setMultiVisibility(View.VISIBLE, binding.recyclerView, binding.filesFrame, binding.noDataFiles);
+			}
 
-				binding.filesFrame.setVisibility(View.VISIBLE);
-				binding.progressBar.setVisibility(View.GONE);
+			binding.filesFrame.setVisibility(View.VISIBLE);
+			binding.progressBar.setVisibility(View.GONE);
 
-			});
+		});
 
 	}
 
@@ -264,26 +259,25 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 		binding.progressBar.setVisibility(View.VISIBLE);
 
 		FilesViewModel filesModel = new ViewModelProvider(this).get(FilesViewModel.class);
-		filesModel.getFilesList2(owner, repo, filesDir, ref, getContext(), binding.progressBar, binding.noDataFiles)
-			.observe(getViewLifecycleOwner(), filesListMain2 -> {
+		filesModel.getFilesList2(owner, repo, filesDir, ref, getContext(), binding.progressBar, binding.noDataFiles).observe(getViewLifecycleOwner(), filesListMain2 -> {
 
-				filesAdapter.getOriginalFiles().clear();
-				filesAdapter.getOriginalFiles().addAll(filesListMain2);
-				filesAdapter.notifyOriginalDataSetChanged();
+			filesAdapter.getOriginalFiles().clear();
+			filesAdapter.getOriginalFiles().addAll(filesListMain2);
+			filesAdapter.notifyOriginalDataSetChanged();
 
-				if(filesListMain2.size() > 0) {
+			if(filesListMain2.size() > 0) {
 
-					AppUtil.setMultiVisibility(View.VISIBLE, binding.recyclerView, binding.filesFrame);
-					binding.noDataFiles.setVisibility(View.GONE);
-				}
-				else {
-					AppUtil.setMultiVisibility(View.VISIBLE, binding.recyclerView, binding.filesFrame, binding.noDataFiles);
-				}
+				AppUtil.setMultiVisibility(View.VISIBLE, binding.recyclerView, binding.filesFrame);
+				binding.noDataFiles.setVisibility(View.GONE);
+			}
+			else {
+				AppUtil.setMultiVisibility(View.VISIBLE, binding.recyclerView, binding.filesFrame, binding.noDataFiles);
+			}
 
-				binding.filesFrame.setVisibility(View.VISIBLE);
-				binding.progressBar.setVisibility(View.GONE);
+			binding.filesFrame.setVisibility(View.VISIBLE);
+			binding.progressBar.setVisibility(View.GONE);
 
-			});
+		});
 
 	}
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java
index b0370c5b..3d2c7686 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java
@@ -39,18 +39,14 @@ import retrofit2.Response;
 public class IssuesFragment extends Fragment {
 
 	public static boolean resumeIssues = false;
-
+	private final String requestType = Constants.issuesRequestType;
 	private FragmentIssuesBinding fragmentIssuesBinding;
 	private Context context;
-
 	private Menu menu;
 	private List<Issue> issuesList;
 	private IssuesAdapter adapter;
-
 	private int pageSize = Constants.issuesPageInit;
 	private int resultLimit;
-	private final String requestType = Constants.issuesRequestType;
-
 	private RepositoryContext repository;
 
 	public static IssuesFragment newInstance(RepositoryContext repository) {
@@ -75,8 +71,7 @@ public class IssuesFragment extends Fragment {
 
 		fragmentIssuesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 			fragmentIssuesBinding.pullToRefresh.setRefreshing(false);
-			loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, repository.getIssueState().toString(),
-				repository.getIssueMilestoneFilterName(), null);
+			loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, repository.getIssueState().toString(), repository.getIssueMilestoneFilterName(), null);
 			adapter.notifyDataChanged();
 		}, 200));
 
@@ -84,13 +79,11 @@ public class IssuesFragment extends Fragment {
 		adapter.setLoadMoreListener(() -> fragmentIssuesBinding.recyclerView.post(() -> {
 			if(issuesList.size() == resultLimit || pageSize == resultLimit) {
 				int page = (issuesList.size() + resultLimit) / resultLimit;
-				loadMore(repository.getOwner(), repository.getName(), page, resultLimit, requestType, repository.getIssueState().toString(),
-					repository.getIssueMilestoneFilterName());
+				loadMore(repository.getOwner(), repository.getName(), page, resultLimit, requestType, repository.getIssueState().toString(), repository.getIssueMilestoneFilterName());
 			}
 		}));
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentIssuesBinding.recyclerView.getContext(),
-			DividerItemDecoration.VERTICAL);
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentIssuesBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
 		fragmentIssuesBinding.recyclerView.setHasFixedSize(true);
 		fragmentIssuesBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 		fragmentIssuesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
@@ -112,16 +105,14 @@ public class IssuesFragment extends Fragment {
 
 				if(issuesList.size() == resultLimit || pageSize == resultLimit) {
 					int page = (issuesList.size() + resultLimit) / resultLimit;
-					loadMore(repository.getOwner(), repository.getName(), page, resultLimit, requestType, repository.getIssueState().toString(),
-						repository.getIssueMilestoneFilterName());
+					loadMore(repository.getOwner(), repository.getName(), page, resultLimit, requestType, repository.getIssueState().toString(), repository.getIssueMilestoneFilterName());
 				}
 			}));
 
 			fragmentIssuesBinding.progressBar.setVisibility(View.VISIBLE);
 			fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE);
 
-			loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, issueState, repository.getIssueMilestoneFilterName(),
-				null);
+			loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, issueState, repository.getIssueMilestoneFilterName(), null);
 			fragmentIssuesBinding.recyclerView.setAdapter(adapter);
 		});
 
@@ -134,21 +125,18 @@ public class IssuesFragment extends Fragment {
 
 				if(issuesList.size() == resultLimit || pageSize == resultLimit) {
 					int page = (issuesList.size() + resultLimit) / resultLimit;
-					loadMore(repository.getOwner(), repository.getName(), page, resultLimit, requestType, repository.getIssueState().toString(),
-						repository.getIssueMilestoneFilterName());
+					loadMore(repository.getOwner(), repository.getName(), page, resultLimit, requestType, repository.getIssueState().toString(), repository.getIssueMilestoneFilterName());
 				}
 			}));
 
 			fragmentIssuesBinding.progressBar.setVisibility(View.VISIBLE);
 			fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE);
 
-			loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, repository.getIssueState().toString(),
-				filterIssueByMilestone, null);
+			loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, repository.getIssueState().toString(), filterIssueByMilestone, null);
 			fragmentIssuesBinding.recyclerView.setAdapter(adapter);
 		});
 
-		loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, repository.getIssueState().toString(),
-			repository.getIssueMilestoneFilterName(), null);
+		loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, repository.getIssueState().toString(), repository.getIssueMilestoneFilterName(), null);
 
 		return fragmentIssuesBinding.getRoot();
 	}
@@ -157,18 +145,14 @@ public class IssuesFragment extends Fragment {
 	public void onResume() {
 		super.onResume();
 		if(resumeIssues) {
-			loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, repository.getIssueState().toString(),
-				repository.getIssueMilestoneFilterName(), null);
+			loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, repository.getIssueState().toString(), repository.getIssueMilestoneFilterName(), null);
 			resumeIssues = false;
 		}
 	}
 
-	private void loadInitial(String repoOwner, String repoName, int resultLimit, String requestType, String issueState, String filterByMilestone,
-		String query) {
+	private void loadInitial(String repoOwner, String repoName, int resultLimit, String requestType, String issueState, String filterByMilestone, String query) {
 
-		Call<List<Issue>> call = RetrofitClient.getApiInterface(context)
-			.issueListIssues(repoOwner, repoName, issueState, null, query, requestType, filterByMilestone, null, null, null, null, null, 1,
-				resultLimit);
+		Call<List<Issue>> call = RetrofitClient.getApiInterface(context).issueListIssues(repoOwner, repoName, issueState, null, query, requestType, filterByMilestone, null, null, null, null, null, 1, resultLimit);
 
 		call.enqueue(new Callback<>() {
 
@@ -206,14 +190,11 @@ public class IssuesFragment extends Fragment {
 		});
 	}
 
-	private void loadMore(String repoOwner, String repoName, int page, int resultLimit, String requestType, String issueState,
-		String filterByMilestone) {
+	private void loadMore(String repoOwner, String repoName, int page, int resultLimit, String requestType, String issueState, String filterByMilestone) {
 
 		fragmentIssuesBinding.progressBar.setVisibility(View.VISIBLE);
 
-		Call<List<Issue>> call = RetrofitClient.getApiInterface(context)
-			.issueListIssues(repoOwner, repoName, issueState, null, null, requestType, filterByMilestone, null, null, null, null, null, page,
-				resultLimit);
+		Call<List<Issue>> call = RetrofitClient.getApiInterface(context).issueListIssues(repoOwner, repoName, issueState, null, null, requestType, filterByMilestone, null, null, null, null, null, page, resultLimit);
 		call.enqueue(new Callback<>() {
 
 			@Override
@@ -268,8 +249,7 @@ public class IssuesFragment extends Fragment {
 
 			@Override
 			public boolean onQueryTextSubmit(String query) {
-				loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, repository.getIssueState().toString(),
-					repository.getIssueMilestoneFilterName(), query);
+				loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, repository.getIssueState().toString(), repository.getIssueMilestoneFilterName(), query);
 				searchView.setQuery(null, false);
 				searchItem.collapseActionView();
 				return false;
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MembersByOrgFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MembersByOrgFragment.java
index 9e5c48d9..7ae62b01 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MembersByOrgFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MembersByOrgFragment.java
@@ -26,8 +26,8 @@ import org.mian.gitnex.viewmodels.MembersByOrgViewModel;
 
 public class MembersByOrgFragment extends Fragment {
 
+	private static final String orgNameF = "param2";
 	private TextView noDataMembers;
-	private static String orgNameF = "param2";
 	private String orgName;
 	private UserGridAdapter adapter;
 	private GridView mGridView;
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
index 2e9ac2fb..673c97ec 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
@@ -33,6 +33,7 @@ import java.util.List;
 
 public class MilestonesFragment extends Fragment {
 
+	public String state = "open";
 	private MilestonesViewModel milestonesViewModel;
 	private FragmentMilestonesBinding viewBinding;
 	private Menu menu;
@@ -41,7 +42,6 @@ public class MilestonesFragment extends Fragment {
 	private RepositoryContext repository;
 	private String milestoneId;
 	private int page = 1;
-	public String state = "open";
 
 	public static MilestonesFragment newInstance(RepositoryContext repository) {
 		MilestonesFragment fragment = new MilestonesFragment();
@@ -49,6 +49,15 @@ public class MilestonesFragment extends Fragment {
 		return fragment;
 	}
 
+	private static int getMilestoneIndex(int milestoneId, List<Milestone> milestones) {
+		for(Milestone milestone : milestones) {
+			if(milestone.getId() == milestoneId) {
+				return milestones.indexOf(milestone);
+			}
+		}
+		return -1;
+	}
+
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
 		repository = RepositoryContext.fromBundle(requireArguments());
@@ -71,8 +80,7 @@ public class MilestonesFragment extends Fragment {
 
 		dataList = new ArrayList<>();
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(viewBinding.recyclerView.getContext(),
-			DividerItemDecoration.VERTICAL);
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(viewBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
 		viewBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 		viewBinding.recyclerView.setHasFixedSize(true);
 		viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
@@ -147,15 +155,6 @@ public class MilestonesFragment extends Fragment {
 		});
 	}
 
-	private static int getMilestoneIndex(int milestoneId, List<Milestone> milestones) {
-		for(Milestone milestone : milestones) {
-			if(milestone.getId() == milestoneId) {
-				return milestones.indexOf(milestone);
-			}
-		}
-		return -1;
-	}
-
 	@Override
 	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java
index 4aca72c5..9e955c5b 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java
@@ -27,13 +27,13 @@ import org.mian.gitnex.viewmodels.IssuesViewModel;
 
 public class MyIssuesFragment extends Fragment {
 
+	public String state = "open";
+	public boolean assignedToMe = false;
 	private IssuesViewModel issuesViewModel;
 	private FragmentIssuesBinding fragmentIssuesBinding;
 	private ExploreIssuesAdapter adapter;
 	private int page = 1;
 	private Menu menu;
-	public String state = "open";
-	public boolean assignedToMe = false;
 
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -44,8 +44,7 @@ public class MyIssuesFragment extends Fragment {
 
 		fragmentIssuesBinding.recyclerView.setHasFixedSize(true);
 		fragmentIssuesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentIssuesBinding.recyclerView.getContext(),
-			DividerItemDecoration.VERTICAL);
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentIssuesBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
 		fragmentIssuesBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 
 		((MainActivity) requireActivity()).setFragmentRefreshListenerMyIssues(myIssues -> {
@@ -79,8 +78,6 @@ public class MyIssuesFragment extends Fragment {
 		return fragmentIssuesBinding.getRoot();
 	}
 
-	;
-
 	private void fetchDataAsync(String query, String state, boolean assignedToMe) {
 
 		issuesViewModel.getIssuesList(query, "issues", true, state, assignedToMe, getContext()).observe(getViewLifecycleOwner(), issuesListMain -> {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java
index 276fe82d..cd9d31e9 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java
@@ -25,9 +25,8 @@ import org.mian.gitnex.viewmodels.ProfileEmailsViewModel;
 
 public class MyProfileEmailsFragment extends Fragment {
 
-	private ProfileEmailsViewModel profileEmailsViewModel;
 	public static boolean refreshEmails = false;
-
+	private ProfileEmailsViewModel profileEmailsViewModel;
 	private ProgressBar mProgressBar;
 	private MyProfileEmailsAdapter adapter;
 	private RecyclerView mRecyclerView;
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowersFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowersFragment.java
index 380e5d7d..c3529e61 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowersFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowersFragment.java
@@ -31,13 +31,12 @@ import retrofit2.Response;
 
 public class MyProfileFollowersFragment extends Fragment {
 
+	private final String TAG = "MyProfileFollowersFragment";
 	private FragmentProfileFollowersFollowingBinding viewBinding;
 	private Context context;
-
 	private List<User> dataList;
 	private UsersAdapter adapter;
 	private int pageSize;
-	private final String TAG = "MyProfileFollowersFragment";
 	private int resultLimit;
 
 	@Override
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowingFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowingFragment.java
index 2216f103..054ec659 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowingFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowingFragment.java
@@ -31,13 +31,12 @@ import retrofit2.Response;
 
 public class MyProfileFollowingFragment extends Fragment {
 
+	private final String TAG = "MyProfileFollowingFragment";
 	private FragmentProfileFollowersFollowingBinding viewBinding;
 	private Context context;
-
 	private List<User> dataList;
 	private UsersAdapter adapter;
 	private int pageSize;
-	private final String TAG = "MyProfileFollowingFragment";
 	private int resultLimit;
 
 	@Override
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFragment.java
index 48a4fc09..6bc1a236 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFragment.java
@@ -71,39 +71,6 @@ public class MyProfileFragment extends Fragment {
 		return v;
 	}
 
-	public static class SectionsPagerAdapter extends FragmentStatePagerAdapter {
-
-		SectionsPagerAdapter(FragmentManager fm) {
-			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
-		}
-
-		@NonNull
-		@Override
-		public Fragment getItem(int position) {
-
-			switch(position) {
-
-				case 0: // followers
-					return new MyProfileFollowersFragment();
-
-				case 1: // following
-					return new MyProfileFollowingFragment();
-
-				case 2: // emails
-					return new MyProfileEmailsFragment();
-
-			}
-
-			return null;
-		}
-
-		@Override
-		public int getCount() {
-			return 3;
-		}
-
-	}
-
 	@Override
 	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
@@ -152,38 +119,36 @@ public class MyProfileFragment extends Fragment {
 			userLanguage.setText(getResources().getConfiguration().locale.getDisplayLanguage());
 		}
 
-		userAvatar.setOnClickListener(loginId -> AppUtil.copyToClipboard(ctx, account.getAccount().getUserName(),
-			ctx.getString(R.string.copyLoginIdToClipBoard, account.getAccount().getUserName())));
+		userAvatar.setOnClickListener(loginId -> AppUtil.copyToClipboard(ctx, account.getAccount().getUserName(), ctx.getString(R.string.copyLoginIdToClipBoard, account.getAccount().getUserName())));
 
 		userFullName.setText(Html.fromHtml(account.getFullName()));
 		userLogin.setText(getString(R.string.usernameWithAt, account.getAccount().getUserName()));
 
 		int avatarRadius = AppUtil.getPixelsFromDensity(ctx, 3);
 
-		PicassoService.getInstance(ctx).get().load(account.getUserInfo().getAvatarUrl()).transform(new RoundedTransformation(avatarRadius, 0))
-			.placeholder(R.drawable.loader_animated).resize(120, 120).centerCrop().into(userAvatar);
+		PicassoService.getInstance(ctx).get().load(account.getUserInfo().getAvatarUrl()).transform(new RoundedTransformation(avatarRadius, 0)).placeholder(R.drawable.loader_animated).resize(120, 120).centerCrop()
+			.into(userAvatar);
 
-		PicassoService.getInstance(ctx).get().load(account.getUserInfo().getAvatarUrl()).transform(new BlurTransformation(ctx))
-			.into(userAvatarBackground, new Callback() {
+		PicassoService.getInstance(ctx).get().load(account.getUserInfo().getAvatarUrl()).transform(new BlurTransformation(ctx)).into(userAvatarBackground, new Callback() {
 
-				@Override
-				public void onSuccess() {
+			@Override
+			public void onSuccess() {
 
-					int invertedColor = new ColorInverter().getImageViewContrastColor(userAvatarBackground);
+				int invertedColor = new ColorInverter().getImageViewContrastColor(userAvatarBackground);
 
-					userFullName.setTextColor(invertedColor);
-					divider.setBackgroundColor(invertedColor);
-					userLogin.setTextColor(invertedColor);
-					userLanguage.setTextColor(invertedColor);
+				userFullName.setTextColor(invertedColor);
+				divider.setBackgroundColor(invertedColor);
+				userLogin.setTextColor(invertedColor);
+				userLanguage.setTextColor(invertedColor);
 
-					ImageViewCompat.setImageTintList(userLanguageIcon, ColorStateList.valueOf(invertedColor));
-				}
+				ImageViewCompat.setImageTintList(userLanguageIcon, ColorStateList.valueOf(invertedColor));
+			}
 
-				@Override
-				public void onError(Exception e) {
+			@Override
+			public void onError(Exception e) {
 
-				}
-			});
+			}
+		});
 
 		MyProfileFragment.SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getChildFragmentManager());
 
@@ -215,4 +180,37 @@ public class MyProfileFragment extends Fragment {
 		tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
 	}
 
+	public static class SectionsPagerAdapter extends FragmentStatePagerAdapter {
+
+		SectionsPagerAdapter(FragmentManager fm) {
+			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+		}
+
+		@NonNull
+		@Override
+		public Fragment getItem(int position) {
+
+			switch(position) {
+
+				case 0: // followers
+					return new MyProfileFollowersFragment();
+
+				case 1: // following
+					return new MyProfileFollowingFragment();
+
+				case 2: // emails
+					return new MyProfileEmailsFragment();
+
+			}
+
+			return null;
+		}
+
+		@Override
+		public int getCount() {
+			return 3;
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java
index 29dcea6a..4f8c189b 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java
@@ -59,8 +59,7 @@ public class MyRepositoriesFragment extends Fragment {
 		fragmentRepositoriesBinding.recyclerView.setHasFixedSize(true);
 		fragmentRepositoriesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-		RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(
-			ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
+		RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
 		fragmentRepositoriesBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 
 		fragmentRepositoriesBinding.recyclerView.setPadding(0, 0, 0, 200);
@@ -79,43 +78,40 @@ public class MyRepositoriesFragment extends Fragment {
 		return fragmentRepositoriesBinding.getRoot();
 	}
 
-	;
-
 	private void fetchDataAsync(String userLogin) {
 
-		repositoriesViewModel.getRepositories(page, resultLimit, userLogin, "myRepos", null, getContext())
-			.observe(getViewLifecycleOwner(), reposListMain -> {
+		repositoriesViewModel.getRepositories(page, resultLimit, userLogin, "myRepos", null, getContext()).observe(getViewLifecycleOwner(), reposListMain -> {
 
-				adapter = new ReposListAdapter(reposListMain, getContext());
-				adapter.setLoadMoreListener(new ReposListAdapter.OnLoadMoreListener() {
+			adapter = new ReposListAdapter(reposListMain, getContext());
+			adapter.setLoadMoreListener(new ReposListAdapter.OnLoadMoreListener() {
 
-					@Override
-					public void onLoadMore() {
+				@Override
+				public void onLoadMore() {
 
-						page += 1;
-						repositoriesViewModel.loadMoreRepos(page, resultLimit, userLogin, "myRepos", null, getContext(), adapter);
-						fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
-					}
-
-					@Override
-					public void onLoadFinished() {
-
-						fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
-					}
-				});
-
-				if(adapter.getItemCount() > 0) {
-					fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
-					fragmentRepositoriesBinding.noData.setVisibility(View.GONE);
-				}
-				else {
-					adapter.notifyDataChanged();
-					fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
-					fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
+					page += 1;
+					repositoriesViewModel.loadMoreRepos(page, resultLimit, userLogin, "myRepos", null, getContext(), adapter);
+					fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
 				}
 
-				fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+				@Override
+				public void onLoadFinished() {
+
+					fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+				}
 			});
+
+			if(adapter.getItemCount() > 0) {
+				fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
+				fragmentRepositoriesBinding.noData.setVisibility(View.GONE);
+			}
+			else {
+				adapter.notifyDataChanged();
+				fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
+				fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
+			}
+
+			fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+		});
 	}
 
 	@Override
diff --git a/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java
index 782c55fa..0d38dd90 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java
@@ -42,8 +42,8 @@ import java.util.List;
 
 public class NotificationsFragment extends Fragment implements NotificationsAdapter.OnNotificationClickedListener, NotificationsAdapter.OnMoreClickedListener {
 
-	private FragmentNotificationsBinding viewBinding;
 	private final List<NotificationThread> notificationThreads = new ArrayList<>();
+	private FragmentNotificationsBinding viewBinding;
 	private NotificationsAdapter notificationsAdapter;
 
 	private Activity activity;
@@ -76,8 +76,7 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 
 		LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context);
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(viewBinding.notifications.getContext(),
-			DividerItemDecoration.VERTICAL);
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(viewBinding.notifications.getContext(), DividerItemDecoration.VERTICAL);
 
 		viewBinding.notifications.setHasFixedSize(true);
 		viewBinding.notifications.setLayoutManager(linearLayoutManager);
@@ -111,18 +110,17 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 		});
 
 		viewBinding.markAllAsRead.setOnClickListener(
-			v1 -> RetrofitClient.getApiInterface(context).notifyReadList(new Date(), "true", Arrays.asList("unread", "pinned"), "read")
-				.enqueue((SimpleCallback<List<NotificationThread>>) (call, voidResponse) -> {
+			v1 -> RetrofitClient.getApiInterface(context).notifyReadList(new Date(), "true", Arrays.asList("unread", "pinned"), "read").enqueue((SimpleCallback<List<NotificationThread>>) (call, voidResponse) -> {
 
-					if(voidResponse.isPresent() && voidResponse.get().isSuccessful()) {
-						Toasty.success(context, getString(R.string.markedNotificationsAsRead));
-						pageCurrentIndex = 1;
-						loadNotifications(false);
-					}
-					else {
-						activity.runOnUiThread(() -> Toasty.error(context, getString(R.string.genericError)));
-					}
-				}));
+				if(voidResponse.isPresent() && voidResponse.get().isSuccessful()) {
+					Toasty.success(context, getString(R.string.markedNotificationsAsRead));
+					pageCurrentIndex = 1;
+					loadNotifications(false);
+				}
+				else {
+					activity.runOnUiThread(() -> Toasty.error(context, getString(R.string.genericError)));
+				}
+			}));
 
 		viewBinding.pullToRefresh.setOnRefreshListener(() -> {
 			viewBinding.pullToRefresh.setRefreshing(false);
@@ -227,28 +225,25 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 	public void onNotificationClicked(NotificationThread notificationThread) {
 
 		if(notificationThread.isUnread() && !notificationThread.isPinned()) {
-			RetrofitClient.getApiInterface(context).notifyReadThread(String.valueOf(notificationThread.getId()), "read")
-				.enqueue((SimpleCallback<NotificationThread>) (call, voidResponse) -> {
-					// reload without any checks, because Gitea returns a 205 and Java expects this to be empty
-					// but Gitea send a response -> results in a call of onFailure and no response is present
-					//if(voidResponse.isPresent() && voidResponse.get().isSuccessful()) {
-					pageCurrentIndex = 1;
-					loadNotifications(false);
-					//}
-				});
+			RetrofitClient.getApiInterface(context).notifyReadThread(String.valueOf(notificationThread.getId()), "read").enqueue((SimpleCallback<NotificationThread>) (call, voidResponse) -> {
+				// reload without any checks, because Gitea returns a 205 and Java expects this to be empty
+				// but Gitea send a response -> results in a call of onFailure and no response is present
+				//if(voidResponse.isPresent() && voidResponse.get().isSuccessful()) {
+				pageCurrentIndex = 1;
+				loadNotifications(false);
+				//}
+			});
 		}
 
 		if(StringUtils.containsAny(notificationThread.getSubject().getType().toLowerCase(), "pull", "issue")) {
 
-			RepositoryContext repo = new RepositoryContext(notificationThread.getRepository().getOwner().getLogin(),
-				notificationThread.getRepository().getName(),
+			RepositoryContext repo = new RepositoryContext(notificationThread.getRepository().getOwner().getLogin(), notificationThread.getRepository().getName(),
 				context); // we can't use the repository object here directly because the permissions are missing
 			String issueUrl = notificationThread.getSubject().getUrl();
 
 			repo.saveToDB(context);
 
-			Intent intent = new IssueContext(repo, Integer.parseInt(issueUrl.substring(issueUrl.lastIndexOf("/") + 1)),
-				notificationThread.getSubject().getType()).getIntent(context, IssueDetailActivity.class);
+			Intent intent = new IssueContext(repo, Integer.parseInt(issueUrl.substring(issueUrl.lastIndexOf("/") + 1)), notificationThread.getSubject().getType()).getIntent(context, IssueDetailActivity.class);
 			intent.putExtra("openedFromLink", "true");
 			startActivity(intent);
 		}
diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
index 4e13582c..32c27625 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
@@ -28,10 +28,9 @@ import retrofit2.Callback;
 
 public class OrganizationInfoFragment extends Fragment {
 
+	private static final String orgNameF = "param1";
 	private Context ctx;
 	private ProgressBar mProgressBar;
-	private static String orgNameF = "param1";
-
 	private String orgName;
 	private ImageView orgAvatar;
 	private TextView orgDescInfo;
@@ -98,8 +97,7 @@ public class OrganizationInfoFragment extends Fragment {
 
 					assert orgInfo != null;
 
-					PicassoService.getInstance(ctx).get().load(orgInfo.getAvatarUrl()).placeholder(R.drawable.loader_animated)
-						.transform(new RoundedTransformation(8, 0)).resize(230, 230).centerCrop().into(orgAvatar);
+					PicassoService.getInstance(ctx).get().load(orgInfo.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(230, 230).centerCrop().into(orgAvatar);
 
 					if(!orgInfo.getDescription().isEmpty()) {
 						Markdown.render(ctx, orgInfo.getDescription(), orgDescInfo);
diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationLabelsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationLabelsFragment.java
index 207fe09e..f8038a0b 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationLabelsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationLabelsFragment.java
@@ -26,14 +26,13 @@ import org.mian.gitnex.viewmodels.OrganizationLabelsViewModel;
 
 public class OrganizationLabelsFragment extends Fragment {
 
+	private static final String repoOwnerF = "param1";
+	private final String type = "org";
 	private OrganizationLabelsViewModel organizationLabelsViewModel;
 	private ProgressBar mProgressBar;
 	private RecyclerView mRecyclerView;
 	private LabelsAdapter adapter;
 	private TextView noData;
-	private static final String repoOwnerF = "param1";
-	private final String type = "org";
-
 	private String repoOwner;
 
 	public static OrganizationLabelsFragment newInstance(String param1) {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoMembersFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoMembersFragment.java
index b033d7c0..82fec3af 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoMembersFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoMembersFragment.java
@@ -26,13 +26,11 @@ import retrofit2.Response;
 
 public class OrganizationTeamInfoMembersFragment extends Fragment {
 
+	private final List<User> teamUserInfo = new ArrayList<>();
 	private Context ctx;
-
 	private FragmentOrganizationTeamInfoMembersBinding binding;
 	private Team team;
-
 	private UserGridAdapter adapter;
-	private final List<User> teamUserInfo = new ArrayList<>();
 
 	public OrganizationTeamInfoMembersFragment() {
 	}
diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoReposFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoReposFragment.java
index ffe2ef73..01b20044 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoReposFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoReposFragment.java
@@ -31,9 +31,8 @@ import org.mian.gitnex.viewmodels.RepositoriesViewModel;
 
 public class OrganizationTeamInfoReposFragment extends Fragment {
 
-	private RepositoriesViewModel repositoriesViewModel;
 	public static boolean repoAdded = false;
-
+	private RepositoriesViewModel repositoriesViewModel;
 	private FragmentRepositoriesBinding fragmentRepositoriesBinding;
 	private ReposListAdapter adapter;
 	private int page = 1;
@@ -67,8 +66,7 @@ public class OrganizationTeamInfoReposFragment extends Fragment {
 		fragmentRepositoriesBinding.recyclerView.setHasFixedSize(true);
 		fragmentRepositoriesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-		RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(
-			ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
+		RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
 		fragmentRepositoriesBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 
 		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
@@ -86,39 +84,38 @@ public class OrganizationTeamInfoReposFragment extends Fragment {
 
 	private void fetchDataAsync() {
 
-		repositoriesViewModel.getRepositories(page, resultLimit, String.valueOf(team.getId()), "team", null, getContext())
-			.observe(getViewLifecycleOwner(), reposListMain -> {
+		repositoriesViewModel.getRepositories(page, resultLimit, String.valueOf(team.getId()), "team", null, getContext()).observe(getViewLifecycleOwner(), reposListMain -> {
 
-				adapter = new ReposListAdapter(reposListMain, getContext());
-				adapter.setLoadMoreListener(new ReposListAdapter.OnLoadMoreListener() {
+			adapter = new ReposListAdapter(reposListMain, getContext());
+			adapter.setLoadMoreListener(new ReposListAdapter.OnLoadMoreListener() {
 
-					@Override
-					public void onLoadMore() {
+				@Override
+				public void onLoadMore() {
 
-						page += 1;
-						repositoriesViewModel.loadMoreRepos(page, resultLimit, String.valueOf(team.getId()), "team", null, getContext(), adapter);
-						fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
-					}
-
-					@Override
-					public void onLoadFinished() {
-
-						fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
-					}
-				});
-
-				if(adapter.getItemCount() > 0) {
-					fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
-					fragmentRepositoriesBinding.noData.setVisibility(View.GONE);
-				}
-				else {
-					adapter.notifyDataChanged();
-					fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
-					fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
+					page += 1;
+					repositoriesViewModel.loadMoreRepos(page, resultLimit, String.valueOf(team.getId()), "team", null, getContext(), adapter);
+					fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
 				}
 
-				fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+				@Override
+				public void onLoadFinished() {
+
+					fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+				}
 			});
+
+			if(adapter.getItemCount() > 0) {
+				fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
+				fragmentRepositoriesBinding.noData.setVisibility(View.GONE);
+			}
+			else {
+				adapter.notifyDataChanged();
+				fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
+				fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
+			}
+
+			fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+		});
 	}
 
 	@Override
diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java
index 573356ec..714ae620 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java
@@ -32,8 +32,8 @@ import org.mian.gitnex.viewmodels.OrganizationsViewModel;
 
 public class OrganizationsFragment extends Fragment {
 
-	private OrganizationsViewModel organizationsViewModel;
 	public static boolean orgCreated = false;
+	private OrganizationsViewModel organizationsViewModel;
 	private FragmentOrganizationsBinding fragmentOrganizationsBinding;
 	private OrganizationsListAdapter adapter;
 	private int page = 1;
@@ -58,8 +58,7 @@ public class OrganizationsFragment extends Fragment {
 		fragmentOrganizationsBinding.recyclerView.setHasFixedSize(true);
 		fragmentOrganizationsBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-		RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(
-			ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
+		RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
 		fragmentOrganizationsBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 
 		fragmentOrganizationsBinding.recyclerView.setPadding(0, 0, 0, 200);
@@ -78,8 +77,6 @@ public class OrganizationsFragment extends Fragment {
 		return fragmentOrganizationsBinding.getRoot();
 	}
 
-	;
-
 	private void fetchDataAsync() {
 
 		organizationsViewModel.getUserOrg(page, resultLimit, getContext()).observe(getViewLifecycleOwner(), orgListMain -> {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/PullRequestChangesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/PullRequestChangesFragment.java
index 4dda7816..7c7ef9a5 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/PullRequestChangesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/PullRequestChangesFragment.java
@@ -17,9 +17,9 @@ import org.mian.gitnex.databinding.FragmentPrChangesBinding;
 
 public class PullRequestChangesFragment extends Fragment {
 
-	private FragmentPrChangesBinding binding;
 	private final DiffFilesFragment diffFilesFragment = DiffFilesFragment.newInstance();
 	private final PullRequestCommitsFragment pullRequestCommitsFragment = PullRequestCommitsFragment.newInstance();
+	private FragmentPrChangesBinding binding;
 
 	public PullRequestChangesFragment() {
 	}
diff --git a/app/src/main/java/org/mian/gitnex/fragments/PullRequestCommitsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/PullRequestCommitsFragment.java
index 682d8d78..6e01f1d9 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/PullRequestCommitsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/PullRequestCommitsFragment.java
@@ -36,13 +36,12 @@ import retrofit2.Response;
  */
 public class PullRequestCommitsFragment extends Fragment {
 
+	private final String TAG = "PullRequestCommitsFragment";
+	private final List<Commit> commitsList = new ArrayList<>();
 	private ActivityCommitsBinding binding;
 	private Context ctx;
-	private final String TAG = "PullRequestCommitsFragment";
 	private int resultLimit;
 	private int pageSize = 1;
-
-	private final List<Commit> commitsList = new ArrayList<>();
 	private CommitsAdapter adapter;
 
 	public PullRequestCommitsFragment() {
@@ -73,12 +72,10 @@ public class PullRequestCommitsFragment extends Fragment {
 			loadInitial(issue, resultLimit);
 			adapter.notifyDataChanged();
 		}, 200));
-		RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT,
-			RelativeLayout.LayoutParams.WRAP_CONTENT);
+		RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
 		params.setMargins(0, 0, 0, 0);
 		binding.pullToRefresh.setLayoutParams(params);
-		RelativeLayout.LayoutParams paramsProgressBar = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT,
-			RelativeLayout.LayoutParams.WRAP_CONTENT);
+		RelativeLayout.LayoutParams paramsProgressBar = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
 		paramsProgressBar.setMargins(0, 0, 0, 0);
 		binding.progressBar.setLayoutParams(paramsProgressBar);
 
@@ -110,9 +107,7 @@ public class PullRequestCommitsFragment extends Fragment {
 
 	private void loadInitial(IssueContext issue, int resultLimit) {
 
-		Call<List<Commit>> call = RetrofitClient.getApiInterface(ctx)
-			.repoGetPullRequestCommits(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(), 1,
-				resultLimit);
+		Call<List<Commit>> call = RetrofitClient.getApiInterface(ctx).repoGetPullRequestCommits(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(), 1, resultLimit);
 
 		call.enqueue(new Callback<>() {
 
@@ -162,9 +157,7 @@ public class PullRequestCommitsFragment extends Fragment {
 
 		binding.progressBar.setVisibility(View.VISIBLE);
 
-		Call<List<Commit>> call = RetrofitClient.getApiInterface(ctx)
-			.repoGetPullRequestCommits(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(), page,
-				resultLimit);
+		Call<List<Commit>> call = RetrofitClient.getApiInterface(ctx).repoGetPullRequestCommits(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(), page, resultLimit);
 
 		call.enqueue(new Callback<>() {
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java
index 6cefd41c..abe56bf9 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java
@@ -40,13 +40,11 @@ import retrofit2.Response;
 public class PullRequestsFragment extends Fragment {
 
 	public static boolean resumePullRequests = false;
-
+	private final String TAG = "PullRequestFragment";
 	private FragmentPullRequestsBinding fragmentPullRequestsBinding;
 	private Menu menu;
-
 	private List<PullRequest> prList;
 	private PullRequestsAdapter adapter;
-	private final String TAG = "PullRequestFragment";
 	private Context context;
 	private int pageSize = Constants.prPageInit;
 	private int resultLimit;
@@ -89,8 +87,7 @@ public class PullRequestsFragment extends Fragment {
 
 		}));
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentPullRequestsBinding.recyclerView.getContext(),
-			DividerItemDecoration.VERTICAL);
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentPullRequestsBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
 		fragmentPullRequestsBinding.recyclerView.setHasFixedSize(true);
 		fragmentPullRequestsBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 		fragmentPullRequestsBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
@@ -142,8 +139,7 @@ public class PullRequestsFragment extends Fragment {
 
 	private void loadInitial(String repoOwner, String repoName, int page, String prState, int resultLimit) {
 
-		Call<List<PullRequest>> call = RetrofitClient.getApiInterface(context)
-			.repoListPullRequests(repoOwner, repoName, prState, null, null, null, page, resultLimit);
+		Call<List<PullRequest>> call = RetrofitClient.getApiInterface(context).repoListPullRequests(repoOwner, repoName, prState, null, null, null, page, resultLimit);
 
 		call.enqueue(new Callback<>() {
 
@@ -187,8 +183,7 @@ public class PullRequestsFragment extends Fragment {
 
 		fragmentPullRequestsBinding.progressBar.setVisibility(View.VISIBLE);
 
-		Call<List<PullRequest>> call = RetrofitClient.getApiInterface(context)
-			.repoListPullRequests(repoOwner, repoName, prState, null, null, null, page, resultLimit);
+		Call<List<PullRequest>> call = RetrofitClient.getApiInterface(context).repoListPullRequests(repoOwner, repoName, prState, null, null, null, page, resultLimit);
 
 		call.enqueue(new Callback<>() {
 
@@ -268,8 +263,7 @@ public class PullRequestsFragment extends Fragment {
 			if(d == null || d.getTitle() == null || d.getBody() == null) {
 				continue;
 			}
-			if(d.getTitle().toLowerCase().contains(text) || d.getBody().toLowerCase().contains(text) || String.valueOf(d.getNumber())
-				.startsWith(text)) {
+			if(d.getTitle().toLowerCase().contains(text) || d.getBody().toLowerCase().contains(text) || String.valueOf(d.getNumber()).startsWith(text)) {
 				arr.add(d);
 			}
 		}
diff --git a/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java
index 3df9b888..db3c6dec 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java
@@ -57,6 +57,65 @@ import okhttp3.Response;
 
 public class ReleasesFragment extends Fragment {
 
+	public static String currentDownloadUrl = null;
+	ActivityResultLauncher<Intent> downloadLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+
+		if(result.getResultCode() == Activity.RESULT_OK && result.getData() != null) {
+
+			try {
+
+				NotificationCompat.Builder builder = new NotificationCompat.Builder(requireContext(), requireContext().getPackageName()).setContentTitle(getString(R.string.fileViewerNotificationTitleStarted))
+					.setContentText(getString(R.string.fileViewerNotificationDescriptionStarted, Uri.parse(currentDownloadUrl).getLastPathSegment())).setSmallIcon(R.drawable.gitnex_transparent)
+					.setPriority(NotificationCompat.PRIORITY_LOW).setChannelId(Constants.downloadNotificationChannelId).setOngoing(true);
+
+				int notificationId = Notifications.uniqueNotificationId(requireContext());
+
+				NotificationManager notificationManager = (NotificationManager) requireContext().getSystemService(Context.NOTIFICATION_SERVICE);
+				notificationManager.notify(notificationId, builder.build());
+
+				SSLContext sslContext = SSLContext.getInstance("TLS");
+				MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(requireContext());
+				sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom());
+
+				ApiKeyAuth auth = new ApiKeyAuth("header", "Authorization");
+				auth.setApiKey(((BaseActivity) requireActivity()).getAccount().getWebAuthorization());
+				OkHttpClient okHttpClient = new OkHttpClient.Builder().addInterceptor(auth).sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
+					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier())).build();
+
+				okHttpClient.newCall(new Request.Builder().url(currentDownloadUrl).build()).enqueue(new Callback() {
+
+					@Override
+					public void onFailure(@NonNull Call call, @NonNull IOException e) {
+
+						builder.setContentTitle(getString(R.string.fileViewerNotificationTitleFailed))
+							.setContentText(getString(R.string.fileViewerNotificationDescriptionFailed, Uri.parse(currentDownloadUrl).getLastPathSegment())).setOngoing(false);
+						notificationManager.notify(notificationId, builder.build());
+					}
+
+					@Override
+					public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
+
+						if(!response.isSuccessful() || response.body() == null) {
+							onFailure(call, new IOException());
+							return;
+						}
+
+						OutputStream outputStream = requireContext().getContentResolver().openOutputStream(result.getData().getData());
+
+						AppUtil.copyProgress(Objects.requireNonNull(response.body()).byteStream(), outputStream, 0, p -> {
+						});
+						builder.setContentTitle(getString(R.string.fileViewerNotificationTitleFinished))
+							.setContentText(getString(R.string.fileViewerNotificationDescriptionFinished, Uri.parse(currentDownloadUrl).getLastPathSegment())).setOngoing(false);
+						notificationManager.notify(notificationId, builder.build());
+					}
+				});
+			}
+			catch(NoSuchAlgorithmException | KeyManagementException e) {
+				throw new RuntimeException(e);
+			}
+		}
+
+	});
 	private ReleasesViewModel releasesViewModel;
 	private ReleasesAdapter adapter;
 	private TagsAdapter tagsAdapter;
@@ -66,8 +125,6 @@ public class ReleasesFragment extends Fragment {
 	private int page = 1;
 	private int pageReleases = 1;
 
-	public static String currentDownloadUrl = null;
-
 	public ReleasesFragment() {
 	}
 
@@ -77,6 +134,15 @@ public class ReleasesFragment extends Fragment {
 		return fragment;
 	}
 
+	private static int getReleaseIndex(String tag, List<Release> releases) {
+		for(Release release : releases) {
+			if(release.getTagName().equals(tag)) {
+				return releases.indexOf(release);
+			}
+		}
+		return -1;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -92,8 +158,7 @@ public class ReleasesFragment extends Fragment {
 
 		fragmentReleasesBinding.recyclerView.setHasFixedSize(true);
 		fragmentReleasesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentReleasesBinding.recyclerView.getContext(),
-			DividerItemDecoration.VERTICAL);
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentReleasesBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
 		fragmentReleasesBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 
 		fragmentReleasesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
@@ -136,8 +201,7 @@ public class ReleasesFragment extends Fragment {
 
 		releasesModel.getReleasesList(owner, repo, getContext()).observe(getViewLifecycleOwner(), releasesListMain -> {
 			if(!repository.isReleasesViewTypeIsTag()) {
-				adapter = new ReleasesAdapter(getContext(), releasesListMain, this::requestFileDownload, repository.getOwner(), repository.getName(),
-					fragmentReleasesBinding);
+				adapter = new ReleasesAdapter(getContext(), releasesListMain, this::requestFileDownload, repository.getOwner(), repository.getName(), fragmentReleasesBinding);
 				adapter.setLoadMoreListener(new ReleasesAdapter.OnLoadMoreListener() {
 
 					@Override
@@ -204,15 +268,6 @@ public class ReleasesFragment extends Fragment {
 
 	}
 
-	private static int getReleaseIndex(String tag, List<Release> releases) {
-		for(Release release : releases) {
-			if(release.getTagName().equals(tag)) {
-				return releases.indexOf(release);
-			}
-		}
-		return -1;
-	}
-
 	@Override
 	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 		if(!((BaseActivity) requireActivity()).getAccount().requiresVersion("1.15.0")) {
@@ -232,68 +287,4 @@ public class ReleasesFragment extends Fragment {
 		downloadLauncher.launch(intent);
 	}
 
-	ActivityResultLauncher<Intent> downloadLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
-
-		if(result.getResultCode() == Activity.RESULT_OK && result.getData() != null) {
-
-			try {
-
-				NotificationCompat.Builder builder = new NotificationCompat.Builder(requireContext(),
-					requireContext().getPackageName()).setContentTitle(getString(R.string.fileViewerNotificationTitleStarted))
-					.setContentText(getString(R.string.fileViewerNotificationDescriptionStarted, Uri.parse(currentDownloadUrl).getLastPathSegment()))
-					.setSmallIcon(R.drawable.gitnex_transparent).setPriority(NotificationCompat.PRIORITY_LOW)
-					.setChannelId(Constants.downloadNotificationChannelId).setOngoing(true);
-
-				int notificationId = Notifications.uniqueNotificationId(requireContext());
-
-				NotificationManager notificationManager = (NotificationManager) requireContext().getSystemService(Context.NOTIFICATION_SERVICE);
-				notificationManager.notify(notificationId, builder.build());
-
-				SSLContext sslContext = SSLContext.getInstance("TLS");
-				MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(requireContext());
-				sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom());
-
-				ApiKeyAuth auth = new ApiKeyAuth("header", "Authorization");
-				auth.setApiKey(((BaseActivity) requireActivity()).getAccount().getWebAuthorization());
-				OkHttpClient okHttpClient = new OkHttpClient.Builder().addInterceptor(auth)
-					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
-					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier())).build();
-
-				okHttpClient.newCall(new Request.Builder().url(currentDownloadUrl).build()).enqueue(new Callback() {
-
-					@Override
-					public void onFailure(@NonNull Call call, @NonNull IOException e) {
-
-						builder.setContentTitle(getString(R.string.fileViewerNotificationTitleFailed)).setContentText(
-								getString(R.string.fileViewerNotificationDescriptionFailed, Uri.parse(currentDownloadUrl).getLastPathSegment()))
-							.setOngoing(false);
-						notificationManager.notify(notificationId, builder.build());
-					}
-
-					@Override
-					public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
-
-						if(!response.isSuccessful() || response.body() == null) {
-							onFailure(call, new IOException());
-							return;
-						}
-
-						OutputStream outputStream = requireContext().getContentResolver().openOutputStream(result.getData().getData());
-
-						AppUtil.copyProgress(Objects.requireNonNull(response.body()).byteStream(), outputStream, 0, p -> {
-						});
-						builder.setContentTitle(getString(R.string.fileViewerNotificationTitleFinished)).setContentText(
-								getString(R.string.fileViewerNotificationDescriptionFinished, Uri.parse(currentDownloadUrl).getLastPathSegment()))
-							.setOngoing(false);
-						notificationManager.notify(notificationId, builder.build());
-					}
-				});
-			}
-			catch(NoSuchAlgorithmException | KeyManagementException e) {
-				throw new RuntimeException(e);
-			}
-		}
-
-	});
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
index 78a2045d..541878d8 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
@@ -168,8 +168,7 @@ public class RepoInfoFragment extends Fragment {
 
 			binding.repoMetaCreatedAt.setText(TimeHelper.formatTime(repoInfo.getCreatedAt(), locale, timeFormat, ctx));
 			if(timeFormat.equals("pretty")) {
-				binding.repoMetaCreatedAt.setOnClickListener(
-					new ClickListener(TimeHelper.customDateFormatForToastDateFormat(repoInfo.getCreatedAt()), ctx));
+				binding.repoMetaCreatedAt.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(repoInfo.getCreatedAt()), ctx));
 			}
 
 			String repoMetaUpdatedAt = TimeHelper.formatTime(repoInfo.getUpdatedAt(), locale, timeFormat, ctx);
@@ -236,8 +235,7 @@ public class RepoInfoFragment extends Fragment {
 			if(repoInfo.isFork()) {
 				binding.repoForkFrame.setVisibility(View.VISIBLE);
 				binding.repoForkFrame.setOnClickListener((v) -> {
-					Intent parent = new RepositoryContext(repoInfo.getParent(), requireContext()).getIntent(requireContext(),
-						RepoDetailActivity.class);
+					Intent parent = new RepositoryContext(repoInfo.getParent(), requireContext()).getIntent(requireContext(), RepoDetailActivity.class);
 					startActivity(parent);
 				});
 				binding.repoFork.setText(getString(R.string.repoForkOf, repoInfo.getParent().getFullName()));
@@ -246,8 +244,7 @@ public class RepoInfoFragment extends Fragment {
 				binding.repoForkFrame.setVisibility(View.GONE);
 			}
 
-			getFileContents(repository.getOwner(), repository.getName(), getResources().getString(R.string.defaultFilename),
-				repoInfo.getDefaultBranch());
+			getFileContents(repository.getOwner(), repository.getName(), getResources().getString(R.string.defaultFilename), repoInfo.getDefaultBranch());
 
 			pageContent.setVisibility(View.VISIBLE);
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java
index 56dabca3..4088b264 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java
@@ -28,12 +28,12 @@ import org.mian.gitnex.viewmodels.RepositoriesViewModel;
 
 public class RepositoriesByOrgFragment extends Fragment {
 
+	private static final String getOrgName = null;
 	private RepositoriesViewModel repositoriesViewModel;
 	private FragmentRepositoriesBinding fragmentRepositoriesBinding;
 	private ReposListAdapter adapter;
 	private int page = 1;
 	private int resultLimit;
-	private static final String getOrgName = null;
 	private String orgName;
 
 	public RepositoriesByOrgFragment() {
@@ -68,8 +68,7 @@ public class RepositoriesByOrgFragment extends Fragment {
 
 		fragmentRepositoriesBinding.recyclerView.setHasFixedSize(true);
 		fragmentRepositoriesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentRepositoriesBinding.recyclerView.getContext(),
-			DividerItemDecoration.VERTICAL);
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentRepositoriesBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
 		fragmentRepositoriesBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 
 		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
@@ -86,8 +85,6 @@ public class RepositoriesByOrgFragment extends Fragment {
 		return fragmentRepositoriesBinding.getRoot();
 	}
 
-	;
-
 	private void fetchDataAsync() {
 
 		repositoriesViewModel.getRepositories(page, resultLimit, "", "org", orgName, getContext()).observe(getViewLifecycleOwner(), reposListMain -> {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java
index 2629750d..94dc69af 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java
@@ -56,8 +56,7 @@ public class RepositoriesFragment extends Fragment {
 		fragmentRepositoriesBinding.recyclerView.setHasFixedSize(true);
 		fragmentRepositoriesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-		RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(
-			ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
+		RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
 		fragmentRepositoriesBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 
 		fragmentRepositoriesBinding.recyclerView.setPadding(0, 0, 0, 200);
@@ -76,43 +75,40 @@ public class RepositoriesFragment extends Fragment {
 		return fragmentRepositoriesBinding.getRoot();
 	}
 
-	;
-
 	private void fetchDataAsync() {
 
-		repositoriesViewModel.getRepositories(page, resultLimit, null, "repos", null, getContext())
-			.observe(getViewLifecycleOwner(), reposListMain -> {
+		repositoriesViewModel.getRepositories(page, resultLimit, null, "repos", null, getContext()).observe(getViewLifecycleOwner(), reposListMain -> {
 
-				adapter = new ReposListAdapter(reposListMain, getContext());
-				adapter.setLoadMoreListener(new ReposListAdapter.OnLoadMoreListener() {
+			adapter = new ReposListAdapter(reposListMain, getContext());
+			adapter.setLoadMoreListener(new ReposListAdapter.OnLoadMoreListener() {
 
-					@Override
-					public void onLoadMore() {
+				@Override
+				public void onLoadMore() {
 
-						page += 1;
-						repositoriesViewModel.loadMoreRepos(page, resultLimit, null, "repos", null, getContext(), adapter);
-						fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
-					}
-
-					@Override
-					public void onLoadFinished() {
-
-						fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
-					}
-				});
-
-				if(adapter.getItemCount() > 0) {
-					fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
-					fragmentRepositoriesBinding.noData.setVisibility(View.GONE);
-				}
-				else {
-					adapter.notifyDataChanged();
-					fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
-					fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
+					page += 1;
+					repositoriesViewModel.loadMoreRepos(page, resultLimit, null, "repos", null, getContext(), adapter);
+					fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
 				}
 
-				fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+				@Override
+				public void onLoadFinished() {
+
+					fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+				}
 			});
+
+			if(adapter.getItemCount() > 0) {
+				fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
+				fragmentRepositoriesBinding.noData.setVisibility(View.GONE);
+			}
+			else {
+				adapter.notifyDataChanged();
+				fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
+				fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
+			}
+
+			fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+		});
 	}
 
 	@Override
diff --git a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
index f416d89f..59a77fc0 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
@@ -117,8 +117,7 @@ public class SettingsFragment extends Fragment {
 			startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + requireActivity().getPackageName())));
 		}
 		catch(ActivityNotFoundException e) {
-			startActivity(
-				new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + requireActivity().getPackageName())));
+			startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + requireActivity().getPackageName())));
 		}
 	}
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java
index 536579a7..d49fd4f0 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java
@@ -56,8 +56,7 @@ public class StarredRepositoriesFragment extends Fragment {
 		fragmentRepositoriesBinding.recyclerView.setHasFixedSize(true);
 		fragmentRepositoriesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-		RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(
-			ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
+		RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
 		fragmentRepositoriesBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 
 		fragmentRepositoriesBinding.recyclerView.setPadding(0, 0, 0, 200);
@@ -76,43 +75,40 @@ public class StarredRepositoriesFragment extends Fragment {
 		return fragmentRepositoriesBinding.getRoot();
 	}
 
-	;
-
 	private void fetchDataAsync() {
 
-		repositoriesViewModel.getRepositories(page, resultLimit, "", "starredRepos", null, getContext())
-			.observe(getViewLifecycleOwner(), reposListMain -> {
+		repositoriesViewModel.getRepositories(page, resultLimit, "", "starredRepos", null, getContext()).observe(getViewLifecycleOwner(), reposListMain -> {
 
-				adapter = new ReposListAdapter(reposListMain, getContext());
-				adapter.setLoadMoreListener(new ReposListAdapter.OnLoadMoreListener() {
+			adapter = new ReposListAdapter(reposListMain, getContext());
+			adapter.setLoadMoreListener(new ReposListAdapter.OnLoadMoreListener() {
 
-					@Override
-					public void onLoadMore() {
+				@Override
+				public void onLoadMore() {
 
-						page += 1;
-						repositoriesViewModel.loadMoreRepos(page, resultLimit, "", "starredRepos", null, getContext(), adapter);
-						fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
-					}
-
-					@Override
-					public void onLoadFinished() {
-
-						fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
-					}
-				});
-
-				if(adapter.getItemCount() > 0) {
-					fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
-					fragmentRepositoriesBinding.noData.setVisibility(View.GONE);
-				}
-				else {
-					adapter.notifyDataChanged();
-					fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
-					fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
+					page += 1;
+					repositoriesViewModel.loadMoreRepos(page, resultLimit, "", "starredRepos", null, getContext(), adapter);
+					fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
 				}
 
-				fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+				@Override
+				public void onLoadFinished() {
+
+					fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+				}
 			});
+
+			if(adapter.getItemCount() > 0) {
+				fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
+				fragmentRepositoriesBinding.noData.setVisibility(View.GONE);
+			}
+			else {
+				adapter.notifyDataChanged();
+				fragmentRepositoriesBinding.recyclerView.setAdapter(adapter);
+				fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
+			}
+
+			fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+		});
 	}
 
 	@Override
diff --git a/app/src/main/java/org/mian/gitnex/fragments/TeamsByOrgFragment.java b/app/src/main/java/org/mian/gitnex/fragments/TeamsByOrgFragment.java
index e79ec3de..e6eedf54 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/TeamsByOrgFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/TeamsByOrgFragment.java
@@ -31,13 +31,12 @@ import org.mian.gitnex.viewmodels.TeamsByOrgViewModel;
 
 public class TeamsByOrgFragment extends Fragment {
 
-	private TeamsByOrgViewModel teamsByOrgViewModel;
+	private static final String orgNameF = "param2";
 	public static boolean resumeTeams = false;
-
+	private TeamsByOrgViewModel teamsByOrgViewModel;
 	private ProgressBar mProgressBar;
 	private RecyclerView mRecyclerView;
 	private TextView noDataTeams;
-	private static final String orgNameF = "param2";
 	private String orgName;
 	private OrganizationPermissions permissions;
 	private TeamsByOrgAdapter adapter;
diff --git a/app/src/main/java/org/mian/gitnex/fragments/WikiFragment.java b/app/src/main/java/org/mian/gitnex/fragments/WikiFragment.java
index b6933e85..83a0fc39 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/WikiFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/WikiFragment.java
@@ -60,8 +60,7 @@ public class WikiFragment extends Fragment {
 		fragmentWikiBinding.recyclerView.setHasFixedSize(true);
 		fragmentWikiBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-		RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(
-			ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
+		RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
 		fragmentWikiBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 
 		fragmentWikiBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
@@ -77,8 +76,6 @@ public class WikiFragment extends Fragment {
 		return fragmentWikiBinding.getRoot();
 	}
 
-	;
-
 	@Override
 	public void onResume() {
 		super.onResume();
@@ -100,8 +97,7 @@ public class WikiFragment extends Fragment {
 				public void onLoadMore() {
 
 					page += 1;
-					wikiViewModel.loadMoreWiki(repository.getOwner(), repository.getName(), page, resultLimit, getContext(), fragmentWikiBinding,
-						adapter);
+					wikiViewModel.loadMoreWiki(repository.getOwner(), repository.getName(), page, resultLimit, getContext(), fragmentWikiBinding, adapter);
 					fragmentWikiBinding.progressBar.setVisibility(View.VISIBLE);
 				}
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/profile/DetailFragment.java b/app/src/main/java/org/mian/gitnex/fragments/profile/DetailFragment.java
index fe79ff87..67c41eeb 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/profile/DetailFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/profile/DetailFragment.java
@@ -31,12 +31,11 @@ import retrofit2.Callback;
 
 public class DetailFragment extends Fragment {
 
-	private Context context;
-	private FragmentProfileDetailBinding binding;
+	private static final String usernameBundle = "";
 	Locale locale;
 	TinyDB tinyDb;
-
-	private static final String usernameBundle = "";
+	private Context context;
+	private FragmentProfileDetailBinding binding;
 	private String username;
 
 	public DetailFragment() {
@@ -104,8 +103,7 @@ public class DetailFragment extends Fragment {
 								binding.userLang.setText(locale.getDisplayLanguage());
 							}
 
-							PicassoService.getInstance(context).get().load(response.body().getAvatarUrl())
-								.transform(new RoundedTransformation(imgRadius, 0)).placeholder(R.drawable.loader_animated).resize(120, 120)
+							PicassoService.getInstance(context).get().load(response.body().getAvatarUrl()).transform(new RoundedTransformation(imgRadius, 0)).placeholder(R.drawable.loader_animated).resize(120, 120)
 								.centerCrop().into(binding.userAvatar);
 
 							PicassoService.getInstance(context).get().load(response.body().getAvatarUrl()).transform(new BlurTransformation(context))
@@ -126,8 +124,7 @@ public class DetailFragment extends Fragment {
 
 							binding.userJoinedOn.setText(TimeHelper.formatTime(response.body().getCreated(), locale, timeFormat, context));
 							if(timeFormat.equals("pretty")) {
-								binding.userJoinedOn.setOnClickListener(
-									new ClickListener(TimeHelper.customDateFormatForToastDateFormat(response.body().getCreated()), context));
+								binding.userJoinedOn.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(response.body().getCreated()), context));
 							}
 							break;
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/profile/FollowersFragment.java b/app/src/main/java/org/mian/gitnex/fragments/profile/FollowersFragment.java
index fa144d63..c67073f5 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/profile/FollowersFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/profile/FollowersFragment.java
@@ -37,16 +37,13 @@ import retrofit2.Response;
 
 public class FollowersFragment extends Fragment {
 
+	private static final String usernameBundle = "";
 	private Context context;
 	private FragmentProfileFollowersFollowingBinding fragmentProfileFollowersFollowingBinding;
-
 	private List<User> usersList;
 	private UsersAdapter adapter;
-
 	private int pageSize;
 	private int resultLimit;
-
-	private static final String usernameBundle = "";
 	private String username;
 
 	public FollowersFragment() {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/profile/FollowingFragment.java b/app/src/main/java/org/mian/gitnex/fragments/profile/FollowingFragment.java
index 2491dfc1..07bc3f49 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/profile/FollowingFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/profile/FollowingFragment.java
@@ -37,16 +37,13 @@ import retrofit2.Response;
 
 public class FollowingFragment extends Fragment {
 
+	private static final String usernameBundle = "";
 	private Context context;
 	private FragmentProfileFollowersFollowingBinding fragmentProfileFollowersFollowingBinding;
-
 	private List<User> usersList;
 	private UsersAdapter adapter;
-
 	private int pageSize;
 	private int resultLimit;
-
-	private static final String usernameBundle = "";
 	private String username;
 
 	public FollowingFragment() {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/profile/OrganizationsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/profile/OrganizationsFragment.java
index 99869106..6362d609 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/profile/OrganizationsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/profile/OrganizationsFragment.java
@@ -37,16 +37,13 @@ import retrofit2.Response;
 
 public class OrganizationsFragment extends Fragment {
 
+	private static final String usernameBundle = "";
 	private Context context;
 	private FragmentOrganizationsBinding fragmentOrganizationsBinding;
-
 	private List<Organization> organizationsList;
 	private OrganizationsListAdapter adapter;
-
 	private int pageSize;
 	private int resultLimit;
-
-	private static final String usernameBundle = "";
 	private String username;
 
 	public OrganizationsFragment() {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/profile/RepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/profile/RepositoriesFragment.java
index 73d7c91e..c0da27a9 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/profile/RepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/profile/RepositoriesFragment.java
@@ -37,16 +37,13 @@ import retrofit2.Response;
 
 public class RepositoriesFragment extends Fragment {
 
+	private static final String usernameBundle = "";
 	private Context context;
 	private FragmentRepositoriesBinding fragmentRepositoriesBinding;
-
 	private List<Repository> reposList;
 	private RepositoriesAdapter adapter;
-
 	private int pageSize;
 	private int resultLimit;
-
-	private static final String usernameBundle = "";
 	private String username;
 
 	public RepositoriesFragment() {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/profile/StarredRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/profile/StarredRepositoriesFragment.java
index 6a0ee0e8..f2de6b24 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/profile/StarredRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/profile/StarredRepositoriesFragment.java
@@ -37,16 +37,13 @@ import retrofit2.Response;
 
 public class StarredRepositoriesFragment extends Fragment {
 
+	private static final String usernameBundle = "";
 	private Context context;
 	private FragmentRepositoriesBinding fragmentRepositoriesBinding;
-
 	private List<Repository> reposList;
 	private StarredRepositoriesAdapter adapter;
-
 	private int pageSize;
 	private int resultLimit;
-
-	private static final String usernameBundle = "";
 	private String username;
 
 	public StarredRepositoriesFragment() {
diff --git a/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java b/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
index 62f56b79..254d202a 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
@@ -21,16 +21,14 @@ import org.mian.gitnex.helpers.contexts.RepositoryContext;
 public class AlertDialogs {
 
 	public static void authorizationTokenRevokedDialog(final Context context) {
-		new AlertDialog.Builder(context).setTitle(R.string.alertDialogTokenRevokedTitle).setMessage(R.string.alertDialogTokenRevokedMessage)
-			.setCancelable(true).setIcon(R.drawable.ic_warning).setNeutralButton(R.string.cancelButton, null)
-			.setPositiveButton(R.string.navLogout, (dialog, which) -> AppUtil.logout(context)).show();
+		new AlertDialog.Builder(context).setTitle(R.string.alertDialogTokenRevokedTitle).setMessage(R.string.alertDialogTokenRevokedMessage).setCancelable(true).setIcon(R.drawable.ic_warning)
+			.setNeutralButton(R.string.cancelButton, null).setPositiveButton(R.string.navLogout, (dialog, which) -> AppUtil.logout(context)).show();
 	}
 
-	public static void labelDeleteDialog(final Context context, final String labelTitle, final String labelId, String type, String orgName,
-		RepositoryContext repository) {
+	public static void labelDeleteDialog(final Context context, final String labelTitle, final String labelId, String type, String orgName, RepositoryContext repository) {
 
-		new AlertDialog.Builder(context).setTitle(context.getString(R.string.deleteGenericTitle, labelTitle)).setMessage(R.string.labelDeleteMessage)
-			.setIcon(R.drawable.ic_delete).setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> {
+		new AlertDialog.Builder(context).setTitle(context.getString(R.string.deleteGenericTitle, labelTitle)).setMessage(R.string.labelDeleteMessage).setIcon(R.drawable.ic_delete)
+			.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> {
 
 				Intent intent = new Intent(context, CreateLabelActivity.class);
 				intent.putExtra("labelId", labelId);
@@ -46,47 +44,37 @@ public class AlertDialogs {
 
 	public static void collaboratorRemoveDialog(final Context context, final String userNameMain, RepositoryContext repository) {
 
-		new AlertDialog.Builder(context).setTitle(context.getString(R.string.removeCollaboratorDialogTitle, userNameMain))
-			.setMessage(R.string.removeCollaboratorMessage).setPositiveButton(R.string.removeButton,
-				(dialog, whichButton) -> CollaboratorActions.deleteCollaborator(context, userNameMain, repository))
-			.setNeutralButton(R.string.cancelButton, null).show();
+		new AlertDialog.Builder(context).setTitle(context.getString(R.string.removeCollaboratorDialogTitle, userNameMain)).setMessage(R.string.removeCollaboratorMessage)
+			.setPositiveButton(R.string.removeButton, (dialog, whichButton) -> CollaboratorActions.deleteCollaborator(context, userNameMain, repository)).setNeutralButton(R.string.cancelButton, null).show();
 
 	}
 
 	public static void addMemberDialog(final Context context, final String userNameMain, int teamId) {
 
-		new AlertDialog.Builder(context).setTitle(context.getResources().getString(R.string.addTeamMember, userNameMain))
-			.setMessage(R.string.addTeamMemberMessage)
-			.setPositiveButton(R.string.addButton, (dialog, whichButton) -> TeamActions.addTeamMember(context, userNameMain, teamId))
-			.setNeutralButton(R.string.cancelButton, null).show();
+		new AlertDialog.Builder(context).setTitle(context.getResources().getString(R.string.addTeamMember, userNameMain)).setMessage(R.string.addTeamMemberMessage)
+			.setPositiveButton(R.string.addButton, (dialog, whichButton) -> TeamActions.addTeamMember(context, userNameMain, teamId)).setNeutralButton(R.string.cancelButton, null).show();
 
 	}
 
 	public static void removeMemberDialog(final Context context, final String userNameMain, int teamId) {
 
-		new AlertDialog.Builder(context).setTitle(context.getResources().getString(R.string.removeTeamMember, userNameMain))
-			.setMessage(R.string.removeTeamMemberMessage)
-			.setPositiveButton(R.string.removeButton, (dialog, whichButton) -> TeamActions.removeTeamMember(context, userNameMain, teamId))
-			.setNeutralButton(R.string.cancelButton, null).show();
+		new AlertDialog.Builder(context).setTitle(context.getResources().getString(R.string.removeTeamMember, userNameMain)).setMessage(R.string.removeTeamMemberMessage)
+			.setPositiveButton(R.string.removeButton, (dialog, whichButton) -> TeamActions.removeTeamMember(context, userNameMain, teamId)).setNeutralButton(R.string.cancelButton, null).show();
 
 	}
 
 	public static void addRepoDialog(final Context context, final String orgName, String repo, int teamId, String teamName) {
 
-		new AlertDialog.Builder(context).setTitle(context.getResources().getString(R.string.addTeamMember, repo))
-			.setMessage(context.getResources().getString(R.string.repoAddToTeamMessage, repo, orgName, teamName))
-			.setPositiveButton(context.getResources().getString(R.string.addButton),
-				(dialog, whichButton) -> TeamActions.addTeamRepo(context, orgName, teamId, repo))
+		new AlertDialog.Builder(context).setTitle(context.getResources().getString(R.string.addTeamMember, repo)).setMessage(context.getResources().getString(R.string.repoAddToTeamMessage, repo, orgName, teamName))
+			.setPositiveButton(context.getResources().getString(R.string.addButton), (dialog, whichButton) -> TeamActions.addTeamRepo(context, orgName, teamId, repo))
 			.setNeutralButton(context.getResources().getString(R.string.cancelButton), null).show();
 
 	}
 
 	public static void removeRepoDialog(final Context context, final String orgName, String repo, int teamId, String teamName) {
 
-		new AlertDialog.Builder(context).setTitle(context.getResources().getString(R.string.removeTeamMember, repo))
-			.setMessage(context.getResources().getString(R.string.repoRemoveTeamMessage, repo, teamName))
-			.setPositiveButton(context.getResources().getString(R.string.removeButton),
-				(dialog, whichButton) -> TeamActions.removeTeamRepo(context, orgName, teamId, repo))
+		new AlertDialog.Builder(context).setTitle(context.getResources().getString(R.string.removeTeamMember, repo)).setMessage(context.getResources().getString(R.string.repoRemoveTeamMessage, repo, teamName))
+			.setPositiveButton(context.getResources().getString(R.string.removeButton), (dialog, whichButton) -> TeamActions.removeTeamRepo(context, orgName, teamId, repo))
 			.setNeutralButton(context.getResources().getString(R.string.cancelButton), null).show();
 
 	}
diff --git a/app/src/main/java/org/mian/gitnex/helpers/AppUtil.java b/app/src/main/java/org/mian/gitnex/helpers/AppUtil.java
index c9b23bd3..2f4ecf07 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/AppUtil.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/AppUtil.java
@@ -49,6 +49,28 @@ import java.util.regex.Pattern;
 
 public class AppUtil {
 
+	private static final HashMap<String[], FileType> extensions = new HashMap<>();
+	public static Typeface typeface;
+
+	static {
+
+		extensions.put(new String[]{"jpg", "jpeg", "gif", "png", "ico", "tif", "tiff", "bmp"}, FileType.IMAGE);
+		extensions.put(new String[]{"mp3", "wav", "opus", "flac", "wma", "aac", "m4a", "oga", "mpc", "ogg"}, FileType.AUDIO);
+		extensions.put(new String[]{"mp4", "mkv", "avi", "mov", "wmv", "qt", "mts", "m2ts", "webm", "flv", "ogv", "amv", "mpg", "mpeg", "mpv", "m4v", "3gp", "wmv"}, FileType.VIDEO);
+		extensions.put(new String[]{"doc", "docx", "ppt", "pptx", "xls", "xlsx", "xlsm", "odt", "ott", "odf", "ods", "ots", "odg", "otg", "odp", "otp", "bin", "psd", "xcf", "pdf"}, FileType.DOCUMENT);
+		extensions.put(new String[]{"exe", "msi", "jar", "dmg", "deb", "apk"}, FileType.EXECUTABLE);
+		extensions.put(
+			new String[]{"txt", "md", "json", "java", "go", "php", "c", "cc", "cpp", "h", "cxx", "cyc", "m", "cs", "bash", "sh", "bsh", "cv", "python", "perl", "pm", "rb", "ruby", "javascript", "coffee", "rc", "rs",
+				"rust", "basic", "clj", "css", "dart", "lisp", "erl", "hs", "lsp", "rkt", "ss", "llvm", "ll", "lua", "matlab", "pascal", "r", "scala", "sql", "latex", "tex", "vb", "vbs", "vhd", "tcl", "wiki.meta",
+				"yaml", "yml", "markdown", "xml", "proto", "regex", "py", "pl", "js", "html", "htm", "volt", "ini", "htaccess", "conf", "gitignore", "gradle", "txt", "properties", "bat", "twig", "cvs", "cmake", "in",
+				"info", "spec", "m4", "am", "dist", "pam", "hx", "ts", "kt", "kts"}, FileType.TEXT);
+		extensions.put(new String[]{"ttf", "otf", "woff", "woff2", "ttc", "eot"}, FileType.FONT);
+	}
+
+	// AppUtil should not be instantiated.
+	private AppUtil() {
+	}
+
 	public static void logout(Context ctx) {
 		TinyDB tinyDB = TinyDB.getInstance(ctx);
 
@@ -77,35 +99,6 @@ public class AppUtil {
 		}
 	}
 
-	public enum FileType {IMAGE, AUDIO, VIDEO, DOCUMENT, TEXT, EXECUTABLE, FONT, UNKNOWN}
-
-	private static final HashMap<String[], FileType> extensions = new HashMap<>();
-
-	// AppUtil should not be instantiated.
-	private AppUtil() {
-	}
-
-	static {
-
-		extensions.put(new String[]{"jpg", "jpeg", "gif", "png", "ico", "tif", "tiff", "bmp"}, FileType.IMAGE);
-		extensions.put(new String[]{"mp3", "wav", "opus", "flac", "wma", "aac", "m4a", "oga", "mpc", "ogg"}, FileType.AUDIO);
-		extensions.put(
-			new String[]{"mp4", "mkv", "avi", "mov", "wmv", "qt", "mts", "m2ts", "webm", "flv", "ogv", "amv", "mpg", "mpeg", "mpv", "m4v", "3gp",
-				"wmv"}, FileType.VIDEO);
-		extensions.put(
-			new String[]{"doc", "docx", "ppt", "pptx", "xls", "xlsx", "xlsm", "odt", "ott", "odf", "ods", "ots", "odg", "otg", "odp", "otp", "bin",
-				"psd", "xcf", "pdf"}, FileType.DOCUMENT);
-		extensions.put(new String[]{"exe", "msi", "jar", "dmg", "deb", "apk"}, FileType.EXECUTABLE);
-		extensions.put(
-			new String[]{"txt", "md", "json", "java", "go", "php", "c", "cc", "cpp", "h", "cxx", "cyc", "m", "cs", "bash", "sh", "bsh", "cv",
-				"python", "perl", "pm", "rb", "ruby", "javascript", "coffee", "rc", "rs", "rust", "basic", "clj", "css", "dart", "lisp", "erl", "hs",
-				"lsp", "rkt", "ss", "llvm", "ll", "lua", "matlab", "pascal", "r", "scala", "sql", "latex", "tex", "vb", "vbs", "vhd", "tcl",
-				"wiki.meta", "yaml", "yml", "markdown", "xml", "proto", "regex", "py", "pl", "js", "html", "htm", "volt", "ini", "htaccess", "conf",
-				"gitignore", "gradle", "txt", "properties", "bat", "twig", "cvs", "cmake", "in", "info", "spec", "m4", "am", "dist", "pam", "hx",
-				"ts", "kt", "kts"}, FileType.TEXT);
-		extensions.put(new String[]{"ttf", "otf", "woff", "woff2", "ttc", "eot"}, FileType.FONT);
-	}
-
 	public static FileType getFileType(String extension) {
 
 		if(extension != null && !extension.isEmpty()) {
@@ -127,8 +120,7 @@ public class AppUtil {
 		return NetworkStatusObserver.getInstance(context).hasNetworkConnection();
 	}
 
-	public static void copyProgress(InputStream inputStream, OutputStream outputStream, long totalSize, ProgressListener progressListener) throws
-		IOException {
+	public static void copyProgress(InputStream inputStream, OutputStream outputStream, long totalSize, ProgressListener progressListener) throws IOException {
 
 		byte[] buffer = new byte[4096];
 		int read;
@@ -162,18 +154,6 @@ public class AppUtil {
 		progressListener.onActionFinished();
 	}
 
-	public interface ProgressListener {
-
-		default void onActionStarted() {
-		}
-
-		default void onActionFinished() {
-		}
-
-		void onProgressChanged(short progress);
-
-	}
-
 	public static int getAppBuildNo(Context context) {
 
 		try {
@@ -221,14 +201,6 @@ public class AppUtil {
 		return str.matches("\\d+");
 	}
 
-	public int getResponseStatusCode(String u) throws Exception {
-
-		URL url = new URL(u);
-		HttpURLConnection http = (HttpURLConnection) url.openConnection();
-		return (http.getResponseCode());
-
-	}
-
 	public static void setAppLocale(Resources resource, String locCode) {
 
 		DisplayMetrics dm = resource.getDisplayMetrics();
@@ -410,10 +382,8 @@ public class AppUtil {
 
 		try {
 			if(tinyDB.getBoolean("useCustomTabs")) {
-				new CustomTabsIntent.Builder().setDefaultColorSchemeParams(
-					new CustomTabColorSchemeParams.Builder().setToolbarColor(getColorFromAttribute(context, R.attr.primaryBackgroundColor))
-						.setNavigationBarColor(getColorFromAttribute(context, R.attr.primaryBackgroundColor))
-						.setSecondaryToolbarColor(R.attr.primaryTextColor).build()).build().launchUrl(context, Uri.parse(url));
+				new CustomTabsIntent.Builder().setDefaultColorSchemeParams(new CustomTabColorSchemeParams.Builder().setToolbarColor(getColorFromAttribute(context, R.attr.primaryBackgroundColor))
+					.setNavigationBarColor(getColorFromAttribute(context, R.attr.primaryBackgroundColor)).setSecondaryToolbarColor(R.attr.primaryTextColor).build()).build().launchUrl(context, Uri.parse(url));
 			}
 			else {
 				Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
@@ -456,8 +426,6 @@ public class AppUtil {
 		return Uri.parse(scheme + raw);
 	}
 
-	public static Typeface typeface;
-
 	public static Typeface getTypeface(Context context) {
 		if(typeface == null) {
 			switch(TinyDB.getInstance(context).getInt("customFontId", -1)) {
@@ -475,4 +443,26 @@ public class AppUtil {
 		return typeface;
 	}
 
+	public int getResponseStatusCode(String u) throws Exception {
+
+		URL url = new URL(u);
+		HttpURLConnection http = (HttpURLConnection) url.openConnection();
+		return (http.getResponseCode());
+
+	}
+
+	public enum FileType {IMAGE, AUDIO, VIDEO, DOCUMENT, TEXT, EXECUTABLE, FONT, UNKNOWN}
+
+	public interface ProgressListener {
+
+		default void onActionStarted() {
+		}
+
+		default void onActionFinished() {
+		}
+
+		void onProgressChanged(short progress);
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/ClickListener.java b/app/src/main/java/org/mian/gitnex/helpers/ClickListener.java
index 868c9146..1260b811 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/ClickListener.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/ClickListener.java
@@ -13,8 +13,8 @@ import org.mian.gitnex.R;
 
 public class ClickListener implements View.OnClickListener {
 
-	private String infoText;
-	private Context mCtx;
+	private final String infoText;
+	private final Context mCtx;
 
 	public ClickListener(String infoText, Context mCtx) {
 
diff --git a/app/src/main/java/org/mian/gitnex/helpers/Constants.java b/app/src/main/java/org/mian/gitnex/helpers/Constants.java
index 96fcf6c6..feb67d9b 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/Constants.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/Constants.java
@@ -9,41 +9,31 @@ import org.mian.gitnex.activities.BaseActivity;
 
 public class Constants {
 
-	public static int getCurrentResultLimit(Context context) {
-		return ((BaseActivity) context).getAccount().requiresVersion("1.15") ? ((BaseActivity) context).getAccount().getDefaultPageLimit() :
-			((BaseActivity) context).getAccount().getMaxPageLimit();
-	}
-
 	// issues variables
 	public static final int issuesPageInit = 1;
 	public static final String issuesRequestType = "issues";
-
 	// pull request
 	public static final int prPageInit = 1;
-
 	// drafts
 	public static final String draftTypeComment = "comment";
 	public static final String draftTypeIssue = "Issue";
 	public static final String draftTypePull = "Pull";
-
 	// polling - notifications
 	public static final int minimumPollingDelay = 1;
 	public static final int defaultPollingDelay = 15;
 	public static final int maximumPollingDelay = 720;
-
 	// public organizations
 	public static final int publicOrganizationsPageInit = 1;
-
 	public static final int maximumFileViewerSize = 3 * 1024 * 1024;
-
 	public static final String mainNotificationChannelId = "main_channel";
 	public static final String downloadNotificationChannelId = "dl_channel";
-
 	public static final long[] defaultVibrationPattern = new long[]{1000, 1000};
-
 	public static final String[] fallbackReactions = new String[]{"+1", "-1", "laugh", "hooray", "confused", "heart", "rocket", "eyes"};
-
 	// work managers
 	public static final String notificationsWorkerId = "notifications_worker";
 
+	public static int getCurrentResultLimit(Context context) {
+		return ((BaseActivity) context).getAccount().requiresVersion("1.15") ? ((BaseActivity) context).getAccount().getDefaultPageLimit() : ((BaseActivity) context).getAccount().getMaxPageLimit();
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/FileDiffView.java b/app/src/main/java/org/mian/gitnex/helpers/FileDiffView.java
index 28111096..e389c09a 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/FileDiffView.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/FileDiffView.java
@@ -11,89 +11,12 @@ import java.util.List;
 
 public class FileDiffView implements Serializable {
 
-	private String fileNewName;
-	private String fileOldName;
-	private String diffType;
-	private String fileInfo;
-	private Stats stats;
-	private List<Content> contents;
-
-	public static class Stats implements Serializable {
-
-		private int lineAdded;
-		private int lineRemoved;
-
-		public Stats(int added, int removed) {
-
-			this.lineAdded = added;
-			this.lineRemoved = removed;
-		}
-
-		public int getAdded() {
-
-			return lineAdded;
-		}
-
-		public int getRemoved() {
-
-			return lineRemoved;
-		}
-
-		public String toString() {
-
-			return "+" + this.lineAdded + ", -" + this.lineRemoved;
-		}
-
-	}
-
-	public static class Content implements Serializable {
-
-		private int lineAdded;
-		private int lineRemoved;
-		private int oldLineStart;
-		private int newLineStart;
-		private String raw;
-
-		public Content(String content) {
-
-			this.raw = content;
-		}
-
-		public Content(String content, int oldStart, int newStart, int removed, int added) {
-
-			this.raw = content;
-			this.lineAdded = added;
-			this.lineRemoved = removed;
-			this.oldLineStart = oldStart;
-			this.newLineStart = newStart;
-		}
-
-		public String getRaw() {
-
-			return raw;
-		}
-
-		public int getLineAdded() {
-
-			return this.lineAdded;
-		}
-
-		public int getLineRemoved() {
-
-			return this.lineRemoved;
-		}
-
-		public int getOldLineStart() {
-
-			return this.oldLineStart;
-		}
-
-		public int getNewLineStart() {
-
-			return this.newLineStart;
-		}
-
-	}
+	private final String fileNewName;
+	private final String fileOldName;
+	private final String diffType;
+	private final String fileInfo;
+	private final Stats stats;
+	private final List<Content> contents;
 
 	public FileDiffView(String oldName, String newName, String diffType, String fileInfo, List<Content> fileContents) {
 
@@ -159,4 +82,81 @@ public class FileDiffView implements Serializable {
 		return this.contents;
 	}
 
+	public static class Stats implements Serializable {
+
+		private int lineAdded;
+		private int lineRemoved;
+
+		public Stats(int added, int removed) {
+
+			this.lineAdded = added;
+			this.lineRemoved = removed;
+		}
+
+		public int getAdded() {
+
+			return lineAdded;
+		}
+
+		public int getRemoved() {
+
+			return lineRemoved;
+		}
+
+		public String toString() {
+
+			return "+" + this.lineAdded + ", -" + this.lineRemoved;
+		}
+
+	}
+
+	public static class Content implements Serializable {
+
+		private int lineAdded;
+		private int lineRemoved;
+		private int oldLineStart;
+		private int newLineStart;
+		private final String raw;
+
+		public Content(String content) {
+
+			this.raw = content;
+		}
+
+		public Content(String content, int oldStart, int newStart, int removed, int added) {
+
+			this.raw = content;
+			this.lineAdded = added;
+			this.lineRemoved = removed;
+			this.oldLineStart = oldStart;
+			this.newLineStart = newStart;
+		}
+
+		public String getRaw() {
+
+			return raw;
+		}
+
+		public int getLineAdded() {
+
+			return this.lineAdded;
+		}
+
+		public int getLineRemoved() {
+
+			return this.lineRemoved;
+		}
+
+		public int getOldLineStart() {
+
+			return this.oldLineStart;
+		}
+
+		public int getNewLineStart() {
+
+			return this.newLineStart;
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/Markdown.java b/app/src/main/java/org/mian/gitnex/helpers/Markdown.java
index 969197fb..8453b4ac 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/Markdown.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/Markdown.java
@@ -79,8 +79,7 @@ public class Markdown {
 
 	private static final Timeout OBJECT_POOL_CLAIM_TIMEOUT = new Timeout(240, TimeUnit.SECONDS);
 
-	private static final ExecutorService executorService = new ThreadPoolExecutor(MAX_THREAD_POOL_SIZE, MAX_THREAD_POOL_SIZE, 0, TimeUnit.SECONDS,
-		new LinkedBlockingQueue<>());
+	private static final ExecutorService executorService = new ThreadPoolExecutor(MAX_THREAD_POOL_SIZE, MAX_THREAD_POOL_SIZE, 0, TimeUnit.SECONDS, new LinkedBlockingQueue<>());
 
 	private static final Pool<Renderer> rendererPool;
 	private static final Pool<RecyclerViewRenderer> rvRendererPool;
@@ -176,15 +175,12 @@ public class Markdown {
 
 		private void setup() {
 
-			Prism4jTheme prism4jTheme =
-				AppUtil.getColorFromAttribute(context, R.attr.isDark) == 1 ? Prism4jThemeDarkula.create() : Prism4jThemeDefault.create();
+			Prism4jTheme prism4jTheme = AppUtil.getColorFromAttribute(context, R.attr.isDark) == 1 ? Prism4jThemeDarkula.create() : Prism4jThemeDefault.create();
 
-			Markwon.Builder builder = Markwon.builder(context).usePlugin(CorePlugin.create()).usePlugin(HtmlPlugin.create())
-				.usePlugin(LinkifyPlugin.create(true)).usePlugin(SoftBreakAddsNewLinePlugin.create()).usePlugin(TablePlugin.create(context))
-				.usePlugin(MovementMethodPlugin.create(TableAwareMovementMethod.create())).usePlugin(TaskListPlugin.create(context))
-				.usePlugin(StrikethroughPlugin.create()).usePlugin(PicassoImagesPlugin.create(PicassoService.getInstance(context).get())).usePlugin(
-					SyntaxHighlightPlugin.create(new Prism4j(MainGrammarLocator.getInstance()), prism4jTheme,
-						MainGrammarLocator.DEFAULT_FALLBACK_LANGUAGE)).usePlugin(new AbstractMarkwonPlugin() {
+			Markwon.Builder builder = Markwon.builder(context).usePlugin(CorePlugin.create()).usePlugin(HtmlPlugin.create()).usePlugin(LinkifyPlugin.create(true)).usePlugin(SoftBreakAddsNewLinePlugin.create())
+				.usePlugin(TablePlugin.create(context)).usePlugin(MovementMethodPlugin.create(TableAwareMovementMethod.create())).usePlugin(TaskListPlugin.create(context)).usePlugin(StrikethroughPlugin.create())
+				.usePlugin(PicassoImagesPlugin.create(PicassoService.getInstance(context).get()))
+				.usePlugin(SyntaxHighlightPlugin.create(new Prism4j(MainGrammarLocator.getInstance()), prism4jTheme, MainGrammarLocator.DEFAULT_FALLBACK_LANGUAGE)).usePlugin(new AbstractMarkwonPlugin() {
 
 					private Typeface tf;
 
@@ -287,19 +283,14 @@ public class Markdown {
 				linkPostProcessor.repository = repository;
 			}
 
-			Prism4jTheme prism4jTheme =
-				AppUtil.getColorFromAttribute(context, R.attr.isDark) == 1 ? Prism4jThemeDarkula.create() : Prism4jThemeDefault.create();
+			Prism4jTheme prism4jTheme = AppUtil.getColorFromAttribute(context, R.attr.isDark) == 1 ? Prism4jThemeDarkula.create() : Prism4jThemeDefault.create();
 
-			final InlineParserFactory inlineParserFactory = MarkwonInlineParser.factoryBuilder().addInlineProcessor(new IssueInlineProcessor())
-				.addInlineProcessor(new UserInlineProcessor()).build();
+			final InlineParserFactory inlineParserFactory = MarkwonInlineParser.factoryBuilder().addInlineProcessor(new IssueInlineProcessor()).addInlineProcessor(new UserInlineProcessor()).build();
 
-			Markwon.Builder builder = Markwon.builder(context).usePlugin(CorePlugin.create()).usePlugin(HtmlPlugin.create())
-				.usePlugin(LinkifyPlugin.create(true)) // TODO not working
-				.usePlugin(SoftBreakAddsNewLinePlugin.create()).usePlugin(TableEntryPlugin.create(context))
-				.usePlugin(MovementMethodPlugin.create(TableAwareMovementMethod.create())).usePlugin(TaskListPlugin.create(context))
-				.usePlugin(StrikethroughPlugin.create()).usePlugin(PicassoImagesPlugin.create(PicassoService.getInstance(context).get())).usePlugin(
-					SyntaxHighlightPlugin.create(new Prism4j(MainGrammarLocator.getInstance()), prism4jTheme,
-						MainGrammarLocator.DEFAULT_FALLBACK_LANGUAGE)).usePlugin(new AbstractMarkwonPlugin() {
+			Markwon.Builder builder = Markwon.builder(context).usePlugin(CorePlugin.create()).usePlugin(HtmlPlugin.create()).usePlugin(LinkifyPlugin.create(true)) // TODO not working
+				.usePlugin(SoftBreakAddsNewLinePlugin.create()).usePlugin(TableEntryPlugin.create(context)).usePlugin(MovementMethodPlugin.create(TableAwareMovementMethod.create()))
+				.usePlugin(TaskListPlugin.create(context)).usePlugin(StrikethroughPlugin.create()).usePlugin(PicassoImagesPlugin.create(PicassoService.getInstance(context).get()))
+				.usePlugin(SyntaxHighlightPlugin.create(new Prism4j(MainGrammarLocator.getInstance()), prism4jTheme, MainGrammarLocator.DEFAULT_FALLBACK_LANGUAGE)).usePlugin(new AbstractMarkwonPlugin() {
 
 					private final Context context = RecyclerViewRenderer.this.context;
 					private Typeface tf;
@@ -362,8 +353,7 @@ public class Markdown {
 								else {
 									repo = new String[]{repoLocal.getOwner(), repoLocal.getName()};
 								}
-								Intent i = new IssueContext(new RepositoryContext(repo[0], repo[1], context), Integer.parseInt(index),
-									null).getIntent(context, IssueDetailActivity.class);
+								Intent i = new IssueContext(new RepositoryContext(repo[0], repo[1], context), Integer.parseInt(index), null).getIntent(context, IssueDetailActivity.class);
 
 								if(link.contains("/")) {
 									i.putExtra("openedFromLink", "true");
@@ -398,9 +388,8 @@ public class Markdown {
 
 		private void setupAdapter() {
 
-			adapter = MarkwonAdapter.builderTextViewIsRoot(R.layout.custom_markdown_adapter).include(TableBlock.class, TableEntry.create(
-					builder2 -> builder2.tableLayout(R.layout.custom_markdown_table, R.id.table_layout)
-						.textLayoutIsRoot(R.layout.custom_markdown_adapter)))
+			adapter = MarkwonAdapter.builderTextViewIsRoot(R.layout.custom_markdown_adapter)
+				.include(TableBlock.class, TableEntry.create(builder2 -> builder2.tableLayout(R.layout.custom_markdown_table, R.id.table_layout).textLayoutIsRoot(R.layout.custom_markdown_adapter)))
 				.include(FencedCodeBlock.class, SimpleEntry.create(R.layout.custom_markdown_code_block, R.id.textCodeBlock)).build();
 		}
 
@@ -520,8 +509,8 @@ public class Markdown {
 		private class LinkPostProcessor implements PostProcessor {
 
 			private final String commentText;
-			private String instanceUrl;
 			private final Context context;
+			private String instanceUrl;
 			private RepositoryContext repository;
 
 			public LinkPostProcessor(String commentText) {
@@ -560,8 +549,7 @@ public class Markdown {
 				Node lastNode = textNode;
 				boolean foundAny = false;
 
-				final Pattern patternIssue = Pattern.compile(
-					instanceUrl + "([^/]+/[^/]+)/(?:issues|pulls)/(\\d+)(?:(?:/#|#)(issue-\\d+|issuecomment-\\d+)|)", Pattern.MULTILINE);
+				final Pattern patternIssue = Pattern.compile(instanceUrl + "([^/]+/[^/]+)/(?:issues|pulls)/(\\d+)(?:(?:/#|#)(issue-\\d+|issuecomment-\\d+)|)", Pattern.MULTILINE);
 				final Matcher matcherIssue = patternIssue.matcher(literal);
 
 				final Pattern patternCommit = Pattern.compile(instanceUrl + "([^/]+/[^/]+)/commit/([a-z0-9_]+)(?!`|\\)|\\S+)", Pattern.MULTILINE);
diff --git a/app/src/main/java/org/mian/gitnex/helpers/NetworkStatusObserver.java b/app/src/main/java/org/mian/gitnex/helpers/NetworkStatusObserver.java
index f2fe47e7..e4dc47e3 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/NetworkStatusObserver.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/NetworkStatusObserver.java
@@ -27,8 +27,7 @@ public class NetworkStatusObserver {
 
 		ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
 
-		NetworkRequest networkRequest = new NetworkRequest.Builder().addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-			.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED).build();
+		NetworkRequest networkRequest = new NetworkRequest.Builder().addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET).addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED).build();
 
 		cm.requestNetwork(networkRequest, new ConnectivityManager.NetworkCallback() {
 
@@ -75,6 +74,20 @@ public class NetworkStatusObserver {
 		}
 	}
 
+	public static NetworkStatusObserver getInstance(Context context) {
+
+		if(networkStatusObserver == null) {
+			synchronized(NetworkStatusObserver.class) {
+				if(networkStatusObserver == null) {
+					networkStatusObserver = new NetworkStatusObserver(context);
+				}
+			}
+		}
+
+		return networkStatusObserver;
+
+	}
+
 	private void networkStatusChanged() {
 		boolean hasNetworkConnection = hasNetworkConnection();
 
@@ -102,18 +115,4 @@ public class NetworkStatusObserver {
 
 	}
 
-	public static NetworkStatusObserver getInstance(Context context) {
-
-		if(networkStatusObserver == null) {
-			synchronized(NetworkStatusObserver.class) {
-				if(networkStatusObserver == null) {
-					networkStatusObserver = new NetworkStatusObserver(context);
-				}
-			}
-		}
-
-		return networkStatusObserver;
-
-	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/Path.java b/app/src/main/java/org/mian/gitnex/helpers/Path.java
index dba4c5e7..acfbb666 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/Path.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/Path.java
@@ -24,6 +24,14 @@ public class Path {
 
 	}
 
+	public static Path of(String path) {
+
+		String[] parsed_segments = path.split("/");
+
+		return new Path(Arrays.stream(parsed_segments).filter(s -> !s.trim().isEmpty()).toArray(String[]::new));
+
+	}
+
 	public Path addListener(Runnable onChangedListener) {
 
 		onChangedListeners.add(onChangedListener);
@@ -118,14 +126,6 @@ public class Path {
 		return segments.toArray(new String[]{});
 	}
 
-	public static Path of(String path) {
-
-		String[] parsed_segments = path.split("/");
-
-		return new Path(Arrays.stream(parsed_segments).filter(s -> !s.trim().isEmpty()).toArray(String[]::new));
-
-	}
-
 	@NonNull
 	@Override
 	public String toString() {
diff --git a/app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java b/app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java
index e6f960d5..da04e186 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java
@@ -23,24 +23,20 @@ import java.util.UUID;
 
 public class PicassoCache implements Cache {
 
-	private Context ctx;
-	private final String TAG = "PicassoCache";
-
 	private static final Bitmap.CompressFormat COMPRESS_FORMAT = Bitmap.CompressFormat.PNG;
 	private static final int COMPRESSION_QUALITY = 50; // 0 = high compression (low file size) | 100 = no compression
-	private final int CACHE_SIZE;
-
 	private static final String CACHE_MAP_FILE = "cacheMap";
-
+	private final String TAG = "PicassoCache";
+	private final int CACHE_SIZE;
 	private final File cachePath;
 	private final HashMap<String, String> cacheMap;
+	private final Context ctx;
 
 	public PicassoCache(File cachePath, Context ctx) throws IOException, ClassNotFoundException {
 
 		TinyDB tinyDb = TinyDB.getInstance(ctx);
 
-		CACHE_SIZE = FilesData.returnOnlyNumberFileSize(
-			tinyDb.getString("cacheSizeImagesStr", ctx.getString(R.string.cacheSizeImagesSelectionSelectedText))) * 1024 * 1024;
+		CACHE_SIZE = FilesData.returnOnlyNumberFileSize(tinyDb.getString("cacheSizeImagesStr", ctx.getString(R.string.cacheSizeImagesSelectionSelectedText))) * 1024 * 1024;
 		this.cachePath = cachePath;
 		cacheMap = new HashMap<>();
 		this.ctx = ctx;
diff --git a/app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java b/app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java
index cc2004c1..181891a8 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java
@@ -47,13 +47,11 @@ public class TimeHelper {
 					return prettyTime.format(date);
 				}
 				case "normal": {
-					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm",
-						locale);
+					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
 					return formatter.format(date);
 				}
 				case "normal1": {
-					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm",
-						locale);
+					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
 					return formatter.format(date);
 				}
 
diff --git a/app/src/main/java/org/mian/gitnex/helpers/TinyDB.java b/app/src/main/java/org/mian/gitnex/helpers/TinyDB.java
index c07b2913..284f356e 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/TinyDB.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/TinyDB.java
@@ -37,6 +37,28 @@ public class TinyDB {
 
 	}
 
+	/**
+	 * Check if external storage is writable or not
+	 *
+	 * @return true if writable, false otherwise
+	 */
+	public static boolean isExternalStorageWritable() {
+		return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
+	}
+
+	/**
+	 * Check if external storage is readable or not
+	 *
+	 * @return true if readable, false otherwise
+	 */
+	public static boolean isExternalStorageReadable() {
+		String state = Environment.getExternalStorageState();
+
+		return Environment.MEDIA_MOUNTED.equals(state) || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state);
+	}
+
+	// Getters
+
 	/**
 	 * Saves 'theBitmap' into 'fullPath'
 	 *
@@ -104,8 +126,6 @@ public class TinyDB {
 		return (fileCreated && bitmapCompressed && streamClosed);
 	}
 
-	// Getters
-
 	/**
 	 * Get int value from SharedPreferences at 'key'. If key not found, return 'defaultValue'
 	 *
@@ -159,6 +179,8 @@ public class TinyDB {
 		return preferences.getString(key, defaultValue);
 	}
 
+	// Put methods
+
 	/**
 	 * Get boolean value from SharedPreferences at 'key'. If key not found, return 'defaultValue'
 	 *
@@ -173,8 +195,6 @@ public class TinyDB {
 		return preferences.getBoolean(key, defaultValue);
 	}
 
-	// Put methods
-
 	/**
 	 * Put int value into SharedPreferences with 'key' and save
 	 *
@@ -250,7 +270,6 @@ public class TinyDB {
 		return new File(path).delete();
 	}
 
-
 	/**
 	 * Clear SharedPreferences (remove everything)
 	 */
@@ -267,7 +286,6 @@ public class TinyDB {
 		return preferences.getAll();
 	}
 
-
 	/**
 	 * Register SharedPreferences change listener
 	 *
@@ -288,27 +306,6 @@ public class TinyDB {
 		preferences.unregisterOnSharedPreferenceChangeListener(listener);
 	}
 
-
-	/**
-	 * Check if external storage is writable or not
-	 *
-	 * @return true if writable, false otherwise
-	 */
-	public static boolean isExternalStorageWritable() {
-		return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
-	}
-
-	/**
-	 * Check if external storage is readable or not
-	 *
-	 * @return true if readable, false otherwise
-	 */
-	public static boolean isExternalStorageReadable() {
-		String state = Environment.getExternalStorageState();
-
-		return Environment.MEDIA_MOUNTED.equals(state) || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state);
-	}
-
 	/**
 	 * null keys would corrupt the shared pref file and make them unreadable this is a preventive measure
 	 *
diff --git a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/SourcePositionListener.java b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/SourcePositionListener.java
index e6df6fd9..090cdb36 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/SourcePositionListener.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/SourcePositionListener.java
@@ -13,25 +13,7 @@ import android.widget.EditText;
 public class SourcePositionListener {
 
 	private final EditText editText;
-
-	@FunctionalInterface
-	public interface OnPositionChanged {
-
-		void onPositionChange(int line, int column);
-
-	}
-
 	private OnPositionChanged onPositionChanged;
-
-	public SourcePositionListener(EditText editText) {
-		this.editText = editText;
-		editText.setAccessibilityDelegate(viewAccessibility);
-	}
-
-	public void setOnPositionChanged(OnPositionChanged listener) {
-		onPositionChanged = listener;
-	}
-
 	private final View.AccessibilityDelegate viewAccessibility = new View.AccessibilityDelegate() {
 
 		@Override
@@ -50,4 +32,20 @@ public class SourcePositionListener {
 		}
 	};
 
+	public SourcePositionListener(EditText editText) {
+		this.editText = editText;
+		editText.setAccessibilityDelegate(viewAccessibility);
+	}
+
+	public void setOnPositionChanged(OnPositionChanged listener) {
+		onPositionChanged = listener;
+	}
+
+	@FunctionalInterface
+	public interface OnPositionChanged {
+
+		void onPositionChange(int line, int column);
+
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/contexts/AccountContext.java b/app/src/main/java/org/mian/gitnex/helpers/contexts/AccountContext.java
index 363b1d8e..9c350f4b 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/contexts/AccountContext.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/contexts/AccountContext.java
@@ -18,14 +18,14 @@ public class AccountContext implements Serializable {
 	private UserAccount account;
 	private User userInfo;
 
-	public static AccountContext fromId(int id, Context context) {
-		return new AccountContext(Objects.requireNonNull(UserAccountsApi.getInstance(context, UserAccountsApi.class)).getAccountById(id));
-	}
-
 	public AccountContext(UserAccount account) {
 		this.account = account;
 	}
 
+	public static AccountContext fromId(int id, Context context) {
+		return new AccountContext(Objects.requireNonNull(UserAccountsApi.getInstance(context, UserAccountsApi.class)).getAccountById(id));
+	}
+
 	public UserAccount getAccount() {
 
 		return account;
diff --git a/app/src/main/java/org/mian/gitnex/helpers/contexts/IssueContext.java b/app/src/main/java/org/mian/gitnex/helpers/contexts/IssueContext.java
index 6d9e563b..fc1811c2 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/contexts/IssueContext.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/contexts/IssueContext.java
@@ -15,19 +15,10 @@ import java.io.Serializable;
 public class IssueContext implements Serializable {
 
 	public static final String INTENT_EXTRA = "issue";
-
-	public static IssueContext fromIntent(Intent intent) {
-		return (IssueContext) intent.getSerializableExtra(INTENT_EXTRA);
-	}
-
-	public static IssueContext fromBundle(Bundle bundle) {
-		return (IssueContext) bundle.getSerializable(INTENT_EXTRA);
-	}
-
+	private final RepositoryContext repository;
 	private Issue issue;
 	private PullRequest pullRequest;
 	private boolean isSubscribed;
-	private final RepositoryContext repository;
 	private int issueIndex = 0;
 	private String issueType;
 
@@ -71,19 +62,34 @@ public class IssueContext implements Serializable {
 		this.repository = new RepositoryContext(repository, context);
 	}
 
+	public static IssueContext fromIntent(Intent intent) {
+		return (IssueContext) intent.getSerializableExtra(INTENT_EXTRA);
+	}
+
+	public static IssueContext fromBundle(Bundle bundle) {
+		return (IssueContext) bundle.getSerializable(INTENT_EXTRA);
+	}
+
 	public PullRequest getPullRequest() {
 
 		return pullRequest;
 	}
 
+	public void setPullRequest(PullRequest pullRequest) {
+
+		this.pullRequest = pullRequest;
+	}
+
 	public Issue getIssue() {
 
 		return issue;
 	}
 
-	public void setPullRequest(PullRequest pullRequest) {
-
-		this.pullRequest = pullRequest;
+	public void setIssue(Issue issue) {
+		this.issue = issue;
+		if(issue != null) {
+			this.issueType = issue.getPullRequest() == null ? "Issue" : "Pull";
+		}
 	}
 
 	public <T extends BaseActivity> Intent getIntent(Context context, Class<T> clazz) {
@@ -123,13 +129,6 @@ public class IssueContext implements Serializable {
 		isSubscribed = subscribed;
 	}
 
-	public void setIssue(Issue issue) {
-		this.issue = issue;
-		if(issue != null) {
-			this.issueType = issue.getPullRequest() == null ? "Issue" : "Pull";
-		}
-	}
-
 	public String getIssueType() {
 
 		return issueType;
diff --git a/app/src/main/java/org/mian/gitnex/helpers/contexts/RepositoryContext.java b/app/src/main/java/org/mian/gitnex/helpers/contexts/RepositoryContext.java
index 316331f5..c823508a 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/contexts/RepositoryContext.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/contexts/RepositoryContext.java
@@ -20,45 +20,18 @@ import java.util.Objects;
 public class RepositoryContext implements Serializable {
 
 	public static final String INTENT_EXTRA = "repository";
-
-	public static RepositoryContext fromIntent(Intent intent) {
-		return (RepositoryContext) intent.getSerializableExtra(INTENT_EXTRA);
-	}
-
-	public static RepositoryContext fromBundle(Bundle bundle) {
-		return (RepositoryContext) bundle.getSerializable(INTENT_EXTRA);
-	}
-
-	public enum State {
-		OPEN, CLOSED;
-
-
-		@NonNull
-		@Override
-		public String toString() {
-			if(this == OPEN) {
-				return "open";
-			}
-			return "closed";
-		}
-	}
-
 	private final AccountContext account;
-	private org.gitnex.tea4j.v2.models.Repository repository;
 	private final String owner;
 	private final String name;
-
+	private org.gitnex.tea4j.v2.models.Repository repository;
 	private State issueState = State.OPEN;
 	private State prState = State.OPEN;
 	private State milestoneState = State.OPEN;
 	private boolean releasesViewTypeIsTag = false;
-
 	private String branchRef;
 	private String issueMilestoneFilterName;
-
 	private boolean starred = false;
 	private boolean watched = false;
-
 	private int repositoryId = 0;
 	private Repository repositoryModel = null;
 
@@ -75,41 +48,56 @@ public class RepositoryContext implements Serializable {
 		this.name = name;
 	}
 
+	public static RepositoryContext fromIntent(Intent intent) {
+		return (RepositoryContext) intent.getSerializableExtra(INTENT_EXTRA);
+	}
+
+	public static RepositoryContext fromBundle(Bundle bundle) {
+		return (RepositoryContext) bundle.getSerializable(INTENT_EXTRA);
+	}
+
 	public State getIssueState() {
 
 		return issueState;
 	}
 
-	public State getMilestoneState() {
-
-		return milestoneState;
-	}
-
-	public State getPrState() {
-
-		return prState;
-	}
-
-	public org.gitnex.tea4j.v2.models.Repository getRepository() {
-
-		return repository;
-	}
-
 	public void setIssueState(State issueState) {
 
 		this.issueState = issueState;
 	}
 
+	public State getMilestoneState() {
+
+		return milestoneState;
+	}
+
 	public void setMilestoneState(State milestoneState) {
 
 		this.milestoneState = milestoneState;
 	}
 
+	public State getPrState() {
+
+		return prState;
+	}
+
 	public void setPrState(State prState) {
 
 		this.prState = prState;
 	}
 
+	public org.gitnex.tea4j.v2.models.Repository getRepository() {
+
+		return repository;
+	}
+
+	public void setRepository(org.gitnex.tea4j.v2.models.Repository repository) {
+		this.repository = repository;
+		if(!repository.getFullName().equalsIgnoreCase(getFullName())) {
+			throw new IllegalArgumentException("repo does not match owner and name");
+		}
+	}
+
 	public String getBranchRef() {
 
 		return branchRef;
@@ -158,13 +146,6 @@ public class RepositoryContext implements Serializable {
 		return repository != null ? repository.getPermissions() : new Permission();
 	}
 
-	public void setRepository(org.gitnex.tea4j.v2.models.Repository repository) {
-		this.repository = repository;
-		if(!repository.getFullName().equalsIgnoreCase(getFullName())) {
-			throw new IllegalArgumentException("repo does not match owner and name");
-		}
-	}
-
 	public boolean hasRepository() {
 		return repository != null;
 	}
@@ -174,16 +155,16 @@ public class RepositoryContext implements Serializable {
 		return starred;
 	}
 
-	public boolean isWatched() {
-
-		return watched;
-	}
-
 	public void setStarred(boolean starred) {
 
 		this.starred = starred;
 	}
 
+	public boolean isWatched() {
+
+		return watched;
+	}
+
 	public void setWatched(boolean watched) {
 
 		this.watched = watched;
@@ -215,8 +196,8 @@ public class RepositoryContext implements Serializable {
 	}
 
 	public void checkAccountSwitch(Context context) {
-		if(((BaseActivity) context).getAccount().getAccount().getAccountId() != account.getAccount().getAccountId() && account.getAccount()
-			.getAccountId() == TinyDB.getInstance(context).getInt("currentActiveAccountId")) {
+		if(((BaseActivity) context).getAccount().getAccount().getAccountId() != account.getAccount().getAccountId() && account.getAccount().getAccountId() == TinyDB.getInstance(context)
+			.getInt("currentActiveAccountId")) {
 			// user changed account using a deep link or a submodule
 			AppUtil.switchToAccount(context, account.getAccount());
 		}
@@ -256,4 +237,18 @@ public class RepositoryContext implements Serializable {
 		}
 	}
 
+	public enum State {
+		OPEN, CLOSED;
+
+
+		@NonNull
+		@Override
+		public String toString() {
+			if(this == OPEN) {
+				return "open";
+			}
+			return "closed";
+		}
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/ssl/MemorizingTrustManager.java b/app/src/main/java/org/mian/gitnex/helpers/ssl/MemorizingTrustManager.java
index 21aeae40..dc9364a5 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/ssl/MemorizingTrustManager.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/ssl/MemorizingTrustManager.java
@@ -45,19 +45,16 @@ import javax.net.ssl.X509TrustManager;
 
 public class MemorizingTrustManager implements X509TrustManager {
 
-	private final static int NOTIFICATION_ID = 100509;
-
 	public final static String KEYSTORE_NAME = "keystore";
 	public final static String KEYSTORE_KEY = "keystore";
-
+	private final static int NOTIFICATION_ID = 100509;
+	private final SparseArray<MTMDecision> openDecisions = new SparseArray<>();
+	private final X509TrustManager defaultTrustManager;
 	private Context context;
 	private NotificationManager notificationManager;
 	private int decisionId = 0;
-	private final SparseArray<MTMDecision> openDecisions = new SparseArray<>();
-
 	private SharedPreferences keyStoreStorage;
 	private KeyStore appKeyStore;
-	private final X509TrustManager defaultTrustManager;
 	private X509TrustManager appTrustManager;
 
 	/**
@@ -101,16 +98,6 @@ public class MemorizingTrustManager implements X509TrustManager {
 		this.defaultTrustManager = getTrustManager(null);
 	}
 
-	private void init(Context m) {
-
-		context = m;
-		notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-
-		keyStoreStorage = m.getSharedPreferences(KEYSTORE_NAME, Context.MODE_PRIVATE);
-		appKeyStore = loadAppKeyStore();
-	}
-
-
 	/**
 	 * Returns a X509TrustManager list containing a new instance of
 	 * TrustManagerFactory.
@@ -132,6 +119,90 @@ public class MemorizingTrustManager implements X509TrustManager {
 		return new X509TrustManager[]{new MemorizingTrustManager(c)};
 	}
 
+	private static boolean isExpiredException(Throwable e) {
+
+		do {
+			if(e instanceof CertificateExpiredException) {
+				return true;
+			}
+			e = e.getCause();
+		} while(e != null);
+
+		return false;
+	}
+
+	private static boolean isPathException(Throwable e) {
+
+		do {
+			if(e instanceof CertPathValidatorException) {
+				return true;
+			}
+
+			e = e.getCause();
+		} while(e != null);
+
+		return false;
+	}
+
+	private static String hexString(byte[] data) {
+
+		StringBuilder si = new StringBuilder();
+
+		for(int i = 0; i < data.length; i++) {
+			si.append(String.format("%02x", data[i]));
+			if(i < data.length - 1) {
+				si.append(":");
+			}
+		}
+
+		return si.toString();
+	}
+
+	private static String certHash(final X509Certificate cert, String digest) {
+
+		try {
+			MessageDigest md = MessageDigest.getInstance(digest);
+			md.update(cert.getEncoded());
+			return hexString(md.digest());
+		}
+		catch(CertificateEncodingException | NoSuchAlgorithmException e) {
+			return e.getMessage();
+		}
+	}
+
+	/**
+	 * Reflectively call
+	 * {@code Notification.setLatestEventInfo(Context, CharSequence, CharSequence, PendingIntent)}
+	 * since it was remove in Android API level 23.
+	 */
+	private static void setLatestEventInfoReflective(Notification notification, Context context, CharSequence mtmNotification, CharSequence certName, PendingIntent call) {
+
+		Method setLatestEventInfo;
+
+		try {
+			setLatestEventInfo = notification.getClass().getMethod("setLatestEventInfo", Context.class, CharSequence.class, CharSequence.class, PendingIntent.class);
+		}
+		catch(NoSuchMethodException e) {
+			throw new IllegalStateException(e);
+		}
+
+		try {
+			setLatestEventInfo.invoke(notification, context, mtmNotification, certName, call);
+		}
+		catch(IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+			throw new IllegalStateException(e);
+		}
+	}
+
+	private void init(Context m) {
+
+		context = m;
+		notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+
+		keyStoreStorage = m.getSharedPreferences(KEYSTORE_NAME, Context.MODE_PRIVATE);
+		appKeyStore = loadAppKeyStore();
+	}
+
 	/**
 	 * Get a list of all certificate aliases stored in MTM.
 	 *
@@ -314,31 +385,6 @@ public class MemorizingTrustManager implements X509TrustManager {
 		}
 	}
 
-	private static boolean isExpiredException(Throwable e) {
-
-		do {
-			if(e instanceof CertificateExpiredException) {
-				return true;
-			}
-			e = e.getCause();
-		} while(e != null);
-
-		return false;
-	}
-
-	private static boolean isPathException(Throwable e) {
-
-		do {
-			if(e instanceof CertPathValidatorException) {
-				return true;
-			}
-
-			e = e.getCause();
-		} while(e != null);
-
-		return false;
-	}
-
 	private void checkCertTrusted(X509Certificate[] chain, String authType, boolean isServer) throws CertificateException {
 		try {
 
@@ -398,39 +444,12 @@ public class MemorizingTrustManager implements X509TrustManager {
 		return myId;
 	}
 
-	private static String hexString(byte[] data) {
-
-		StringBuilder si = new StringBuilder();
-
-		for(int i = 0; i < data.length; i++) {
-			si.append(String.format("%02x", data[i]));
-			if(i < data.length - 1) {
-				si.append(":");
-			}
-		}
-
-		return si.toString();
-	}
-
-	private static String certHash(final X509Certificate cert, String digest) {
-
-		try {
-			MessageDigest md = MessageDigest.getInstance(digest);
-			md.update(cert.getEncoded());
-			return hexString(md.digest());
-		}
-		catch(CertificateEncodingException | NoSuchAlgorithmException e) {
-			return e.getMessage();
-		}
-	}
-
 	private void certDetails(StringBuilder stringBuilder, X509Certificate c) {
 
 		SimpleDateFormat validityDateFormatter = new SimpleDateFormat("yyyy-MM-dd", context.getResources().getConfiguration().locale);
 
-		stringBuilder.append("\n").append(c.getSubjectDN().toString()).append("\n").append(validityDateFormatter.format(c.getNotBefore()))
-			.append(" - ").append(validityDateFormatter.format(c.getNotAfter())).append("\nSHA-256: ").append(certHash(c, "SHA-256"))
-			.append("\nSHA-1: ").append(certHash(c, "SHA-1")).append("\nSigned by: ").append(c.getIssuerDN().toString()).append("\n");
+		stringBuilder.append("\n").append(c.getSubjectDN().toString()).append("\n").append(validityDateFormatter.format(c.getNotBefore())).append(" - ").append(validityDateFormatter.format(c.getNotAfter()))
+			.append("\nSHA-256: ").append(certHash(c, "SHA-256")).append("\nSHA-1: ").append(certHash(c, "SHA-1")).append("\nSigned by: ").append(c.getIssuerDN().toString()).append("\n");
 	}
 
 	private String certChainMessage(final X509Certificate[] chain, CertificateException cause) {
@@ -507,40 +526,13 @@ public class MemorizingTrustManager implements X509TrustManager {
 		return stringBuilder.toString();
 	}
 
-	/**
-	 * Reflectively call
-	 * <code>Notification.setLatestEventInfo(Context, CharSequence, CharSequence, PendingIntent)</code>
-	 * since it was remove in Android API level 23.
-	 */
-	private static void setLatestEventInfoReflective(Notification notification, Context context, CharSequence mtmNotification, CharSequence certName,
-		PendingIntent call) {
-
-		Method setLatestEventInfo;
-
-		try {
-			setLatestEventInfo = notification.getClass()
-				.getMethod("setLatestEventInfo", Context.class, CharSequence.class, CharSequence.class, PendingIntent.class);
-		}
-		catch(NoSuchMethodException e) {
-			throw new IllegalStateException(e);
-		}
-
-		try {
-			setLatestEventInfo.invoke(notification, context, mtmNotification, certName, call);
-		}
-		catch(IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-			throw new IllegalStateException(e);
-		}
-	}
-
 	private void startActivityNotification(Intent intent, int decisionId, String certName) {
 
 		final PendingIntent call = PendingIntent.getActivity(context, 0, intent, 0);
 		final String mtmNotification = context.getString(R.string.mtmNotification);
 
-		NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "ssl").setSmallIcon(android.R.drawable.ic_lock_lock)
-			.setContentTitle(mtmNotification).setContentText(certName).setTicker(certName).setContentIntent(call).setAutoCancel(true)
-			.setPriority(NotificationCompat.PRIORITY_HIGH);
+		NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "ssl").setSmallIcon(android.R.drawable.ic_lock_lock).setContentTitle(mtmNotification).setContentText(certName).setTicker(certName)
+			.setContentIntent(call).setAutoCancel(true).setPriority(NotificationCompat.PRIORITY_HIGH);
 
 		notificationManager.notify(NOTIFICATION_ID + decisionId, builder.build());
 	}
diff --git a/app/src/main/java/org/mian/gitnex/notifications/Notifications.java b/app/src/main/java/org/mian/gitnex/notifications/Notifications.java
index 48a842f4..140cd40a 100644
--- a/app/src/main/java/org/mian/gitnex/notifications/Notifications.java
+++ b/app/src/main/java/org/mian/gitnex/notifications/Notifications.java
@@ -44,8 +44,7 @@ public class Notifications {
 			notificationManager.deleteNotificationChannel(context.getPackageName()); // TODO Can be removed in future versions
 
 			// Create new notification channels
-			NotificationChannel mainChannel = new NotificationChannel(Constants.mainNotificationChannelId,
-				context.getString(R.string.mainNotificationChannelName), NotificationManager.IMPORTANCE_DEFAULT);
+			NotificationChannel mainChannel = new NotificationChannel(Constants.mainNotificationChannelId, context.getString(R.string.mainNotificationChannelName), NotificationManager.IMPORTANCE_DEFAULT);
 			mainChannel.setDescription(context.getString(R.string.mainNotificationChannelDescription));
 
 			if(tinyDB.getBoolean("notificationsEnableVibration", true)) {
@@ -64,8 +63,7 @@ public class Notifications {
 				mainChannel.enableLights(false);
 			}
 
-			NotificationChannel downloadChannel = new NotificationChannel(Constants.downloadNotificationChannelId,
-				context.getString(R.string.fileViewerNotificationChannelName), NotificationManager.IMPORTANCE_LOW);
+			NotificationChannel downloadChannel = new NotificationChannel(Constants.downloadNotificationChannelId, context.getString(R.string.fileViewerNotificationChannelName), NotificationManager.IMPORTANCE_LOW);
 			downloadChannel.setDescription(context.getString(R.string.fileViewerNotificationChannelDescription));
 
 			notificationManager.createNotificationChannel(mainChannel);
@@ -85,8 +83,7 @@ public class Notifications {
 
 		if(tinyDB.getBoolean("notificationsEnabled", true)) {
 
-			Constraints.Builder constraints = new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).setRequiresBatteryNotLow(false)
-				.setRequiresStorageNotLow(false).setRequiresCharging(false);
+			Constraints.Builder constraints = new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).setRequiresBatteryNotLow(false).setRequiresStorageNotLow(false).setRequiresCharging(false);
 
 			if(android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 				constraints.setRequiresDeviceIdle(false);
@@ -94,11 +91,10 @@ public class Notifications {
 
 			int pollingDelayMinutes = Math.max(tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay), 15);
 
-			PeriodicWorkRequest periodicWorkRequest = new PeriodicWorkRequest.Builder(NotificationsWorker.class, pollingDelayMinutes,
-				TimeUnit.MINUTES).setConstraints(constraints.build()).addTag(Constants.notificationsWorkerId).build();
+			PeriodicWorkRequest periodicWorkRequest = new PeriodicWorkRequest.Builder(NotificationsWorker.class, pollingDelayMinutes, TimeUnit.MINUTES).setConstraints(constraints.build())
+				.addTag(Constants.notificationsWorkerId).build();
 
-			WorkManager.getInstance(context)
-				.enqueueUniquePeriodicWork(Constants.notificationsWorkerId, ExistingPeriodicWorkPolicy.KEEP, periodicWorkRequest);
+			WorkManager.getInstance(context).enqueueUniquePeriodicWork(Constants.notificationsWorkerId, ExistingPeriodicWorkPolicy.KEEP, periodicWorkRequest);
 
 		}
 	}
diff --git a/app/src/main/java/org/mian/gitnex/notifications/NotificationsWorker.java b/app/src/main/java/org/mian/gitnex/notifications/NotificationsWorker.java
index d3f1cda4..512924b6 100644
--- a/app/src/main/java/org/mian/gitnex/notifications/NotificationsWorker.java
+++ b/app/src/main/java/org/mian/gitnex/notifications/NotificationsWorker.java
@@ -53,8 +53,7 @@ public class NotificationsWorker extends Worker {
 		for(UserAccount userAccount : userAccountsApi.loggedInUserAccounts()) {
 
 			// We do also accept empty values, since the server version was not saved properly in the beginning.
-			if(userAccount.getServerVersion() == null || userAccount.getServerVersion().isEmpty() || new Version(
-				userAccount.getServerVersion()).higherOrEqual("1.12.3")) {
+			if(userAccount.getServerVersion() == null || userAccount.getServerVersion().isEmpty() || new Version(userAccount.getServerVersion()).higherOrEqual("1.12.3")) {
 
 				Map<String, String> userAccountParameters = new HashMap<>();
 				userAccountParameters.put("previousTimestamp", AppUtil.getTimestampFromDate(context, new Date()));
@@ -75,8 +74,7 @@ public class NotificationsWorker extends Worker {
 	 * Used to bypass the 15-minute limit of {@code WorkManager}.
 	 */
 	private void pollingLoops() {
-		int notificationLoops = tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay) < 15 ?
-			Math.min(15 - tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay), 10) : 1;
+		int notificationLoops = tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay) < 15 ? Math.min(15 - tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay), 10) : 1;
 
 		for(int i = 0; i < notificationLoops; i++) {
 			long startPollingTime = System.currentTimeMillis();
@@ -99,9 +97,8 @@ public class NotificationsWorker extends Worker {
 
 			try {
 				assert userAccountParameters != null;
-				Call<List<NotificationThread>> call = RetrofitClient.getApiInterface(context, userAccount.getInstanceUrl(), userAccount.getToken(),
-						null)
-					.notifyGetList(false, Arrays.asList("unread"), null, new Date(userAccountParameters.get("previousTimestamp")), null, null, 1);
+				Call<List<NotificationThread>> call = RetrofitClient.getApiInterface(context, userAccount.getInstanceUrl(), userAccount.getToken(), null)
+					.notifyGetList(false, List.of("unread"), null, new Date(userAccountParameters.get("previousTimestamp")), null, null, 1);
 
 				Response<List<NotificationThread>> response = call.execute();
 
@@ -124,11 +121,9 @@ public class NotificationsWorker extends Worker {
 
 		NotificationManagerCompat notificationManagerCompat = NotificationManagerCompat.from(context);
 
-		Notification summaryNotification = new NotificationCompat.Builder(context, Constants.mainNotificationChannelId).setContentTitle(
-				context.getString(R.string.newMessages, userAccount.getUserName()))
-			.setContentText(String.format(context.getString(R.string.youHaveGotNewNotifications), notificationThreads.size()))
-			.setSmallIcon(R.drawable.gitnex_transparent).setGroup(userAccount.getUserName()).setGroupSummary(true).setAutoCancel(true)
-			.setContentIntent(pendingIntent).build();
+		Notification summaryNotification = new NotificationCompat.Builder(context, Constants.mainNotificationChannelId).setContentTitle(context.getString(R.string.newMessages, userAccount.getUserName()))
+			.setContentText(String.format(context.getString(R.string.youHaveGotNewNotifications), notificationThreads.size())).setSmallIcon(R.drawable.gitnex_transparent).setGroup(userAccount.getUserName())
+			.setGroupSummary(true).setAutoCancel(true).setContentIntent(pendingIntent).build();
 
 		notificationManagerCompat.notify(userAccount.getAccountId(), summaryNotification);
 
@@ -136,12 +131,10 @@ public class NotificationsWorker extends Worker {
 
 			String subjectUrl = notificationThread.getSubject().getUrl();
 			String issueId = context.getResources().getString(R.string.hash) + subjectUrl.substring(subjectUrl.lastIndexOf("/") + 1);
-			String notificationHeader = issueId + " " + notificationThread.getSubject().getTitle() + " " + String.format(
-				context.getResources().getString(R.string.notificationExtraInfo), notificationThread.getRepository().getFullName(),
-				notificationThread.getSubject().getType());
+			String notificationHeader = issueId + " " + notificationThread.getSubject().getTitle() + " " + String.format(context.getResources().getString(R.string.notificationExtraInfo),
+				notificationThread.getRepository().getFullName(), notificationThread.getSubject().getType());
 
-			NotificationCompat.Builder builder1 = getBaseNotificationBuilder().setContentTitle(notificationHeader).setGroup(userAccount.getUserName())
-				.setContentIntent(pendingIntent);
+			NotificationCompat.Builder builder1 = getBaseNotificationBuilder().setContentTitle(notificationHeader).setGroup(userAccount.getUserName()).setContentIntent(pendingIntent);
 
 			notificationManagerCompat.notify(Notifications.uniqueNotificationId(context), builder1.build());
 
@@ -150,9 +143,8 @@ public class NotificationsWorker extends Worker {
 
 	private NotificationCompat.Builder getBaseNotificationBuilder() {
 
-		NotificationCompat.Builder builder = new NotificationCompat.Builder(context, Constants.mainNotificationChannelId).setSmallIcon(
-				R.drawable.gitnex_transparent).setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION))
-			.setCategory(NotificationCompat.CATEGORY_MESSAGE).setPriority(NotificationCompat.PRIORITY_DEFAULT).setAutoCancel(true);
+		NotificationCompat.Builder builder = new NotificationCompat.Builder(context, Constants.mainNotificationChannelId).setSmallIcon(R.drawable.gitnex_transparent)
+			.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)).setCategory(NotificationCompat.CATEGORY_MESSAGE).setPriority(NotificationCompat.PRIORITY_DEFAULT).setAutoCancel(true);
 
 		if(tinyDB.getBoolean("notificationsEnableLights", true)) {
 			builder.setLights(tinyDB.getInt("notificationsLightColor", Color.GREEN), 1500, 1500);
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/FilesViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/FilesViewModel.java
index 853716fb..71efce46 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/FilesViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/FilesViewModel.java
@@ -28,8 +28,7 @@ public class FilesViewModel extends ViewModel {
 	private MutableLiveData<List<ContentsResponse>> filesList;
 	private MutableLiveData<List<ContentsResponse>> filesList2;
 
-	public LiveData<List<ContentsResponse>> getFilesList(String owner, String repo, String ref, Context ctx, ProgressBar progressBar,
-		TextView noDataFiles) {
+	public LiveData<List<ContentsResponse>> getFilesList(String owner, String repo, String ref, Context ctx, ProgressBar progressBar, TextView noDataFiles) {
 
 		filesList = new MutableLiveData<>();
 		loadFilesList(owner, repo, ref, ctx, progressBar, noDataFiles);
@@ -65,8 +64,7 @@ public class FilesViewModel extends ViewModel {
 		});
 	}
 
-	public LiveData<List<ContentsResponse>> getFilesList2(String owner, String repo, String filesDir, String ref, Context ctx,
-		ProgressBar progressBar, TextView noDataFiles) {
+	public LiveData<List<ContentsResponse>> getFilesList2(String owner, String repo, String filesDir, String ref, Context ctx, ProgressBar progressBar, TextView noDataFiles) {
 
 		filesList2 = new MutableLiveData<>();
 		loadFilesList2(owner, repo, filesDir, ref, ctx, progressBar, noDataFiles);
@@ -74,8 +72,7 @@ public class FilesViewModel extends ViewModel {
 		return filesList2;
 	}
 
-	private void loadFilesList2(String owner, String repo, String filesDir, String ref, final Context ctx, ProgressBar progressBar,
-		TextView noDataFiles) {
+	private void loadFilesList2(String owner, String repo, String filesDir, String ref, final Context ctx, ProgressBar progressBar, TextView noDataFiles) {
 
 		Call<List<ContentsResponse>> call = RetrofitClient.getApiInterface(ctx).repoGetContentsList(owner, repo, filesDir, ref);
 
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java
index 6edf975a..9573b83a 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java
@@ -35,9 +35,7 @@ public class IssuesViewModel extends ViewModel {
 
 	public void loadIssuesList(String searchKeyword, String type, Boolean created, String state, Boolean assignedToMe, Context ctx) {
 
-		Call<List<Issue>> call = RetrofitClient.getApiInterface(ctx)
-			.issueSearchIssues(state, null, null, searchKeyword, null, type, null, null, assignedToMe, created, null, null, null, null, 1,
-				resultLimit);
+		Call<List<Issue>> call = RetrofitClient.getApiInterface(ctx).issueSearchIssues(state, null, null, searchKeyword, null, type, null, null, assignedToMe, created, null, null, null, null, 1, resultLimit);
 
 		call.enqueue(new Callback<>() {
 
@@ -60,12 +58,9 @@ public class IssuesViewModel extends ViewModel {
 		});
 	}
 
-	public void loadMoreIssues(String searchKeyword, String type, Boolean created, String state, int page, Boolean assignedToMe, Context ctx,
-		ExploreIssuesAdapter adapter) {
+	public void loadMoreIssues(String searchKeyword, String type, Boolean created, String state, int page, Boolean assignedToMe, Context ctx, ExploreIssuesAdapter adapter) {
 
-		Call<List<Issue>> call = RetrofitClient.getApiInterface(ctx)
-			.issueSearchIssues(state, null, null, searchKeyword, null, type, null, null, assignedToMe, created, null, null, null, null, page,
-				resultLimit);
+		Call<List<Issue>> call = RetrofitClient.getApiInterface(ctx).issueSearchIssues(state, null, null, searchKeyword, null, type, null, null, assignedToMe, created, null, null, null, null, page, resultLimit);
 
 		call.enqueue(new Callback<>() {
 
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/MilestonesViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/MilestonesViewModel.java
index bf918419..bdb34621 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/MilestonesViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/MilestonesViewModel.java
@@ -35,8 +35,7 @@ public class MilestonesViewModel extends ViewModel {
 
 	public void loadMilestonesList(String repoOwner, String repoName, String milestoneState, Context ctx) {
 
-		Call<List<Milestone>> call = RetrofitClient.getApiInterface(ctx)
-			.issueGetMilestonesList(repoOwner, repoName, milestoneState, null, 1, resultLimit);
+		Call<List<Milestone>> call = RetrofitClient.getApiInterface(ctx).issueGetMilestonesList(repoOwner, repoName, milestoneState, null, 1, resultLimit);
 
 		call.enqueue(new Callback<>() {
 
@@ -61,8 +60,7 @@ public class MilestonesViewModel extends ViewModel {
 
 	public void loadMoreMilestones(String repoOwner, String repoName, int page, String milestoneState, Context ctx, MilestonesAdapter adapter) {
 
-		Call<List<Milestone>> call = RetrofitClient.getApiInterface(ctx)
-			.issueGetMilestonesList(repoOwner, repoName, milestoneState, null, page, resultLimit);
+		Call<List<Milestone>> call = RetrofitClient.getApiInterface(ctx).issueGetMilestonesList(repoOwner, repoName, milestoneState, null, page, resultLimit);
 
 		call.enqueue(new Callback<>() {
 
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/ReleasesViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/ReleasesViewModel.java
index a80568af..2579a2bb 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/ReleasesViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/ReleasesViewModel.java
@@ -26,6 +26,7 @@ public class ReleasesViewModel extends ViewModel {
 
 	private MutableLiveData<List<Release>> releasesList;
 	private int resultLimit;
+	private MutableLiveData<List<Tag>> tagsList;
 
 	public LiveData<List<Release>> getReleasesList(String owner, String repo, Context ctx) {
 
@@ -95,8 +96,6 @@ public class ReleasesViewModel extends ViewModel {
 		});
 	}
 
-	private MutableLiveData<List<Tag>> tagsList;
-
 	public LiveData<List<Tag>> getTagsList(String owner, String repo, Context ctx) {
 
 		tagsList = new MutableLiveData<>();
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/WikiViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/WikiViewModel.java
index 08ab182e..ce62d97b 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/WikiViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/WikiViewModel.java
@@ -28,8 +28,7 @@ public class WikiViewModel extends ViewModel {
 
 	private MutableLiveData<List<WikiPageMetaData>> wikiList;
 
-	public LiveData<List<WikiPageMetaData>> getWiki(String owner, String repo, int page, int resultLimit, Context ctx,
-		FragmentWikiBinding fragmentWikiBinding) {
+	public LiveData<List<WikiPageMetaData>> getWiki(String owner, String repo, int page, int resultLimit, Context ctx, FragmentWikiBinding fragmentWikiBinding) {
 
 		wikiList = new MutableLiveData<>();
 		loadWikiList(owner, repo, page, resultLimit, ctx, fragmentWikiBinding);
@@ -79,8 +78,7 @@ public class WikiViewModel extends ViewModel {
 		});
 	}
 
-	public void loadMoreWiki(String owner, String repo, int page, int resultLimit, Context ctx, FragmentWikiBinding fragmentWikiBinding,
-		WikiListAdapter adapter) {
+	public void loadMoreWiki(String owner, String repo, int page, int resultLimit, Context ctx, FragmentWikiBinding fragmentWikiBinding, WikiListAdapter adapter) {
 
 		Call<List<WikiPageMetaData>> call;
 		call = RetrofitClient.getApiInterface(ctx).repoGetWikiPages(owner, repo, page, resultLimit);
diff --git a/app/src/main/java/org/mian/gitnex/views/ReactionList.java b/app/src/main/java/org/mian/gitnex/views/ReactionList.java
index ffb07702..da99afda 100644
--- a/app/src/main/java/org/mian/gitnex/views/ReactionList.java
+++ b/app/src/main/java/org/mian/gitnex/views/ReactionList.java
@@ -37,8 +37,6 @@ import retrofit2.Response;
 @SuppressLint("ViewConstructor")
 public class ReactionList extends HorizontalScrollView {
 
-	private enum ReactionType {COMMENT, ISSUE}
-
 	private Runnable onReactionAddedListener;
 
 	@SuppressLint("SetTextI18n")
@@ -48,8 +46,7 @@ public class ReactionList extends HorizontalScrollView {
 
 		LinearLayout root = new LinearLayout(context);
 
-		LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
-			ViewGroup.LayoutParams.WRAP_CONTENT);
+		LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 
 		root.setOrientation(LinearLayout.HORIZONTAL);
 		root.setGravity(Gravity.START);
@@ -83,8 +80,7 @@ public class ReactionList extends HorizontalScrollView {
 				switch(reactionType) {
 
 					case ISSUE:
-						response = RetrofitClient.getApiInterface(context).issueGetIssueReactions(repoOwner, repoName, (long) id, null, null)
-							.execute();
+						response = RetrofitClient.getApiInterface(context).issueGetIssueReactions(repoOwner, repoName, (long) id, null, null).execute();
 						break;
 
 					case COMMENT:
@@ -113,8 +109,7 @@ public class ReactionList extends HorizontalScrollView {
 
 						List<Reaction> issueReactions = sortedReactions.get(content);
 
-						@SuppressLint("InflateParams") CardView reactionBadge = (CardView) LayoutInflater.from(context)
-							.inflate(R.layout.layout_reaction_badge, this, false);
+						@SuppressLint("InflateParams") CardView reactionBadge = (CardView) LayoutInflater.from(context).inflate(R.layout.layout_reaction_badge, this, false);
 
 						for(Reaction issueReaction : issueReactions) {
 							if(issueReaction.getUser().getLogin().equals(loginUid)) {
@@ -125,8 +120,7 @@ public class ReactionList extends HorizontalScrollView {
 
 						Emoji emoji = EmojiManager.getForAlias(content);
 
-						((TextView) reactionBadge.findViewById(R.id.symbol)).setText(
-							((emoji == null) ? content : emoji.getUnicode()) + " " + issueReactions.size());
+						((TextView) reactionBadge.findViewById(R.id.symbol)).setText(((emoji == null) ? content : emoji.getUnicode()) + " " + issueReactions.size());
 
 						reactionBadge.setOnClickListener(v -> {
 
@@ -142,8 +136,8 @@ public class ReactionList extends HorizontalScrollView {
 							recyclerView.setAdapter(adapter);
 
 							assert emoji != null;
-							AlertDialog alertDialog = new AlertDialog.Builder(context).setView(recyclerView).setTitle(emoji.getUnicode())
-								.setPositiveButton(R.string.okButton, (dialog, which) -> dialog.cancel()).setCancelable(true).create();
+							AlertDialog alertDialog = new AlertDialog.Builder(context).setView(recyclerView).setTitle(emoji.getUnicode()).setPositiveButton(R.string.okButton, (dialog, which) -> dialog.cancel())
+								.setCancelable(true).create();
 
 							alertDialog.show();
 
@@ -167,4 +161,6 @@ public class ReactionList extends HorizontalScrollView {
 		this.onReactionAddedListener = onReactionAddedListener;
 	}
 
+	private enum ReactionType {COMMENT, ISSUE}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/views/ReactionSpinner.java b/app/src/main/java/org/mian/gitnex/views/ReactionSpinner.java
index 99b8497a..0b057b6a 100644
--- a/app/src/main/java/org/mian/gitnex/views/ReactionSpinner.java
+++ b/app/src/main/java/org/mian/gitnex/views/ReactionSpinner.java
@@ -34,11 +34,6 @@ import retrofit2.Response;
 public class ReactionSpinner extends HorizontalScrollView {
 
 	private static final List<String> allowedReactionsCache = new ArrayList<>();
-
-	private enum ReactionType {COMMENT, ISSUE}
-
-	private enum ReactionAction {REMOVE, ADD}
-
 	private Runnable onInteractedListener;
 	private Runnable onLoadingFinishedListener;
 
@@ -50,8 +45,7 @@ public class ReactionSpinner extends HorizontalScrollView {
 
 		int sidesPadding = AppUtil.getPixelsFromDensity(context, 10);
 
-		LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
-			ViewGroup.LayoutParams.WRAP_CONTENT);
+		LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 
 		root.setOrientation(LinearLayout.HORIZONTAL);
 		root.setPadding(sidesPadding, 0, sidesPadding, 0);
@@ -85,13 +79,10 @@ public class ReactionSpinner extends HorizontalScrollView {
 					// Show all allowed reactions
 					for(String allowedReaction : allowedReactions) {
 
-						@SuppressLint("InflateParams") CardView reactionButton = (CardView) LayoutInflater.from(context)
-							.inflate(R.layout.layout_reaction_button, root, false);
+						@SuppressLint("InflateParams") CardView reactionButton = (CardView) LayoutInflater.from(context).inflate(R.layout.layout_reaction_button, root, false);
 
 						// Checks if current user reacted with 'allowedReaction'
-						boolean myReaction = allReactions.stream().anyMatch(
-							issueReaction -> issueReaction.getContent().equals(allowedReaction) && issueReaction.getUser().getLogin()
-								.equals(loginUid));
+						boolean myReaction = allReactions.stream().anyMatch(issueReaction -> issueReaction.getContent().equals(allowedReaction) && issueReaction.getUser().getLogin().equals(loginUid));
 
 						ReactionAction reactionAction;
 
@@ -146,8 +137,7 @@ public class ReactionSpinner extends HorizontalScrollView {
 
 	}
 
-	private boolean react(String repoOwner, String repoName, ReactionType reactionType, ReactionAction reactionAction,
-		EditReactionOption issueReaction, int id) throws IOException {
+	private boolean react(String repoOwner, String repoName, ReactionType reactionType, ReactionAction reactionAction, EditReactionOption issueReaction, int id) throws IOException {
 
 		Response<?> response = null;
 
@@ -157,14 +147,12 @@ public class ReactionSpinner extends HorizontalScrollView {
 				switch(reactionAction) {
 
 					case ADD:
-						response = RetrofitClient.getApiInterface(getContext()).issuePostIssueReaction(repoOwner, repoName, (long) id, issueReaction)
-							.execute();
+						response = RetrofitClient.getApiInterface(getContext()).issuePostIssueReaction(repoOwner, repoName, (long) id, issueReaction).execute();
 						break;
 
 
 					case REMOVE:
-						response = RetrofitClient.getApiInterface(getContext())
-							.issueDeleteIssueReactionWithBody(repoOwner, repoName, (long) id, issueReaction).execute();
+						response = RetrofitClient.getApiInterface(getContext()).issueDeleteIssueReactionWithBody(repoOwner, repoName, (long) id, issueReaction).execute();
 						break;
 
 				}
@@ -174,14 +162,12 @@ public class ReactionSpinner extends HorizontalScrollView {
 				switch(reactionAction) {
 
 					case ADD:
-						response = RetrofitClient.getApiInterface(getContext())
-							.issuePostCommentReaction(repoOwner, repoName, (long) id, issueReaction).execute();
+						response = RetrofitClient.getApiInterface(getContext()).issuePostCommentReaction(repoOwner, repoName, (long) id, issueReaction).execute();
 						break;
 
 
 					case REMOVE:
-						response = RetrofitClient.getApiInterface(getContext())
-							.issueDeleteCommentReactionWithBody(repoOwner, repoName, (long) id, issueReaction).execute();
+						response = RetrofitClient.getApiInterface(getContext()).issueDeleteCommentReactionWithBody(repoOwner, repoName, (long) id, issueReaction).execute();
 						break;
 
 				}
@@ -241,4 +227,8 @@ public class ReactionSpinner extends HorizontalScrollView {
 		this.onLoadingFinishedListener = onLoadingFinishedListener;
 	}
 
+	private enum ReactionType {COMMENT, ISSUE}
+
+	private enum ReactionAction {REMOVE, ADD}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/views/SyntaxHighlightedArea.java b/app/src/main/java/org/mian/gitnex/views/SyntaxHighlightedArea.java
index a46aea41..d2d5d50e 100644
--- a/app/src/main/java/org/mian/gitnex/views/SyntaxHighlightedArea.java
+++ b/app/src/main/java/org/mian/gitnex/views/SyntaxHighlightedArea.java
@@ -99,8 +99,8 @@ public class SyntaxHighlightedArea extends LinearLayout {
 
 					MainGrammarLocator mainGrammarLocator = MainGrammarLocator.getInstance();
 
-					CharSequence highlightedSource = Prism4jSyntaxHighlight.create(new Prism4j(mainGrammarLocator), prism4jTheme,
-						MainGrammarLocator.DEFAULT_FALLBACK_LANGUAGE).highlight(mainGrammarLocator.fromExtension(extension), source);
+					CharSequence highlightedSource = Prism4jSyntaxHighlight.create(new Prism4j(mainGrammarLocator), prism4jTheme, MainGrammarLocator.DEFAULT_FALLBACK_LANGUAGE)
+						.highlight(mainGrammarLocator.fromExtension(extension), source);
 
 					getActivity().runOnUiThread(() -> sourceView.setText(highlightedSource));
 
diff --git a/app/src/main/res/drawable-anydpi-v24/gitnex_transparent.xml b/app/src/main/res/drawable-anydpi-v24/gitnex_transparent.xml
index 47cbfcef..ee76750d 100644
--- a/app/src/main/res/drawable-anydpi-v24/gitnex_transparent.xml
+++ b/app/src/main/res/drawable-anydpi-v24/gitnex_transparent.xml
@@ -1,45 +1,45 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="#FFFFFF"
     android:viewportWidth="120.59775"
-    android:viewportHeight="120.59775"
-    android:tint="#FFFFFF">
-  <group android:translateX="-7.436125"
-      android:translateY="-7.436125">
-    <path
-        android:pathData="M67.733,67.74m-67.733,0a67.733,67.733 0,1 1,135.466 0a67.733,67.733 0,1 1,-135.466 0"
-        android:fillColor="#39404a"
-        android:fillAlpha="0.0"/>
-    <path
-        android:pathData="M31.738,44.619a9.139,9.151 63.874,1 0,12.769 -13.108a9.139,9.151 63.874,1 0,-12.769 13.108z"
-        android:fillColor="#39404a"/>
-    <path
-        android:pathData="M31.875,114.541a9.139,9.151 63.874,1 0,12.769 -13.108a9.139,9.151 63.874,1 0,-12.769 13.108z"
-        android:fillColor="#39404a"/>
-    <path
-        android:pathData="M61.361,79.846a9.139,9.151 63.874,1 0,12.769 -13.108a9.139,9.151 63.874,1 0,-12.769 13.108z"
-        android:fillColor="#39404a"/>
-    <path
-        android:pathData="M34.37,18.337l7.038,0.003l-0.096,85.655l-7.038,-0.003z"
-        android:fillColor="#39404a"/>
-    <path
-        android:pathData="m37.878,38.133c31.743,0.128 29.614,-4.427 29.723,36.496"
-        android:strokeWidth="8.7255"
-        android:fillColor="#00000000"
-        android:strokeColor="#39404a"/>
-    <path
-        android:pathData="m97.323,108.453c-31.743,-0.128 -29.614,4.427 -29.723,-36.496"
-        android:strokeWidth="8.7255"
-        android:fillColor="#00000000"
-        android:strokeColor="#39404a"/>
-    <path
-        android:pathData="M90.959,44.619a9.139,9.151 63.874,1 0,12.769 -13.108a9.139,9.151 63.874,1 0,-12.769 13.108z"
-        android:fillColor="#39404a"/>
-    <path
-        android:pathData="M90.955,114.542a9.139,9.151 63.874,1 0,12.769 -13.108a9.139,9.151 63.874,1 0,-12.769 13.108z"
-        android:fillColor="#39404a"/>
-    <path
-        android:pathData="M93.872,35.062l7.038,0.002l-0.096,68.927l-7.038,-0.002z"
-        android:fillColor="#39404a"/>
-  </group>
+    android:viewportHeight="120.59775">
+    <group android:translateX="-7.436125"
+        android:translateY="-7.436125">
+        <path
+            android:fillAlpha="0.0"
+            android:fillColor="#39404a"
+            android:pathData="M67.733,67.74m-67.733,0a67.733,67.733 0,1 1,135.466 0a67.733,67.733 0,1 1,-135.466 0"/>
+        <path
+            android:fillColor="#39404a"
+            android:pathData="M31.738,44.619a9.139,9.151 63.874,1 0,12.769 -13.108a9.139,9.151 63.874,1 0,-12.769 13.108z"/>
+        <path
+            android:fillColor="#39404a"
+            android:pathData="M31.875,114.541a9.139,9.151 63.874,1 0,12.769 -13.108a9.139,9.151 63.874,1 0,-12.769 13.108z"/>
+        <path
+            android:fillColor="#39404a"
+            android:pathData="M61.361,79.846a9.139,9.151 63.874,1 0,12.769 -13.108a9.139,9.151 63.874,1 0,-12.769 13.108z"/>
+        <path
+            android:fillColor="#39404a"
+            android:pathData="M34.37,18.337l7.038,0.003l-0.096,85.655l-7.038,-0.003z"/>
+        <path
+            android:fillColor="#00000000"
+            android:pathData="m37.878,38.133c31.743,0.128 29.614,-4.427 29.723,36.496"
+            android:strokeWidth="8.7255"
+            android:strokeColor="#39404a"/>
+        <path
+            android:fillColor="#00000000"
+            android:pathData="m97.323,108.453c-31.743,-0.128 -29.614,4.427 -29.723,-36.496"
+            android:strokeWidth="8.7255"
+            android:strokeColor="#39404a"/>
+        <path
+            android:fillColor="#39404a"
+            android:pathData="M90.959,44.619a9.139,9.151 63.874,1 0,12.769 -13.108a9.139,9.151 63.874,1 0,-12.769 13.108z"/>
+        <path
+            android:fillColor="#39404a"
+            android:pathData="M90.955,114.542a9.139,9.151 63.874,1 0,12.769 -13.108a9.139,9.151 63.874,1 0,-12.769 13.108z"/>
+        <path
+            android:fillColor="#39404a"
+            android:pathData="M93.872,35.062l7.038,0.002l-0.096,68.927l-7.038,-0.002z"/>
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/app_logo.xml b/app/src/main/res/drawable/app_logo.xml
index 7af56a17..5482b0a2 100644
--- a/app/src/main/res/drawable/app_logo.xml
+++ b/app/src/main/res/drawable/app_logo.xml
@@ -3,43 +3,43 @@
     android:height="512dp"
     android:viewportWidth="135.47"
     android:viewportHeight="135.47">
-  <path
-      android:pathData="M67.528,0.045L68.043,0.045A67.735,67.735 0,0 1,135.778 67.78L135.778,67.78A67.735,67.735 0,0 1,68.043 135.515L67.528,135.515A67.735,67.735 0,0 1,-0.207 67.78L-0.207,67.78A67.735,67.735 0,0 1,67.528 0.045z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="0"
-      android:fillColor="#222222"
-      android:strokeColor="#609926"
-      android:fillAlpha="0.988235"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M33.02,44.728a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"
-      android:fillColor="#609926"/>
-  <path
-      android:pathData="M33.155,111.207a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"
-      android:fillColor="#609926"/>
-  <path
-      android:pathData="M62.351,78.22a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"
-      android:fillColor="#609926"/>
-  <path
-      android:pathData="M35.626,19.74l6.968,0.002l-0.095,81.437l-6.968,-0.002z"
-      android:fillColor="#609926"/>
-  <path
-      android:pathData="m39.1,38.561c31.431,0.121 29.323,-4.209 29.431,34.699"
-      android:strokeWidth="8.466067"
-      android:fillColor="#00000000"
-      android:strokeColor="#609926"/>
-  <path
-      android:pathData="M97.96,105.418C66.529,105.297 68.637,109.628 68.529,70.72"
-      android:strokeWidth="8.466067"
-      android:fillColor="#00000000"
-      android:strokeColor="#609926"/>
-  <path
-      android:pathData="M91.659,44.728a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"
-      android:fillColor="#609926"/>
-  <path
-      android:pathData="M91.655,111.208a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"
-      android:fillColor="#609926"/>
-  <path
-      android:pathData="M94.543,35.641l6.968,0.002l-0.095,65.533l-6.968,-0.002z"
-      android:fillColor="#609926"/>
+    <path
+        android:fillAlpha="0.988235"
+        android:fillColor="#222222"
+        android:pathData="M67.528,0.045L68.043,0.045A67.735,67.735 0,0 1,135.778 67.78L135.778,67.78A67.735,67.735 0,0 1,68.043 135.515L67.528,135.515A67.735,67.735 0,0 1,-0.207 67.78L-0.207,67.78A67.735,67.735 0,0 1,67.528 0.045z"
+        android:strokeWidth="0"
+        android:strokeColor="#609926"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#609926"
+        android:pathData="M33.02,44.728a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"/>
+    <path
+        android:fillColor="#609926"
+        android:pathData="M33.155,111.207a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"/>
+    <path
+        android:fillColor="#609926"
+        android:pathData="M62.351,78.22a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"/>
+    <path
+        android:fillColor="#609926"
+        android:pathData="M35.626,19.74l6.968,0.002l-0.095,81.437l-6.968,-0.002z"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="m39.1,38.561c31.431,0.121 29.323,-4.209 29.431,34.699"
+        android:strokeWidth="8.466067"
+        android:strokeColor="#609926"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M97.96,105.418C66.529,105.297 68.637,109.628 68.529,70.72"
+        android:strokeWidth="8.466067"
+        android:strokeColor="#609926"/>
+    <path
+        android:fillColor="#609926"
+        android:pathData="M91.659,44.728a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"/>
+    <path
+        android:fillColor="#609926"
+        android:pathData="M91.655,111.208a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"/>
+    <path
+        android:fillColor="#609926"
+        android:pathData="M94.543,35.641l6.968,0.002l-0.095,65.533l-6.968,-0.002z"/>
 </vector>
diff --git a/app/src/main/res/drawable/app_logo_background.xml b/app/src/main/res/drawable/app_logo_background.xml
index e009ebe7..a66ffa5c 100644
--- a/app/src/main/res/drawable/app_logo_background.xml
+++ b/app/src/main/res/drawable/app_logo_background.xml
@@ -4,75 +4,75 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="0"
-      android:scaleY="0"
-      android:translateX="54"
-      android:translateY="54">
-      <path android:fillColor="#3DDC84"
+    <group android:scaleX="0"
+        android:scaleY="0"
+        android:translateX="54"
+        android:translateY="54">
+        <path android:fillColor="#3DDC84"
             android:pathData="M0,0h108v108h-108z"/>
-      <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-      <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
-            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-  </group>
+        <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+        <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+            android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
index e3979cd7..6e1d4eda 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:tint="#FFFFFF"
+    android:viewportWidth="24.0" android:viewportHeight="24.0">
     <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_android.xml b/app/src/main/res/drawable/ic_android.xml
index b45d1adc..66fda940 100644
--- a/app/src/main/res/drawable/ic_android.xml
+++ b/app/src/main/res/drawable/ic_android.xml
@@ -1,5 +1,6 @@
-<vector android:height="24dp" android:tint="#368f73"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/iconsColor" android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:tint="#368f73"
+    android:viewportWidth="24.0" android:viewportHeight="24.0">
+    <path android:fillColor="?attr/iconsColor"
+        android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_appearance.xml b/app/src/main/res/drawable/ic_appearance.xml
index 43bb0fda..61fbf081 100644
--- a/app/src/main/res/drawable/ic_appearance.xml
+++ b/app/src/main/res/drawable/ic_appearance.xml
@@ -3,25 +3,25 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M4,3L20,3A2,2 0,0 1,22 5L22,15A2,2 0,0 1,20 17L4,17A2,2 0,0 1,2 15L2,5A2,2 0,0 1,4 3z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M8,21L16,21"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M12,17L12,21"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M4,3L20,3A2,2 0,0 1,22 5L22,15A2,2 0,0 1,20 17L4,17A2,2 0,0 1,2 15L2,5A2,2 0,0 1,4 3z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M8,21L16,21"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,17L12,21"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
index 7771303c..efc1349a 100644
--- a/app/src/main/res/drawable/ic_arrow_back.xml
+++ b/app/src/main/res/drawable/ic_arrow_back.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M19,12L5,12"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M12,19l-7,-7l7,-7"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,12L5,12"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,19l-7,-7l7,-7"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml
index 4b9aeb78..7b3b93b5 100644
--- a/app/src/main/res/drawable/ic_arrow_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_down.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,5L12,19"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M19,12l-7,7l-7,-7"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,5L12,19"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,12l-7,7l-7,-7"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml
index e66fc4b0..1162674e 100644
--- a/app/src/main/res/drawable/ic_arrow_right.xml
+++ b/app/src/main/res/drawable/ic_arrow_right.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M5,12L19,12"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M12,5l7,7l-7,7"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M5,12L19,12"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,5l7,7l-7,7"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_up.xml b/app/src/main/res/drawable/ic_arrow_up.xml
index 53aba22c..a0d9bf7c 100644
--- a/app/src/main/res/drawable/ic_arrow_up.xml
+++ b/app/src/main/res/drawable/ic_arrow_up.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,19L12,5"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M5,12l7,-7l7,7"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,19L12,5"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M5,12l7,-7l7,7"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_branch.xml b/app/src/main/res/drawable/ic_branch.xml
index af27d484..936bfb56 100644
--- a/app/src/main/res/drawable/ic_branch.xml
+++ b/app/src/main/res/drawable/ic_branch.xml
@@ -3,32 +3,32 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M6,3L6,15"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M18,6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M6,18m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M18,9a9,9 0,0 1,-9 9"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M6,3L6,15"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M18,6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M6,18m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M18,9a9,9 0,0 1,-9 9"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_browser.xml b/app/src/main/res/drawable/ic_browser.xml
index 6a0bacc4..eab9daf1 100644
--- a/app/src/main/res/drawable/ic_browser.xml
+++ b/app/src/main/res/drawable/ic_browser.xml
@@ -1,4 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/iconsColor" android:fillType="evenOdd" android:pathData="M6,3h1v1L6,4L6,3zM4,3h1v1L4,4L4,3zM2,3h1v1L2,4L2,3zM14,13L2,13L2,5h12v8zM14,4L8,4L8,3h6v1zM15,3c0,-0.55 -0.45,-1 -1,-1L2,2c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1L15,3z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:viewportWidth="16" android:viewportHeight="16">
+    <path android:fillColor="?attr/iconsColor" android:fillType="evenOdd"
+        android:pathData="M6,3h1v1L6,4L6,3zM4,3h1v1L4,4L4,3zM2,3h1v1L2,4L2,3zM14,13L2,13L2,5h12v8zM14,4L8,4L8,3h6v1zM15,3c0,-0.55 -0.45,-1 -1,-1L2,2c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1L15,3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_bug_report.xml b/app/src/main/res/drawable/ic_bug_report.xml
index 0c7a7a74..1da75c6a 100644
--- a/app/src/main/res/drawable/ic_bug_report.xml
+++ b/app/src/main/res/drawable/ic_bug_report.xml
@@ -3,81 +3,81 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,7.5L12,7.5A5,5 0,0 1,17 12.5L17,16.5A5,5 0,0 1,12 21.5L12,21.5A5,5 0,0 1,7 16.5L7,12.5A5,5 0,0 1,12 7.5z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M2,12.5l2,2l3,0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M22,12.5l-2,2l-3,0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M3,21.5l2,-3l2,-1"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M21,21.5l-2,-3l-2,-1"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M3,8.5l2,2l2,1"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M21,8.5l-2,2l-2,1"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M12,7.5L12,21.5"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M15.38,8.82A3,3 0,0 0,16 7h0a3,3 0,0 0,-3 -3H11A3,3 0,0 0,8 7H8a3,3 0,0 0,0.61 1.82"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M9,4.5L8,2.5"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M15,4.5L16,2.5"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,7.5L12,7.5A5,5 0,0 1,17 12.5L17,16.5A5,5 0,0 1,12 21.5L12,21.5A5,5 0,0 1,7 16.5L7,12.5A5,5 0,0 1,12 7.5z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M2,12.5l2,2l3,0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M22,12.5l-2,2l-3,0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3,21.5l2,-3l2,-1"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M21,21.5l-2,-3l-2,-1"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3,8.5l2,2l2,1"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M21,8.5l-2,2l-2,1"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,7.5L12,21.5"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M15.38,8.82A3,3 0,0 0,16 7h0a3,3 0,0 0,-3 -3H11A3,3 0,0 0,8 7H8a3,3 0,0 0,0.61 1.82"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,4.5L8,2.5"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M15,4.5L16,2.5"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_calendar.xml b/app/src/main/res/drawable/ic_calendar.xml
index e1b21ec9..4237707f 100644
--- a/app/src/main/res/drawable/ic_calendar.xml
+++ b/app/src/main/res/drawable/ic_calendar.xml
@@ -3,32 +3,32 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M5,4L19,4A2,2 0,0 1,21 6L21,20A2,2 0,0 1,19 22L5,22A2,2 0,0 1,3 20L3,6A2,2 0,0 1,5 4z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M16,2L16,6"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M8,2L8,6"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M3,10L21,10"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M5,4L19,4A2,2 0,0 1,21 6L21,20A2,2 0,0 1,19 22L5,22A2,2 0,0 1,3 20L3,6A2,2 0,0 1,5 4z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M16,2L16,6"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M8,2L8,6"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3,10L21,10"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
index c29fab52..7248efd0 100644
--- a/app/src/main/res/drawable/ic_check.xml
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M20,6l-11,11l-5,-5"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M20,6l-11,11l-5,-5"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml
index ad83d5ae..eaa78443 100644
--- a/app/src/main/res/drawable/ic_chevron_down.xml
+++ b/app/src/main/res/drawable/ic_chevron_down.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M6,9l6,6l6,-6"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M6,9l6,6l6,-6"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_left.xml b/app/src/main/res/drawable/ic_chevron_left.xml
index 46dc2ef5..cf64ac53 100644
--- a/app/src/main/res/drawable/ic_chevron_left.xml
+++ b/app/src/main/res/drawable/ic_chevron_left.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M15,18l-6,-6l6,-6"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M15,18l-6,-6l6,-6"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_right.xml b/app/src/main/res/drawable/ic_chevron_right.xml
index e1870d55..ff6cc234 100644
--- a/app/src/main/res/drawable/ic_chevron_right.xml
+++ b/app/src/main/res/drawable/ic_chevron_right.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M9,18l6,-6l-6,-6"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,18l6,-6l-6,-6"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_up.xml b/app/src/main/res/drawable/ic_chevron_up.xml
index 3492762d..f0ad48be 100644
--- a/app/src/main/res/drawable/ic_chevron_up.xml
+++ b/app/src/main/res/drawable/ic_chevron_up.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M18,15l-6,-6l-6,6"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M18,15l-6,-6l-6,6"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index c88b244f..e2e6cf6d 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M18,6L6,18"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M6,6L18,18"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M18,6L6,18"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M6,6L18,18"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_code.xml b/app/src/main/res/drawable/ic_code.xml
index ca3382ea..4a370df9 100644
--- a/app/src/main/res/drawable/ic_code.xml
+++ b/app/src/main/res/drawable/ic_code.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M16,18l6,-6l-6,-6"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M8,6l-6,6l6,6"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M16,18l6,-6l-6,-6"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M8,6l-6,6l6,6"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_comment.xml b/app/src/main/res/drawable/ic_comment.xml
index a461e578..3dd94559 100644
--- a/app/src/main/res/drawable/ic_comment.xml
+++ b/app/src/main/res/drawable/ic_comment.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M21,15a2,2 0,0 1,-2 2H7l-4,4V5a2,2 0,0 1,2 -2h14a2,2 0,0 1,2 2z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M21,15a2,2 0,0 1,-2 2H7l-4,4V5a2,2 0,0 1,2 -2h14a2,2 0,0 1,2 2z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_commit.xml b/app/src/main/res/drawable/ic_commit.xml
index 928d115e..e2b474a7 100644
--- a/app/src/main/res/drawable/ic_commit.xml
+++ b/app/src/main/res/drawable/ic_commit.xml
@@ -3,25 +3,25 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,12m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M1.05,12L7,12"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M17.01,12L22.96,12"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,12m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M1.05,12L7,12"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M17.01,12L22.96,12"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml
index 80b19fec..c15d82c2 100644
--- a/app/src/main/res/drawable/ic_copy.xml
+++ b/app/src/main/res/drawable/ic_copy.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M11,9L20,9A2,2 0,0 1,22 11L22,20A2,2 0,0 1,20 22L11,22A2,2 0,0 1,9 20L9,11A2,2 0,0 1,11 9z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M5,15H4a2,2 0,0 1,-2 -2V4a2,2 0,0 1,2 -2h9a2,2 0,0 1,2 2v1"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M11,9L20,9A2,2 0,0 1,22 11L22,20A2,2 0,0 1,20 22L11,22A2,2 0,0 1,9 20L9,11A2,2 0,0 1,11 9z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M5,15H4a2,2 0,0 1,-2 -2V4a2,2 0,0 1,2 -2h9a2,2 0,0 1,2 2v1"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 93e8f59b..0871fbb1 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -3,32 +3,32 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M3,6l2,0l16,0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M19,6v14a2,2 0,0 1,-2 2H7a2,2 0,0 1,-2 -2V6m3,0V4a2,2 0,0 1,2 -2h4a2,2 0,0 1,2 2v2"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M10,11L10,17"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M14,11L14,17"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3,6l2,0l16,0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,6v14a2,2 0,0 1,-2 2H7a2,2 0,0 1,-2 -2V6m3,0V4a2,2 0,0 1,2 -2h4a2,2 0,0 1,2 2v2"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M10,11L10,17"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M14,11L14,17"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_diff.xml b/app/src/main/res/drawable/ic_diff.xml
index 45b3785f..8e9fa1ab 100644
--- a/app/src/main/res/drawable/ic_diff.xml
+++ b/app/src/main/res/drawable/ic_diff.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M12.25,3.5a0.75,0.75 0,0 1,0.75 0.75V8.5h4.25a0.75,0.75 0,0 1,0 1.5H13v4.25a0.75,0.75 0,0 1,-1.5 0V10H7.25a0.75,0.75 0,0 1,0 -1.5h4.25V4.25a0.75,0.75 0,0 1,0.75 -0.75zM6.562,19.25a0.75,0.75 0,0 1,0.75 -0.75h9.938a0.75,0.75 0,0 1,0 1.5H7.312a0.75,0.75 0,0 1,-0.75 -0.75z"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:fillType="evenOdd"
+        android:pathData="M12.25,3.5a0.75,0.75 0,0 1,0.75 0.75V8.5h4.25a0.75,0.75 0,0 1,0 1.5H13v4.25a0.75,0.75 0,0 1,-1.5 0V10H7.25a0.75,0.75 0,0 1,0 -1.5h4.25V4.25a0.75,0.75 0,0 1,0.75 -0.75zM6.562,19.25a0.75,0.75 0,0 1,0.75 -0.75h9.938a0.75,0.75 0,0 1,0 1.5H7.312a0.75,0.75 0,0 1,-0.75 -0.75z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_directory.xml b/app/src/main/res/drawable/ic_directory.xml
index 0756ffd6..87e891e7 100644
--- a/app/src/main/res/drawable/ic_directory.xml
+++ b/app/src/main/res/drawable/ic_directory.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M3.75,4.5a0.25,0.25 0,0 0,-0.25 0.25v14.5c0,0.138 0.112,0.25 0.25,0.25h16.5a0.25,0.25 0,0 0,0.25 -0.25V7.687a0.25,0.25 0,0 0,-0.25 -0.25h-8.471a1.75,1.75 0,0 1,-1.447 -0.765L8.928,4.61a0.25,0.25 0,0 0,-0.208 -0.11H3.75zM2,4.75C2,3.784 2.784,3 3.75,3h4.971c0.58,0 1.12,0.286 1.447,0.765l1.404,2.063a0.25,0.25 0,0 0,0.207 0.11h8.471c0.966,0 1.75,0.783 1.75,1.75V19.25A1.75,1.75 0,0 1,20.25 21H3.75A1.75,1.75 0,0 1,2 19.25V4.75z"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:fillType="evenOdd"
+        android:pathData="M3.75,4.5a0.25,0.25 0,0 0,-0.25 0.25v14.5c0,0.138 0.112,0.25 0.25,0.25h16.5a0.25,0.25 0,0 0,0.25 -0.25V7.687a0.25,0.25 0,0 0,-0.25 -0.25h-8.471a1.75,1.75 0,0 1,-1.447 -0.765L8.928,4.61a0.25,0.25 0,0 0,-0.208 -0.11H3.75zM2,4.75C2,3.784 2.784,3 3.75,3h4.971c0.58,0 1.12,0.286 1.447,0.765l1.404,2.063a0.25,0.25 0,0 0,0.207 0.11h8.471c0.966,0 1.75,0.783 1.75,1.75V19.25A1.75,1.75 0,0 1,20.25 21H3.75A1.75,1.75 0,0 1,2 19.25V4.75z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_done.xml b/app/src/main/res/drawable/ic_done.xml
index 8043ef1b..770e2652 100644
--- a/app/src/main/res/drawable/ic_done.xml
+++ b/app/src/main/res/drawable/ic_done.xml
@@ -1,5 +1,6 @@
-<vector android:height="24dp" android:tint="?attr/iconsColor"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:tint="?attr/iconsColor"
+    android:viewportWidth="24.0" android:viewportHeight="24.0">
+    <path android:fillColor="#FF000000"
+        android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_dotted_menu.xml b/app/src/main/res/drawable/ic_dotted_menu.xml
index 96809e08..916b5ea6 100644
--- a/app/src/main/res/drawable/ic_dotted_menu.xml
+++ b/app/src/main/res/drawable/ic_dotted_menu.xml
@@ -3,25 +3,25 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,12m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M12,5m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M12,19m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,12m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,5m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,19m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_dotted_menu_horizontal.xml b/app/src/main/res/drawable/ic_dotted_menu_horizontal.xml
index d6632219..a90afd93 100644
--- a/app/src/main/res/drawable/ic_dotted_menu_horizontal.xml
+++ b/app/src/main/res/drawable/ic_dotted_menu_horizontal.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M6,12a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM14,12a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM20,14a2,2 0,1 0,0 -4,2 2,0 0,0 0,4z"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:fillType="evenOdd"
+        android:pathData="M6,12a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM14,12a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM20,14a2,2 0,1 0,0 -4,2 2,0 0,0 0,4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
index 0254bca5..4db5200c 100644
--- a/app/src/main/res/drawable/ic_download.xml
+++ b/app/src/main/res/drawable/ic_download.xml
@@ -3,25 +3,25 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M21,15v4a2,2 0,0 1,-2 2H5a2,2 0,0 1,-2 -2v-4"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M7,10l5,5l5,-5"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M12,15L12,3"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M21,15v4a2,2 0,0 1,-2 2H5a2,2 0,0 1,-2 -2v-4"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M7,10l5,5l5,-5"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,15L12,3"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_drafts.xml b/app/src/main/res/drawable/ic_drafts.xml
index c7334b0b..48c712f4 100644
--- a/app/src/main/res/drawable/ic_drafts.xml
+++ b/app/src/main/res/drawable/ic_drafts.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M22,12l-6,0l-2,3l-4,0l-2,-3l-6,0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M5.45,5.11L2,12v6a2,2 0,0 0,2 2h16a2,2 0,0 0,2 -2v-6l-3.45,-6.89A2,2 0,0 0,16.76 4H7.24a2,2 0,0 0,-1.79 1.11z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M22,12l-6,0l-2,3l-4,0l-2,-3l-6,0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M5.45,5.11L2,12v6a2,2 0,0 0,2 2h16a2,2 0,0 0,2 -2v-6l-3.45,-6.89A2,2 0,0 0,16.76 4H7.24a2,2 0,0 0,-1.79 1.11z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
index 051bd72c..ab1c41b7 100644
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -3,9 +3,9 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="m16.6533,1.7224a2.7358,2.7594 0,0 1,3.8676 0l1.6977,1.7124a2.7358,2.7594 0,0 1,0 3.901L8.7587,20.9123c-0.3283,0.3311 -0.7347,0.574 -1.1818,0.7017L2.4946,23.0804A1.1725,1.1826 0,0 1,1.0454 21.6171L2.4977,16.4925A2.7358,2.7594 0,0 1,3.1933 15.2972L16.6533,1.7208ZM18.8638,3.3938a0.3908,0.3942 0,0 0,-0.5534 0l-1.9729,1.9915 2.2496,2.2706 1.9744,-1.9915a0.3908,0.3942 0,0 0,0 -0.5582zM16.9284,9.3274 L14.6788,7.0568 4.852,16.9702A0.3908,0.3942 0,0 0,4.7519 17.1405L3.8796,20.2201 6.9327,19.3402a0.3893,0.3926 0,0 0,0.1688 -0.1009z"
-      android:strokeWidth="1.57004"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:fillType="evenOdd"
+        android:pathData="m16.6533,1.7224a2.7358,2.7594 0,0 1,3.8676 0l1.6977,1.7124a2.7358,2.7594 0,0 1,0 3.901L8.7587,20.9123c-0.3283,0.3311 -0.7347,0.574 -1.1818,0.7017L2.4946,23.0804A1.1725,1.1826 0,0 1,1.0454 21.6171L2.4977,16.4925A2.7358,2.7594 0,0 1,3.1933 15.2972L16.6533,1.7208ZM18.8638,3.3938a0.3908,0.3942 0,0 0,-0.5534 0l-1.9729,1.9915 2.2496,2.2706 1.9744,-1.9915a0.3908,0.3942 0,0 0,0 -0.5582zM16.9284,9.3274 L14.6788,7.0568 4.852,16.9702A0.3908,0.3942 0,0 0,4.7519 17.1405L3.8796,20.2201 6.9327,19.3402a0.3893,0.3926 0,0 0,0.1688 -0.1009z"
+        android:strokeWidth="1.57004"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml
index 30a2eb64..d9684613 100644
--- a/app/src/main/res/drawable/ic_email.xml
+++ b/app/src/main/res/drawable/ic_email.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M4,4h16c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H4c-1.1,0 -2,-0.9 -2,-2V6c0,-1.1 0.9,-2 2,-2z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M22,6l-10,7l-10,-7"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M4,4h16c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H4c-1.1,0 -2,-0.9 -2,-2V6c0,-1.1 0.9,-2 2,-2z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M22,6l-10,7l-10,-7"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_file.xml b/app/src/main/res/drawable/ic_file.xml
index b2c86a3c..9383376a 100644
--- a/app/src/main/res/drawable/ic_file.xml
+++ b/app/src/main/res/drawable/ic_file.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M5,2.5a0.5,0.5 0,0 0,-0.5 0.5v18a0.5,0.5 0,0 0,0.5 0.5h14a0.5,0.5 0,0 0,0.5 -0.5L19.5,8.5h-4a2,2 0,0 1,-2 -2v-4L5,2.5zM15,2.5v4a0.5,0.5 0,0 0,0.5 0.5h4a0.5,0.5 0,0 0,-0.146 -0.336l-4.018,-4.018A0.5,0.5 0,0 0,15 2.5zM3,3a2,2 0,0 1,2 -2h9.982a2,2 0,0 1,1.414 0.586l4.018,4.018A2,2 0,0 1,21 7.018L21,21a2,2 0,0 1,-2 2L5,23a2,2 0,0 1,-2 -2L3,3z"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:fillType="evenOdd"
+        android:pathData="M5,2.5a0.5,0.5 0,0 0,-0.5 0.5v18a0.5,0.5 0,0 0,0.5 0.5h14a0.5,0.5 0,0 0,0.5 -0.5L19.5,8.5h-4a2,2 0,0 1,-2 -2v-4L5,2.5zM15,2.5v4a0.5,0.5 0,0 0,0.5 0.5h4a0.5,0.5 0,0 0,-0.146 -0.336l-4.018,-4.018A0.5,0.5 0,0 0,15 2.5zM3,3a2,2 0,0 1,2 -2h9.982a2,2 0,0 1,1.414 0.586l4.018,4.018A2,2 0,0 1,21 7.018L21,21a2,2 0,0 1,-2 2L5,23a2,2 0,0 1,-2 -2L3,3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml
index df817d87..66f8e7f3 100644
--- a/app/src/main/res/drawable/ic_filter.xml
+++ b/app/src/main/res/drawable/ic_filter.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M22,3l-20,0l8,9.46l0,6.54l4,2l0,-8.54l8,-9.46z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M22,3l-20,0l8,9.46l0,6.54l4,2l0,-8.54l8,-9.46z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_closed.xml b/app/src/main/res/drawable/ic_filter_closed.xml
index de6ea523..41821770 100644
--- a/app/src/main/res/drawable/ic_filter_closed.xml
+++ b/app/src/main/res/drawable/ic_filter_closed.xml
@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-android:width="24dp"
-android:height="24dp"
-android:viewportWidth="24"
-android:viewportHeight="24">
-<path
-    android:pathData="M22,3l-20,0l8,9.46l0,6.54l4,2l0,-8.54l8,-9.46z"
-    android:strokeLineJoin="round"
-    android:strokeWidth="2"
-    android:fillColor="#00000000"
-    android:strokeColor="#AF4242"
-    android:strokeLineCap="round"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M22,3l-20,0l8,9.46l0,6.54l4,2l0,-8.54l8,-9.46z"
+        android:strokeWidth="2"
+        android:strokeColor="#AF4242"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_flag.xml b/app/src/main/res/drawable/ic_flag.xml
index b45a7177..cfa69801 100644
--- a/app/src/main/res/drawable/ic_flag.xml
+++ b/app/src/main/res/drawable/ic_flag.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M4,15s1,-1 4,-1 5,2 8,2 4,-1 4,-1V3s-1,1 -4,1 -5,-2 -8,-2 -4,1 -4,1z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M4,22L4,15"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M4,15s1,-1 4,-1 5,2 8,2 4,-1 4,-1V3s-1,1 -4,1 -5,-2 -8,-2 -4,1 -4,1z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M4,22L4,15"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_fork.xml b/app/src/main/res/drawable/ic_fork.xml
index 4ad23171..c039c3f8 100644
--- a/app/src/main/res/drawable/ic_fork.xml
+++ b/app/src/main/res/drawable/ic_fork.xml
@@ -3,16 +3,16 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M12,21a1.75,1.75 0,1 1,0 -3.5,1.75 1.75,0 0,1 0,3.5zM8.75,19.25a3.25,3.25 0,1 0,6.5 0,3.25 3.25,0 0,0 -6.5,0zM5.75,6.5a1.75,1.75 0,1 1,0 -3.5,1.75 1.75,0 0,1 0,3.5zM2.5,4.75a3.25,3.25 0,1 0,6.5 0,3.25 3.25,0 0,0 -6.5,0zM18.25,6.5a1.75,1.75 0,1 1,0 -3.5,1.75 1.75,0 0,1 0,3.5zM15,4.75a3.25,3.25 0,1 0,6.5 0,3.25 3.25,0 0,0 -6.5,0z"
-      android:fillType="evenOdd"/>
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M6.5,7.75v1A2.25,2.25 0,0 0,8.75 11h6.5a2.25,2.25 0,0 0,2.25 -2.25v-1H19v1a3.75,3.75 0,0 1,-3.75 3.75h-6.5A3.75,3.75 0,0 1,5 8.75v-1h1.5z"
-      android:fillType="evenOdd"/>
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M11.25,16.25v-5h1.5v5h-1.5z"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:fillType="evenOdd"
+        android:pathData="M12,21a1.75,1.75 0,1 1,0 -3.5,1.75 1.75,0 0,1 0,3.5zM8.75,19.25a3.25,3.25 0,1 0,6.5 0,3.25 3.25,0 0,0 -6.5,0zM5.75,6.5a1.75,1.75 0,1 1,0 -3.5,1.75 1.75,0 0,1 0,3.5zM2.5,4.75a3.25,3.25 0,1 0,6.5 0,3.25 3.25,0 0,0 -6.5,0zM18.25,6.5a1.75,1.75 0,1 1,0 -3.5,1.75 1.75,0 0,1 0,3.5zM15,4.75a3.25,3.25 0,1 0,6.5 0,3.25 3.25,0 0,0 -6.5,0z"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:fillType="evenOdd"
+        android:pathData="M6.5,7.75v1A2.25,2.25 0,0 0,8.75 11h6.5a2.25,2.25 0,0 0,2.25 -2.25v-1H19v1a3.75,3.75 0,0 1,-3.75 3.75h-6.5A3.75,3.75 0,0 1,5 8.75v-1h1.5z"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:fillType="evenOdd"
+        android:pathData="M11.25,16.25v-5h1.5v5h-1.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
index 4a854b7c..48637675 100644
--- a/app/src/main/res/drawable/ic_info.xml
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -3,25 +3,25 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M12,16L12,12"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M12,8L12.01,8"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,16L12,12"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,8L12.01,8"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_issue.xml b/app/src/main/res/drawable/ic_issue.xml
index a651eb29..2e7cffb7 100644
--- a/app/src/main/res/drawable/ic_issue.xml
+++ b/app/src/main/res/drawable/ic_issue.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M11.75,11.75m-2.25,0a2.25,2.25 0,1 1,4.5 0a2.25,2.25 0,1 1,-4.5 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="73.9523"
-      android:fillColor="?attr/iconsColor"
-      android:strokeColor="#00000000"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:pathData="M11.75,11.75m-2.25,0a2.25,2.25 0,1 1,4.5 0a2.25,2.25 0,1 1,-4.5 0"
+        android:strokeWidth="73.9523"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_issue_closed.xml b/app/src/main/res/drawable/ic_issue_closed.xml
index 06cb2a06..db14e9e5 100644
--- a/app/src/main/res/drawable/ic_issue_closed.xml
+++ b/app/src/main/res/drawable/ic_issue_closed.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,22c5.523,0 10,-4.477 10,-10S17.523,2 12,2 2,6.477 2,12s4.477,10 10,10z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M9,12l2,2 4,-4"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,22c5.523,0 10,-4.477 10,-10S17.523,2 12,2 2,6.477 2,12s4.477,10 10,10z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,12l2,2 4,-4"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_keyword.xml b/app/src/main/res/drawable/ic_keyword.xml
index 99929ce9..784817cf 100644
--- a/app/src/main/res/drawable/ic_keyword.xml
+++ b/app/src/main/res/drawable/ic_keyword.xml
@@ -3,10 +3,10 @@
     android:height="25dp"
     android:viewportWidth="25"
     android:viewportHeight="25">
-  <path
-      android:pathData="M12.5,12.5m-12.5,0a12.5,12.5 0,1 1,25 0a12.5,12.5 0,1 1,-25 0"
-      android:fillColor="#89D0E9"/>
-  <path
-      android:pathData="M11.972,13.052L10.256,14.792V17H9.368V8.6H10.256V13.676L15.188,8.6H16.208L12.572,12.404L16.46,17H15.404L11.972,13.052Z"
-      android:fillColor="#486069"/>
+    <path
+        android:fillColor="#89D0E9"
+        android:pathData="M12.5,12.5m-12.5,0a12.5,12.5 0,1 1,25 0a12.5,12.5 0,1 1,-25 0"/>
+    <path
+        android:fillColor="#486069"
+        android:pathData="M11.972,13.052L10.256,14.792V17H9.368V8.6H10.256V13.676L15.188,8.6H16.208L12.572,12.404L16.46,17H15.404L11.972,13.052Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_label.xml b/app/src/main/res/drawable/ic_label.xml
index f7f3fbe1..816ee887 100644
--- a/app/src/main/res/drawable/ic_label.xml
+++ b/app/src/main/res/drawable/ic_label.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M20.59,13.41l-7.17,7.17a2,2 0,0 1,-2.83 0L2,12V2h10l8.59,8.59a2,2 0,0 1,0 2.82z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M7,7L7.01,7"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M20.59,13.41l-7.17,7.17a2,2 0,0 1,-2.83 0L2,12V2h10l8.59,8.59a2,2 0,0 1,0 2.82z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M7,7L7.01,7"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
index f99a18bc..4d56c51a 100644
--- a/app/src/main/res/drawable/ic_language.xml
+++ b/app/src/main/res/drawable/ic_language.xml
@@ -1,5 +1,6 @@
-<vector android:height="24dp" android:tint="?attr/iconsColor"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:tint="?attr/iconsColor"
+    android:viewportWidth="24.0" android:viewportHeight="24.0">
+    <path android:fillColor="#FF000000"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_like.xml b/app/src/main/res/drawable/ic_like.xml
index 216ce2d0..72f7c223 100644
--- a/app/src/main/res/drawable/ic_like.xml
+++ b/app/src/main/res/drawable/ic_like.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M14,9V5a3,3 0,0 0,-3 -3l-4,9v11h11.28a2,2 0,0 0,2 -1.7l1.38,-9a2,2 0,0 0,-2 -2.3zM7,22H4a2,2 0,0 1,-2 -2v-7a2,2 0,0 1,2 -2h3"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M14,9V5a3,3 0,0 0,-3 -3l-4,9v11h11.28a2,2 0,0 0,2 -1.7l1.38,-9a2,2 0,0 0,-2 -2.3zM7,22H4a2,2 0,0 1,-2 -2v-7a2,2 0,0 1,2 -2h3"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml
index 34212db0..90b9a723 100644
--- a/app/src/main/res/drawable/ic_link.xml
+++ b/app/src/main/res/drawable/ic_link.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M10,13a5,5 0,0 0,7.54 0.54l3,-3a5,5 0,0 0,-7.07 -7.07l-1.72,1.71"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M14,11a5,5 0,0 0,-7.54 -0.54l-3,3a5,5 0,0 0,7.07 7.07l1.71,-1.71"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M10,13a5,5 0,0 0,7.54 0.54l3,-3a5,5 0,0 0,-7.07 -7.07l-1.72,1.71"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M14,11a5,5 0,0 0,-7.54 -0.54l-3,3a5,5 0,0 0,7.07 7.07l1.71,-1.71"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loader.xml b/app/src/main/res/drawable/ic_loader.xml
index 10eea365..3d7fcd54 100644
--- a/app/src/main/res/drawable/ic_loader.xml
+++ b/app/src/main/res/drawable/ic_loader.xml
@@ -1,7 +1,9 @@
-<vector android:autoMirrored="true" android:height="40dp"
-    android:viewportHeight="40" android:viewportWidth="40"
-    android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="40dp"
+    android:height="40dp" android:autoMirrored="true"
+    android:viewportWidth="40" android:viewportHeight="40">
     <path android:fillAlpha="0.2" android:fillColor="@color/colorAccent"
-        android:pathData="M20.201,5.169c-8.254,0 -14.946,6.692 -14.946,14.946c0,8.255 6.692,14.946 14.946,14.946s14.946,-6.691 14.946,-14.946C35.146,11.861 28.455,5.169 20.201,5.169zM20.201,31.749c-6.425,0 -11.634,-5.208 -11.634,-11.634c0,-6.425 5.209,-11.634 11.634,-11.634c6.425,0 11.633,5.209 11.633,11.634C31.834,26.541 26.626,31.749 20.201,31.749z" android:strokeAlpha="0.2"/>
-    <path android:fillColor="@color/colorAccent" android:pathData="M26.013,10.047l1.654,-2.866c-2.198,-1.272 -4.743,-2.012 -7.466,-2.012h0v3.312h0C22.32,8.481 24.301,9.057 26.013,10.047z"/>
+        android:pathData="M20.201,5.169c-8.254,0 -14.946,6.692 -14.946,14.946c0,8.255 6.692,14.946 14.946,14.946s14.946,-6.691 14.946,-14.946C35.146,11.861 28.455,5.169 20.201,5.169zM20.201,31.749c-6.425,0 -11.634,-5.208 -11.634,-11.634c0,-6.425 5.209,-11.634 11.634,-11.634c6.425,0 11.633,5.209 11.633,11.634C31.834,26.541 26.626,31.749 20.201,31.749z"
+        android:strokeAlpha="0.2"/>
+    <path android:fillColor="@color/colorAccent"
+        android:pathData="M26.013,10.047l1.654,-2.866c-2.198,-1.272 -4.743,-2.012 -7.466,-2.012h0v3.312h0C22.32,8.481 24.301,9.057 26.013,10.047z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
index 603fd244..b44d3424 100644
--- a/app/src/main/res/drawable/ic_location.xml
+++ b/app/src/main/res/drawable/ic_location.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M21,10c0,7 -9,13 -9,13s-9,-6 -9,-13a9,9 0,0 1,18 0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M12,10m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M21,10c0,7 -9,13 -9,13s-9,-6 -9,-13a9,9 0,0 1,18 0z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,10m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
index 87eaf2be..de803123 100644
--- a/app/src/main/res/drawable/ic_lock.xml
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M5,11L19,11A2,2 0,0 1,21 13L21,20A2,2 0,0 1,19 22L5,22A2,2 0,0 1,3 20L3,13A2,2 0,0 1,5 11z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M7,11V7a5,5 0,0 1,10 0v4"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M5,11L19,11A2,2 0,0 1,21 13L21,20A2,2 0,0 1,19 22L5,22A2,2 0,0 1,3 20L3,13A2,2 0,0 1,5 11z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M7,11V7a5,5 0,0 1,10 0v4"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_logout.xml b/app/src/main/res/drawable/ic_logout.xml
index 1d3ff3d1..830ef232 100644
--- a/app/src/main/res/drawable/ic_logout.xml
+++ b/app/src/main/res/drawable/ic_logout.xml
@@ -3,25 +3,25 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M9,21H5a2,2 0,0 1,-2 -2V5a2,2 0,0 1,2 -2h4"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M16,17l5,-5l-5,-5"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M21,12L9,12"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,21H5a2,2 0,0 1,-2 -2V5a2,2 0,0 1,2 -2h4"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M16,17l5,-5l-5,-5"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M21,12L9,12"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_markdown.xml b/app/src/main/res/drawable/ic_markdown.xml
index 93fa75dc..b999100a 100644
--- a/app/src/main/res/drawable/ic_markdown.xml
+++ b/app/src/main/res/drawable/ic_markdown.xml
@@ -1,4 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/iconsColor" android:fillType="evenOdd" android:pathData="M14.85,3L1.15,3C0.52,3 0,3.52 0,4.15v7.69C0,12.48 0.52,13 1.15,13h13.69c0.64,0 1.15,-0.52 1.15,-1.15v-7.7C16,3.52 15.48,3 14.85,3zM9,11L7,11L7,8L5.5,9.92 4,8v3L2,11L2,5h2l1.5,2L7,5h2v6zM11.99,11.5L9.5,8L11,8L11,5h2v3h1.5l-2.51,3.5z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:viewportWidth="16" android:viewportHeight="16">
+    <path android:fillColor="?attr/iconsColor" android:fillType="evenOdd"
+        android:pathData="M14.85,3L1.15,3C0.52,3 0,3.52 0,4.15v7.69C0,12.48 0.52,13 1.15,13h13.69c0.64,0 1.15,-0.52 1.15,-1.15v-7.7C16,3.52 15.48,3 14.85,3zM9,11L7,11L7,8L5.5,9.92 4,8v3L2,11L2,5h2l1.5,2L7,5h2v6zM11.99,11.5L9.5,8L11,8L11,5h2v3h1.5l-2.51,3.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml
index 0b25012e..8a4a02c3 100644
--- a/app/src/main/res/drawable/ic_menu.xml
+++ b/app/src/main/res/drawable/ic_menu.xml
@@ -3,25 +3,25 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M3,12L21,12"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M3,6L21,6"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M3,18L21,18"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3,12L21,12"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3,6L21,6"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3,18L21,18"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_migrate.xml b/app/src/main/res/drawable/ic_migrate.xml
index b5c43f59..26b93346 100644
--- a/app/src/main/res/drawable/ic_migrate.xml
+++ b/app/src/main/res/drawable/ic_migrate.xml
@@ -3,10 +3,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M4.75,0A2.75,2.75 0,0 0,2 2.75v16.5A2.75,2.75 0,0 0,4.75 22h11a0.75,0.75 0,0 0,0 -1.5h-11c-0.69,0 -1.25,-0.56 -1.25,-1.25V18A1.5,1.5 0,0 1,5 16.5h7.25a0.75,0.75 0,0 0,0 -1.5H5c-0.546,0 -1.059,0.146 -1.5,0.401V2.75c0,-0.69 0.56,-1.25 1.25,-1.25H18.5v7a0.75,0.75 0,0 0,1.5 0V0.75a0.75,0.75 0,0 0,-0.75 -0.75H4.75z"/>
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M20,13.903l2.202,2.359a0.75,0.75 0,0 0,1.096 -1.024l-3.5,-3.75a0.75,0.75 0,0 0,-1.096 0l-3.5,3.75a0.75,0.75 0,1 0,1.096 1.024l2.202,-2.36v9.348a0.75,0.75 0,0 0,1.5 0v-9.347z"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:pathData="M4.75,0A2.75,2.75 0,0 0,2 2.75v16.5A2.75,2.75 0,0 0,4.75 22h11a0.75,0.75 0,0 0,0 -1.5h-11c-0.69,0 -1.25,-0.56 -1.25,-1.25V18A1.5,1.5 0,0 1,5 16.5h7.25a0.75,0.75 0,0 0,0 -1.5H5c-0.546,0 -1.059,0.146 -1.5,0.401V2.75c0,-0.69 0.56,-1.25 1.25,-1.25H18.5v7a0.75,0.75 0,0 0,1.5 0V0.75a0.75,0.75 0,0 0,-0.75 -0.75H4.75z"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:pathData="M20,13.903l2.202,2.359a0.75,0.75 0,0 0,1.096 -1.024l-3.5,-3.75a0.75,0.75 0,0 0,-1.096 0l-3.5,3.75a0.75,0.75 0,1 0,1.096 1.024l2.202,-2.36v9.348a0.75,0.75 0,0 0,1.5 0v-9.347z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_milestone.xml b/app/src/main/res/drawable/ic_milestone.xml
index 7d9998dc..e4c3ae7a 100644
--- a/app/src/main/res/drawable/ic_milestone.xml
+++ b/app/src/main/res/drawable/ic_milestone.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M11.75,1a0.75,0.75 0,0 1,0.75 0.75L12.5,4h6.532c0.42,0 0.826,0.15 1.143,0.425l3.187,2.75a1.75,1.75 0,0 1,0 2.65l-3.187,2.75a1.75,1.75 0,0 1,-1.143 0.425L12.5,13v9.25a0.75,0.75 0,0 1,-1.5 0L11,13L3.75,13A1.75,1.75 0,0 1,2 11.25v-5.5C2,4.783 2.784,4 3.75,4L11,4L11,1.75a0.75,0.75 0,0 1,0.75 -0.75zM11.75,5.5h7.282a0.25,0.25 0,0 1,0.163 0.06l3.188,2.75a0.25,0.25 0,0 1,0 0.38l-3.188,2.75a0.25,0.25 0,0 1,-0.163 0.06L3.75,11.5a0.25,0.25 0,0 1,-0.25 -0.25v-5.5a0.25,0.25 0,0 1,0.25 -0.25h8z"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:fillType="evenOdd"
+        android:pathData="M11.75,1a0.75,0.75 0,0 1,0.75 0.75L12.5,4h6.532c0.42,0 0.826,0.15 1.143,0.425l3.187,2.75a1.75,1.75 0,0 1,0 2.65l-3.187,2.75a1.75,1.75 0,0 1,-1.143 0.425L12.5,13v9.25a0.75,0.75 0,0 1,-1.5 0L11,13L3.75,13A1.75,1.75 0,0 1,2 11.25v-5.5C2,4.783 2.784,4 3.75,4L11,4L11,1.75a0.75,0.75 0,0 1,0.75 -0.75zM11.75,5.5h7.282a0.25,0.25 0,0 1,0.163 0.06l3.188,2.75a0.25,0.25 0,0 1,0 0.38l-3.188,2.75a0.25,0.25 0,0 1,-0.163 0.06L3.75,11.5a0.25,0.25 0,0 1,-0.25 -0.25v-5.5a0.25,0.25 0,0 1,0.25 -0.25h8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml
index 341baca5..c5808fd6 100644
--- a/app/src/main/res/drawable/ic_notifications.xml
+++ b/app/src/main/res/drawable/ic_notifications.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M18,8A6,6 0,0 0,6 8c0,7 -3,9 -3,9h18s-3,-2 -3,-9"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M13.73,21a2,2 0,0 1,-3.46 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M18,8A6,6 0,0 0,6 8c0,7 -3,9 -3,9h18s-3,-2 -3,-9"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M13.73,21a2,2 0,0 1,-3.46 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_organization.xml b/app/src/main/res/drawable/ic_organization.xml
index 045235d3..ce6f121c 100644
--- a/app/src/main/res/drawable/ic_organization.xml
+++ b/app/src/main/res/drawable/ic_organization.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M7.25,12a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5zM6.5,9.25a0.75,0.75 0,0 1,0.75 -0.75h0.5a0.75,0.75 0,0 1,0 1.5h-0.5a0.75,0.75 0,0 1,-0.75 -0.75zM7.25,5a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5zM10,12.75a0.75,0.75 0,0 1,0.75 -0.75h0.5a0.75,0.75 0,0 1,0 1.5h-0.5a0.75,0.75 0,0 1,-0.75 -0.75zM10.75,8.5a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5zM10,5.75a0.75,0.75 0,0 1,0.75 -0.75h0.5a0.75,0.75 0,0 1,0 1.5h-0.5a0.75,0.75 0,0 1,-0.75 -0.75zM14.25,12a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5zM13.5,9.25a0.75,0.75 0,0 1,0.75 -0.75h0.5a0.75,0.75 0,0 1,0 1.5h-0.5a0.75,0.75 0,0 1,-0.75 -0.75zM14.25,5a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5z"/>
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M3,20a2,2 0,0 0,2 2h3.75a0.75,0.75 0,0 0,0.75 -0.75L9.5,19h3v2.25c0,0.414 0.336,0.75 0.75,0.75L17,22c0.092,0 0.183,-0.006 0.272,-0.018a0.758,0.758 0,0 0,0.166 0.018L21.5,22a2,2 0,0 0,2 -2v-7.625a2,2 0,0 0,-0.8 -1.6l-1,-0.75a0.75,0.75 0,1 0,-0.9 1.2l1,0.75a0.5,0.5 0,0 1,0.2 0.4L22,20a0.5,0.5 0,0 1,-0.5 0.5h-2.563c0.041,-0.16 0.063,-0.327 0.063,-0.5L19,3a2,2 0,0 0,-2 -2L5,1a2,2 0,0 0,-2 2v17zM5,20.5a0.5,0.5 0,0 1,-0.5 -0.5L4.5,3a0.5,0.5 0,0 1,0.5 -0.5h12a0.5,0.5 0,0 1,0.5 0.5v17a0.5,0.5 0,0 1,-0.5 0.5h-3v-2.25a0.75,0.75 0,0 0,-0.75 -0.75h-4.5a0.75,0.75 0,0 0,-0.75 0.75v2.25L5,20.5z"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:pathData="M7.25,12a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5zM6.5,9.25a0.75,0.75 0,0 1,0.75 -0.75h0.5a0.75,0.75 0,0 1,0 1.5h-0.5a0.75,0.75 0,0 1,-0.75 -0.75zM7.25,5a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5zM10,12.75a0.75,0.75 0,0 1,0.75 -0.75h0.5a0.75,0.75 0,0 1,0 1.5h-0.5a0.75,0.75 0,0 1,-0.75 -0.75zM10.75,8.5a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5zM10,5.75a0.75,0.75 0,0 1,0.75 -0.75h0.5a0.75,0.75 0,0 1,0 1.5h-0.5a0.75,0.75 0,0 1,-0.75 -0.75zM14.25,12a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5zM13.5,9.25a0.75,0.75 0,0 1,0.75 -0.75h0.5a0.75,0.75 0,0 1,0 1.5h-0.5a0.75,0.75 0,0 1,-0.75 -0.75zM14.25,5a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5z"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:fillType="evenOdd"
+        android:pathData="M3,20a2,2 0,0 0,2 2h3.75a0.75,0.75 0,0 0,0.75 -0.75L9.5,19h3v2.25c0,0.414 0.336,0.75 0.75,0.75L17,22c0.092,0 0.183,-0.006 0.272,-0.018a0.758,0.758 0,0 0,0.166 0.018L21.5,22a2,2 0,0 0,2 -2v-7.625a2,2 0,0 0,-0.8 -1.6l-1,-0.75a0.75,0.75 0,1 0,-0.9 1.2l1,0.75a0.5,0.5 0,0 1,0.2 0.4L22,20a0.5,0.5 0,0 1,-0.5 0.5h-2.563c0.041,-0.16 0.063,-0.327 0.063,-0.5L19,3a2,2 0,0 0,-2 -2L5,1a2,2 0,0 0,-2 2v17zM5,20.5a0.5,0.5 0,0 1,-0.5 -0.5L4.5,3a0.5,0.5 0,0 1,0.5 -0.5h12a0.5,0.5 0,0 1,0.5 0.5v17a0.5,0.5 0,0 1,-0.5 0.5h-3v-2.25a0.75,0.75 0,0 0,-0.75 -0.75h-4.5a0.75,0.75 0,0 0,-0.75 0.75v2.25L5,20.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_otp.xml b/app/src/main/res/drawable/ic_otp.xml
index 2c12e3ad..5e65507b 100644
--- a/app/src/main/res/drawable/ic_otp.xml
+++ b/app/src/main/res/drawable/ic_otp.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M7,2L17,2A2,2 0,0 1,19 4L19,20A2,2 0,0 1,17 22L7,22A2,2 0,0 1,5 20L5,4A2,2 0,0 1,7 2z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M12,18L12.01,18"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M7,2L17,2A2,2 0,0 1,19 4L19,20A2,2 0,0 1,17 22L7,22A2,2 0,0 1,5 20L5,4A2,2 0,0 1,7 2z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,18L12.01,18"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_people.xml b/app/src/main/res/drawable/ic_people.xml
index 69852ba9..50b81141 100644
--- a/app/src/main/res/drawable/ic_people.xml
+++ b/app/src/main/res/drawable/ic_people.xml
@@ -3,32 +3,32 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M17,21v-2a4,4 0,0 0,-4 -4H5a4,4 0,0 0,-4 4v2"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M9,7m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M23,21v-2a4,4 0,0 0,-3 -3.87"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M16,3.13a4,4 0,0 1,0 7.75"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M17,21v-2a4,4 0,0 0,-4 -4H5a4,4 0,0 0,-4 4v2"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,7m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M23,21v-2a4,4 0,0 0,-3 -3.87"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M16,3.13a4,4 0,0 1,0 7.75"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml
index 8bebc422..d1b2eaad 100644
--- a/app/src/main/res/drawable/ic_person.xml
+++ b/app/src/main/res/drawable/ic_person.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M20,21v-2a4,4 0,0 0,-4 -4H8a4,4 0,0 0,-4 4v2"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M12,7m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M20,21v-2a4,4 0,0 0,-4 -4H8a4,4 0,0 0,-4 4v2"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,7m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_person_add.xml b/app/src/main/res/drawable/ic_person_add.xml
index 9d952ac7..eaf16223 100644
--- a/app/src/main/res/drawable/ic_person_add.xml
+++ b/app/src/main/res/drawable/ic_person_add.xml
@@ -3,32 +3,32 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M16,21v-2a4,4 0,0 0,-4 -4H5a4,4 0,0 0,-4 4v2"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M8.5,7m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M20,8L20,14"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M23,11L17,11"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M16,21v-2a4,4 0,0 0,-4 -4H5a4,4 0,0 0,-4 4v2"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M8.5,7m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M20,8L20,14"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M23,11L17,11"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_person_remove.xml b/app/src/main/res/drawable/ic_person_remove.xml
index 5ba9a887..3d9d4fbd 100644
--- a/app/src/main/res/drawable/ic_person_remove.xml
+++ b/app/src/main/res/drawable/ic_person_remove.xml
@@ -3,25 +3,25 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M16,21v-2a4,4 0,0 0,-4 -4H5a4,4 0,0 0,-4 4v2"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M8.5,7m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M23,11L17,11"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M16,21v-2a4,4 0,0 0,-4 -4H5a4,4 0,0 0,-4 4v2"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M8.5,7m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M23,11L17,11"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_pin.xml b/app/src/main/res/drawable/ic_pin.xml
index 420f66c8..752919a6 100644
--- a/app/src/main/res/drawable/ic_pin.xml
+++ b/app/src/main/res/drawable/ic_pin.xml
@@ -4,8 +4,8 @@
     android:tint="?attr/iconsColor"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M7.886,1.553a1.75,1.75 0,0 1,2.869 0.604l0.633,1.629a5.666,5.666 0,0 0,3.725 3.395l3.959,1.131a1.75,1.75 0,0 1,0.757 2.92L16.06,15l5.594,5.595a0.75,0.75 0,1 1,-1.06 1.06L15,16.061l-3.768,3.768a1.75,1.75 0,0 1,-2.92 -0.757l-1.131,-3.96a5.667,5.667 0,0 0,-3.395 -3.724l-1.63,-0.633a1.75,1.75 0,0 1,-0.603 -2.869l6.333,-6.333zM14.475,14.465l-0.005,0.005 -0.005,0.005 -4.294,4.293a0.25,0.25 0,0 1,-0.417 -0.108l-1.13,-3.96A7.166,7.166 0,0 0,4.33 9.99L2.7,9.356a0.25,0.25 0,0 1,-0.086 -0.41l6.333,-6.332a0.25,0.25 0,0 1,0.41 0.086l0.633,1.63a7.167,7.167 0,0 0,4.71 4.293l3.96,1.131a0.25,0.25 0,0 1,0.108 0.417l-4.293,4.294z"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="#FF000000"
+        android:fillType="evenOdd"
+        android:pathData="M7.886,1.553a1.75,1.75 0,0 1,2.869 0.604l0.633,1.629a5.666,5.666 0,0 0,3.725 3.395l3.959,1.131a1.75,1.75 0,0 1,0.757 2.92L16.06,15l5.594,5.595a0.75,0.75 0,1 1,-1.06 1.06L15,16.061l-3.768,3.768a1.75,1.75 0,0 1,-2.92 -0.757l-1.131,-3.96a5.667,5.667 0,0 0,-3.395 -3.724l-1.63,-0.633a1.75,1.75 0,0 1,-0.603 -2.869l6.333,-6.333zM14.475,14.465l-0.005,0.005 -0.005,0.005 -4.294,4.293a0.25,0.25 0,0 1,-0.417 -0.108l-1.13,-3.96A7.166,7.166 0,0 0,4.33 9.99L2.7,9.356a0.25,0.25 0,0 1,-0.086 -0.41l6.333,-6.332a0.25,0.25 0,0 1,0.41 0.086l0.633,1.63a7.167,7.167 0,0 0,4.71 4.293l3.96,1.131a0.25,0.25 0,0 1,0.108 0.417l-4.293,4.294z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_play.xml b/app/src/main/res/drawable/ic_play.xml
index 9bf43095..86435538 100644
--- a/app/src/main/res/drawable/ic_play.xml
+++ b/app/src/main/res/drawable/ic_play.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M5,3l14,9l-14,9l0,-18z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M5,3l14,9l-14,9l0,-18z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_pull_request.xml b/app/src/main/res/drawable/ic_pull_request.xml
index 04022300..3d4f443d 100644
--- a/app/src/main/res/drawable/ic_pull_request.xml
+++ b/app/src/main/res/drawable/ic_pull_request.xml
@@ -3,32 +3,32 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M18,18m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M6,6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M13,6h3a2,2 0,0 1,2 2v7"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M6,9L6,21"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M18,18m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M6,6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M13,6h3a2,2 0,0 1,2 2v7"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M6,9L6,21"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_question.xml b/app/src/main/res/drawable/ic_question.xml
index ca41c5a6..1bcb0090 100644
--- a/app/src/main/res/drawable/ic_question.xml
+++ b/app/src/main/res/drawable/ic_question.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M10.97,8.265a1.45,1.45 0,0 0,-0.487 0.57,0.75 0.75,0 0,1 -1.341,-0.67c0.2,-0.402 0.513,-0.826 0.997,-1.148C10.627,6.69 11.244,6.5 12,6.5c0.658,0 1.369,0.195 1.934,0.619a2.45,2.45 0,0 1,1.004 2.006c0,1.033 -0.513,1.72 -1.027,2.215 -0.19,0.183 -0.399,0.358 -0.579,0.508l-0.147,0.123a4.329,4.329 0,0 0,-0.435 0.409v1.37a0.75,0.75 0,1 1,-1.5 0v-1.473c0,-0.237 0.067,-0.504 0.247,-0.736 0.22,-0.28 0.486,-0.517 0.718,-0.714l0.183,-0.153 0.001,-0.001c0.172,-0.143 0.324,-0.27 0.47,-0.412 0.368,-0.355 0.569,-0.676 0.569,-1.136a0.953,0.953 0,0 0,-0.404 -0.806C12.766,8.118 12.384,8 12,8c-0.494,0 -0.814,0.121 -1.03,0.265zM13,17a1,1 0,1 1,-2 0,1 1,0 0,1 2,0z"/>
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M12,1C5.925,1 1,5.925 1,12s4.925,11 11,11 11,-4.925 11,-11S18.075,1 12,1zM2.5,12a9.5,9.5 0,1 1,19 0,9.5 9.5,0 0,1 -19,0z"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:pathData="M10.97,8.265a1.45,1.45 0,0 0,-0.487 0.57,0.75 0.75,0 0,1 -1.341,-0.67c0.2,-0.402 0.513,-0.826 0.997,-1.148C10.627,6.69 11.244,6.5 12,6.5c0.658,0 1.369,0.195 1.934,0.619a2.45,2.45 0,0 1,1.004 2.006c0,1.033 -0.513,1.72 -1.027,2.215 -0.19,0.183 -0.399,0.358 -0.579,0.508l-0.147,0.123a4.329,4.329 0,0 0,-0.435 0.409v1.37a0.75,0.75 0,1 1,-1.5 0v-1.473c0,-0.237 0.067,-0.504 0.247,-0.736 0.22,-0.28 0.486,-0.517 0.718,-0.714l0.183,-0.153 0.001,-0.001c0.172,-0.143 0.324,-0.27 0.47,-0.412 0.368,-0.355 0.569,-0.676 0.569,-1.136a0.953,0.953 0,0 0,-0.404 -0.806C12.766,8.118 12.384,8 12,8c-0.494,0 -0.814,0.121 -1.03,0.265zM13,17a1,1 0,1 1,-2 0,1 1,0 0,1 2,0z"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:fillType="evenOdd"
+        android:pathData="M12,1C5.925,1 1,5.925 1,12s4.925,11 11,11 11,-4.925 11,-11S18.075,1 12,1zM2.5,12a9.5,9.5 0,1 1,19 0,9.5 9.5,0 0,1 -19,0z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_release.xml b/app/src/main/res/drawable/ic_release.xml
index 30a995d8..8d411a63 100644
--- a/app/src/main/res/drawable/ic_release.xml
+++ b/app/src/main/res/drawable/ic_release.xml
@@ -3,32 +3,32 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M16.5,9.4L7.5,4.21"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M21,16V8a2,2 0,0 0,-1 -1.73l-7,-4a2,2 0,0 0,-2 0l-7,4A2,2 0,0 0,3 8v8a2,2 0,0 0,1 1.73l7,4a2,2 0,0 0,2 0l7,-4A2,2 0,0 0,21 16z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M3.27,6.96l8.73,5.05l8.73,-5.05"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M12,22.08L12,12"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M16.5,9.4L7.5,4.21"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M21,16V8a2,2 0,0 0,-1 -1.73l-7,-4a2,2 0,0 0,-2 0l-7,4A2,2 0,0 0,3 8v8a2,2 0,0 0,1 1.73l7,4a2,2 0,0 0,2 0l7,-4A2,2 0,0 0,21 16z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3.27,6.96l8.73,5.05l8.73,-5.05"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,22.08L12,12"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_remove.xml b/app/src/main/res/drawable/ic_remove.xml
index f6e9e941..7d4ed879 100644
--- a/app/src/main/res/drawable/ic_remove.xml
+++ b/app/src/main/res/drawable/ic_remove.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:tint="#FFFFFF"
+    android:viewportWidth="24.0" android:viewportHeight="24.0">
     <path android:fillColor="#FF000000" android:pathData="M19,13H5v-2h14v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_reopen.xml b/app/src/main/res/drawable/ic_reopen.xml
index 3598d914..73250ce0 100644
--- a/app/src/main/res/drawable/ic_reopen.xml
+++ b/app/src/main/res/drawable/ic_reopen.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M23,4l0,6l-6,0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M20.49,15a9,9 0,1 1,-2.12 -9.36L23,10"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M23,4l0,6l-6,0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M20.49,15a9,9 0,1 1,-2.12 -9.36L23,10"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_reply.xml b/app/src/main/res/drawable/ic_reply.xml
index 8e780355..26538623 100644
--- a/app/src/main/res/drawable/ic_reply.xml
+++ b/app/src/main/res/drawable/ic_reply.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="?attr/iconsColor"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:tint="?attr/iconsColor"
+    android:viewportWidth="24.0" android:viewportHeight="24.0">
     <path android:fillColor="#FF000000" android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_repo.xml b/app/src/main/res/drawable/ic_repo.xml
index ed771016..1fd3fac9 100644
--- a/app/src/main/res/drawable/ic_repo.xml
+++ b/app/src/main/res/drawable/ic_repo.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M3,2.75A2.75,2.75 0,0 1,5.75 0h14.5a0.75,0.75 0,0 1,0.75 0.75v20.5a0.75,0.75 0,0 1,-0.75 0.75h-6a0.75,0.75 0,0 1,0 -1.5h5.25v-4H6A1.5,1.5 0,0 0,4.5 18v0.75c0,0.716 0.43,1.334 1.05,1.605a0.75,0.75 0,0 1,-0.6 1.374A3.25,3.25 0,0 1,3 18.75v-16zM19.5,1.5V15H6c-0.546,0 -1.059,0.146 -1.5,0.401V2.75c0,-0.69 0.56,-1.25 1.25,-1.25H19.5z"
-      android:fillType="evenOdd"/>
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M7,18.25a0.25,0.25 0,0 1,0.25 -0.25h5a0.25,0.25 0,0 1,0.25 0.25v5.01a0.25,0.25 0,0 1,-0.397 0.201l-2.206,-1.604a0.25,0.25 0,0 0,-0.294 0L7.397,23.46a0.25,0.25 0,0 1,-0.397 -0.2v-5.01z"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:fillType="evenOdd"
+        android:pathData="M3,2.75A2.75,2.75 0,0 1,5.75 0h14.5a0.75,0.75 0,0 1,0.75 0.75v20.5a0.75,0.75 0,0 1,-0.75 0.75h-6a0.75,0.75 0,0 1,0 -1.5h5.25v-4H6A1.5,1.5 0,0 0,4.5 18v0.75c0,0.716 0.43,1.334 1.05,1.605a0.75,0.75 0,0 1,-0.6 1.374A3.25,3.25 0,0 1,3 18.75v-16zM19.5,1.5V15H6c-0.546,0 -1.059,0.146 -1.5,0.401V2.75c0,-0.69 0.56,-1.25 1.25,-1.25H19.5z"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:pathData="M7,18.25a0.25,0.25 0,0 1,0.25 -0.25h5a0.25,0.25 0,0 1,0.25 0.25v5.01a0.25,0.25 0,0 1,-0.397 0.201l-2.206,-1.604a0.25,0.25 0,0 0,-0.294 0L7.397,23.46a0.25,0.25 0,0 1,-0.397 -0.2v-5.01z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_save.xml b/app/src/main/res/drawable/ic_save.xml
index b22331a5..7f12d5ea 100644
--- a/app/src/main/res/drawable/ic_save.xml
+++ b/app/src/main/res/drawable/ic_save.xml
@@ -3,25 +3,25 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M19,21H5a2,2 0,0 1,-2 -2V5a2,2 0,0 1,2 -2h11l5,5v11a2,2 0,0 1,-2 2z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M17,21l0,-8l-10,0l0,8"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M7,3l0,5l8,0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,21H5a2,2 0,0 1,-2 -2V5a2,2 0,0 1,2 -2h11l5,5v11a2,2 0,0 1,-2 2z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M17,21l0,-8l-10,0l0,8"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M7,3l0,5l8,0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index 14d35950..ddb1c773 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M11,11m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M21,21L16.65,16.65"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M11,11m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M21,21L16.65,16.65"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_security.xml b/app/src/main/res/drawable/ic_security.xml
index d03068a9..5c22ed80 100644
--- a/app/src/main/res/drawable/ic_security.xml
+++ b/app/src/main/res/drawable/ic_security.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,22s8,-4 8,-10V5l-8,-3 -8,3v7c0,6 8,10 8,10z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,22s8,-4 8,-10V5l-8,-3 -8,3v7c0,6 8,10 8,10z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml
index ea45d40a..7655830e 100644
--- a/app/src/main/res/drawable/ic_send.xml
+++ b/app/src/main/res/drawable/ic_send.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M22,2L11,13"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M22,2l-7,20l-4,-9l-9,-4l20,-7z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M22,2L11,13"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M22,2l-7,20l-4,-9l-9,-4l20,-7z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 5930c1f8..1634c979 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M19.4,15a1.65,1.65 0,0 0,0.33 1.82l0.06,0.06a2,2 0,0 1,0 2.83,2 2,0 0,1 -2.83,0l-0.06,-0.06a1.65,1.65 0,0 0,-1.82 -0.33,1.65 1.65,0 0,0 -1,1.51V21a2,2 0,0 1,-2 2,2 2,0 0,1 -2,-2v-0.09A1.65,1.65 0,0 0,9 19.4a1.65,1.65 0,0 0,-1.82 0.33l-0.06,0.06a2,2 0,0 1,-2.83 0,2 2,0 0,1 0,-2.83l0.06,-0.06a1.65,1.65 0,0 0,0.33 -1.82,1.65 1.65,0 0,0 -1.51,-1H3a2,2 0,0 1,-2 -2,2 2,0 0,1 2,-2h0.09A1.65,1.65 0,0 0,4.6 9a1.65,1.65 0,0 0,-0.33 -1.82l-0.06,-0.06a2,2 0,0 1,0 -2.83,2 2,0 0,1 2.83,0l0.06,0.06a1.65,1.65 0,0 0,1.82 0.33H9a1.65,1.65 0,0 0,1 -1.51V3a2,2 0,0 1,2 -2,2 2,0 0,1 2,2v0.09a1.65,1.65 0,0 0,1 1.51,1.65 1.65,0 0,0 1.82,-0.33l0.06,-0.06a2,2 0,0 1,2.83 0,2 2,0 0,1 0,2.83l-0.06,0.06a1.65,1.65 0,0 0,-0.33 1.82V9a1.65,1.65 0,0 0,1.51 1H21a2,2 0,0 1,2 2,2 2,0 0,1 -2,2h-0.09a1.65,1.65 0,0 0,-1.51 1z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19.4,15a1.65,1.65 0,0 0,0.33 1.82l0.06,0.06a2,2 0,0 1,0 2.83,2 2,0 0,1 -2.83,0l-0.06,-0.06a1.65,1.65 0,0 0,-1.82 -0.33,1.65 1.65,0 0,0 -1,1.51V21a2,2 0,0 1,-2 2,2 2,0 0,1 -2,-2v-0.09A1.65,1.65 0,0 0,9 19.4a1.65,1.65 0,0 0,-1.82 0.33l-0.06,0.06a2,2 0,0 1,-2.83 0,2 2,0 0,1 0,-2.83l0.06,-0.06a1.65,1.65 0,0 0,0.33 -1.82,1.65 1.65,0 0,0 -1.51,-1H3a2,2 0,0 1,-2 -2,2 2,0 0,1 2,-2h0.09A1.65,1.65 0,0 0,4.6 9a1.65,1.65 0,0 0,-0.33 -1.82l-0.06,-0.06a2,2 0,0 1,0 -2.83,2 2,0 0,1 2.83,0l0.06,0.06a1.65,1.65 0,0 0,1.82 0.33H9a1.65,1.65 0,0 0,1 -1.51V3a2,2 0,0 1,2 -2,2 2,0 0,1 2,2v0.09a1.65,1.65 0,0 0,1 1.51,1.65 1.65,0 0,0 1.82,-0.33l0.06,-0.06a2,2 0,0 1,2.83 0,2 2,0 0,1 0,2.83l-0.06,0.06a1.65,1.65 0,0 0,-0.33 1.82V9a1.65,1.65 0,0 0,1.51 1H21a2,2 0,0 1,2 2,2 2,0 0,1 -2,2h-0.09a1.65,1.65 0,0 0,-1.51 1z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index 494c9dc4..31553849 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -3,39 +3,39 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M18,5m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M6,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M18,19m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M8.59,13.51L15.42,17.49"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M15.41,6.51L8.59,10.49"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M18,5m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M6,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M18,19m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M8.59,13.51L15.42,17.49"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M15.41,6.51L8.59,10.49"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_snippet.xml b/app/src/main/res/drawable/ic_snippet.xml
index 41a20ab6..9be692d4 100644
--- a/app/src/main/res/drawable/ic_snippet.xml
+++ b/app/src/main/res/drawable/ic_snippet.xml
@@ -3,10 +3,10 @@
     android:height="25dp"
     android:viewportWidth="25"
     android:viewportHeight="25">
-  <path
-      android:pathData="M12.5,12.5m-12.5,0a12.5,12.5 0,1 1,25 0a12.5,12.5 0,1 1,-25 0"
-      android:fillColor="#F8B6C2"/>
-  <path
-      android:pathData="M12.684,17.072C12.06,17.072 11.46,16.972 10.884,16.772C10.316,16.572 9.876,16.308 9.564,15.98L9.912,15.296C10.216,15.6 10.62,15.848 11.124,16.04C11.628,16.224 12.148,16.316 12.684,16.316C13.436,16.316 14,16.18 14.376,15.908C14.752,15.628 14.94,15.268 14.94,14.828C14.94,14.492 14.836,14.224 14.628,14.024C14.428,13.824 14.18,13.672 13.884,13.568C13.588,13.456 13.176,13.336 12.648,13.208C12.016,13.048 11.512,12.896 11.136,12.752C10.76,12.6 10.436,12.372 10.164,12.068C9.9,11.764 9.768,11.352 9.768,10.832C9.768,10.408 9.88,10.024 10.104,9.68C10.328,9.328 10.672,9.048 11.136,8.84C11.6,8.632 12.176,8.528 12.864,8.528C13.344,8.528 13.812,8.596 14.268,8.732C14.732,8.86 15.132,9.04 15.468,9.272L15.168,9.98C14.816,9.748 14.44,9.576 14.04,9.464C13.64,9.344 13.248,9.284 12.864,9.284C12.128,9.284 11.572,9.428 11.196,9.716C10.828,9.996 10.644,10.36 10.644,10.808C10.644,11.144 10.744,11.416 10.944,11.624C11.152,11.824 11.408,11.98 11.712,12.092C12.024,12.196 12.44,12.312 12.96,12.44C13.576,12.592 14.072,12.744 14.448,12.896C14.832,13.04 15.156,13.264 15.42,13.568C15.684,13.864 15.816,14.268 15.816,14.78C15.816,15.204 15.7,15.592 15.468,15.944C15.244,16.288 14.896,16.564 14.424,16.772C13.952,16.972 13.372,17.072 12.684,17.072Z"
-      android:fillColor="#486069"/>
+    <path
+        android:fillColor="#F8B6C2"
+        android:pathData="M12.5,12.5m-12.5,0a12.5,12.5 0,1 1,25 0a12.5,12.5 0,1 1,-25 0"/>
+    <path
+        android:fillColor="#486069"
+        android:pathData="M12.684,17.072C12.06,17.072 11.46,16.972 10.884,16.772C10.316,16.572 9.876,16.308 9.564,15.98L9.912,15.296C10.216,15.6 10.62,15.848 11.124,16.04C11.628,16.224 12.148,16.316 12.684,16.316C13.436,16.316 14,16.18 14.376,15.908C14.752,15.628 14.94,15.268 14.94,14.828C14.94,14.492 14.836,14.224 14.628,14.024C14.428,13.824 14.18,13.672 13.884,13.568C13.588,13.456 13.176,13.336 12.648,13.208C12.016,13.048 11.512,12.896 11.136,12.752C10.76,12.6 10.436,12.372 10.164,12.068C9.9,11.764 9.768,11.352 9.768,10.832C9.768,10.408 9.88,10.024 10.104,9.68C10.328,9.328 10.672,9.048 11.136,8.84C11.6,8.632 12.176,8.528 12.864,8.528C13.344,8.528 13.812,8.596 14.268,8.732C14.732,8.86 15.132,9.04 15.468,9.272L15.168,9.98C14.816,9.748 14.44,9.576 14.04,9.464C13.64,9.344 13.248,9.284 12.864,9.284C12.128,9.284 11.572,9.428 11.196,9.716C10.828,9.996 10.644,10.36 10.644,10.808C10.644,11.144 10.744,11.416 10.944,11.624C11.152,11.824 11.408,11.98 11.712,12.092C12.024,12.196 12.44,12.312 12.96,12.44C13.576,12.592 14.072,12.744 14.448,12.896C14.832,13.04 15.156,13.264 15.42,13.568C15.684,13.864 15.816,14.268 15.816,14.78C15.816,15.204 15.7,15.592 15.468,15.944C15.244,16.288 14.896,16.564 14.424,16.772C13.952,16.972 13.372,17.072 12.684,17.072Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml
index 46e8ad01..cdf6b04e 100644
--- a/app/src/main/res/drawable/ic_star.xml
+++ b/app/src/main/res/drawable/ic_star.xml
@@ -5,10 +5,10 @@
 
     android:viewportHeight="24">
     <path
-        android:pathData="M12,2l3.09,6.26l6.91,1.01l-5,4.87l1.18,6.88l-6.18,-3.25l-6.18,3.25l1.18,-6.88l-5,-4.87l6.91,-1.01l3.09,-6.26z"
-        android:strokeLineJoin="round"
-        android:strokeWidth="2"
         android:fillColor="?attr/iconsColor"
+        android:pathData="M12,2l3.09,6.26l6.91,1.01l-5,4.87l1.18,6.88l-6.18,-3.25l-6.18,3.25l1.18,-6.88l-5,-4.87l6.91,-1.01l3.09,-6.26z"
+        android:strokeWidth="2"
         android:strokeColor="?attr/iconsColor"
-        android:strokeLineCap="round"/>
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_star_unfilled.xml b/app/src/main/res/drawable/ic_star_unfilled.xml
index 2ad4c8e9..a6426131 100644
--- a/app/src/main/res/drawable/ic_star_unfilled.xml
+++ b/app/src/main/res/drawable/ic_star_unfilled.xml
@@ -4,11 +4,11 @@
     android:viewportWidth="24"
 
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,2l3.09,6.26l6.91,1.01l-5,4.87l1.18,6.88l-6.18,-3.25l-6.18,3.25l1.18,-6.88l-5,-4.87l6.91,-1.01l3.09,-6.26z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,2l3.09,6.26l6.91,1.01l-5,4.87l1.18,6.88l-6.18,-3.25l-6.18,3.25l1.18,-6.88l-5,-4.87l6.91,-1.01l3.09,-6.26z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_submodule.xml b/app/src/main/res/drawable/ic_submodule.xml
index 2f2eb4cd..b9c242cf 100644
--- a/app/src/main/res/drawable/ic_submodule.xml
+++ b/app/src/main/res/drawable/ic_submodule.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M2,4.75C2,3.784 2.784,3 3.75,3h4.965a1.75,1.75 0,0 1,1.456 0.78l1.406,2.109a0.25,0.25 0,0 0,0.208 0.111h8.465c0.966,0 1.75,0.784 1.75,1.75v11.5A1.75,1.75 0,0 1,20.25 21L3.75,21A1.75,1.75 0,0 1,2 19.25L2,4.75zM14.78,9.72a0.75,0.75 0,1 0,-1.06 1.06l1.72,1.72L6.75,12.5a0.75,0.75 0,0 0,0 1.5h8.69l-1.72,1.72a0.75,0.75 0,1 0,1.06 1.06l3,-3a0.75,0.75 0,0 0,0 -1.06l-3,-3z"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:fillType="evenOdd"
+        android:pathData="M2,4.75C2,3.784 2.784,3 3.75,3h4.965a1.75,1.75 0,0 1,1.456 0.78l1.406,2.109a0.25,0.25 0,0 0,0.208 0.111h8.465c0.966,0 1.75,0.784 1.75,1.75v11.5A1.75,1.75 0,0 1,20.25 21L3.75,21A1.75,1.75 0,0 1,2 19.25L2,4.75zM14.78,9.72a0.75,0.75 0,1 0,-1.06 1.06l1.72,1.72L6.75,12.5a0.75,0.75 0,0 0,0 1.5h8.69l-1.72,1.72a0.75,0.75 0,1 0,1.06 1.06l3,-3a0.75,0.75 0,0 0,0 -1.06l-3,-3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_symlink.xml b/app/src/main/res/drawable/ic_symlink.xml
index 9a363867..91122102 100644
--- a/app/src/main/res/drawable/ic_symlink.xml
+++ b/app/src/main/res/drawable/ic_symlink.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/iconsColor"
-      android:pathData="M3,3a2,2 0,0 1,2 -2h9.982a2,2 0,0 1,1.414 0.586l4.018,4.018A2,2 0,0 1,21 7.018L21,21a2,2 0,0 1,-2 2L4.75,23a0.75,0.75 0,0 1,0 -1.5L19,21.5a0.5,0.5 0,0 0,0.5 -0.5L19.5,8.5h-4a2,2 0,0 1,-2 -2v-4L5,2.5a0.5,0.5 0,0 0,-0.5 0.5v6.25a0.75,0.75 0,0 1,-1.5 0L3,3zM15,2.5v4a0.5,0.5 0,0 0,0.5 0.5h4a0.5,0.5 0,0 0,-0.146 -0.336l-4.018,-4.018A0.5,0.5 0,0 0,15 2.5zM9.308,14.5l-2.104,-2.236a0.75,0.75 0,1 1,1.092 -1.028l3.294,3.5a0.75,0.75 0,0 1,0 1.028l-3.294,3.5a0.75,0.75 0,1 1,-1.092 -1.028L9.308,16L4.09,16a2.59,2.59 0,0 0,-2.59 2.59v3.16a0.75,0.75 0,0 1,-1.5 0v-3.16a4.09,4.09 0,0 1,4.09 -4.09h5.218z"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="?attr/iconsColor"
+        android:fillType="evenOdd"
+        android:pathData="M3,3a2,2 0,0 1,2 -2h9.982a2,2 0,0 1,1.414 0.586l4.018,4.018A2,2 0,0 1,21 7.018L21,21a2,2 0,0 1,-2 2L4.75,23a0.75,0.75 0,0 1,0 -1.5L19,21.5a0.5,0.5 0,0 0,0.5 -0.5L19.5,8.5h-4a2,2 0,0 1,-2 -2v-4L5,2.5a0.5,0.5 0,0 0,-0.5 0.5v6.25a0.75,0.75 0,0 1,-1.5 0L3,3zM15,2.5v4a0.5,0.5 0,0 0,0.5 0.5h4a0.5,0.5 0,0 0,-0.146 -0.336l-4.018,-4.018A0.5,0.5 0,0 0,15 2.5zM9.308,14.5l-2.104,-2.236a0.75,0.75 0,1 1,1.092 -1.028l3.294,3.5a0.75,0.75 0,0 1,0 1.028l-3.294,3.5a0.75,0.75 0,1 1,-1.092 -1.028L9.308,16L4.09,16a2.59,2.59 0,0 0,-2.59 2.59v3.16a0.75,0.75 0,0 1,-1.5 0v-3.16a4.09,4.09 0,0 1,4.09 -4.09h5.218z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_tasks.xml b/app/src/main/res/drawable/ic_tasks.xml
index c60621ba..0ccf3b1c 100644
--- a/app/src/main/res/drawable/ic_tasks.xml
+++ b/app/src/main/res/drawable/ic_tasks.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M16,4h2a2,2 0,0 1,2 2v14a2,2 0,0 1,-2 2H6a2,2 0,0 1,-2 -2V6a2,2 0,0 1,2 -2h2"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M9,2L15,2A1,1 0,0 1,16 3L16,5A1,1 0,0 1,15 6L9,6A1,1 0,0 1,8 5L8,3A1,1 0,0 1,9 2z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M16,4h2a2,2 0,0 1,2 2v14a2,2 0,0 1,-2 2H6a2,2 0,0 1,-2 -2V6a2,2 0,0 1,2 -2h2"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,2L15,2A1,1 0,0 1,16 3L16,5A1,1 0,0 1,15 6L9,6A1,1 0,0 1,8 5L8,3A1,1 0,0 1,9 2z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_tool.xml b/app/src/main/res/drawable/ic_tool.xml
index cec91fef..68f4bc6e 100644
--- a/app/src/main/res/drawable/ic_tool.xml
+++ b/app/src/main/res/drawable/ic_tool.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M14.7,6.3a1,1 0,0 0,0 1.4l1.6,1.6a1,1 0,0 0,1.4 0l3.77,-3.77a6,6 0,0 1,-7.94 7.94l-6.91,6.91a2.12,2.12 0,0 1,-3 -3l6.91,-6.91a6,6 0,0 1,7.94 -7.94l-3.76,3.76z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M14.7,6.3a1,1 0,0 0,0 1.4l1.6,1.6a1,1 0,0 0,1.4 0l3.77,-3.77a6,6 0,0 1,-7.94 7.94l-6.91,6.91a2.12,2.12 0,0 1,-3 -3l6.91,-6.91a6,6 0,0 1,7.94 -7.94l-3.76,3.76z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_unlock.xml b/app/src/main/res/drawable/ic_unlock.xml
index 69322218..f50c274e 100644
--- a/app/src/main/res/drawable/ic_unlock.xml
+++ b/app/src/main/res/drawable/ic_unlock.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M5,11L19,11A2,2 0,0 1,21 13L21,20A2,2 0,0 1,19 22L5,22A2,2 0,0 1,3 20L3,13A2,2 0,0 1,5 11z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M7,11V7a5,5 0,0 1,9.9 -1"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M5,11L19,11A2,2 0,0 1,21 13L21,20A2,2 0,0 1,19 22L5,22A2,2 0,0 1,3 20L3,13A2,2 0,0 1,5 11z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M7,11V7a5,5 0,0 1,9.9 -1"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_unwatch.xml b/app/src/main/res/drawable/ic_unwatch.xml
index abb78f9f..a3369b24 100644
--- a/app/src/main/res/drawable/ic_unwatch.xml
+++ b/app/src/main/res/drawable/ic_unwatch.xml
@@ -4,17 +4,17 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#00000000"
         android:pathData="M1,12s4,-8 11,-8 11,8 11,8 -4,8 -11,8 -11,-8 -11,-8z"
-        android:strokeLineJoin="round"
         android:strokeWidth="2"
-        android:fillColor="#00000000"
         android:strokeColor="?attr/iconsColor"
-        android:strokeLineCap="round"/>
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
     <path
-        android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-        android:strokeLineJoin="round"
-        android:strokeWidth="2"
         android:fillColor="#00000000"
+        android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeWidth="2"
         android:strokeColor="?attr/iconsColor"
-        android:strokeLineCap="round"/>
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml
index 6188f3b0..ff53349e 100644
--- a/app/src/main/res/drawable/ic_update.xml
+++ b/app/src/main/res/drawable/ic_update.xml
@@ -3,25 +3,25 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M23,4l0,6l-6,0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M1,20l0,-6l6,0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M3.51,9a9,9 0,0 1,14.85 -3.36L23,10M1,14l4.64,4.36A9,9 0,0 0,20.49 15"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M23,4l0,6l-6,0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M1,20l0,-6l6,0"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3.51,9a9,9 0,0 1,14.85 -3.36L23,10M1,14l4.64,4.36A9,9 0,0 0,20.49 15"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_verified_user.xml b/app/src/main/res/drawable/ic_verified_user.xml
index fe957909..ccced5da 100644
--- a/app/src/main/res/drawable/ic_verified_user.xml
+++ b/app/src/main/res/drawable/ic_verified_user.xml
@@ -1,5 +1,6 @@
-<vector android:height="24dp" android:tint="?attr/iconsColor"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM10,17l-4,-4 1.41,-1.41L10,14.17l6.59,-6.59L18,9l-8,8z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:tint="?attr/iconsColor"
+    android:viewportWidth="24.0" android:viewportHeight="24.0">
+    <path android:fillColor="#FF000000"
+        android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM10,17l-4,-4 1.41,-1.41L10,14.17l6.59,-6.59L18,9l-8,8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml
index 53514f5b..d35666b4 100644
--- a/app/src/main/res/drawable/ic_warning.xml
+++ b/app/src/main/res/drawable/ic_warning.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="?attr/iconsColor"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:tint="?attr/iconsColor"
+    android:viewportWidth="24.0" android:viewportHeight="24.0">
     <path android:fillColor="#FF000000" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_watchers.xml b/app/src/main/res/drawable/ic_watchers.xml
index d4f40478..3a307142 100644
--- a/app/src/main/res/drawable/ic_watchers.xml
+++ b/app/src/main/res/drawable/ic_watchers.xml
@@ -1,5 +1,6 @@
-<vector android:height="24dp" android:tint="?attr/iconsColor"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:tint="?attr/iconsColor"
+    android:viewportWidth="24.0" android:viewportHeight="24.0">
+    <path android:fillColor="#FF000000"
+        android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_wiki.xml b/app/src/main/res/drawable/ic_wiki.xml
index abe8a807..4648cda4 100644
--- a/app/src/main/res/drawable/ic_wiki.xml
+++ b/app/src/main/res/drawable/ic_wiki.xml
@@ -3,18 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M2,3h6a4,4 0,0 1,4 4v14a3,3 0,0 0,-3 -3H2z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M22,3h-6a4,4 0,0 0,-4 4v14a3,3 0,0 1,3 -3h7z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="?attr/iconsColor"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M2,3h6a4,4 0,0 1,4 4v14a3,3 0,0 0,-3 -3H2z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M22,3h-6a4,4 0,0 0,-4 4v14a3,3 0,0 1,3 -3h7z"
+        android:strokeWidth="2"
+        android:strokeColor="?attr/iconsColor"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/loader_animated.xml b/app/src/main/res/drawable/loader_animated.xml
index 29f7b236..b521ad7d 100644
--- a/app/src/main/res/drawable/loader_animated.xml
+++ b/app/src/main/res/drawable/loader_animated.xml
@@ -6,7 +6,7 @@
         <animated-rotate
             android:drawable="@drawable/ic_loader"
             android:pivotX="50%"
-            android:pivotY="50%" />
+            android:pivotY="50%"/>
     </item>
 
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/app/src/main/res/drawable/progress_bar.xml b/app/src/main/res/drawable/progress_bar.xml
index b8b362e3..3178ed33 100644
--- a/app/src/main/res/drawable/progress_bar.xml
+++ b/app/src/main/res/drawable/progress_bar.xml
@@ -4,10 +4,10 @@
 
     <item
         android:id="@android:id/background"
-        android:top="2dp"
         android:bottom="2dp"
+        android:left="1dp"
         android:right="1dp"
-        android:left="1dp">
+        android:top="2dp">
         <shape>
             <corners android:radius="10dp"/>
             <solid android:color="?attr/inputBackgroundColor"/>
@@ -16,14 +16,14 @@
 
     <item
         android:id="@android:id/progress"
-        android:top="2dp"
         android:bottom="2dp"
         android:left="1dp"
-        android:right="1dp">
+        android:right="1dp"
+        android:top="2dp">
 
         <scale android:scaleWidth="100%">
             <shape>
-                <corners android:radius="10dp" />
+                <corners android:radius="10dp"/>
             </shape>
         </scale>
     </item>
diff --git a/app/src/main/res/drawable/shape_archived.xml b/app/src/main/res/drawable/shape_archived.xml
index 29f2a199..5deb42d8 100644
--- a/app/src/main/res/drawable/shape_archived.xml
+++ b/app/src/main/res/drawable/shape_archived.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
+    android:shape="rectangle">
 
     <corners android:radius="3dp"/>
-    <solid android:color="@color/releasePre" />
+    <solid android:color="@color/releasePre"/>
 
 </shape>
diff --git a/app/src/main/res/drawable/shape_badge_background.xml b/app/src/main/res/drawable/shape_badge_background.xml
index 200f3a02..92a33527 100644
--- a/app/src/main/res/drawable/shape_badge_background.xml
+++ b/app/src/main/res/drawable/shape_badge_background.xml
@@ -2,13 +2,13 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <corners android:radius="8dp" />
+    <corners android:radius="8dp"/>
     <solid
         android:color="?attr/iconsColor"/>
     <padding
         android:bottom="2dp"
         android:left="5dp"
         android:right="5dp"
-        android:top="2dp" />
+        android:top="2dp"/>
 
 </shape>
diff --git a/app/src/main/res/drawable/shape_bottom_sheet_top_corners.xml b/app/src/main/res/drawable/shape_bottom_sheet_top_corners.xml
index 3b0eafdc..e0bc56f2 100644
--- a/app/src/main/res/drawable/shape_bottom_sheet_top_corners.xml
+++ b/app/src/main/res/drawable/shape_bottom_sheet_top_corners.xml
@@ -4,10 +4,10 @@
 
     <corners
         android:topLeftRadius="12dp"
-        android:topRightRadius="12dp" />
+        android:topRightRadius="12dp"/>
 
-    <padding android:top="12dp" />
+    <padding android:top="12dp"/>
 
-    <solid android:color="?attr/primaryBackgroundColor" />
+    <solid android:color="?attr/primaryBackgroundColor"/>
 
 </shape>
diff --git a/app/src/main/res/drawable/shape_full_circle.xml b/app/src/main/res/drawable/shape_full_circle.xml
index bca322a9..cd23384d 100644
--- a/app/src/main/res/drawable/shape_full_circle.xml
+++ b/app/src/main/res/drawable/shape_full_circle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
+    android:shape="rectangle">
     <solid android:color="?attr/primaryBackgroundColor"/>
     <corners android:radius="32dp"/>
 
diff --git a/app/src/main/res/drawable/shape_inputs.xml b/app/src/main/res/drawable/shape_inputs.xml
index cc896af4..c3e0c2a7 100644
--- a/app/src/main/res/drawable/shape_inputs.xml
+++ b/app/src/main/res/drawable/shape_inputs.xml
@@ -12,10 +12,10 @@
     </corners>
 
     <padding
-        android:top="0dp"
-        android:right="10dp"
+        android:bottom="0dp"
         android:left="10dp"
-        android:bottom="0dp">
+        android:right="10dp"
+        android:top="0dp">
     </padding>
 
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/shape_list_divider.xml b/app/src/main/res/drawable/shape_list_divider.xml
index 5269b123..ad91908a 100644
--- a/app/src/main/res/drawable/shape_list_divider.xml
+++ b/app/src/main/res/drawable/shape_list_divider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:width="1dp" android:height="1dp" />
-    <solid android:color="?attr/dividerColor" />
+    <size android:width="1dp" android:height="1dp"/>
+    <solid android:color="?attr/dividerColor"/>
 </shape>
diff --git a/app/src/main/res/drawable/shape_round_corners.xml b/app/src/main/res/drawable/shape_round_corners.xml
index 97773612..8495e78d 100644
--- a/app/src/main/res/drawable/shape_round_corners.xml
+++ b/app/src/main/res/drawable/shape_round_corners.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
+    android:shape="rectangle">
     <solid android:color="?attr/primaryBackgroundColor"/>
     <corners android:radius="12dp"/>
 
diff --git a/app/src/main/res/layout/activity_add_collaborator_to_repository.xml b/app/src/main/res/layout/activity_add_collaborator_to_repository.xml
index 0e7c6dab..201f42c3 100644
--- a/app/src/main/res/layout/activity_add_collaborator_to_repository.xml
+++ b/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"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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="20sp" />
+                android:textSize="20sp"/>
 
         </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="10dp"
-        android:layout_marginEnd="10dp"
         android:layout_marginTop="10dp"
+        android:layout_marginEnd="10dp"
         android:layout_marginBottom="10dp">
 
         <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="8dp"
             android:layout_marginBottom="8dp"
-            app:startIconDrawable="@drawable/ic_search"
-            app:startIconTint="?attr/iconsColor"
+            android:hint="@string/addCollaboratorSearchHint"
+            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:imeOptions="actionSend"
-                android:inputType="text"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -104,17 +104,17 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerViewUserSearch"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/primaryBackgroundColor"
         android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
         android:layout_marginTop="5dp"
+        android:layout_marginEnd="0dp"
         android:layout_marginBottom="0dp"
-        android:scrollbars="vertical" />
+        android:background="?attr/primaryBackgroundColor"
+        android:scrollbars="vertical"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_add_new_account.xml b/app/src/main/res/layout/activity_add_new_account.xml
index 4d938238..a57e1e45 100644
--- a/app/src/main/res/layout/activity_add_new_account.xml
+++ b/app/src/main/res/layout/activity_add_new_account.xml
@@ -26,24 +26,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
+                android:layout_marginRight="15dp"
                 android:contentDescription="@string/close"
-                android:src="@drawable/ic_arrow_back" />
+                android:gravity="center_vertical"
+                android:src="@drawable/ic_arrow_back"/>
 
             <TextView
                 android:id="@+id/toolbarTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:text="@string/addNewAccount"
-                android:textColor="?attr/primaryTextColor"
+                android:layout_marginEnd="20dp"
                 android:ellipsize="none"
                 android:scrollbars="horizontal"
                 android:singleLine="true"
-                android:layout_marginEnd="20dp"
-                android:textSize="18sp" />
+                android:text="@string/addNewAccount"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="18sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -58,26 +58,26 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/protocolSpinnerLayout"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:boxBackgroundColor="?attr/inputBackgroundColor"
-            android:textColorHint="?attr/hintColor"
-            app:hintTextColor="?attr/hintColor"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
             android:hint="@string/protocol"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
             app:endIconTint="?attr/iconsColor"
-            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
+            app:hintTextColor="?attr/hintColor">
 
             <AutoCompleteTextView
                 android:id="@+id/protocolSpinner"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:inputType="none"
-                android:textColor="?attr/inputTextColor"
-                android:labelFor="@+id/protocolSpinner"
                 android:imeOptions="actionNext"
-                android:textSize="16sp" />
+                android:inputType="none"
+                android:labelFor="@+id/protocolSpinner"
+                android:textColor="?attr/inputTextColor"
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -85,28 +85,28 @@
             android:id="@+id/instanceUrlLayout"
             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="8dp"
             android:layout_marginBottom="8dp"
-            app:startIconDrawable="@drawable/ic_link"
-            app:startIconTint="?attr/iconsColor"
+            android:hint="@string/instanceUrl"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            app:boxStrokeErrorColor="@color/darkRed"
             app:endIconMode="clear_text"
             app:endIconTint="?attr/iconsColor"
-            android:hint="@string/instanceUrl">
+            app:hintTextColor="?attr/hintColor"
+            app:startIconDrawable="@drawable/ic_link"
+            app:startIconTint="?attr/iconsColor">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/instanceUrl"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:imeOptions="actionNext"
+                android:singleLine="true"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:singleLine="true"
-                android:imeOptions="actionNext"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -114,28 +114,28 @@
             android:id="@+id/loginTokenLayout"
             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="8dp"
             android:layout_marginBottom="8dp"
-            app:startIconDrawable="@drawable/ic_lock"
-            app:startIconTint="?attr/iconsColor"
+            android:hint="@string/copyToken"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            app:boxStrokeErrorColor="@color/darkRed"
             app:endIconMode="clear_text"
             app:endIconTint="?attr/iconsColor"
-            android:hint="@string/copyToken">
+            app:hintTextColor="?attr/hintColor"
+            app:startIconDrawable="@drawable/ic_lock"
+            app:startIconTint="?attr/iconsColor">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/loginToken"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:imeOptions="actionNext"
+                android:singleLine="true"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:singleLine="true"
-                android:imeOptions="actionNext"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -146,7 +146,7 @@
             android:layout_marginTop="8dp"
             android:text="@string/addNewAccountText"
             android:textColor="@color/btnTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_add_new_team_member.xml b/app/src/main/res/layout/activity_add_new_team_member.xml
index d5530436..f0903a67 100644
--- a/app/src/main/res/layout/activity_add_new_team_member.xml
+++ b/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"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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="20sp" />
+                android:textSize="20sp"/>
 
         </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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        android:visibility="gone"
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
         android:layout_marginTop="10dp"
+        android:layout_marginEnd="10dp"
         android:layout_marginBottom="10dp">
 
         <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="8dp"
             android:layout_marginBottom="8dp"
-            app:startIconDrawable="@drawable/ic_search"
-            app:startIconTint="?attr/iconsColor"
+            android:hint="@string/addCollaboratorSearchHint"
+            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:inputType="text"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -103,17 +103,17 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerViewUserSearch"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/primaryBackgroundColor"
         android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
         android:layout_marginTop="5dp"
+        android:layout_marginEnd="0dp"
         android:layout_marginBottom="0dp"
-        android:scrollbars="vertical" />
+        android:background="?attr/primaryBackgroundColor"
+        android:scrollbars="vertical"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_admin_cron_tasks.xml b/app/src/main/res/layout/activity_admin_cron_tasks.xml
index 92f67c41..5b982019 100644
--- a/app/src/main/res/layout/activity_admin_cron_tasks.xml
+++ b/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:fitsSystemWindows="true"
     android:orientation="vertical">
@@ -11,8 +11,8 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -24,24 +24,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -49,13 +49,13 @@
 
     <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="visible"
-        android:indeterminate="true"
         android:layout_below="@+id/appbar"
-        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        android:indeterminate="true"
+        android:visibility="visible"
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/pullToRefresh"
@@ -68,7 +68,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
@@ -81,6 +81,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_admin_get_users.xml b/app/src/main/res/layout/activity_admin_get_users.xml
index 171efa5e..0ac399dc 100644
--- a/app/src/main/res/layout/activity_admin_get_users.xml
+++ b/app/src/main/res/layout/activity_admin_get_users.xml
@@ -1,17 +1,17 @@
 <?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:orientation="vertical"
-    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,27 +23,27 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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:textColor="?attr/primaryTextColor"
+                android:layout_marginEnd="20dp"
                 android:ellipsize="none"
                 android:scrollbars="horizontal"
                 android:singleLine="true"
-                android:layout_marginEnd="20dp"
-                android:textSize="18sp" />
+                android:text="@string/adminUsers"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="18sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -52,26 +52,26 @@
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/pull_to_refresh"
         android:layout_width="match_parent"
-        android:layout_marginTop="56dp"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="56dp">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <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:layout_marginTop="56dp"
         android:indeterminate="true"
-        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/no_data_users"
@@ -82,6 +82,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_code_editor.xml b/app/src/main/res/layout/activity_code_editor.xml
index 5c226060..cc462a61 100644
--- a/app/src/main/res/layout/activity_code_editor.xml
+++ b/app/src/main/res/layout/activity_code_editor.xml
@@ -1,17 +1,17 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/codeEditor"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -50,14 +50,14 @@
         android:id="@+id/codeView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="56dp"
         android:layout_above="@+id/source_info_layout"
+        android:layout_marginTop="56dp"
         android:background="@color/colorPrimary"
         android:dropDownWidth="@dimen/dimen150dp"
         android:dropDownHorizontalOffset="0dp"
         android:dropDownSelector="@color/colorPrimary"
-        android:textSize="14sp"
-        android:gravity="top|start" />
+        android:gravity="top|start"
+        android:textSize="14sp"/>
 
     <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"
@@ -86,8 +86,8 @@
             android:gravity="center"
             android:textColor="@color/colorAccent"
             android:textSize="@dimen/dimen14sp"
-            tools:text="0:0"
-            tools:ignore="RelativeOverlap" />
+            tools:ignore="RelativeOverlap"
+            tools:text="0:0"/>
     </RelativeLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_commits.xml b/app/src/main/res/layout/activity_commits.xml
index a9ac7997..4f961b0b 100644
--- a/app/src/main/res/layout/activity_commits.xml
+++ b/app/src/main/res/layout/activity_commits.xml
@@ -1,17 +1,17 @@
 <?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:orientation="vertical"
-    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,27 +23,27 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/commitTitle"
-                android:textColor="?attr/primaryTextColor"
+                android:layout_marginEnd="20dp"
                 android:ellipsize="none"
                 android:scrollbars="horizontal"
                 android:singleLine="true"
-                android:layout_marginEnd="20dp"
-                android:textSize="18sp" />
+                android:text="@string/commitTitle"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="18sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -66,12 +66,12 @@
 
     <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:layout_marginTop="56dp"
         android:indeterminate="true"
-        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noDataCommits"
@@ -82,6 +82,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_create_file.xml b/app/src/main/res/layout/activity_create_file.xml
index fc496756..91bada6f 100644
--- a/app/src/main/res/layout/activity_create_file.xml
+++ b/app/src/main/res/layout/activity_create_file.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/pageTitleNewFile"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -54,37 +54,37 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/newFileNameLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/newFileNameTintCopy"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                app:helperTextEnabled="true"
                 app:helperText="@string/newFileNameHintMessage"
+                app:helperTextEnabled="true"
                 app:helperTextTextColor="?attr/inputTextColor"
-                android:hint="@string/newFileNameTintCopy">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/newFileName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="textCapSentences"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:inputType="textCapSentences"
-                    android:singleLine="true"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -92,15 +92,15 @@
                 android:id="@+id/newFileContentLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/newFileContentTintCopy"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/newFileContentTintCopy">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/newFileContent"
@@ -112,37 +112,37 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/newFileBranchesLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:boxBackgroundColor="?attr/inputBackgroundColor"
-                android:textColorHint="?attr/hintColor"
-                app:hintTextColor="?attr/hintColor"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:hint="@string/newFileBranches"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 app:endIconTint="?attr/iconsColor"
-                app:helperTextEnabled="true"
                 app:helperText="@string/newFileEmptyBranchMessage"
+                app:helperTextEnabled="true"
                 app:helperTextTextColor="?attr/inputTextColor"
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
+                app:hintTextColor="?attr/hintColor">
 
                 <AutoCompleteTextView
                     android:id="@+id/new_file_branches"
                     style="@style/Widget.MaterialComponents.AutoCompleteTextView.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
                     android:inputType="textCapSentences"
                     android:labelFor="@id/new_file_branches"
                     android:singleLine="true"
-                    android:imeOptions="actionNext"
                     android:textColor="?attr/inputTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -150,29 +150,29 @@
                 android:id="@+id/newFileCommitMessageLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
-                app:endIconMode="clear_text"
-                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/newFileMessageTintCopy"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:counterEnabled="true"
                 app:counterMaxLength="255"
                 app:counterTextColor="?attr/inputTextColor"
-                android:hint="@string/newFileMessageTintCopy">
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/newFileCommitMessage"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="textMultiLine|textCapSentences"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:singleLine="true"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -182,7 +182,7 @@
                 android:layout_height="60dp"
                 android:layout_marginTop="8dp"
                 android:text="@string/newFileButtonCopy"
-                android:textColor="@color/btnTextColor" />
+                android:textColor="@color/btnTextColor"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_create_issue.xml b/app/src/main/res/layout/activity_create_issue.xml
index 43d25e9a..9c64ca54 100644
--- a/app/src/main/res/layout/activity_create_issue.xml
+++ b/app/src/main/res/layout/activity_create_issue.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/pageTitleCreateNewIssue"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -54,37 +54,37 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/newIssueTitleLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
-                app:endIconMode="clear_text"
-                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/newIssueTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:counterEnabled="true"
                 app:counterMaxLength="255"
                 app:counterTextColor="?attr/inputTextColor"
-                android:hint="@string/newIssueTitle">
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/newIssueTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="textCapSentences"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:inputType="textCapSentences"
-                    android:singleLine="true"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -92,27 +92,27 @@
                 android:id="@+id/newIssueDescriptionLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/newIssueDescriptionTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/newIssueDescriptionTitle">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/newIssueDescription"
                     android:layout_width="match_parent"
                     android:layout_height="140dp"
+                    android:gravity="top|start"
+                    android:inputType="textCapSentences|textMultiLine"
+                    android:scrollbars="vertical"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:gravity="top|start"
-                    android:scrollbars="vertical"
-                    android:inputType="textCapSentences|textMultiLine"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -120,46 +120,46 @@
                 android:id="@+id/newIssueAssigneesListLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:boxBackgroundColor="?attr/inputBackgroundColor"
-                android:textColorHint="?attr/hintColor"
-                app:hintTextColor="?attr/hintColor"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
-                android:hint="@string/newIssueAssigneesListTitle">
+                android:hint="@string/newIssueAssigneesListTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/newIssueAssigneesList"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:focusable="false"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:focusable="false"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/newIssueMilestoneSpinnerLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:boxBackgroundColor="?attr/inputBackgroundColor"
-                android:textColorHint="?attr/hintColor"
-                app:hintTextColor="?attr/hintColor"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:hint="@string/newIssueMilestoneTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 app:endIconTint="?attr/iconsColor"
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
+                app:hintTextColor="?attr/hintColor">
 
                 <AutoCompleteTextView
                     android:id="@+id/newIssueMilestoneSpinner"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="none"
-                    android:textColor="?attr/inputTextColor"
                     android:labelFor="@+id/newIssueMilestoneSpinner"
-                    android:textSize="16sp" />
+                    android:textColor="?attr/inputTextColor"
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -167,22 +167,22 @@
                 android:id="@+id/newIssueLabelsLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:boxBackgroundColor="?attr/inputBackgroundColor"
-                android:textColorHint="?attr/hintColor"
-                app:hintTextColor="?attr/hintColor"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
-                android:hint="@string/newIssueLabelsTitle">
+                android:hint="@string/newIssueLabelsTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/newIssueLabels"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:focusable="false"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:focusable="false"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -190,26 +190,26 @@
                 android:id="@+id/newIssueDueDateLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/newIssueDueDateTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/newIssueDueDateTitle">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/newIssueDueDate"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:focusable="false"
+                    android:maxLines="1"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:maxLines="1"
-                    android:focusable="false"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -219,7 +219,7 @@
                 android:layout_height="60dp"
                 android:layout_marginTop="8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor" />
+                android:textColor="@color/btnTextColor"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_create_label.xml b/app/src/main/res/layout/activity_create_label.xml
index 03ebf1ee..9391d43d 100644
--- a/app/src/main/res/layout/activity_create_label.xml
+++ b/app/src/main/res/layout/activity_create_label.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/pageTitleCreateLabel"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -49,22 +49,22 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="16dp">
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/labelNameLayout"
             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="8dp"
             android:layout_marginBottom="8dp"
+            android:hint="@string/labelName"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            app:boxStrokeErrorColor="@color/darkRed"
             app:endIconMode="clear_text"
             app:endIconTint="?attr/iconsColor"
-            android:hint="@string/labelName">
+            app:hintTextColor="?attr/hintColor">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/labelName"
@@ -73,7 +73,7 @@
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -88,17 +88,17 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
+                android:layout_weight=".95"
                 android:gravity="center_vertical"
                 android:text="@string/labelColor"
                 android:textColor="?attr/primaryTextColor"
-                android:layout_weight=".95"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
             <TextView
                 android:id="@+id/colorPicker"
                 android:layout_width="28dp"
                 android:layout_height="28dp"
-                android:background="@color/releasePre" />
+                android:background="@color/releasePre"/>
 
         </LinearLayout>
 
@@ -108,7 +108,7 @@
             android:layout_height="60dp"
             android:layout_marginTop="8dp"
             android:text="@string/newCreateButtonCopy"
-            android:textColor="@color/btnTextColor" />
+            android:textColor="@color/btnTextColor"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_create_milestone.xml b/app/src/main/res/layout/activity_create_milestone.xml
index 6b77fb04..ba0ec03a 100644
--- a/app/src/main/res/layout/activity_create_milestone.xml
+++ b/app/src/main/res/layout/activity_create_milestone.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/pageTitleCreateMilestone"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -54,34 +54,34 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/milestoneTitleLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/newMilestoneTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/newMilestoneTitle">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/milestoneTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="textCapSentences"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:inputType="textCapSentences"
-                    android:singleLine="true"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -89,30 +89,30 @@
                 android:id="@+id/milestoneDescriptionLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
-                app:endIconMode="clear_text"
-                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/newMilestoneDescription"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:counterEnabled="true"
                 app:counterMaxLength="255"
                 app:counterTextColor="?attr/inputTextColor"
-                android:hint="@string/newMilestoneDescription">
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/milestoneDescription"
                     android:layout_width="match_parent"
                     android:layout_height="140dp"
+                    android:gravity="top|start"
+                    android:inputType="textCapSentences|textMultiLine"
+                    android:scrollbars="vertical"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:gravity="top|start"
-                    android:scrollbars="vertical"
-                    android:inputType="textCapSentences|textMultiLine"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -120,26 +120,26 @@
                 android:id="@+id/milestoneDueDateLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/newMilestoneDueDate"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/newMilestoneDueDate">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/milestoneDueDate"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:focusable="false"
+                    android:maxLines="1"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:maxLines="1"
-                    android:focusable="false"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -149,7 +149,7 @@
                 android:layout_height="60dp"
                 android:layout_marginTop="8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor" />
+                android:textColor="@color/btnTextColor"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_create_new_user.xml b/app/src/main/res/layout/activity_create_new_user.xml
index 7ddbd807..625839a4 100644
--- a/app/src/main/res/layout/activity_create_new_user.xml
+++ b/app/src/main/res/layout/activity_create_new_user.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/adminCreateNewUser"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -54,34 +54,34 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/fullNameLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/userFullNameText"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/userFullNameText">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/fullName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="textCapSentences"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:inputType="textCapSentences"
-                    android:singleLine="true"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -89,26 +89,26 @@
                 android:id="@+id/userUserNameLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/userUserName"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/userUserName">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/userUserName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:singleLine="true"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -116,26 +116,26 @@
                 android:id="@+id/userEmailLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/userEmail"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/userEmail">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/userEmail"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:singleLine="true"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -143,25 +143,25 @@
                 android:id="@+id/userPasswordLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/userPassword"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/userPassword">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/userPassword"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:singleLine="true"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -171,7 +171,7 @@
                 android:layout_height="60dp"
                 android:layout_marginTop="8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor" />
+                android:textColor="@color/btnTextColor"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_create_organization.xml b/app/src/main/res/layout/activity_create_organization.xml
index 2da33093..ab2bdf9d 100644
--- a/app/src/main/res/layout/activity_create_organization.xml
+++ b/app/src/main/res/layout/activity_create_organization.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/pageTitleCreateOrganization"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -54,34 +54,34 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/newOrganizationNameLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/newOrgTintCopy"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/newOrgTintCopy">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/newOrganizationName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="textCapSentences"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:inputType="textCapSentences"
-                    android:singleLine="true"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -89,30 +89,30 @@
                 android:id="@+id/newOrganizationDescriptionLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
-                app:endIconMode="clear_text"
-                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/newOrgDescTintCopy"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:counterEnabled="true"
                 app:counterMaxLength="255"
                 app:counterTextColor="?attr/inputTextColor"
-                android:hint="@string/newOrgDescTintCopy">
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/newOrganizationDescription"
                     android:layout_width="match_parent"
                     android:layout_height="140dp"
+                    android:gravity="top|start"
+                    android:inputType="textCapSentences|textMultiLine"
+                    android:scrollbars="vertical"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:gravity="top|start"
-                    android:scrollbars="vertical"
-                    android:inputType="textCapSentences|textMultiLine"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -122,7 +122,7 @@
                 android:layout_height="60dp"
                 android:layout_marginTop="8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor" />
+                android:textColor="@color/btnTextColor"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_create_pr.xml b/app/src/main/res/layout/activity_create_pr.xml
index 2318f900..ae2efa49 100644
--- a/app/src/main/res/layout/activity_create_pr.xml
+++ b/app/src/main/res/layout/activity_create_pr.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/pageTitleNewPullRequest"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -54,37 +54,37 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/prTitleLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
-                app:endIconMode="clear_text"
-                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/newIssueTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:counterEnabled="true"
                 app:counterMaxLength="255"
                 app:counterTextColor="?attr/inputTextColor"
-                android:hint="@string/newIssueTitle">
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/prTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="textCapSentences"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:inputType="textCapSentences"
-                    android:singleLine="true"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -92,99 +92,99 @@
                 android:id="@+id/prBodyLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/newIssueDescriptionTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/newIssueDescriptionTitle">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/prBody"
                     android:layout_width="match_parent"
                     android:layout_height="140dp"
+                    android:gravity="top|start"
+                    android:inputType="textCapSentences|textMultiLine"
+                    android:scrollbars="vertical"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:gravity="top|start"
-                    android:scrollbars="vertical"
-                    android:inputType="textCapSentences|textMultiLine"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/mergeIntoBranchSpinnerLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:boxBackgroundColor="?attr/inputBackgroundColor"
-                android:textColorHint="?attr/hintColor"
-                app:hintTextColor="?attr/hintColor"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:hint="@string/mergeIntoBranch"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 app:endIconTint="?attr/iconsColor"
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
+                app:hintTextColor="?attr/hintColor">
 
                 <AutoCompleteTextView
                     android:id="@+id/mergeIntoBranchSpinner"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="none"
-                    android:textColor="?attr/inputTextColor"
                     android:labelFor="@+id/mergeIntoBranchSpinner"
-                    android:textSize="16sp" />
+                    android:textColor="?attr/inputTextColor"
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/pullFromBranchSpinnerLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:boxBackgroundColor="?attr/inputBackgroundColor"
-                android:textColorHint="?attr/hintColor"
-                app:hintTextColor="?attr/hintColor"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:hint="@string/pullFromBranch"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 app:endIconTint="?attr/iconsColor"
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
+                app:hintTextColor="?attr/hintColor">
 
                 <AutoCompleteTextView
                     android:id="@+id/pullFromBranchSpinner"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="none"
-                    android:textColor="?attr/inputTextColor"
                     android:labelFor="@+id/pullFromBranchSpinner"
-                    android:textSize="16sp" />
+                    android:textColor="?attr/inputTextColor"
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/milestonesSpinnerLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:boxBackgroundColor="?attr/inputBackgroundColor"
-                android:textColorHint="?attr/hintColor"
-                app:hintTextColor="?attr/hintColor"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:hint="@string/newIssueMilestoneTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 app:endIconTint="?attr/iconsColor"
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
+                app:hintTextColor="?attr/hintColor">
 
                 <AutoCompleteTextView
                     android:id="@+id/milestonesSpinner"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="none"
-                    android:textColor="?attr/inputTextColor"
                     android:labelFor="@+id/milestonesSpinner"
-                    android:textSize="16sp" />
+                    android:textColor="?attr/inputTextColor"
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -192,22 +192,22 @@
                 android:id="@+id/prLabelsLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:boxBackgroundColor="?attr/inputBackgroundColor"
-                android:textColorHint="?attr/hintColor"
-                app:hintTextColor="?attr/hintColor"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
-                android:hint="@string/newIssueLabelsTitle">
+                android:hint="@string/newIssueLabelsTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/prLabels"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:focusable="false"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:focusable="false"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -215,26 +215,26 @@
                 android:id="@+id/prDueDateLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/newIssueDueDateTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/newIssueDueDateTitle">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/prDueDate"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:focusable="false"
+                    android:maxLines="1"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:maxLines="1"
-                    android:focusable="false"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -244,7 +244,7 @@
                 android:layout_height="60dp"
                 android:layout_marginTop="8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor" />
+                android:textColor="@color/btnTextColor"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_create_release.xml b/app/src/main/res/layout/activity_create_release.xml
index cd26b21d..4f965236 100644
--- a/app/src/main/res/layout/activity_create_release.xml
+++ b/app/src/main/res/layout/activity_create_release.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/createRelease"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -54,34 +54,34 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/releaseTitleLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/releaseTitleText"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/releaseTitleText">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/releaseTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="textCapSentences"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:inputType="textCapSentences"
-                    android:singleLine="true"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -89,27 +89,27 @@
                 android:id="@+id/releaseTagNameLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/releaseTagNameText"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/releaseTagNameText">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/releaseTagName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="textCapSentences"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:inputType="textCapSentences"
-                    android:singleLine="true"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -117,51 +117,51 @@
                 android:id="@+id/releaseContentLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/releaseContentText"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/releaseContentText">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/releaseContent"
                     android:layout_width="match_parent"
                     android:layout_height="140dp"
+                    android:gravity="top|start"
+                    android:inputType="textCapSentences"
+                    android:scrollbars="vertical"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:gravity="top|start"
-                    android:scrollbars="vertical"
-                    android:inputType="textCapSentences"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/releaseBranchLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:boxBackgroundColor="?attr/inputBackgroundColor"
-                android:textColorHint="?attr/hintColor"
-                app:hintTextColor="?attr/hintColor"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:hint="@string/releaseBranchText"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 app:endIconTint="?attr/iconsColor"
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
+                app:hintTextColor="?attr/hintColor">
 
                 <AutoCompleteTextView
                     android:id="@+id/releaseBranch"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="none"
-                    android:textColor="?attr/inputTextColor"
                     android:labelFor="@+id/releaseBranch"
-                    android:textSize="16sp" />
+                    android:textColor="?attr/inputTextColor"
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -169,21 +169,21 @@
                 android:id="@+id/releaseType"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/releaseTypeText"
-                android:checked="false"
-                android:textSize="16sp"
                 android:layout_marginTop="10dp"
-                android:textColor="?attr/primaryTextColor"/>
+                android:checked="false"
+                android:text="@string/releaseTypeText"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"/>
 
             <CheckBox
                 android:id="@+id/releaseDraft"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/releaseDraftText"
-                android:checked="false"
-                android:textSize="16sp"
                 android:layout_marginTop="10dp"
-                android:textColor="?attr/primaryTextColor"/>
+                android:checked="false"
+                android:text="@string/releaseDraftText"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"/>
 
             <Button
                 android:id="@+id/createNewRelease"
@@ -191,7 +191,7 @@
                 android:layout_height="60dp"
                 android:layout_marginTop="8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor" />
+                android:textColor="@color/btnTextColor"/>
 
             <Button
                 android:id="@+id/createNewTag"
@@ -199,7 +199,7 @@
                 android:layout_height="60dp"
                 android:layout_marginTop="8dp"
                 android:text="@string/create_tag"
-                android:textColor="@color/btnTextColor" />
+                android:textColor="@color/btnTextColor"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_create_repo.xml b/app/src/main/res/layout/activity_create_repo.xml
index 5f47de01..0adac7e8 100644
--- a/app/src/main/res/layout/activity_create_repo.xml
+++ b/app/src/main/res/layout/activity_create_repo.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/pageTitleNewRepo"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -54,30 +54,30 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/ownerSpinnerLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:boxBackgroundColor="?attr/inputBackgroundColor"
-                android:textColorHint="?attr/hintColor"
-                app:hintTextColor="?attr/hintColor"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:hint="@string/newRepoOwner"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 app:endIconTint="?attr/iconsColor"
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
+                app:hintTextColor="?attr/hintColor">
 
                 <AutoCompleteTextView
                     android:id="@+id/ownerSpinner"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="none"
-                    android:textColor="?attr/inputTextColor"
                     android:labelFor="@+id/ownerSpinner"
-                    android:textSize="16sp" />
+                    android:textColor="?attr/inputTextColor"
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -85,25 +85,25 @@
                 android:id="@+id/newRepoNameLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/newRepoTintCopy"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/newRepoTintCopy">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/newRepoName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:inputType="textCapSentences"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:inputType="textCapSentences"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -111,29 +111,29 @@
                 android:id="@+id/newRepoDescriptionLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
-                app:endIconMode="clear_text"
-                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/newRepoDescTintCopy"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:counterEnabled="true"
                 app:counterMaxLength="255"
                 app:counterTextColor="?attr/inputTextColor"
-                android:hint="@string/newRepoDescTintCopy">
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/newRepoDescription"
                     android:layout_width="match_parent"
                     android:layout_height="140dp"
+                    android:gravity="top|start"
+                    android:inputType="textCapSentences|textMultiLine"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:gravity="top|start"
-                    android:inputType="textCapSentences|textMultiLine"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -141,11 +141,11 @@
                 android:id="@+id/newRepoPrivate"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/newRepoPrivateCopy"
-                android:checked="true"
-                android:textSize="16sp"
                 android:layout_marginTop="10dp"
-                android:textColor="?attr/primaryTextColor"/>
+                android:checked="true"
+                android:text="@string/newRepoPrivateCopy"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"/>
 
             <Button
                 android:id="@+id/createNewRepoButton"
@@ -153,7 +153,7 @@
                 android:layout_height="60dp"
                 android:layout_marginTop="8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor" />
+                android:textColor="@color/btnTextColor"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_create_team_by_org.xml b/app/src/main/res/layout/activity_create_team_by_org.xml
index fba01eaf..1db2d235 100644
--- a/app/src/main/res/layout/activity_create_team_by_org.xml
+++ b/app/src/main/res/layout/activity_create_team_by_org.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/pageTitleCreateTeam"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -54,34 +54,34 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/teamNameLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/newTeamTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/newTeamTitle">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/teamName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="textCapSentences"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:inputType="textCapSentences"
-                    android:singleLine="true"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -89,29 +89,29 @@
                 android:id="@+id/teamDescLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
-                app:endIconMode="clear_text"
-                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/newTeamDesc"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:counterEnabled="true"
                 app:counterMaxLength="255"
                 app:counterTextColor="?attr/inputTextColor"
-                android:hint="@string/newTeamDesc">
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/teamDesc"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:singleLine="true"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -119,24 +119,24 @@
                 android:id="@+id/teamPermissionLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
-                android:hint="@string/newTeamPermission">
+                android:hint="@string/newTeamPermission"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/teamPermission"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:focusable="false"
+                    android:maxLines="1"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:maxLines="1"
-                    android:focusable="false"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -144,33 +144,33 @@
                 android:id="@+id/teamPermissionDetail"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="start"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="12sp"
-                android:gravity="start"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/teamAccessControlsLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
-                android:hint="@string/newTeamAccessControls">
+                android:hint="@string/newTeamAccessControls"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/teamAccessControls"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:focusable="false"
+                    android:maxLines="1"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:maxLines="1"
-                    android:focusable="false"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </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"/>
 
             <Button
                 android:id="@+id/createTeamButton"
@@ -186,7 +186,7 @@
                 android:layout_height="60dp"
                 android:layout_marginTop="8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor" />
+                android:textColor="@color/btnTextColor"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_deeplinks.xml b/app/src/main/res/layout/activity_deeplinks.xml
index d57a633c..483ebfcd 100644
--- a/app/src/main/res/layout/activity_deeplinks.xml
+++ b/app/src/main/res/layout/activity_deeplinks.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+<LinearLayout 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="wrap_content"
     android:background="?attr/primaryBackgroundColor"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:orientation="vertical">
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <ScrollView
         android:layout_width="match_parent"
@@ -28,12 +28,12 @@
                 android:id="@+id/addNewAccountFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="32dp"
-                android:paddingBottom="16dp"
+                android:orientation="vertical"
                 android:paddingStart="16dp"
+                android:paddingTop="32dp"
                 android:paddingEnd="16dp"
-                android:visibility="gone"
-                android:orientation="vertical">
+                android:paddingBottom="16dp"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/addAccountText"
@@ -41,34 +41,34 @@
                     android:layout_height="wrap_content"
                     android:text="@string/accountDoesNotExist"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
                 <Button
                     android:id="@+id/addNewAccount"
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
+                    android:layout_marginTop="24dp"
                     android:text="@string/addNewAccountText"
                     android:textColor="@color/btnTextColor"
-                    android:textSize="16sp"
-                    android:layout_marginTop="24dp" />
+                    android:textSize="16sp"/>
 
                 <Button
                     android:id="@+id/openInBrowser"
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
+                    android:layout_marginTop="8dp"
                     android:text="@string/openWebRepo"
                     android:textColor="@color/btnTextColor"
-                    android:textSize="16sp"
-                    android:layout_marginTop="8dp" />
+                    android:textSize="16sp"/>
 
                 <Button
                     android:id="@+id/launchApp"
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
+                    android:layout_marginTop="8dp"
                     android:text="@string/launchApp"
                     android:textColor="@color/btnTextColor"
-                    android:textSize="16sp"
-                    android:layout_marginTop="8dp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -76,12 +76,12 @@
                 android:id="@+id/noActionFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="32dp"
-                android:paddingBottom="16dp"
+                android:orientation="vertical"
                 android:paddingStart="16dp"
+                android:paddingTop="32dp"
                 android:paddingEnd="16dp"
-                android:visibility="gone"
-                android:orientation="vertical">
+                android:paddingBottom="16dp"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/noActionText"
@@ -89,52 +89,52 @@
                     android:layout_height="wrap_content"
                     android:text="@string/noActionText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
                 <Button
                     android:id="@+id/repository"
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
+                    android:layout_marginTop="24dp"
                     android:text="@string/navRepos"
                     android:textColor="@color/btnTextColor"
-                    android:textSize="16sp"
-                    android:layout_marginTop="24dp" />
+                    android:textSize="16sp"/>
 
                 <Button
                     android:id="@+id/organization"
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
+                    android:layout_marginTop="8dp"
                     android:text="@string/navOrg"
                     android:textColor="@color/btnTextColor"
-                    android:textSize="16sp"
-                    android:layout_marginTop="8dp" />
+                    android:textSize="16sp"/>
 
                 <Button
                     android:id="@+id/notification"
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
+                    android:layout_marginTop="8dp"
                     android:text="@string/pageTitleNotifications"
                     android:textColor="@color/btnTextColor"
-                    android:textSize="16sp"
-                    android:layout_marginTop="8dp" />
+                    android:textSize="16sp"/>
 
                 <Button
                     android:id="@+id/explore"
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
+                    android:layout_marginTop="8dp"
                     android:text="@string/pageTitleExplore"
                     android:textColor="@color/btnTextColor"
-                    android:textSize="16sp"
-                    android:layout_marginTop="8dp" />
+                    android:textSize="16sp"/>
 
                 <Button
                     android:id="@+id/launchApp2"
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
+                    android:layout_marginTop="8dp"
                     android:text="@string/launchApp"
                     android:textColor="@color/btnTextColor"
-                    android:textSize="16sp"
-                    android:layout_marginTop="8dp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_diff.xml b/app/src/main/res/layout/activity_diff.xml
index fe7bf0e2..e81ff803 100644
--- a/app/src/main/res/layout/activity_diff.xml
+++ b/app/src/main/res/layout/activity_diff.xml
@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="?attr/primaryBackgroundColor">
+    android:background="?attr/primaryBackgroundColor"
+    android:orientation="vertical">
 
     <FrameLayout
         android:id="@+id/fragment_container"
diff --git a/app/src/main/res/layout/activity_edit_issue.xml b/app/src/main/res/layout/activity_edit_issue.xml
index ee12a25a..d6baf89e 100644
--- a/app/src/main/res/layout/activity_edit_issue.xml
+++ b/app/src/main/res/layout/activity_edit_issue.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/editIssueNavHeader"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -54,34 +54,34 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/editIssueTitleLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/newIssueTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/newIssueTitle">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/editIssueTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="textCapSentences"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:inputType="textCapSentences"
-                    android:singleLine="true"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -89,51 +89,51 @@
                 android:id="@+id/editIssueDescriptionLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/newIssueDescriptionTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/newIssueDescriptionTitle">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/editIssueDescription"
                     android:layout_width="match_parent"
                     android:layout_height="140dp"
+                    android:gravity="top|start"
+                    android:inputType="textCapSentences|textMultiLine"
+                    android:scrollbars="vertical"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:gravity="top|start"
-                    android:scrollbars="vertical"
-                    android:inputType="textCapSentences|textMultiLine"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/editIssueMilestoneSpinnerLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:boxBackgroundColor="?attr/inputBackgroundColor"
-                android:textColorHint="?attr/hintColor"
-                app:hintTextColor="?attr/hintColor"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:hint="@string/newIssueMilestoneTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 app:endIconTint="?attr/iconsColor"
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
+                app:hintTextColor="?attr/hintColor">
 
                 <AutoCompleteTextView
                     android:id="@+id/editIssueMilestoneSpinner"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="none"
-                    android:textColor="?attr/inputTextColor"
                     android:labelFor="@+id/editIssueMilestoneSpinner"
-                    android:textSize="16sp" />
+                    android:textColor="?attr/inputTextColor"
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -141,26 +141,26 @@
                 android:id="@+id/editIssueDueDateLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/newIssueDueDateTitle"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/newIssueDueDateTitle">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/editIssueDueDate"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:focusable="false"
+                    android:maxLines="1"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:maxLines="1"
-                    android:focusable="false"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -170,7 +170,7 @@
                 android:layout_height="60dp"
                 android:layout_marginTop="8dp"
                 android:text="@string/saveButton"
-                android:textColor="@color/btnTextColor" />
+                android:textColor="@color/btnTextColor"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_file_view.xml b/app/src/main/res/layout/activity_file_view.xml
index fd413002..571d3e62 100644
--- a/app/src/main/res/layout/activity_file_view.xml
+++ b/app/src/main/res/layout/activity_file_view.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -24,27 +24,27 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/defaultFilename"
-                android:textColor="?attr/primaryTextColor"
+                android:layout_marginEnd="20dp"
                 android:ellipsize="none"
                 android:scrollbars="horizontal"
                 android:singleLine="true"
-                android:layout_marginEnd="20dp"
-                android:textSize="18sp" />
+                android:text="@string/defaultFilename"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="18sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -52,11 +52,11 @@
 
     <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"/>
 
     <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="14sp" />
+                    android:textSize="14sp"/>
 
                 <TextView
                     android:id="@+id/markdownTv"
@@ -91,8 +91,8 @@
                     android:layout_height="wrap_content"
                     android:textColor="?attr/primaryTextColor"
                     android:textIsSelectable="true"
-                    android:visibility="gone"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"
+                    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:visibility="gone"
-                android:padding="16dp"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                android:visibility="gone"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml
index 9e6cf5dc..dd6795c9 100644
--- a/app/src/main/res/layout/activity_issue_detail.xml
+++ b/app/src/main/res/layout/activity_issue_detail.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     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:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -25,20 +25,20 @@
                 android:id="@+id/issuePrState"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_issue"
+                android:contentDescription="@string/generalImgContentText"
                 android:paddingStart="0dp"
                 android:paddingEnd="8dp"
-                android:visibility="gone"
-                android:contentDescription="@string/generalImgContentText" />
+                android:src="@drawable/ic_issue"
+                android:visibility="gone"/>
 
             <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="18sp"
                 android:textColor="?attr/primaryTextColor"
-                android:id="@+id/toolbar_title" />
+                android:textSize="18sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -46,31 +46,31 @@
 
     <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:layout_marginTop="56dp"
         android:indeterminate="true"
-        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/addNewComment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:text="@string/commentButtonText"
-        android:contentDescription="@string/commentButtonText"
-        android:textColor="@color/colorWhite"
-        android:backgroundTint="?attr/fabColor"
         android:layout_gravity="bottom|end"
-        app:iconTint="@color/colorWhite"
-        app:icon="@drawable/ic_reply" />
+        android:layout_margin="16dp"
+        android:backgroundTint="?attr/fabColor"
+        android:contentDescription="@string/commentButtonText"
+        android:text="@string/commentButtonText"
+        android:textColor="@color/colorWhite"
+        app:icon="@drawable/ic_reply"
+        app:iconTint="@color/colorWhite"/>
 
     <RelativeLayout
         android:id="@+id/relativeMainLayoutFrame"
         android:layout_width="match_parent"
-        android:layout_marginTop="56dp"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_marginTop="56dp">
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/pullToRefresh"
@@ -78,9 +78,9 @@
             android:layout_height="wrap_content">
 
             <androidx.core.widget.NestedScrollView
+                android:id="@+id/scrollViewComments"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/scrollViewComments"
                 android:fillViewport="true">
 
                 <RelativeLayout
@@ -100,25 +100,25 @@
                             android:layout_width="@dimen/list_avatar_size"
                             android:layout_height="@dimen/list_avatar_size"
                             android:layout_marginEnd="10dp"
-                            android:contentDescription="@string/generalImgContentText" />
+                            android:contentDescription="@string/generalImgContentText"/>
 
                         <TextView
                             android:id="@+id/issueTitle"
-                            android:layout_toEndOf="@+id/assigneeAvatar"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:layout_toEndOf="@+id/assigneeAvatar"
                             android:gravity="start"
                             android:textColor="?attr/primaryTextColor"
                             android:textIsSelectable="true"
-                            android:textSize="16sp" />
+                            android:textSize="16sp"/>
 
                         <LinearLayout
                             android:id="@+id/msdueFrame"
-                            android:layout_toEndOf="@+id/assigneeAvatar"
-                            android:layout_below="@+id/issueTitle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:layout_below="@+id/issueTitle"
                             android:layout_marginTop="10dp"
+                            android:layout_toEndOf="@+id/assigneeAvatar"
                             android:orientation="vertical">
 
                             <LinearLayout
@@ -133,8 +133,8 @@
                                 <ImageView
                                     android:layout_width="18dp"
                                     android:layout_height="wrap_content"
-                                    app:srcCompat="@drawable/ic_calendar"
-                                    android:contentDescription="@string/generalImgContentText" />
+                                    android:contentDescription="@string/generalImgContentText"
+                                    app:srcCompat="@drawable/ic_calendar"/>
 
                                 <TextView
                                     android:id="@+id/issueDueDate"
@@ -143,7 +143,7 @@
                                     android:layout_marginStart="8dp"
                                     android:singleLine="true"
                                     android:textColor="?attr/primaryTextColor"
-                                    android:textSize="14sp" />
+                                    android:textSize="14sp"/>
 
                             </LinearLayout>
 
@@ -159,8 +159,8 @@
                                 <ImageView
                                     android:layout_width="18dp"
                                     android:layout_height="wrap_content"
-                                    app:srcCompat="@drawable/ic_milestone"
-                                    android:contentDescription="@string/generalImgContentText" />
+                                    android:contentDescription="@string/generalImgContentText"
+                                    app:srcCompat="@drawable/ic_milestone"/>
 
                                 <TextView
                                     android:id="@+id/issueMilestone"
@@ -169,92 +169,92 @@
                                     android:layout_marginStart="8dp"
                                     android:singleLine="true"
                                     android:textColor="?attr/primaryTextColor"
-                                    android:textSize="14sp" />
+                                    android:textSize="14sp"/>
 
                             </LinearLayout>
 
                         </LinearLayout>
 
                         <HorizontalScrollView
-                            android:layout_below="@+id/msdueFrame"
+                            android:id="@+id/assigneesScrollView"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:id="@+id/assigneesScrollView"
+                            android:layout_below="@+id/msdueFrame"
                             android:layout_alignParentEnd="false"
+                            android:fillViewport="true"
                             android:foregroundGravity="right"
-                            android:scrollbarThumbHorizontal="@android:color/transparent"
-                            android:fillViewport="true">
+                            android:scrollbarThumbHorizontal="@android:color/transparent">
 
                             <LinearLayout
                                 android:id="@+id/frameAssignees"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:orientation="horizontal"
                                 android:layout_gravity="end"
+                                android:layout_marginTop="10dp"
                                 android:gravity="end"
-                                android:layout_marginTop="10dp">
+                                android:orientation="horizontal">
 
                             </LinearLayout>
                         </HorizontalScrollView>
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/issueDescription"
-                            android:layout_below="@+id/assigneesScrollView"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:layout_below="@+id/assigneesScrollView"
+                            android:autoLink="web"
                             android:gravity="start"
                             android:textColor="?attr/primaryTextColor"
-                            android:autoLink="web"
                             android:textColorLink="@color/lightBlue"
                             android:textIsSelectable="true"
-                            android:textSize="14sp" />
+                            android:textSize="14sp"/>
 
                         <HorizontalScrollView
-                            android:layout_below="@+id/issueDescription"
+                            android:id="@+id/labelsScrollView"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:id="@+id/labelsScrollView"
+                            android:layout_below="@+id/issueDescription"
                             android:layout_alignParentEnd="false"
+                            android:fillViewport="true"
                             android:foregroundGravity="right"
-                            android:scrollbarThumbHorizontal="@android:color/transparent"
-                            android:fillViewport="true">
+                            android:scrollbarThumbHorizontal="@android:color/transparent">
 
                             <LinearLayout
                                 android:id="@+id/frameLabels"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:orientation="horizontal"
-                                android:layout_marginTop="10dp">
+                                android:layout_marginTop="10dp"
+                                android:orientation="horizontal">
 
                             </LinearLayout>
                         </HorizontalScrollView>
 
                         <RelativeLayout
+                            android:id="@+id/issueTimeFrame"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:id="@+id/issueTimeFrame"
                             android:layout_below="@+id/labelsScrollView"
-                            android:orientation="horizontal"
-                            android:layout_marginTop="10dp">
+                            android:layout_marginTop="10dp"
+                            android:orientation="horizontal">
 
                             <TextView
                                 android:id="@+id/issueCreatedTime"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:gravity="start"
-                                android:visibility="gone"
                                 android:textColor="?attr/hintColor"
-                                android:textSize="12sp" />
+                                android:textSize="12sp"
+                                android:visibility="gone"/>
 
                             <TextView
                                 android:id="@+id/issueModified"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:textColor="?attr/hintColor"
                                 android:layout_toEndOf="@+id/issueCreatedTime"
+                                android:text="@string/modifiedText"
+                                android:textColor="?attr/hintColor"
                                 android:textSize="12sp"
-                                android:visibility="gone"
-                                android:text="@string/modifiedText" />
+                                android:visibility="gone"/>
 
                         </RelativeLayout>
 
@@ -263,19 +263,19 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_below="@+id/issueTimeFrame"
-                            android:visibility="gone"
                             android:layout_marginTop="10dp"
-                            android:orientation="horizontal" />
+                            android:orientation="horizontal"
+                            android:visibility="gone"/>
 
                     </RelativeLayout>
 
                     <View
-                        android:layout_below="@id/mainIssueLayout"
+                        android:id="@+id/divider"
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
-                        android:id="@+id/divider"
-                        android:visibility="gone"
-                        android:background="?attr/dividerColor" />
+                        android:layout_below="@id/mainIssueLayout"
+                        android:background="?attr/dividerColor"
+                        android:visibility="gone"/>
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -287,9 +287,9 @@
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:background="?attr/primaryBackgroundColor"
-                            android:paddingBottom="64dp"
                             android:clipToPadding="false"
-                            android:scrollbars="vertical" />
+                            android:paddingBottom="64dp"
+                            android:scrollbars="vertical"/>
 
                     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f8c07e3e..6829ed6f 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/loginForm"
     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:gravity="center"
-    android:id="@+id/loginForm">
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
         android:orientation="vertical"
-        android:padding="16dp"
-        android:fitsSystemWindows="true" >
+        android:padding="16dp">
 
         <ImageView
             android:layout_width="100dp"
@@ -23,16 +23,16 @@
             android:layout_marginBottom="20dp"
             android:baselineAligned="false"
             android:contentDescription="@string/appName"
-            android:src="@mipmap/app_logo" />
+            android:src="@mipmap/app_logo"/>
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:gravity="start"
             android:text="@string/loginMethodText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="12sp"
-            android:layout_marginBottom="10dp"
-            android:gravity="start" />
+            android:textSize="12sp"/>
 
         <RadioGroup
             android:id="@+id/loginMethod"
@@ -46,8 +46,8 @@
                 android:id="@+id/loginToken"
                 android:layout_width="wrap_content"
                 android:layout_height="36dp"
-                android:text="@string/copyToken"
                 android:checked="true"
+                android:text="@string/copyToken"
                 android:textColor="?attr/primaryTextColor"/>
 
             <RadioButton
@@ -61,25 +61,25 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/httpsSpinnerLayout"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:boxBackgroundColor="?attr/inputBackgroundColor"
-            android:textColorHint="?attr/hintColor"
-            app:hintTextColor="?attr/hintColor"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
             android:hint="@string/protocol"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
             app:endIconTint="?attr/iconsColor"
-            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
+            app:hintTextColor="?attr/hintColor">
 
             <AutoCompleteTextView
                 android:id="@+id/httpsSpinner"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="none"
-                android:textColor="?attr/inputTextColor"
                 android:labelFor="@+id/httpsSpinner"
-                android:textSize="16sp" />
+                android:textColor="?attr/inputTextColor"
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -87,28 +87,28 @@
             android:id="@+id/instance_urlLayout"
             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="8dp"
             android:layout_marginBottom="8dp"
-            app:startIconDrawable="@drawable/ic_link"
-            app:startIconTint="?attr/iconsColor"
+            android:hint="@string/instanceUrl"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            app:boxStrokeErrorColor="@color/darkRed"
             app:endIconMode="clear_text"
             app:endIconTint="?attr/iconsColor"
-            android:hint="@string/instanceUrl">
+            app:hintTextColor="?attr/hintColor"
+            app:startIconDrawable="@drawable/ic_link"
+            app:startIconTint="?attr/iconsColor">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/instance_url"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:inputType="textUri"
+                android:singleLine="true"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:inputType="textUri"
-                android:singleLine="true"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -116,27 +116,27 @@
             android:id="@+id/login_uidLayout"
             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="8dp"
             android:layout_marginBottom="8dp"
-            app:startIconDrawable="@drawable/ic_person"
-            app:startIconTint="?attr/iconsColor"
+            android:hint="@string/userName"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            app:boxStrokeErrorColor="@color/darkRed"
             app:endIconMode="clear_text"
             app:endIconTint="?attr/iconsColor"
-            android:hint="@string/userName">
+            app:hintTextColor="?attr/hintColor"
+            app:startIconDrawable="@drawable/ic_person"
+            app:startIconTint="?attr/iconsColor">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/login_uid"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:singleLine="true"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:singleLine="true"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -144,28 +144,28 @@
             android:id="@+id/login_passwdLayout"
             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="8dp"
             android:layout_marginBottom="8dp"
-            app:startIconDrawable="@drawable/ic_lock"
-            app:startIconTint="?attr/iconsColor"
-            app:endIconTint="?attr/iconsColor"
+            android:hint="@string/passWord"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            app:boxStrokeErrorColor="@color/darkRed"
             app:endIconMode="password_toggle"
-            android:hint="@string/passWord">
+            app:endIconTint="?attr/iconsColor"
+            app:hintTextColor="?attr/hintColor"
+            app:startIconDrawable="@drawable/ic_lock"
+            app:startIconTint="?attr/iconsColor">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/login_passwd"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:inputType="textPassword"
+                android:singleLine="true"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:inputType="textPassword"
-                android:singleLine="true"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -173,31 +173,31 @@
             android:id="@+id/otpCodeLayout"
             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="8dp"
             android:layout_marginBottom="8dp"
-            app:startIconDrawable="@drawable/ic_otp"
-            app:startIconTint="?attr/iconsColor"
+            android:hint="@string/loginOTP"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            app:boxStrokeErrorColor="@color/darkRed"
             app:endIconMode="clear_text"
             app:endIconTint="?attr/iconsColor"
             app:helperText="@string/otpMessage"
-            app:helperTextTextColor="?attr/inputTextColor"
             app:helperTextEnabled="true"
-            android:hint="@string/loginOTP">
+            app:helperTextTextColor="?attr/inputTextColor"
+            app:hintTextColor="?attr/hintColor"
+            app:startIconDrawable="@drawable/ic_otp"
+            app:startIconTint="?attr/iconsColor">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/otpCode"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:inputType="number"
+                android:singleLine="true"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:inputType="number"
-                android:singleLine="true"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -205,27 +205,27 @@
             android:id="@+id/loginTokenCodeLayout"
             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="8dp"
             android:layout_marginBottom="8dp"
-            app:startIconDrawable="@drawable/ic_lock"
-            app:startIconTint="?attr/iconsColor"
+            android:hint="@string/copyToken"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            app:boxStrokeErrorColor="@color/darkRed"
             app:endIconMode="clear_text"
             app:endIconTint="?attr/iconsColor"
-            android:hint="@string/copyToken">
+            app:hintTextColor="?attr/hintColor"
+            app:startIconDrawable="@drawable/ic_lock"
+            app:startIconTint="?attr/iconsColor">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/loginTokenCode"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:singleLine="true"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:singleLine="true"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -235,31 +235,31 @@
             android:layout_height="60dp"
             android:layout_marginTop="8dp"
             android:text="@string/btnLogin"
-            android:textColor="@color/btnTextColor" />
+            android:textColor="@color/btnTextColor"/>
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="10dp"
+            android:autoLink="web"
+            android:gravity="center"
             android:text="@string/appRepoLink"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp"
-            android:gravity="center"
-            android:autoLink="web"
             android:textColorLink="@color/lightBlue"
-            android:layout_marginTop="20dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp" />
+            android:textSize="14sp"/>
 
         <TextView
             android:id="@+id/appVersion"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
+            android:layout_gravity="center_horizontal"
             android:layout_marginTop="5dp"
             android:layout_weight="1"
             android:maxLines="1"
-            android:textSize="14sp"
             android:textColor="?attr/primaryTextColor"
-            android:layout_gravity="center_horizontal"/>
+            android:textSize="14sp"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 375a2fce..b7e6f280 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,11 +3,11 @@
     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"
     android:fitsSystemWindows="true"
+    tools:context=".activities.MainActivity"
     tools:openDrawer="start">
 
     <LinearLayout
@@ -16,22 +16,22 @@
         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"
-            app:titleTextColor="?attr/primaryTextColor"
+            android:elevation="0dp"
             android:theme="@style/Widget.AppCompat.SearchView"
-            android:elevation="0dp">
+            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="18sp"
                 android:textColor="?attr/primaryTextColor"
-                android:id="@+id/toolbar_title" />
+                android:textSize="18sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -43,15 +43,15 @@
     </LinearLayout>
 
     <com.google.android.material.navigation.NavigationView
+        android:id="@+id/nav_view"
         android:layout_width="320dp"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:id="@+id/nav_view"
-        app:headerLayout="@layout/nav_header"
-        app:menu="@menu/drawer_menu"
         android:background="?attr/primaryBackgroundColor"
+        app:headerLayout="@layout/nav_header"
         app:itemIconTint="?attr/primaryTextColor"
         app:itemTextAppearance="@style/DrawerIcon"
-        app:itemTextColor="?attr/primaryTextColor" />
+        app:itemTextColor="?attr/primaryTextColor"
+        app:menu="@menu/drawer_menu"/>
 
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_merge_pull_request.xml b/app/src/main/res/layout/activity_merge_pull_request.xml
index 7bbd716b..df183546 100644
--- a/app/src/main/res/layout/activity_merge_pull_request.xml
+++ b/app/src/main/res/layout/activity_merge_pull_request.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,33 +23,33 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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"/>
 
             <HorizontalScrollView
+                android:id="@+id/replyToPRNavHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/replyToPRNavHeader"
-                android:foregroundGravity="right"
-                android:layout_marginEnd="25dp"
                 android:layout_marginStart="0dp"
-                android:scrollbarThumbHorizontal="@android:color/transparent"
-                android:fillViewport="true">
+                android:layout_marginEnd="25dp"
+                android:fillViewport="true"
+                android:foregroundGravity="right"
+                android:scrollbarThumbHorizontal="@android:color/transparent">
 
                 <TextView
                     android:id="@+id/toolbar_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:textColor="?attr/primaryTextColor"
                     android:maxLines="1"
-                    android:textSize="20sp" />
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="20sp"/>
 
             </HorizontalScrollView>
 
@@ -65,37 +65,37 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/mergeTitleLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
-                app:endIconMode="clear_text"
-                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/mergePullRequestButtonText"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:counterEnabled="true"
                 app:counterMaxLength="255"
                 app:counterTextColor="?attr/inputTextColor"
-                android:hint="@string/mergePullRequestButtonText">
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/mergeTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="textCapSentences"
+                    android:singleLine="true"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:inputType="textCapSentences"
-                    android:singleLine="true"
-                    android:imeOptions="actionNext"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -103,50 +103,50 @@
                 android:id="@+id/mergeDescriptionLayout"
                 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="8dp"
                 android:layout_marginBottom="8dp"
+                android:hint="@string/mergeCommentText"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                app:boxStrokeErrorColor="@color/darkRed"
                 app:endIconMode="clear_text"
                 app:endIconTint="?attr/iconsColor"
-                android:hint="@string/mergeCommentText">
+                app:hintTextColor="?attr/hintColor">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/mergeDescription"
                     android:layout_width="match_parent"
                     android:layout_height="140dp"
+                    android:gravity="top|start"
+                    android:inputType="textCapSentences"
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
-                    android:gravity="top|start"
-                    android:inputType="textCapSentences"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/mergeSpinnerLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:boxBackgroundColor="?attr/inputBackgroundColor"
-                android:textColorHint="?attr/hintColor"
-                app:hintTextColor="?attr/hintColor"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:hint="@string/mergeStrategy"
+                android:textColorHint="?attr/hintColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 app:endIconTint="?attr/iconsColor"
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
+                app:hintTextColor="?attr/hintColor">
 
                 <AutoCompleteTextView
                     android:id="@+id/mergeSpinner"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="none"
-                    android:textColor="?attr/inputTextColor"
                     android:labelFor="@+id/mergeSpinner"
-                    android:textSize="16sp" />
+                    android:textColor="?attr/inputTextColor"
+                    android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -154,32 +154,32 @@
                 android:id="@+id/deleteBranch"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/deleteBranchAfterMerge"
-                android:checked="false"
-                android:textSize="16sp"
                 android:layout_marginTop="10dp"
-                android:visibility="gone"
-                android:textColor="?attr/primaryTextColor"/>
+                android:checked="false"
+                android:text="@string/deleteBranchAfterMerge"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/deleteBranchForkInfo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="0dp"
+                android:gravity="start"
                 android:text="@string/deleteBranchForkInfo"
                 android:textColor="?attr/hintColor"
-                android:textSize="12sp"
-                android:gravity="start"
-                android:layout_marginTop="0dp" />
+                android:textSize="12sp"/>
 
             <TextView
                 android:id="@+id/mergeInfo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:gravity="start"
                 android:text="@string/mergeNoteText"
                 android:textColor="?attr/hintColor"
-                android:textSize="12sp"
-                android:gravity="start"
-                android:layout_marginTop="15dp" />
+                android:textSize="12sp"/>
 
             <Button
                 android:id="@+id/mergeButton"
@@ -187,18 +187,18 @@
                 android:layout_height="60dp"
                 android:layout_marginTop="8dp"
                 android:text="@string/mergePullRequestButtonText"
-                android:textColor="@color/btnTextColor" />
+                android:textColor="@color/btnTextColor"/>
 
             <TextView
                 android:id="@+id/mergeInfoDisabledMessage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:gravity="start"
                 android:text="@string/mergeInfoDisabledMessage"
                 android:textColor="?attr/hintColor"
                 android:textSize="12sp"
-                android:gravity="start"
-                android:visibility="gone"
-                android:layout_marginTop="10dp" />
+                android:visibility="gone"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_org_detail.xml b/app/src/main/res/layout/activity_org_detail.xml
index db7d7d61..986b22c6 100644
--- a/app/src/main/res/layout/activity_org_detail.xml
+++ b/app/src/main/res/layout/activity_org_detail.xml
@@ -5,16 +5,16 @@
     android:id="@+id/main_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     android:background="?attr/primaryBackgroundColor"
+    android:fitsSystemWindows="true"
     tools:context=".activities.OrganizationDetailActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -25,56 +25,56 @@
             app:layout_scrollFlags="enterAlways">
 
             <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="18sp"
                 android:textColor="?attr/primaryTextColor"
-                android:id="@+id/toolbar_title" />
+                android:textSize="18sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
-            app:tabTextAppearance="@style/customTabLayout"
-            app:tabMode="scrollable"
-            app:tabTextColor="?attr/primaryTextColor"
-            android:background="?attr/primaryBackgroundColor"
-            app:tabIndicatorColor="?attr/pagerTabIndicatorColor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone">
+            android:background="?attr/primaryBackgroundColor"
+            android:visibility="gone"
+            app:tabIndicatorColor="?attr/pagerTabIndicatorColor"
+            app:tabMode="scrollable"
+            app:tabTextAppearance="@style/customTabLayout"
+            app:tabTextColor="?attr/primaryTextColor">
 
             <com.google.android.material.tabs.TabItem
                 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>
 
@@ -84,7 +84,7 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        android:visibility="gone"/>
+        android:visibility="gone"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_org_team_info.xml b/app/src/main/res/layout/activity_org_team_info.xml
index a074efad..fd47c15b 100644
--- a/app/src/main/res/layout/activity_org_team_info.xml
+++ b/app/src/main/res/layout/activity_org_team_info.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -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="20sp" />
+                android:textSize="20sp"/>
 
         </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>
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index 7431dba1..a7ed7db7 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -4,15 +4,15 @@
     android:id="@+id/main_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:background="?attr/primaryBackgroundColor">
+    android:background="?attr/primaryBackgroundColor"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,25 +23,25 @@
             app:layout_scrollFlags="enterAlways">
 
             <TextView
+                android:id="@+id/toolbarTitle"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
                 android:gravity="center_vertical"
-                android:textSize="18sp"
                 android:textColor="?attr/primaryTextColor"
-                android:id="@+id/toolbarTitle" />
+                android:textSize="18sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
-            app:tabTextAppearance="@style/customTabLayout"
-            app:tabMode="scrollable"
-            app:tabTextColor="?attr/primaryTextColor"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:background="?attr/primaryBackgroundColor"
             app:tabIndicatorColor="?attr/pagerTabIndicatorColor"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            app:tabMode="scrollable"
+            app:tabTextAppearance="@style/customTabLayout"
+            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>
diff --git a/app/src/main/res/layout/activity_profile_email.xml b/app/src/main/res/layout/activity_profile_email.xml
index 32e585c0..7921c559 100644
--- a/app/src/main/res/layout/activity_profile_email.xml
+++ b/app/src/main/res/layout/activity_profile_email.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -25,24 +25,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/pageTitleAddEmail"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -51,22 +51,22 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="16dp">
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/userEmailLayout"
             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="8dp"
             android:layout_marginBottom="8dp"
+            android:hint="@string/profileEmailTitle"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            app:boxStrokeErrorColor="@color/darkRed"
             app:endIconMode="clear_text"
             app:endIconTint="?attr/iconsColor"
-            android:hint="@string/profileEmailTitle">
+            app:hintTextColor="?attr/hintColor">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/userEmail"
@@ -75,7 +75,7 @@
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -85,7 +85,7 @@
             android:layout_height="60dp"
             android:layout_marginTop="8dp"
             android:text="@string/saveButton"
-            android:textColor="@color/btnTextColor" />
+            android:textColor="@color/btnTextColor"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_repo_detail.xml b/app/src/main/res/layout/activity_repo_detail.xml
index b1fa2e94..b786b6b0 100644
--- a/app/src/main/res/layout/activity_repo_detail.xml
+++ b/app/src/main/res/layout/activity_repo_detail.xml
@@ -6,16 +6,16 @@
     android:id="@+id/main_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     android:background="?attr/primaryBackgroundColor"
+    android:fitsSystemWindows="true"
     tools:context=".activities.RepoDetailActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -33,34 +33,34 @@
                 android:paddingEnd="8dp"
                 android:src="@drawable/ic_lock"
                 android:visibility="gone"
-                tools:visibility="visible" />
+                tools:visibility="visible"/>
 
             <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="18sp"
                 android:textColor="?attr/primaryTextColor"
-                android:id="@+id/toolbar_title" />
+                android:textSize="18sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
         <com.google.android.material.progressindicator.LinearProgressIndicator
             android:id="@+id/loadingIndicator"
-            android:indeterminate="true"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:indeterminate="true"/>
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/primaryBackgroundColor"
+            app:tabIndicatorColor="?attr/pagerTabIndicatorColor"
             app:tabMode="scrollable"
             app:tabTextAppearance="@style/customTabLayout"
-            android:layout_width="match_parent"
-            android:background="?attr/primaryBackgroundColor"
-            app:tabTextColor="?attr/primaryTextColor"
-            app:tabIndicatorColor="?attr/pagerTabIndicatorColor"
-            android:layout_height="wrap_content">
+            app:tabTextColor="?attr/primaryTextColor">
 
         </com.google.android.material.tabs.TabLayout>
     </com.google.android.material.appbar.AppBarLayout>
@@ -69,6 +69,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>
diff --git a/app/src/main/res/layout/activity_repo_forks.xml b/app/src/main/res/layout/activity_repo_forks.xml
index e9d88d55..b0daa7b5 100644
--- a/app/src/main/res/layout/activity_repo_forks.xml
+++ b/app/src/main/res/layout/activity_repo_forks.xml
@@ -1,17 +1,17 @@
 <?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">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,27 +23,27 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/commitTitle"
-                android:textColor="?attr/primaryTextColor"
+                android:layout_marginEnd="20dp"
                 android:ellipsize="none"
                 android:scrollbars="horizontal"
                 android:singleLine="true"
-                android:layout_marginEnd="20dp"
-                android:textSize="18sp" />
+                android:text="@string/commitTitle"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="18sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -52,36 +52,36 @@
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/pullToRefresh"
         android:layout_width="match_parent"
-        android:layout_marginTop="56dp"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="56dp">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <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:layout_marginTop="56dp"
         android:indeterminate="true"
-        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progressLoadMore"
+        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="56dp"
-        android:visibility="gone"
         android:indeterminate="true"
-        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        android:visibility="gone"
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noData"
@@ -92,6 +92,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_repo_stargazers.xml b/app/src/main/res/layout/activity_repo_stargazers.xml
index 7d1a33c8..b611d764 100644
--- a/app/src/main/res/layout/activity_repo_stargazers.xml
+++ b/app/src/main/res/layout/activity_repo_stargazers.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     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 +11,8 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -24,23 +24,23 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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="20sp" />
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -50,20 +50,20 @@
         android:id="@+id/gridView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?attr/primaryBackgroundColor"
+        android:columnWidth="80dp"
+        android:gravity="center"
         android:horizontalSpacing="10dp"
         android:numColumns="4"
-        android:columnWidth="80dp"
-        android:stretchMode="columnWidth"
-        android:background="?attr/primaryBackgroundColor"
-        android:gravity="center"/>
+        android:stretchMode="columnWidth"/>
 
     <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"
@@ -73,6 +73,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_repo_watchers.xml b/app/src/main/res/layout/activity_repo_watchers.xml
index f622f725..f63307a7 100644
--- a/app/src/main/res/layout/activity_repo_watchers.xml
+++ b/app/src/main/res/layout/activity_repo_watchers.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     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 +11,8 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -24,23 +24,23 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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="20sp" />
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -50,20 +50,20 @@
         android:id="@+id/gridView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?attr/primaryBackgroundColor"
+        android:columnWidth="80dp"
+        android:gravity="center"
         android:horizontalSpacing="10dp"
         android:numColumns="4"
-        android:columnWidth="80dp"
-        android:stretchMode="columnWidth"
-        android:background="?attr/primaryBackgroundColor"
-        android:gravity="center" />
+        android:stretchMode="columnWidth"/>
 
     <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"
@@ -73,6 +73,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_repository_settings.xml b/app/src/main/res/layout/activity_repository_settings.xml
index 346ff102..b6fd96a0 100644
--- a/app/src/main/res/layout/activity_repository_settings.xml
+++ b/app/src/main/res/layout/activity_repository_settings.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout 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:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    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"
         android:layout_marginBottom="10dp"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -27,12 +27,12 @@
                 android:layout_height="@dimen/close_button_size"
                 android:layout_marginLeft="15dp"
                 android:layout_marginRight="15dp"
-                android:contentDescription="@string/close"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:gravity="center_vertical"
-                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"
@@ -42,7 +42,7 @@
                 android:maxLines="1"
                 android:text="@string/repoSettingsTitle"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -54,8 +54,8 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/editProperties"
@@ -63,28 +63,28 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:background="?android:attr/selectableItemBackground"
-                android:drawablePadding="32dp"
-                android:padding="16dp"
-                android:focusable="true"
                 android:clickable="true"
+                android:drawablePadding="32dp"
+                android:focusable="true"
+                android:padding="16dp"
                 android:text="@string/repoSettingsEditProperties"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                app:drawableStartCompat="@drawable/ic_edit" />
+                app:drawableStartCompat="@drawable/ic_edit"/>
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"/>
 
             <LinearLayout
                 android:id="@+id/transferOwnerFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?android:attr/selectableItemBackground"
-                android:orientation="vertical"
-                android:focusable="true"
                 android:clickable="true"
+                android:focusable="true"
+                android:orientation="vertical"
                 tools:visibility="visible">
 
                 <TextView
@@ -99,7 +99,7 @@
                     android:text="@string/repoSettingsTransferOwnership"
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="16sp"
-                    app:drawableStartCompat="@drawable/ic_arrow_up" />
+                    app:drawableStartCompat="@drawable/ic_arrow_up"/>
 
                 <TextView
                     android:id="@+id/transferRepositoryOwnershipHint"
@@ -111,12 +111,12 @@
                     android:paddingBottom="16dp"
                     android:text="@string/repoSettingsTransferOwnershipHint"
                     android:textColor="?attr/hintColor"
-                    android:textSize="12sp" />
+                    android:textSize="12sp"/>
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="?attr/dividerColor" />
+                    android:background="?attr/dividerColor"/>
 
             </LinearLayout>
 
@@ -125,9 +125,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?android:attr/selectableItemBackground"
-                android:orientation="vertical"
-                android:focusable="true"
                 android:clickable="true"
+                android:focusable="true"
+                android:orientation="vertical"
                 android:paddingBottom="16dp">
 
                 <TextView
@@ -142,7 +142,7 @@
                     android:text="@string/repoSettingsDelete"
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="16sp"
-                    app:drawableStartCompat="@drawable/ic_delete" />
+                    app:drawableStartCompat="@drawable/ic_delete"/>
 
                 <TextView
                     android:id="@+id/deleteRepositoryHint"
@@ -153,7 +153,7 @@
                     android:paddingEnd="16dp"
                     android:text="@string/repoSettingsDeleteHint"
                     android:textColor="?attr/hintColor"
-                    android:textSize="12sp" />
+                    android:textSize="12sp"/>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_settings_appearance.xml b/app/src/main/res/layout/activity_settings_appearance.xml
index 17ad1a3b..31a0e4a3 100644
--- a/app/src/main/res/layout/activity_settings_appearance.xml
+++ b/app/src/main/res/layout/activity_settings_appearance.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:orientation="vertical"
-    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"
         android:layout_marginBottom="10dp"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -27,12 +27,12 @@
                 android:layout_height="@dimen/close_button_size"
                 android:layout_marginLeft="15dp"
                 android:layout_marginRight="15dp"
-                android:contentDescription="@string/close"
-                android:gravity="center_vertical"
                 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"
@@ -42,7 +42,7 @@
                 android:maxLines="1"
                 android:text="@string/settingsAppearanceHeader"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -52,12 +52,12 @@
         android:id="@+id/themeSelectionFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
-        android:orientation="vertical"
-        android:focusable="true"
         android:clickable="true"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:focusable="true"
+        android:orientation="vertical"
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/themeHeaderSelector"
@@ -67,7 +67,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/themeSelectionHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <TextView
             android:id="@+id/themeSelected"
@@ -77,7 +77,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/themeSelectionSelectedText"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
@@ -85,12 +85,12 @@
         android:id="@+id/lightThemeTimeSelectionFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
-        android:orientation="vertical"
-        android:focusable="true"
         android:clickable="true"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:focusable="true"
+        android:orientation="vertical"
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/lightThemeTimeHeaderSelector"
@@ -100,7 +100,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/settingsLightThemeTimeSelectorHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <TextView
             android:id="@+id/lightThemeSelectedTime"
@@ -110,7 +110,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/settingsThemeTimeSelectedHint"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
@@ -118,12 +118,12 @@
         android:id="@+id/darkThemeTimeSelectionFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
-        android:orientation="vertical"
-        android:focusable="true"
         android:clickable="true"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:focusable="true"
+        android:orientation="vertical"
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/darkThemeTimeHeaderSelector"
@@ -133,7 +133,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/settingsDarkThemeTimeSelectorHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <TextView
             android:id="@+id/darkThemeSelectedTime"
@@ -143,7 +143,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/settingsThemeTimeSelectedHint"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
@@ -151,12 +151,12 @@
         android:id="@+id/customFontFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
-        android:focusable="true"
         android:clickable="true"
+        android:focusable="true"
         android:orientation="vertical"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/customFontHeaderSelector"
@@ -166,7 +166,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/settingsCustomFontHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <TextView
             android:id="@+id/customFontSelected"
@@ -176,7 +176,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/settingsCustomFontDefault"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
@@ -184,12 +184,12 @@
         android:id="@+id/timeFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
-        android:focusable="true"
         android:clickable="true"
+        android:focusable="true"
         android:orientation="vertical"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/tvDateTimeHeaderSelector"
@@ -199,7 +199,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/settingsDateTimeHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <TextView
             android:id="@+id/tvDateTimeSelected"
@@ -209,7 +209,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/settingsDateTimeHeaderDefault"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
@@ -217,10 +217,10 @@
         android:id="@+id/counterBadgeFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/tvCounterBadgeHeader"
@@ -230,7 +230,7 @@
             android:layout_marginEnd="72dp"
             android:text="@string/settingsCounterBadges"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/switchCounterBadge"
@@ -242,7 +242,7 @@
             android:gravity="end"
             android:paddingStart="0dp"
             android:paddingEnd="24dp"
-            android:switchMinWidth="56dp" />
+            android:switchMinWidth="56dp"/>
 
     </RelativeLayout>
 
@@ -250,10 +250,10 @@
         android:id="@+id/labelsInListFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/tvLabelsInListHeader"
@@ -263,7 +263,7 @@
             android:layout_marginEnd="72dp"
             android:text="@string/settingsLabelsInListHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/switchLabelsInListBadge"
@@ -275,7 +275,7 @@
             android:gravity="end"
             android:paddingStart="0dp"
             android:paddingEnd="24dp"
-            android:switchMinWidth="56dp" />
+            android:switchMinWidth="56dp"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -285,7 +285,7 @@
             android:layout_marginEnd="72dp"
             android:text="@string/settingsLabelsInListHint"
             android:textColor="?attr/hintColor"
-            android:textSize="12sp" />
+            android:textSize="12sp"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/activity_settings_drafts.xml b/app/src/main/res/layout/activity_settings_drafts.xml
index 57aa34d6..a340bd36 100644
--- a/app/src/main/res/layout/activity_settings_drafts.xml
+++ b/app/src/main/res/layout/activity_settings_drafts.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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 +11,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -27,12 +27,12 @@
                 android:layout_height="@dimen/close_button_size"
                 android:layout_marginLeft="15dp"
                 android:layout_marginRight="15dp"
-                android:contentDescription="@string/close"
-                android:gravity="center_vertical"
-                android:focusable="true"
-                android:clickable="true"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_close" />
+                android:clickable="true"
+                android:contentDescription="@string/close"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                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="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -52,10 +52,10 @@
         android:id="@+id/enableDraftsCommentsDeletion"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/enableCommentsDeletionHeader"
@@ -65,7 +65,7 @@
             android:layout_marginEnd="72dp"
             android:text="@string/settingsEnableCommentsDeletionText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/commentsDeletionSwitch"
@@ -77,7 +77,7 @@
             android:gravity="end"
             android:paddingStart="0dp"
             android:paddingEnd="25dp"
-            android:switchMinWidth="56dp" />
+            android:switchMinWidth="56dp"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -87,7 +87,7 @@
             android:layout_marginEnd="72dp"
             android:text="@string/settingsEnableCommentsDeletionHintText"
             android:textColor="?attr/hintColor"
-            android:textSize="12sp" />
+            android:textSize="12sp"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/activity_settings_general.xml b/app/src/main/res/layout/activity_settings_general.xml
index f334d074..0f15478f 100644
--- a/app/src/main/res/layout/activity_settings_general.xml
+++ b/app/src/main/res/layout/activity_settings_general.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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 +11,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -27,12 +27,12 @@
                 android:layout_height="@dimen/close_button_size"
                 android:layout_marginLeft="15dp"
                 android:layout_marginRight="15dp"
-                android:contentDescription="@string/close"
-                android:gravity="center_vertical"
                 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"
@@ -42,7 +42,7 @@
                 android:maxLines="1"
                 android:text="@string/settingsGeneralHeader"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -52,12 +52,12 @@
         android:id="@+id/setDefaultLinkHandler"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
-        android:focusable="true"
         android:clickable="true"
+        android:focusable="true"
         android:orientation="vertical"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/generalDeepLinkDefaultScreen"
@@ -67,7 +67,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/generalDeepLinkDefaultScreen"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -76,7 +76,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/generalDeepLinkDefaultScreenHintText"
             android:textColor="?attr/hintColor"
-            android:textSize="12sp" />
+            android:textSize="12sp"/>
 
         <TextView
             android:id="@+id/generalDeepLinkSelected"
@@ -86,7 +86,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/generalDeepLinkSelectedText"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
@@ -94,12 +94,12 @@
         android:id="@+id/homeScreenFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
-        android:focusable="true"
         android:clickable="true"
+        android:focusable="true"
         android:orientation="vertical"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/homeScreenHeaderSelector"
@@ -109,7 +109,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/settingsHomeScreenHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <TextView
             android:id="@+id/homeScreenSelected"
@@ -119,7 +119,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/settingsHomeScreenSelectedText"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
@@ -127,10 +127,10 @@
         android:id="@+id/customTabsFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/customTabsHeader"
@@ -140,7 +140,7 @@
             android:layout_marginEnd="72dp"
             android:text="@string/useCustomTabs"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/switchTabs"
@@ -152,7 +152,7 @@
             android:gravity="end"
             android:paddingStart="0dp"
             android:paddingEnd="24dp"
-            android:switchMinWidth="56dp" />
+            android:switchMinWidth="56dp"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/activity_settings_notifications.xml b/app/src/main/res/layout/activity_settings_notifications.xml
index 7d7c427a..97849d0f 100644
--- a/app/src/main/res/layout/activity_settings_notifications.xml
+++ b/app/src/main/res/layout/activity_settings_notifications.xml
@@ -12,8 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
@@ -29,12 +29,12 @@
                 android:layout_height="@dimen/close_button_size"
                 android:layout_marginLeft="15dp"
                 android:layout_marginRight="15dp"
-                android:contentDescription="@string/close"
-                android:gravity="center_vertical"
                 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"
@@ -44,7 +44,7 @@
                 android:maxLines="1"
                 android:text="@string/pageTitleNotifications"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </androidx.appcompat.widget.Toolbar>
 
@@ -54,10 +54,10 @@
         android:id="@+id/enableNotificationsFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/enableNotificationsHeader"
@@ -67,7 +67,7 @@
             android:layout_marginEnd="72dp"
             android:text="@string/enableNotificationsHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/enableNotificationsMode"
@@ -79,7 +79,7 @@
             android:gravity="end"
             android:paddingStart="0dp"
             android:paddingEnd="25dp"
-            android:switchMinWidth="56dp" />
+            android:switchMinWidth="56dp"/>
 
     </RelativeLayout>
 
@@ -87,10 +87,10 @@
         android:id="@+id/pollingDelayFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="vertical"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/pollingDelayHeaderSelector"
@@ -100,7 +100,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/notificationsPollingHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <TextView
             android:id="@+id/pollingDelaySelected"
@@ -110,7 +110,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/pollingDelaySelectedText"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
@@ -118,10 +118,10 @@
         android:id="@+id/enableLightsFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/enableLightsHeader"
@@ -131,7 +131,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/enableLightsHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/enableLightsMode"
@@ -143,7 +143,7 @@
             android:gravity="end"
             android:paddingStart="0dp"
             android:paddingEnd="25dp"
-            android:switchMinWidth="56dp" />
+            android:switchMinWidth="56dp"/>
 
     </RelativeLayout>
 
@@ -151,10 +151,10 @@
         android:id="@+id/chooseColorFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/chooseColorHeader"
@@ -164,7 +164,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/chooseColorSelectorHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <androidx.cardview.widget.CardView
             android:id="@+id/chooseColorState"
@@ -175,7 +175,7 @@
             android:layout_marginEnd="30dp"
             android:gravity="end"
             app:cardCornerRadius="15dp"
-            app:cardElevation="0dp" />
+            app:cardElevation="0dp"/>
 
     </RelativeLayout>
 
@@ -183,10 +183,10 @@
         android:id="@+id/enableVibrationFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/enableVibrationHeader"
@@ -196,7 +196,7 @@
             android:layout_marginEnd="72dp"
             android:text="@string/enableVibrationHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/enableVibrationMode"
@@ -208,7 +208,7 @@
             android:gravity="end"
             android:paddingStart="0dp"
             android:paddingEnd="25dp"
-            android:switchMinWidth="56dp" />
+            android:switchMinWidth="56dp"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/activity_settings_reports.xml b/app/src/main/res/layout/activity_settings_reports.xml
index 8ddb8312..ae81a942 100644
--- a/app/src/main/res/layout/activity_settings_reports.xml
+++ b/app/src/main/res/layout/activity_settings_reports.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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 +11,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -26,12 +26,12 @@
                 android:layout_height="@dimen/close_button_size"
                 android:layout_marginLeft="15dp"
                 android:layout_marginRight="15dp"
-                android:contentDescription="@string/close"
-                android:gravity="center_vertical"
                 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"
@@ -41,7 +41,7 @@
                 android:maxLines="1"
                 android:text="@string/reportViewerHeader"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -51,10 +51,10 @@
         android:id="@+id/enableSendReports"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/enableReportsHeader"
@@ -64,7 +64,7 @@
             android:layout_marginEnd="72dp"
             android:text="@string/settingsEnableReportsText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/crashReportsSwitch"
@@ -76,7 +76,7 @@
             android:gravity="end"
             android:paddingStart="0dp"
             android:paddingEnd="25dp"
-            android:switchMinWidth="56dp" />
+            android:switchMinWidth="56dp"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/activity_settings_security.xml b/app/src/main/res/layout/activity_settings_security.xml
index 257a6003..b435e6ee 100644
--- a/app/src/main/res/layout/activity_settings_security.xml
+++ b/app/src/main/res/layout/activity_settings_security.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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 +11,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -26,12 +26,12 @@
                 android:layout_height="@dimen/close_button_size"
                 android:layout_marginLeft="15dp"
                 android:layout_marginRight="15dp"
-                android:contentDescription="@string/close"
-                android:gravity="center_vertical"
                 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"
@@ -41,7 +41,7 @@
                 android:maxLines="1"
                 android:text="@string/settingsSecurityHeader"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -51,10 +51,10 @@
         android:id="@+id/biometricFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/biometricHeader"
@@ -64,7 +64,7 @@
             android:layout_marginEnd="72dp"
             android:text="@string/settingsBiometricHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/switchBiometric"
@@ -76,7 +76,7 @@
             android:gravity="end"
             android:paddingStart="0dp"
             android:paddingEnd="24dp"
-            android:switchMinWidth="56dp" />
+            android:switchMinWidth="56dp"/>
 
     </RelativeLayout>
 
@@ -84,10 +84,10 @@
         android:id="@+id/certsFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="vertical"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/tvCertHeader"
@@ -97,7 +97,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/settingsCertsSelectorHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
     </LinearLayout>
 
@@ -105,10 +105,10 @@
         android:id="@+id/cacheSizeDataSelectionFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="vertical"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/cacheSizeDataHeaderSelector"
@@ -118,7 +118,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/cacheSizeDataSelectionHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <TextView
             android:id="@+id/cacheSizeDataSelected"
@@ -128,7 +128,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/cacheSizeDataSelectionSelectedText"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
@@ -136,10 +136,10 @@
         android:id="@+id/cacheSizeImagesSelectionFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="vertical"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/cacheSizeImagesHeaderSelector"
@@ -149,7 +149,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/cacheSizeImagesSelectionHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <TextView
             android:id="@+id/cacheSizeImagesSelected"
@@ -159,7 +159,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/cacheSizeImagesSelectionSelectedText"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
@@ -167,10 +167,10 @@
         android:id="@+id/clearCacheSelectionFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="vertical"
-        android:padding="15dp"
-        android:layout_marginBottom="5dp">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/clearCacheHeaderSelector"
@@ -180,7 +180,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/clearCacheSelectionHeaderText"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <TextView
             android:id="@+id/clearCacheSelected"
@@ -190,7 +190,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/clearCacheSelectionSelectedText"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_settings_translation.xml b/app/src/main/res/layout/activity_settings_translation.xml
index 381bfe3c..fa82d63a 100644
--- a/app/src/main/res/layout/activity_settings_translation.xml
+++ b/app/src/main/res/layout/activity_settings_translation.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:orientation="vertical"
-    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"
         android:layout_marginBottom="10dp"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -26,12 +26,12 @@
                 android:layout_height="@dimen/close_button_size"
                 android:layout_marginLeft="15dp"
                 android:layout_marginRight="15dp"
-                android:contentDescription="@string/close"
-                android:gravity="center_vertical"
                 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"
@@ -41,7 +41,7 @@
                 android:maxLines="1"
                 android:text="@string/settingsLanguageHeaderText"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -52,8 +52,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
-        android:focusable="true"
         android:clickable="true"
+        android:focusable="true"
         android:orientation="vertical"
         android:padding="15dp">
 
@@ -65,7 +65,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/settingsLanguageSelectorHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <TextView
             android:id="@+id/tvLanguageSelected"
@@ -75,7 +75,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/settingsLanguageSelectedHeaderDefault"
             android:textColor="?attr/selectedTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
@@ -83,14 +83,14 @@
         android:id="@+id/helpTranslate"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:autoLink="web"
+        android:background="?android:attr/selectableItemBackground"
         android:paddingStart="39dp"
-        android:paddingBottom="15dp"
         android:paddingTop="15dp"
         android:paddingEnd="24dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:autoLink="web"
+        android:paddingBottom="15dp"
         android:text="@string/settingsHelpTranslateText"
         android:textColor="@color/lightBlue"
-        android:textSize="16sp" />
+        android:textSize="16sp"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_wiki.xml b/app/src/main/res/layout/activity_wiki.xml
index 097dce6a..042e54a7 100644
--- a/app/src/main/res/layout/activity_wiki.xml
+++ b/app/src/main/res/layout/activity_wiki.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -24,27 +24,27 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/defaultFilename"
-                android:textColor="?attr/primaryTextColor"
+                android:layout_marginEnd="20dp"
                 android:ellipsize="none"
                 android:scrollbars="horizontal"
                 android:singleLine="true"
-                android:layout_marginEnd="20dp"
-                android:textSize="18sp" />
+                android:text="@string/defaultFilename"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="18sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -52,11 +52,11 @@
 
     <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"/>
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -72,8 +72,8 @@
                 android:id="@+id/render_wiki"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:visibility="gone"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="gone">
 
                 <LinearLayout
                     android:id="@+id/markdown_frame"
@@ -81,10 +81,10 @@
                     android:layout_height="wrap_content"
                     android:background="?attr/primaryBackgroundColor"
                     android:orientation="vertical"
-                    android:paddingTop="0dp"
-                    android:paddingBottom="16dp"
                     android:paddingStart="16dp"
+                    android:paddingTop="0dp"
                     android:paddingEnd="16dp"
+                    android:paddingBottom="16dp"
                     android:visibility="gone">
 
                     <androidx.recyclerview.widget.RecyclerView
@@ -93,7 +93,7 @@
                         android:layout_height="wrap_content"
                         android:textColor="?attr/primaryTextColor"
                         android:textIsSelectable="true"
-                        android:textSize="14sp" />
+                        android:textSize="14sp"/>
 
                 </LinearLayout>
 
@@ -102,7 +102,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:visibility="gone"
-                    tools:visibility="visible" />
+                    tools:visibility="visible"/>
 
             </LinearLayout>
 
@@ -110,37 +110,37 @@
                 android:id="@+id/create_wiki"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="0dp"
-                android:paddingBottom="16dp"
+                android:orientation="vertical"
                 android:paddingStart="16dp"
+                android:paddingTop="0dp"
                 android:paddingEnd="16dp"
-                android:orientation="vertical">
+                android:paddingBottom="16dp">
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/title_layout"
                     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="8dp"
                     android:layout_marginBottom="8dp"
+                    android:hint="@string/newIssueTitle"
+                    android:textColorHint="?attr/hintColor"
+                    app:boxBackgroundColor="?attr/inputBackgroundColor"
+                    app:boxStrokeErrorColor="@color/darkRed"
                     app:endIconMode="clear_text"
                     app:endIconTint="?attr/iconsColor"
-                    android:hint="@string/newIssueTitle">
+                    app:hintTextColor="?attr/hintColor">
 
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/wiki_title"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:imeOptions="actionNext"
+                        android:inputType="textCapSentences"
+                        android:singleLine="true"
                         android:textColor="?attr/inputTextColor"
                         android:textColorHighlight="?attr/hintColor"
                         android:textColorHint="?attr/hintColor"
-                        android:inputType="textCapSentences"
-                        android:singleLine="true"
-                        android:imeOptions="actionNext"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"/>
 
                 </com.google.android.material.textfield.TextInputLayout>
 
@@ -148,24 +148,24 @@
                     android:id="@+id/content_layout"
                     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="8dp"
-                    android:layout_marginBottom="8dp">
+                    android:layout_marginBottom="8dp"
+                    android:textColorHint="?attr/hintColor"
+                    app:boxBackgroundColor="?attr/inputBackgroundColor"
+                    app:boxStrokeErrorColor="@color/darkRed"
+                    app:hintTextColor="?attr/hintColor">
 
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/wiki_content"
                         android:layout_width="match_parent"
                         android:layout_height="480dp"
+                        android:gravity="top|start"
+                        android:imeOptions="actionNext"
+                        android:singleLine="false"
                         android:textColor="?attr/inputTextColor"
                         android:textColorHighlight="?attr/hintColor"
                         android:textColorHint="?attr/hintColor"
-                        android:gravity="top|start"
-                        android:singleLine="false"
-                        android:imeOptions="actionNext"
-                        android:textSize="14sp" />
+                        android:textSize="14sp"/>
 
                 </com.google.android.material.textfield.TextInputLayout>
 
@@ -173,11 +173,11 @@
                     android:id="@+id/markdown_preview"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="?attr/primaryTextColor"
-                    android:textIsSelectable="true"
                     android:layout_marginTop="@dimen/dimen8dp"
                     android:layout_marginBottom="@dimen/dimen8dp"
-                    android:textSize="14sp" />
+                    android:textColor="?attr/primaryTextColor"
+                    android:textIsSelectable="true"
+                    android:textSize="14sp"/>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/add_new_team_repository.xml b/app/src/main/res/layout/add_new_team_repository.xml
index 5729a102..794fc976 100644
--- a/app/src/main/res/layout/add_new_team_repository.xml
+++ b/app/src/main/res/layout/add_new_team_repository.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/primaryBackgroundColor">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -23,24 +23,24 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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/addButton"
                 android:textColor="?attr/primaryTextColor"
-                android:maxLines="1"
-                android:textSize="20sp" />
+                android:textSize="20sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -48,12 +48,12 @@
 
     <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:visibility="gone"
         android:indeterminate="true"
-        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        android:visibility="gone"
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noData"
@@ -64,17 +64,17 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerViewTeamRepos"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/primaryBackgroundColor"
         android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
         android:layout_marginTop="5dp"
+        android:layout_marginEnd="0dp"
         android:layout_marginBottom="0dp"
-        android:scrollbars="vertical" />
+        android:background="?attr/primaryBackgroundColor"
+        android:scrollbars="vertical"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/badge_issue.xml b/app/src/main/res/layout/badge_issue.xml
index 33e227d0..46c8dfe7 100644
--- a/app/src/main/res/layout/badge_issue.xml
+++ b/app/src/main/res/layout/badge_issue.xml
@@ -9,22 +9,22 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:textSize="16sp"
-        app:textAllCaps="true"
         android:text="@string/pageTitleIssues"
-        android:textColor="@color/lightGray" />
+        android:textColor="@color/lightGray"
+        android:textSize="16sp"
+        app:textAllCaps="true"/>
 
     <TextView
         android:id="@+id/counterBadgeIssue"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
-        android:textSize="12sp"
-        android:layout_marginTop="1dp"
         android:layout_marginStart="8dp"
+        android:layout_marginTop="1dp"
         android:layout_toEndOf="@+id/counterBadgeIssueText"
         android:background="@drawable/shape_badge_background"
+        android:gravity="center"
         android:text="@string/infoTabRepoZero"
-        android:textColor="@color/colorWhite" />
+        android:textColor="@color/colorWhite"
+        android:textSize="12sp"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/badge_notification.xml b/app/src/main/res/layout/badge_notification.xml
index 11f8f366..c1ee6885 100644
--- a/app/src/main/res/layout/badge_notification.xml
+++ b/app/src/main/res/layout/badge_notification.xml
@@ -9,13 +9,13 @@
         android:id="@+id/counterBadgeNotification"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:maxLength="4"
-        android:ellipsize="marquee"
         android:background="@drawable/shape_badge_background"
+        android:ellipsize="marquee"
+        android:maxLength="4"
         android:paddingStart="5dp"
         android:paddingEnd="5dp"
+        android:singleLine="true"
         android:textColor="@color/colorWhite"
-        android:textSize="12sp" />
+        android:textSize="12sp"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/badge_pull.xml b/app/src/main/res/layout/badge_pull.xml
index 0fdc052e..33926242 100644
--- a/app/src/main/res/layout/badge_pull.xml
+++ b/app/src/main/res/layout/badge_pull.xml
@@ -14,7 +14,7 @@
         android:text="@string/tabPullRequests"
         android:textColor="@color/lightGray"
         android:textSize="16sp"
-        app:textAllCaps="true" />
+        app:textAllCaps="true"/>
 
     <TextView
         android:id="@+id/counterBadgePull"
@@ -24,6 +24,6 @@
         android:background="@drawable/shape_badge_background"
         android:text="@string/infoTabRepoZero"
         android:textColor="@color/colorWhite"
-        android:textSize="12sp" />
+        android:textSize="12sp"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/badge_release.xml b/app/src/main/res/layout/badge_release.xml
index e1ae71a2..1cf7d164 100644
--- a/app/src/main/res/layout/badge_release.xml
+++ b/app/src/main/res/layout/badge_release.xml
@@ -14,7 +14,7 @@
         android:text="@string/tabTextReleases"
         android:textColor="@color/lightGray"
         android:textSize="16sp"
-        app:textAllCaps="true" />
+        app:textAllCaps="true"/>
 
     <TextView
         android:id="@+id/counterBadgeRelease"
@@ -24,6 +24,6 @@
         android:background="@drawable/shape_badge_background"
         android:text="@string/infoTabRepoZero"
         android:textColor="@color/colorWhite"
-        android:textSize="12sp" />
+        android:textSize="12sp"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/bottom_sheet_admin_users.xml b/app/src/main/res/layout/bottom_sheet_admin_users.xml
index 01b0dac6..18f83079 100644
--- a/app/src/main/res/layout/bottom_sheet_admin_users.xml
+++ b/app/src/main/res/layout/bottom_sheet_admin_users.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -22,8 +22,8 @@
                 android:id="@+id/adminUsersHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/navAdministration"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,23 +40,23 @@
                 android:id="@+id/giteaUsersAdminSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/createNewUser"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_person_add"
+                    android:padding="4dp"
                     android:text="@string/adminCreateNewUser"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_person_add"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_drafts.xml b/app/src/main/res/layout/bottom_sheet_drafts.xml
index 8be6a450..18481a4e 100644
--- a/app/src/main/res/layout/bottom_sheet_drafts.xml
+++ b/app/src/main/res/layout/bottom_sheet_drafts.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -22,8 +22,8 @@
                 android:id="@+id/draftsHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/draftsHeader"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,23 +40,23 @@
                 android:id="@+id/draftsSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/deleteAllDrafts"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_delete"
+                    android:padding="4dp"
                     android:text="@string/menuDeleteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_delete"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_file_viewer.xml b/app/src/main/res/layout/bottom_sheet_file_viewer.xml
index 2d8138b2..7cdab844 100644
--- a/app/src/main/res/layout/bottom_sheet_file_viewer.xml
+++ b/app/src/main/res/layout/bottom_sheet_file_viewer.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/filesHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/file"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,49 +40,49 @@
                 android:id="@+id/filesSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/editFile"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_edit"
+                    android:padding="4dp"
                     android:text="@string/menuEditText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_edit"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/deleteFile"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_delete"
+                    android:padding="4dp"
                     android:text="@string/menuDeleteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_delete"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/downloadFile"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_download"
+                    android:padding="4dp"
                     android:text="@string/download"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_download"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_issue_comments.xml b/app/src/main/res/layout/bottom_sheet_issue_comments.xml
index 1c57ff52..0582cff4 100644
--- a/app/src/main/res/layout/bottom_sheet_issue_comments.xml
+++ b/app/src/main/res/layout/bottom_sheet_issue_comments.xml
@@ -23,22 +23,22 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dp"
-                android:orientation="horizontal" />
+                android:orientation="horizontal"/>
 
             <View
+                android:id="@+id/reactionDivider"
                 android:layout_width="match_parent"
                 android:layout_height="4dp"
-                android:id="@+id/reactionDivider"
                 android:layout_marginTop="12dp"
                 android:layout_marginBottom="16dp"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"/>
 
             <LinearLayout
                 android:id="@+id/issueComments"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -47,7 +47,7 @@
                     android:gravity="center"
                     android:text="@string/commentButtonText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -55,62 +55,62 @@
                 android:id="@+id/issueCommentsSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/commentMenuEdit"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_edit"
+                    android:padding="4dp"
                     android:text="@string/menuEditText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_edit"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/commentMenuDelete"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_delete"
+                    android:padding="4dp"
                     android:text="@string/menuDeleteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_delete"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/commentMenuQuote"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_comment"
+                    android:padding="4dp"
                     android:text="@string/menuQuoteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_comment"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/commentMenuCopy"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_copy"
+                    android:padding="4dp"
                     android:text="@string/menuCopyText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_copy"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
@@ -119,55 +119,55 @@
                 android:layout_width="match_parent"
                 android:layout_height="4dp"
                 android:layout_marginBottom="16dp"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"/>
 
             <com.google.android.flexbox.FlexboxLayout
                 android:id="@+id/issueOtherSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/issueCommentCopyUrl"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_link"
+                    android:padding="4dp"
                     android:text="@string/genericCopyUrl"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_link"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/issueCommentShare"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_share"
+                    android:padding="4dp"
                     android:text="@string/share"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_share"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/open"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_browser"
+                    android:padding="4dp"
                     android:text="@string/openInBrowser"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_browser"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_issues_filter.xml b/app/src/main/res/layout/bottom_sheet_issues_filter.xml
index 7ddd0be7..115d923f 100644
--- a/app/src/main/res/layout/bottom_sheet_issues_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_issues_filter.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/issuesFilterHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/strFilter"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,49 +40,49 @@
                 android:id="@+id/issuesFilterSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/filterByMilestone"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_milestone"
+                    android:padding="4dp"
                     android:text="@string/newIssueMilestoneTitle"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_milestone"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/openIssues"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_issue"
+                    android:padding="4dp"
                     android:text="@string/isOpen"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_issue"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/closedIssues"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_issue_closed"
+                    android:padding="4dp"
                     android:text="@string/isClosed"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_issue_closed"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_labels_in_list.xml b/app/src/main/res/layout/bottom_sheet_labels_in_list.xml
index 65de6606..56ba6053 100644
--- a/app/src/main/res/layout/bottom_sheet_labels_in_list.xml
+++ b/app/src/main/res/layout/bottom_sheet_labels_in_list.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/labelsListHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/labelName"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,36 +40,36 @@
                 android:id="@+id/labelsListSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/labelMenuEdit"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_edit"
+                    android:padding="4dp"
                     android:text="@string/menuEditText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_edit"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/labelMenuDelete"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_delete"
+                    android:padding="4dp"
                     android:text="@string/menuDeleteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_delete"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_milestones_filter.xml b/app/src/main/res/layout/bottom_sheet_milestones_filter.xml
index c4ff33c6..2d53a562 100644
--- a/app/src/main/res/layout/bottom_sheet_milestones_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_milestones_filter.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/milestonesFilterHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/strFilter"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,36 +40,36 @@
                 android:id="@+id/milestonesFilterSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/openMilestone"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_milestone"
+                    android:padding="4dp"
                     android:text="@string/isOpen"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_milestone"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/closedMilestone"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_done"
+                    android:padding="4dp"
                     android:text="@string/isClosed"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_done"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_milestones_in_list.xml b/app/src/main/res/layout/bottom_sheet_milestones_in_list.xml
index 5b884e7a..2b47c636 100644
--- a/app/src/main/res/layout/bottom_sheet_milestones_in_list.xml
+++ b/app/src/main/res/layout/bottom_sheet_milestones_in_list.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/milestonesListHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/newIssueMilestoneTitle"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,36 +40,36 @@
                 android:id="@+id/milestonesListSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/closeMilestone"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_close"
+                    android:padding="4dp"
                     android:text="@string/close"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_close"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/openMilestone"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_check"
+                    android:padding="4dp"
                     android:text="@string/isOpen"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_check"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_my_issues_filter.xml b/app/src/main/res/layout/bottom_sheet_my_issues_filter.xml
index 475cc78e..12be8680 100644
--- a/app/src/main/res/layout/bottom_sheet_my_issues_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_my_issues_filter.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/myIssuesFilterHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/strFilter"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,49 +40,49 @@
                 android:id="@+id/myIssuesSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/openMyIssues"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_issue"
+                    android:padding="4dp"
                     android:text="@string/isOpen"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_issue"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/closedMyIssues"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_issue_closed"
+                    android:padding="4dp"
                     android:text="@string/isClosed"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_issue_closed"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/assignedToMe"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_person"
+                    android:padding="4dp"
                     android:text="@string/assignedToMe"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_person"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_notifications.xml b/app/src/main/res/layout/bottom_sheet_notifications.xml
index 47efa094..84880f97 100644
--- a/app/src/main/res/layout/bottom_sheet_notifications.xml
+++ b/app/src/main/res/layout/bottom_sheet_notifications.xml
@@ -3,10 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -14,15 +14,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/notificationsHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -31,7 +31,7 @@
                     android:gravity="center"
                     android:text="@string/pageTitleNotifications"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -39,49 +39,49 @@
                 android:id="@+id/notificationsListSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/markPinned"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_pin"
+                    android:padding="4dp"
                     android:text="@string/pinNotification"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_pin"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/markRead"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_unwatch"
+                    android:padding="4dp"
                     android:text="@string/markAsRead"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_unwatch"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/markUnread"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_watchers"
+                    android:padding="4dp"
                     android:text="@string/markAsUnread"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_watchers"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_notifications_filter.xml b/app/src/main/res/layout/bottom_sheet_notifications_filter.xml
index 6bdbfacf..af885301 100644
--- a/app/src/main/res/layout/bottom_sheet_notifications_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_notifications_filter.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/notificationsFilterHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/strFilter"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,36 +40,36 @@
                 android:id="@+id/notificationsFilterSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/unreadNotifications"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_watchers"
+                    android:padding="4dp"
                     android:text="@string/isUnread"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_watchers"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/readNotifications"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_unwatch"
+                    android:padding="4dp"
                     android:text="@string/isRead"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_unwatch"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_organization.xml b/app/src/main/res/layout/bottom_sheet_organization.xml
index 3daa9bf5..31dcab77 100644
--- a/app/src/main/res/layout/bottom_sheet_organization.xml
+++ b/app/src/main/res/layout/bottom_sheet_organization.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/organizationHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/newCreateButtonCopy"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,65 +40,65 @@
                 android:id="@+id/orgCreateSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/createRepository"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_repo"
+                    android:padding="4dp"
                     android:text="@string/repository"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_repo"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/createTeam"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_people"
+                    android:padding="4dp"
                     android:text="@string/team"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_people"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/createLabel"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_label"
+                    android:padding="4dp"
                     android:text="@string/label"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_label"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
             <View
+                android:id="@+id/orgDivider"
                 android:layout_width="match_parent"
                 android:layout_height="4dp"
-                android:id="@+id/orgDivider"
                 android:layout_marginBottom="16dp"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"/>
 
             <LinearLayout
                 android:id="@+id/organizationShareHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeaderOrg"
@@ -107,56 +107,56 @@
                     android:gravity="center"
                     android:text="@string/organization"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
             <com.google.android.flexbox.FlexboxLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/copyOrgUrl"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="8dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_copy"
+                    android:padding="8dp"
                     android:text="@string/genericCopyUrl"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_copy"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/share"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="8dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_share"
+                    android:padding="8dp"
                     android:text="@string/share"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_share"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/open"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="8dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_browser"
+                    android:padding="8dp"
                     android:text="@string/openInBrowser"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_browser"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_organization_teams.xml b/app/src/main/res/layout/bottom_sheet_organization_teams.xml
index 0fa38752..5470e13d 100644
--- a/app/src/main/res/layout/bottom_sheet_organization_teams.xml
+++ b/app/src/main/res/layout/bottom_sheet_organization_teams.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/orgTeamHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/team"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,36 +40,36 @@
                 android:id="@+id/orgTeamSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/addRepo"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_repo"
+                    android:padding="4dp"
                     android:text="@string/addButton"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_repo"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/addNewMember"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_person_add"
+                    android:padding="4dp"
                     android:text="@string/addRemove"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_person_add"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_profile.xml b/app/src/main/res/layout/bottom_sheet_profile.xml
index 3d07bfcc..2216214d 100644
--- a/app/src/main/res/layout/bottom_sheet_profile.xml
+++ b/app/src/main/res/layout/bottom_sheet_profile.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/myProfileHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/navProfile"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,23 +40,23 @@
                 android:id="@+id/myProfileSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/addNewEmailAddress"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_email"
+                    android:padding="4dp"
                     android:text="@string/addButton"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_email"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_pull_request_filter.xml b/app/src/main/res/layout/bottom_sheet_pull_request_filter.xml
index 8d1665e9..12de8c93 100644
--- a/app/src/main/res/layout/bottom_sheet_pull_request_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_pull_request_filter.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/prFilterHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/strFilter"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,36 +40,36 @@
                 android:id="@+id/prFilterSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/openPr"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_pull_request"
+                    android:padding="4dp"
                     android:text="@string/isOpen"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_pull_request"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/closedPr"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_issue_closed"
+                    android:padding="4dp"
                     android:text="@string/isClosed"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_issue_closed"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_release_in_list.xml b/app/src/main/res/layout/bottom_sheet_release_in_list.xml
index 4ef50f61..9836731e 100644
--- a/app/src/main/res/layout/bottom_sheet_release_in_list.xml
+++ b/app/src/main/res/layout/bottom_sheet_release_in_list.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/releasesListHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/release"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,23 +40,23 @@
                 android:id="@+id/releasesListSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/deleteRelease"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_delete"
+                    android:padding="4dp"
                     android:text="@string/menuDeleteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_delete"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_releases_tags.xml b/app/src/main/res/layout/bottom_sheet_releases_tags.xml
index 7d5cba78..de4236c8 100644
--- a/app/src/main/res/layout/bottom_sheet_releases_tags.xml
+++ b/app/src/main/res/layout/bottom_sheet_releases_tags.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/releasesTagsHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/strFilter"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,36 +40,36 @@
                 android:id="@+id/releasesTagsFilterSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/releases"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_release"
+                    android:padding="4dp"
                     android:text="@string/tabTextReleases"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_release"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/tags"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_label"
+                    android:padding="4dp"
                     android:text="@string/tags"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_label"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_reply_layout.xml b/app/src/main/res/layout/bottom_sheet_reply_layout.xml
index 86fdd1ea..3abf2e91 100644
--- a/app/src/main/res/layout/bottom_sheet_reply_layout.xml
+++ b/app/src/main/res/layout/bottom_sheet_reply_layout.xml
@@ -31,22 +31,22 @@
                     android:layout_height="26dp"
                     android:layout_marginEnd="15dp"
                     android:layout_weight="0"
-                    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:src="@drawable/ic_close"/>
 
                 <TextView
                     android:id="@+id/toolbar_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:maxLines="2"
                     android:ellipsize="end"
+                    android:maxLines="2"
                     android:text="@string/commentButtonText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"/>
 
                 <ImageButton
                     android:id="@+id/drafts"
@@ -55,10 +55,10 @@
                     android:layout_marginStart="15dp"
                     android:layout_weight="0"
                     android:background="?android:attr/selectableItemBackground"
-                    android:focusable="true"
                     android:clickable="true"
                     android:contentDescription="@string/close"
-                    android:src="@drawable/ic_drafts" />
+                    android:focusable="true"
+                    android:src="@drawable/ic_drafts"/>
 
                 <ImageButton
                     android:id="@+id/send"
@@ -68,11 +68,11 @@
                     android:layout_weight="0"
                     android:alpha=".5"
                     android:background="?android:attr/selectableItemBackground"
-                    android:focusable="true"
                     android:clickable="true"
                     android:contentDescription="@string/close"
                     android:enabled="false"
-                    android:src="@drawable/ic_send" />
+                    android:focusable="true"
+                    android:src="@drawable/ic_send"/>
 
             </LinearLayout>
 
@@ -83,24 +83,24 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="15dp"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="15dp">
 
         <EditText
             android:id="@+id/comment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:autofillHints="@string/commentButtonText"
             android:background="@drawable/shape_inputs"
             android:inputType="textMultiLine|textImeMultiLine|textCapSentences"
+            android:labelFor="@+id/comment"
             android:maxLines="5"
             android:padding="10dp"
             android:scrollbars="vertical"
             android:textColor="?attr/inputTextColor"
             android:textColorHighlight="?attr/primaryTextColor"
             android:textColorHint="?attr/primaryBackgroundColor"
-            android:textSize="16sp"
-            android:labelFor="@+id/comment"
-            android:autofillHints="@string/commentButtonText" />
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/drafts_hint"
@@ -111,7 +111,7 @@
             android:textColor="?attr/hintColor"
             android:textSize="12sp"
             android:visibility="gone"
-            tools:visibility="visible" />
+            tools:visibility="visible"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_repo.xml b/app/src/main/res/layout/bottom_sheet_repo.xml
index c21e16a3..e5bb4763 100644
--- a/app/src/main/res/layout/bottom_sheet_repo.xml
+++ b/app/src/main/res/layout/bottom_sheet_repo.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/repoCreateHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/newCreateButtonCopy"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,130 +40,130 @@
                 android:id="@+id/repoCreateSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/newFile"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_file"
+                    android:padding="4dp"
                     android:text="@string/file"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_file"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/createNewIssue"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_issue"
+                    android:padding="4dp"
                     android:text="@string/issue"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_issue"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/createLabel"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_label"
+                    android:padding="4dp"
                     android:text="@string/label"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_label"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/createNewMilestone"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_milestone"
+                    android:padding="4dp"
                     android:text="@string/newIssueMilestoneTitle"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_milestone"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/createRelease"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_release"
+                    android:padding="4dp"
                     android:text="@string/release"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_release"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/createPullRequest"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_pull_request"
+                    android:padding="4dp"
                     android:text="@string/pr"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_pull_request"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/addCollaborator"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_person_add"
+                    android:padding="4dp"
                     android:text="@string/collaborator"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_person_add"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/create_wiki"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_wiki"
+                    android:padding="4dp"
                     android:text="@string/wiki"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_wiki"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
             <View
+                android:id="@+id/repoDivider"
                 android:layout_width="match_parent"
                 android:layout_height="4dp"
-                android:id="@+id/repoDivider"
                 android:layout_marginBottom="16dp"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"/>
 
             <LinearLayout
                 android:id="@+id/repoOthersHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeaderRepo"
@@ -172,7 +172,7 @@
                     android:gravity="center"
                     android:text="@string/repository"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -180,114 +180,114 @@
                 android:id="@+id/repoOthersSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/starRepository"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_star"
+                    android:padding="4dp"
                     android:text="@string/starMember"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_star"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/unStarRepository"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_star_unfilled"
+                    android:padding="4dp"
                     android:text="@string/unstar"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_star_unfilled"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/watchRepository"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_watchers"
+                    android:padding="4dp"
                     android:text="@string/watch"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_watchers"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/unWatchRepository"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_unwatch"
+                    android:padding="4dp"
                     android:text="@string/unwatch"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_unwatch"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/copyRepoUrl"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_copy"
+                    android:padding="4dp"
                     android:text="@string/genericCopyUrl"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_copy"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/shareRepository"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_share"
+                    android:padding="4dp"
                     android:text="@string/share"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_share"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/openWebRepo"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_browser"
+                    android:padding="4dp"
                     android:text="@string/openInBrowser"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_browser"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/repoSettings"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_alignSelf="flex_start"
                     android:gravity="center"
-                    app:drawableTopCompat="@drawable/ic_settings"
+                    android:padding="4dp"
                     android:text="@string/navSettings"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_settings"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_single_issue.xml b/app/src/main/res/layout/bottom_sheet_single_issue.xml
index b91dac6f..8684f943 100644
--- a/app/src/main/res/layout/bottom_sheet_single_issue.xml
+++ b/app/src/main/res/layout/bottom_sheet_single_issue.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/commentReactionButtons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dp"
-                android:orientation="horizontal" />
+                android:orientation="horizontal"/>
 
             <View
                 android:id="@+id/reactionDivider"
@@ -31,14 +31,14 @@
                 android:layout_height="4dp"
                 android:layout_marginTop="12dp"
                 android:layout_marginBottom="16dp"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"/>
 
             <LinearLayout
                 android:id="@+id/bottomSheetHeaderFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -47,7 +47,7 @@
                     android:gravity="center"
                     android:text="@string/issue"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -55,144 +55,144 @@
                 android:id="@+id/issuePrtSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/openFilesDiff"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_file"
+                    android:padding="4dp"
                     android:text="@string/tabTextFiles"
                     android:textColor="?attr/primaryTextColor"
+                    android:textSize="16sp"
                     android:visibility="gone"
-                    android:textSize="16sp" />
+                    app:drawableTopCompat="@drawable/ic_file"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/mergePullRequest"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_pull_request"
+                    android:padding="4dp"
                     android:text="@string/mergePullRequestButtonText"
                     android:textColor="?attr/primaryTextColor"
+                    android:textSize="16sp"
                     android:visibility="gone"
-                    android:textSize="16sp" />
+                    app:drawableTopCompat="@drawable/ic_pull_request"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/updatePullRequest"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_update"
+                    android:padding="4dp"
                     android:text="@string/newUpdateButtonCopy"
                     android:textColor="?attr/primaryTextColor"
+                    android:textSize="16sp"
                     android:visibility="gone"
-                    android:textSize="16sp" />
+                    app:drawableTopCompat="@drawable/ic_update"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/deletePrHeadBranch"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_branch"
+                    android:padding="4dp"
                     android:text="@string/deleteBranch"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_branch"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/editIssue"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_edit"
+                    android:padding="4dp"
                     android:text="@string/menuEditText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_edit"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/addRemoveAssignees"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_person_add"
+                    android:padding="4dp"
                     android:text="@string/newIssueAssigneesListTitle"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_person_add"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/editLabels"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_label"
+                    android:padding="4dp"
                     android:text="@string/newIssueLabelsTitle"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_label"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/subscribeIssue"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_unwatch"
+                    android:padding="4dp"
                     android:text="@string/singleIssueSubscribe"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_unwatch"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/unsubscribeIssue"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_watchers"
+                    android:padding="4dp"
                     android:text="@string/singleIssueUnSubscribe"
                     android:textColor="?attr/primaryTextColor"
+                    android:textSize="16sp"
                     android:visibility="gone"
-                    android:textSize="16sp" />
+                    app:drawableTopCompat="@drawable/ic_watchers"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/closeIssue"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_issue_closed"
+                    android:padding="4dp"
                     android:text="@string/close"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_issue_closed"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
@@ -201,55 +201,55 @@
                 android:layout_width="match_parent"
                 android:layout_height="4dp"
                 android:layout_marginBottom="16dp"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"/>
 
             <com.google.android.flexbox.FlexboxLayout
                 android:id="@+id/issuePrShareSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/copyIssueUrl"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_copy"
+                    android:padding="4dp"
                     android:text="@string/genericCopyUrl"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_copy"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/shareIssue"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_share"
+                    android:padding="4dp"
                     android:text="@string/share"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_share"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/open"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_browser"
+                    android:padding="4dp"
                     android:text="@string/openInBrowser"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_browser"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_tag_in_list.xml b/app/src/main/res/layout/bottom_sheet_tag_in_list.xml
index 5210e112..06f4cec5 100644
--- a/app/src/main/res/layout/bottom_sheet_tag_in_list.xml
+++ b/app/src/main/res/layout/bottom_sheet_tag_in_list.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/tagsListHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/tags"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,23 +40,23 @@
                 android:id="@+id/tagsListSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/tagMenuDelete"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_delete"
+                    android:padding="4dp"
                     android:text="@string/menuDeleteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_delete"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_user_profile.xml b/app/src/main/res/layout/bottom_sheet_user_profile.xml
index 3ff90c45..9fdd2e3a 100644
--- a/app/src/main/res/layout/bottom_sheet_user_profile.xml
+++ b/app/src/main/res/layout/bottom_sheet_user_profile.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -22,8 +22,8 @@
                 android:id="@+id/usersProfileHeadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/pageTitleUsers"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,37 +40,37 @@
                 android:id="@+id/usersProfileSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/followUser"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_person_add"
+                    android:padding="4dp"
                     android:text="@string/userFollow"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_person_add"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/unfollowUser"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_person_remove"
+                    android:padding="4dp"
                     android:text="@string/unfollowUser"
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="16sp"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    app:drawableTopCompat="@drawable/ic_person_remove"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_wiki_in_list.xml b/app/src/main/res/layout/bottom_sheet_wiki_in_list.xml
index b7c294da..60a427a3 100644
--- a/app/src/main/res/layout/bottom_sheet_wiki_in_list.xml
+++ b/app/src/main/res/layout/bottom_sheet_wiki_in_list.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:paddingTop="6dp"
-    android:paddingBottom="12dp"
-    android:background="?attr/primaryBackgroundColor">
+    android:paddingBottom="12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,15 +15,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/wiki_list_head_frame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="8dp">
 
                 <TextView
                     android:id="@+id/bottom_sheet_header"
@@ -32,7 +32,7 @@
                     android:gravity="center"
                     android:text="@string/wiki"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -40,36 +40,36 @@
                 android:id="@+id/wiki_list_section"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:flexWrap="wrap"
-                app:alignItems="stretch"
                 android:padding="8dp"
-                app:alignContent="stretch" >
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
 
                 <TextView
                     android:id="@+id/edit_wiki"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_edit"
+                    android:padding="4dp"
                     android:text="@string/menuEditText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_edit"
+                    app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/delete_wiki"
                     android:layout_width="98dp"
                     android:layout_height="100dp"
-                    android:padding="4dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    app:layout_alignSelf="flex_start"
-                    app:drawableTopCompat="@drawable/ic_delete"
+                    android:padding="4dp"
                     android:text="@string/menuDeleteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    app:drawableTopCompat="@drawable/ic_delete"
+                    app:layout_alignSelf="flex_start"/>
 
             </com.google.android.flexbox.FlexboxLayout>
 
diff --git a/app/src/main/res/layout/custom_about_dialog.xml b/app/src/main/res/layout/custom_about_dialog.xml
index ce025d19..4faea934 100644
--- a/app/src/main/res/layout/custom_about_dialog.xml
+++ b/app/src/main/res/layout/custom_about_dialog.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:scrollbars="none"
-    android:layout_width="wrap_content">
+    android:scrollbars="none">
 
     <RelativeLayout android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent">
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/shape_round_corners"
             android:layout_alignParentTop="true"
             android:layout_centerHorizontal="true"
+            android:layout_gravity="center"
             android:layout_marginTop="40dp"
-            android:layout_gravity="center">
+            android:background="@drawable/shape_round_corners"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -30,118 +30,118 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/appName"
-                    android:textStyle="bold"
-                    android:textColor="?attr/primaryTextColor"
                     android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="5dp"
+                    android:text="@string/appName"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="24sp"
-                    android:layout_marginTop="5dp" />
+                    android:textStyle="bold"/>
 
                 <TextView
                     android:id="@+id/appVersionBuild"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:textIsSelectable="true"
-                    android:textSize="14sp"
-                    android:text="@string/appVersionBuild"
                     android:layout_marginTop="5dp"
-                    android:textColor="?attr/primaryTextColor" />
+                    android:text="@string/appVersionBuild"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textIsSelectable="true"
+                    android:textSize="14sp"/>
 
             </LinearLayout>
 
             <LinearLayout
-                android:layout_marginTop="15dp"
-                android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:orientation="vertical">
 
                 <!-- user server version -->
                 <TextView
                     android:id="@+id/userServerVersionHeader"
-                    android:text="@string/commitPage"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="24dp"
                     android:paddingStart="28dp"
                     android:paddingEnd="28dp"
+                    android:text="@string/commitPage"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="16sp"
-                    android:textStyle="bold"
-                    android:textColor="?attr/primaryTextColor" />
+                    android:textStyle="bold"/>
 
                 <View
+                    android:id="@+id/dividerUserServerVersion"
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:id="@+id/dividerUserServerVersion"
-                    android:background="?attr/dividerColor"
                     android:layout_marginTop="5dp"
-                    android:layout_marginBottom="5dp" />
+                    android:layout_marginBottom="5dp"
+                    android:background="?attr/dividerColor"/>
 
                 <TextView
                     android:id="@+id/userServerVersion"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textIsSelectable="true"
                     android:paddingStart="28dp"
                     android:paddingEnd="28dp"
-                    android:textSize="14sp"
-                    android:textColor="?attr/primaryTextColor" />
+                    android:textColor="?attr/primaryTextColor"
+                    android:textIsSelectable="true"
+                    android:textSize="14sp"/>
                 <!-- user server version -->
 
                 <!-- support -->
                 <TextView
                     android:id="@+id/supportHeader"
-                    android:text="@string/supportText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="24dp"
                     android:paddingStart="28dp"
                     android:paddingEnd="28dp"
+                    android:text="@string/supportText"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="16sp"
-                    android:textStyle="bold"
-                    android:textColor="?attr/primaryTextColor" />
+                    android:textStyle="bold"/>
 
                 <View
+                    android:id="@+id/dividerSupport"
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:id="@+id/dividerSupport"
-                    android:background="?attr/dividerColor"
                     android:layout_marginTop="5dp"
-                    android:layout_marginBottom="5dp" />
+                    android:layout_marginBottom="5dp"
+                    android:background="?attr/dividerColor"/>
 
                 <TextView
                     android:id="@+id/donationLinkPatreon"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/supportTextPatreon"
-                    android:textColor="@color/lightBlue"
+                    android:autoLink="web"
                     android:paddingStart="28dp"
                     android:paddingEnd="28dp"
-                    android:textSize="14sp"
-                    android:autoLink="web"
-                    android:textColorLink="@color/lightBlue" />
+                    android:text="@string/supportTextPatreon"
+                    android:textColor="@color/lightBlue"
+                    android:textColorLink="@color/lightBlue"
+                    android:textSize="14sp"/>
                 <!-- support -->
 
                 <!-- translate -->
                 <TextView
                     android:id="@+id/translateHeader"
-                    android:text="@string/translateText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="24dp"
                     android:paddingStart="28dp"
                     android:paddingEnd="28dp"
+                    android:text="@string/translateText"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="16sp"
-                    android:textStyle="bold"
-                    android:textColor="?attr/primaryTextColor" />
+                    android:textStyle="bold"/>
 
                 <View
+                    android:id="@+id/dividerTranslate"
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:id="@+id/dividerTranslate"
-                    android:background="?attr/dividerColor"
                     android:layout_marginTop="5dp"
-                    android:layout_marginBottom="5dp" />
+                    android:layout_marginBottom="5dp"
+                    android:background="?attr/dividerColor"/>
 
                 <TextView
                     android:id="@+id/translateLink"
@@ -149,13 +149,13 @@
                     android:layout_height="wrap_content"
                     android:autoLink="web"
                     android:gravity="start"
+                    android:paddingStart="28dp"
+                    android:paddingEnd="28dp"
                     android:text="@string/translateWithCrowdin"
                     android:textColor="@color/lightBlue"
                     android:textColorLink="@color/lightBlue"
-                    android:paddingStart="28dp"
-                    android:paddingEnd="28dp"
                     android:textSize="14sp"
-                    android:visibility="visible" />
+                    android:visibility="visible"/>
                 <!-- translate -->
 
             </LinearLayout>
@@ -164,12 +164,12 @@
                 android:id="@+id/appWebsite"
                 android:layout_width="140dp"
                 android:layout_height="60dp"
+                android:layout_gravity="center_horizontal"
                 android:layout_marginTop="24dp"
                 android:layout_marginBottom="12dp"
-                android:layout_gravity="center_horizontal"
                 android:text="@string/websiteText"
                 android:textColor="@color/btnTextColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </LinearLayout>
 
@@ -181,11 +181,11 @@
             <androidx.cardview.widget.CardView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
                 app:cardBackgroundColor="?attr/primaryBackgroundColor"
                 app:cardCornerRadius="48dp"
                 app:cardElevation="2dp"
                 app:contentPadding="4dp"
-                android:layout_gravity="center_horizontal"
                 tools:visibility="visible">
 
                 <ImageView
@@ -194,8 +194,8 @@
                     android:layout_height="80dp"
                     android:layout_alignParentTop="true"
                     android:layout_centerHorizontal="true"
-                    android:src="@drawable/app_logo"
-                    android:contentDescription="@string/appName" />
+                    android:contentDescription="@string/appName"
+                    android:src="@drawable/app_logo"/>
 
             </androidx.cardview.widget.CardView>
 
diff --git a/app/src/main/res/layout/custom_assignees_list.xml b/app/src/main/res/layout/custom_assignees_list.xml
index 7e2833d8..2e534ca8 100644
--- a/app/src/main/res/layout/custom_assignees_list.xml
+++ b/app/src/main/res/layout/custom_assignees_list.xml
@@ -13,22 +13,22 @@
         android:layout_height="36dp"
         android:checked="false"
         android:textColor="?attr/primaryTextColor"
-        android:textSize="16sp" />
+        android:textSize="16sp"/>
 
     <androidx.cardview.widget.CardView
         android:layout_width="20dp"
         android:layout_height="20dp"
-        android:layout_marginTop="8dp"
         android:layout_marginStart="36dp"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="4dp"
-        app:cardElevation="0dp"
-        app:cardCornerRadius="4dp">
+        app:cardCornerRadius="4dp"
+        app:cardElevation="0dp">
 
         <ImageView
             android:id="@+id/assigneesAvatar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/generalImgContentText" />
+            android:contentDescription="@string/generalImgContentText"/>
 
     </androidx.cardview.widget.CardView>
 
@@ -36,11 +36,11 @@
         android:id="@+id/assigneesName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingTop="8dp"
         android:paddingStart="64dp"
+        android:paddingTop="8dp"
         android:paddingEnd="4dp"
         android:textColor="?attr/primaryTextColor"
-        android:textSize="16sp" />
+        android:textSize="16sp"/>
 
 </RelativeLayout>
 
diff --git a/app/src/main/res/layout/custom_assignees_selection_dialog.xml b/app/src/main/res/layout/custom_assignees_selection_dialog.xml
index 45a48d99..f1471fa8 100644
--- a/app/src/main/res/layout/custom_assignees_selection_dialog.xml
+++ b/app/src/main/res/layout/custom_assignees_selection_dialog.xml
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/shape_round_corners"
     android:orientation="vertical">
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <LinearLayout
         android:id="@+id/dialogFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:visibility="gone">
 
         <LinearLayout
+            android:id="@+id/TitleFrame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:id="@+id/TitleFrame"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <TextView
                 android:id="@+id/title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:drawablePadding="16dp"
+                android:text="@string/newIssueSelectAssigneesListTitle"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="20sp"
                 android:textStyle="bold"
-                app:drawableStartCompat="@drawable/ic_person_add"
-                android:drawablePadding="16dp"
-                android:text="@string/newIssueSelectAssigneesListTitle" />
+                app:drawableStartCompat="@drawable/ic_person_add"/>
 
         </LinearLayout>
 
         <View
+            android:id="@+id/dividerTitle"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:id="@+id/dividerTitle"
-            android:background="?attr/dividerColor" />
+            android:background="?attr/dividerColor"/>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="100"
             android:layout_margin="12dp"
+            android:layout_weight="100"
             android:orientation="vertical">
 
             <androidx.recyclerview.widget.RecyclerView
@@ -59,7 +59,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
         </LinearLayout>
 
@@ -69,29 +69,29 @@
             android:orientation="vertical">
 
             <View
+                android:id="@+id/divider"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:id="@+id/divider"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:paddingStart="16dp"
-                android:paddingEnd="16dp"
                 android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                android:orientation="vertical" >
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
 
                 <Button
                     android:id="@+id/save"
+                    style="?android:attr/button"
                     android:layout_width="wrap_content"
                     android:layout_height="60dp"
-                    style="?android:attr/button"
                     android:layout_alignParentStart="true"
                     android:text="@string/saveButton"
                     android:textColor="@color/colorWhite"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </RelativeLayout>
 
diff --git a/app/src/main/res/layout/custom_explore_repositories_dialog.xml b/app/src/main/res/layout/custom_explore_repositories_dialog.xml
index 979fffbe..110353da 100644
--- a/app/src/main/res/layout/custom_explore_repositories_dialog.xml
+++ b/app/src/main/res/layout/custom_explore_repositories_dialog.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/shape_round_corners"
     android:orientation="vertical">
 
@@ -13,37 +13,37 @@
         android:orientation="vertical">
 
         <LinearLayout
+            android:id="@+id/titleFrame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:id="@+id/titleFrame"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <TextView
                 android:id="@+id/title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:drawablePadding="16dp"
+                android:text="@string/exploreFilterDialogTitle"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="20sp"
                 android:textStyle="bold"
-                app:drawableStartCompat="@drawable/ic_filter"
-                android:drawablePadding="16dp"
-                android:text="@string/exploreFilterDialogTitle"
-                android:layout_marginBottom="4dp" />
+                app:drawableStartCompat="@drawable/ic_filter"/>
 
         </LinearLayout>
 
         <View
+            android:id="@+id/dividerTitle"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:id="@+id/dividerTitle"
-            android:background="?attr/dividerColor" />
+            android:background="?attr/dividerColor"/>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="100"
             android:layout_margin="12dp"
+            android:layout_weight="100"
             android:orientation="vertical">
 
             <CheckBox
@@ -51,65 +51,65 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:checked="false"
-                android:textColor="?attr/primaryTextColor"
                 android:text="@string/exploreFilterIncludeTopic"
-                android:textSize="16sp" />
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"/>
 
             <CheckBox
                 android:id="@+id/includeDesc"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:checked="false"
-                android:textColor="?attr/primaryTextColor"
                 android:text="@string/exploreFilterIncludeDesc"
-                android:textSize="16sp" />
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"/>
 
             <CheckBox
                 android:id="@+id/includeTemplate"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:checked="false"
-                android:textColor="?attr/primaryTextColor"
                 android:text="@string/exploreFilterIncludeTemplateRepos"
-                android:textSize="16sp" />
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"/>
 
             <CheckBox
                 android:id="@+id/onlyArchived"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:checked="false"
-                android:textColor="?attr/primaryTextColor"
                 android:text="@string/exploreFilterIncludeArchive"
-                android:textSize="16sp" />
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"/>
 
         </LinearLayout>
 
     </LinearLayout>
 
     <View
+        android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:id="@+id/divider"
-        android:background="?attr/dividerColor" />
+        android:background="?attr/dividerColor"/>
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="horizontal"
         android:paddingStart="16dp"
-        android:paddingEnd="16dp"
         android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:orientation="horizontal" >
+        android:paddingEnd="16dp"
+        android:paddingBottom="8dp">
 
         <Button
             android:id="@+id/cancel"
+            style="?android:attr/button"
             android:layout_width="wrap_content"
             android:layout_height="60dp"
-            style="?android:attr/button"
             android:layout_alignParentStart="true"
             android:text="@string/close"
             android:textColor="@color/colorWhite"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/custom_labels_list.xml b/app/src/main/res/layout/custom_labels_list.xml
index f329520d..46bb1af1 100644
--- a/app/src/main/res/layout/custom_labels_list.xml
+++ b/app/src/main/res/layout/custom_labels_list.xml
@@ -13,22 +13,22 @@
         android:layout_height="36dp"
         android:checked="false"
         android:textColor="?attr/primaryTextColor"
-        android:textSize="16sp" />
+        android:textSize="16sp"/>
 
     <androidx.cardview.widget.CardView
         android:layout_width="20dp"
         android:layout_height="20dp"
-        android:layout_marginTop="8dp"
         android:layout_marginStart="36dp"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="4dp"
-        app:cardElevation="0dp"
-        app:cardCornerRadius="4dp">
+        app:cardCornerRadius="4dp"
+        app:cardElevation="0dp">
 
         <ImageView
             android:id="@+id/labelColor"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:contentDescription="@string/generalImgContentText" />
+            android:contentDescription="@string/generalImgContentText"/>
 
     </androidx.cardview.widget.CardView>
 
@@ -36,11 +36,11 @@
         android:id="@+id/labelText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingTop="8dp"
         android:paddingStart="64dp"
+        android:paddingTop="8dp"
         android:paddingEnd="4dp"
         android:textColor="?attr/primaryTextColor"
-        android:textSize="16sp" />
+        android:textSize="16sp"/>
 
 </RelativeLayout>
 
diff --git a/app/src/main/res/layout/custom_labels_selection_dialog.xml b/app/src/main/res/layout/custom_labels_selection_dialog.xml
index 8d616f7b..524ecdeb 100644
--- a/app/src/main/res/layout/custom_labels_selection_dialog.xml
+++ b/app/src/main/res/layout/custom_labels_selection_dialog.xml
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/shape_round_corners"
     android:orientation="vertical">
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <LinearLayout
         android:id="@+id/dialogFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:visibility="gone">
 
         <LinearLayout
+            android:id="@+id/TitleFrame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:id="@+id/TitleFrame"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <TextView
                 android:id="@+id/title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:drawablePadding="16dp"
+                android:text="@string/newIssueSelectLabelsListTitle"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="20sp"
                 android:textStyle="bold"
-                app:drawableStartCompat="@drawable/ic_label"
-                android:drawablePadding="16dp"
-                android:text="@string/newIssueSelectLabelsListTitle" />
+                app:drawableStartCompat="@drawable/ic_label"/>
 
         </LinearLayout>
 
         <View
+            android:id="@+id/dividerTitle"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:id="@+id/dividerTitle"
-            android:background="?attr/dividerColor" />
+            android:background="?attr/dividerColor"/>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="100"
             android:layout_margin="12dp"
+            android:layout_weight="100"
             android:orientation="vertical">
 
             <androidx.recyclerview.widget.RecyclerView
@@ -59,7 +59,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
         </LinearLayout>
 
@@ -69,29 +69,29 @@
             android:orientation="vertical">
 
             <View
+                android:id="@+id/divider"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:id="@+id/divider"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:paddingStart="16dp"
-                android:paddingEnd="16dp"
                 android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                android:orientation="vertical" >
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
 
                 <Button
                     android:id="@+id/save"
+                    style="?android:attr/button"
                     android:layout_width="wrap_content"
                     android:layout_height="60dp"
-                    style="?android:attr/button"
                     android:layout_alignParentStart="true"
                     android:text="@string/saveButton"
                     android:textColor="@color/colorWhite"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
             </RelativeLayout>
 
diff --git a/app/src/main/res/layout/custom_markdown_adapter.xml b/app/src/main/res/layout/custom_markdown_adapter.xml
index f0092b26..faf8b284 100644
--- a/app/src/main/res/layout/custom_markdown_adapter.xml
+++ b/app/src/main/res/layout/custom_markdown_adapter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:layout_marginTop="4dp"
-    android:layout_marginBottom="4dp"
-    android:layout_height="wrap_content" />
+    android:layout_marginBottom="4dp"/>
diff --git a/app/src/main/res/layout/custom_markdown_code_block.xml b/app/src/main/res/layout/custom_markdown_code_block.xml
index 68c142fb..68a8f00f 100644
--- a/app/src/main/res/layout/custom_markdown_code_block.xml
+++ b/app/src/main/res/layout/custom_markdown_code_block.xml
@@ -5,9 +5,9 @@
     android:clipChildren="false"
     android:clipToPadding="false"
     android:fillViewport="true"
-    android:scrollbarStyle="outsideInset"
     android:paddingTop="8dip"
-    android:paddingBottom="8dip" >
+    android:paddingBottom="8dip"
+    android:scrollbarStyle="outsideInset">
 
     <TextView
         android:id="@+id/textCodeBlock"
diff --git a/app/src/main/res/layout/custom_markdown_table.xml b/app/src/main/res/layout/custom_markdown_table.xml
index e4fff5a2..d530d000 100644
--- a/app/src/main/res/layout/custom_markdown_table.xml
+++ b/app/src/main/res/layout/custom_markdown_table.xml
@@ -14,6 +14,6 @@
         android:id="@+id/table_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:stretchColumns="*" />
+        android:stretchColumns="*"/>
 
 </HorizontalScrollView>
diff --git a/app/src/main/res/layout/custom_pr_info_dialog.xml b/app/src/main/res/layout/custom_pr_info_dialog.xml
index 2b7e5cf7..756bd2aa 100644
--- a/app/src/main/res/layout/custom_pr_info_dialog.xml
+++ b/app/src/main/res/layout/custom_pr_info_dialog.xml
@@ -14,17 +14,17 @@
             android:id="@+id/headBranchHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="?attr/primaryTextColor"
-            android:text="@string/pullFromBranch"
             android:layout_marginBottom="4dp"
-            android:textSize="16sp" />
+            android:text="@string/pullFromBranch"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/headBranch"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:textColor="?attr/primaryTextColor" />
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="14sp"/>
 
     </LinearLayout>
 
@@ -38,17 +38,17 @@
             android:id="@+id/baseBranchHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="?attr/primaryTextColor"
-            android:text="@string/mergeIntoBranch"
             android:layout_marginBottom="4dp"
-            android:textSize="16sp" />
+            android:text="@string/mergeIntoBranch"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/baseBranch"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:textColor="?attr/primaryTextColor" />
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="14sp"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/custom_pr_update_strategy_dialog.xml b/app/src/main/res/layout/custom_pr_update_strategy_dialog.xml
index d21bd76d..49721258 100644
--- a/app/src/main/res/layout/custom_pr_update_strategy_dialog.xml
+++ b/app/src/main/res/layout/custom_pr_update_strategy_dialog.xml
@@ -9,11 +9,11 @@
         android:id="@+id/selectStrategy"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="20sp"
+        android:padding="16dp"
         android:text="@string/selectUpdateStrategy"
         android:textColor="?attr/primaryTextColor"
-        android:padding="16dp"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:textSize="20sp"
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <View
         android:id="@+id/dividerTop"
@@ -21,29 +21,29 @@
         android:layout_height="1dp"
         android:background="?attr/dividerColor"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/selectStrategy" />
+        app:layout_constraintTop_toBottomOf="@+id/selectStrategy"/>
 
     <Button
         android:id="@+id/updatePullMerge"
         android:layout_width="0dp"
         android:layout_height="60dp"
         android:layout_margin="16dp"
-        android:textColor="@color/colorWhite"
         android:text="@string/updateStrategyMerge"
+        android:textColor="@color/colorWhite"
         app:layout_constraintEnd_toStartOf="@id/updatePullRebase"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/selectStrategy" />
+        app:layout_constraintTop_toBottomOf="@id/selectStrategy"/>
 
     <Button
         android:id="@+id/updatePullRebase"
         android:layout_width="0dp"
         android:layout_height="60dp"
         android:layout_margin="16dp"
-        android:textColor="@color/colorWhite"
         android:text="@string/updateStrategyRebase"
+        android:textColor="@color/colorWhite"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/updatePullMerge"
-        app:layout_constraintTop_toBottomOf="@id/selectStrategy" />
+        app:layout_constraintTop_toBottomOf="@id/selectStrategy"/>
 
     <View
         android:id="@+id/dividerBottom"
@@ -52,20 +52,20 @@
         android:layout_marginTop="16dp"
         android:background="?attr/dividerColor"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/updatePullMerge" />
+        app:layout_constraintTop_toBottomOf="@+id/updatePullMerge"/>
 
     <Button
         android:id="@+id/cancelPullUpdate"
+        style="?android:attr/button"
         android:layout_width="wrap_content"
         android:layout_height="60dp"
-        style="?android:attr/button"
         android:layout_alignParentStart="true"
+        android:layout_margin="16dp"
         android:text="@string/cancelButton"
         android:textColor="@color/colorWhite"
-        android:layout_margin="16dp"
         android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/dividerBottom"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/dividerBottom"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/custom_progress_loader.xml b/app/src/main/res/layout/custom_progress_loader.xml
index ffb274af..779b6b0b 100644
--- a/app/src/main/res/layout/custom_progress_loader.xml
+++ b/app/src/main/res/layout/custom_progress_loader.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <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"
         android:minWidth="360dp"
-        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/custom_repository_delete_dialog.xml b/app/src/main/res/layout/custom_repository_delete_dialog.xml
index 20fc76ed..17089ab0 100644
--- a/app/src/main/res/layout/custom_repository_delete_dialog.xml
+++ b/app/src/main/res/layout/custom_repository_delete_dialog.xml
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/shape_round_corners"
     android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="16dp">
 
         <TextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:drawablePadding="16dp"
+            android:text="@string/repoSettingsDelete"
             android:textColor="?attr/primaryTextColor"
             android:textSize="20sp"
             android:textStyle="bold"
-            app:drawableStartCompat="@drawable/ic_delete"
-            android:drawablePadding="16dp"
-            android:text="@string/repoSettingsDelete"
-            android:layout_marginBottom="16dp" />
+            app:drawableStartCompat="@drawable/ic_delete"/>
 
         <TextView
             android:id="@+id/description"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp"
+            android:layout_marginBottom="16dp"
             android:text="@string/repoSettingsDeleteDescription"
-            android:layout_marginBottom="16dp" />
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="16sp"/>
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/repoNameForDeletionLayout"
             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_marginBottom="8dp"
             android:layout_marginTop="8dp"
-            android:hint="@string/newRepoTintCopy">
+            android:layout_marginBottom="8dp"
+            android:hint="@string/newRepoTintCopy"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            app:boxStrokeErrorColor="@color/darkRed"
+            app:hintTextColor="?attr/hintColor">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/repoNameForDeletion"
@@ -53,57 +53,57 @@
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
     </LinearLayout>
 
     <View
+        android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:id="@+id/divider"
-        android:background="?attr/dividerColor" />
+        android:background="?attr/dividerColor"/>
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/processingRequest"
+        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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        android:visibility="gone"
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="horizontal"
         android:paddingStart="16dp"
-        android:paddingEnd="16dp"
         android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:orientation="horizontal" >
+        android:paddingEnd="16dp"
+        android:paddingBottom="8dp">
 
         <Button
             android:id="@+id/cancel"
+            style="?android:attr/button"
             android:layout_width="wrap_content"
             android:layout_height="60dp"
-            style="?android:attr/button"
             android:layout_alignParentStart="true"
             android:text="@string/cancelButton"
             android:textColor="@color/colorWhite"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
         <Button
             android:id="@+id/delete"
+            style="?android:attr/button"
             android:layout_width="wrap_content"
             android:layout_height="60dp"
-            style="?android:attr/button"
             android:layout_alignParentEnd="true"
-            android:text="@string/menuDeleteText"
             android:backgroundTint="@color/darkRed"
+            android:text="@string/menuDeleteText"
             android:textColor="@color/colorWhite"
             android:textSize="16sp"
-            tools:ignore="RelativeOverlap" />
+            tools:ignore="RelativeOverlap"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml b/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml
index 134b642b..7d3f8012 100644
--- a/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml
+++ b/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/shape_round_corners"
     android:orientation="vertical">
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/mainView"
@@ -29,19 +29,19 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="16dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="16dp">
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/repoNameLayout"
                     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_marginBottom="8dp"
-                    android:hint="@string/newRepoTintCopy">
+                    android:hint="@string/newRepoTintCopy"
+                    android:textColorHint="?attr/hintColor"
+                    app:boxBackgroundColor="?attr/inputBackgroundColor"
+                    app:boxStrokeErrorColor="@color/darkRed"
+                    app:hintTextColor="?attr/hintColor">
 
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/repoName"
@@ -50,7 +50,7 @@
                         android:textColor="?attr/inputTextColor"
                         android:textColorHighlight="?attr/hintColor"
                         android:textColorHint="?attr/hintColor"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"/>
 
                 </com.google.android.material.textfield.TextInputLayout>
 
@@ -58,13 +58,13 @@
                     android:id="@+id/repoWebsiteLayout"
                     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_marginBottom="8dp"
                     android:layout_marginTop="8dp"
-                    android:hint="@string/websiteText">
+                    android:layout_marginBottom="8dp"
+                    android:hint="@string/websiteText"
+                    android:textColorHint="?attr/hintColor"
+                    app:boxBackgroundColor="?attr/inputBackgroundColor"
+                    app:boxStrokeErrorColor="@color/darkRed"
+                    app:hintTextColor="?attr/hintColor">
 
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/repoWebsite"
@@ -73,7 +73,7 @@
                         android:textColor="?attr/inputTextColor"
                         android:textColorHighlight="?attr/hintColor"
                         android:textColorHint="?attr/hintColor"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"/>
 
                 </com.google.android.material.textfield.TextInputLayout>
 
@@ -81,13 +81,13 @@
                     android:id="@+id/repoDescriptionLayout"
                     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_marginBottom="8dp"
                     android:layout_marginTop="8dp"
-                    android:hint="@string/newRepoDescTintCopy">
+                    android:layout_marginBottom="8dp"
+                    android:hint="@string/newRepoDescTintCopy"
+                    android:textColorHint="?attr/hintColor"
+                    app:boxBackgroundColor="?attr/inputBackgroundColor"
+                    app:boxStrokeErrorColor="@color/darkRed"
+                    app:hintTextColor="?attr/hintColor">
 
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/repoDescription"
@@ -96,7 +96,7 @@
                         android:textColor="?attr/inputTextColor"
                         android:textColorHighlight="?attr/hintColor"
                         android:textColorHint="?attr/hintColor"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"/>
 
                 </com.google.android.material.textfield.TextInputLayout>
 
@@ -105,127 +105,127 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:checked="true"
-                    android:textColor="?attr/primaryTextColor"
-                    android:text="@string/newRepoPrivateCopy" />
+                    android:text="@string/newRepoPrivateCopy"
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/repoAsTemplate"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:checked="true"
-                    android:textColor="?attr/primaryTextColor"
-                    android:text="@string/repoPropertiesTemplate" />
+                    android:text="@string/repoPropertiesTemplate"
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/repoEnableIssues"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:checked="true"
-                    android:textColor="?attr/primaryTextColor"
-                    android:text="@string/repoPropertiesEnableIssues" />
+                    android:text="@string/repoPropertiesEnableIssues"
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/repoEnableWiki"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:checked="true"
-                    android:textColor="?attr/primaryTextColor"
-                    android:text="@string/repoPropertiesEnableWiki" />
+                    android:text="@string/repoPropertiesEnableWiki"
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/repoEnablePr"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:checked="true"
-                    android:textColor="?attr/primaryTextColor"
-                    android:text="@string/repoPropertiesEnablePr" />
+                    android:text="@string/repoPropertiesEnablePr"
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/repoEnableTimer"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:checked="true"
-                    android:textColor="?attr/primaryTextColor"
-                    android:text="@string/repoPropertiesEnableTimeTracker" />
+                    android:text="@string/repoPropertiesEnableTimeTracker"
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/repoEnableMerge"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:checked="true"
-                    android:textColor="?attr/primaryTextColor"
-                    android:text="@string/repoPropertiesEnableMergeCommits" />
+                    android:text="@string/repoPropertiesEnableMergeCommits"
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/repoEnableRebase"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:checked="true"
-                    android:textColor="?attr/primaryTextColor"
-                    android:text="@string/repoPropertiesEnableRebase" />
+                    android:text="@string/repoPropertiesEnableRebase"
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/repoEnableSquash"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:checked="true"
-                    android:textColor="?attr/primaryTextColor"
-                    android:text="@string/repoPropertiesEnableSquash" />
+                    android:text="@string/repoPropertiesEnableSquash"
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/repoEnableForceMerge"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:checked="true"
-                    android:textColor="?attr/primaryTextColor"
-                    android:text="@string/repoPropertiesEnableForceMerge" />
+                    android:text="@string/repoPropertiesEnableForceMerge"
+                    android:textColor="?attr/primaryTextColor"/>
 
             </LinearLayout>
 
             <View
+                android:id="@+id/divider"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:id="@+id/divider"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"/>
 
             <com.google.android.material.progressindicator.LinearProgressIndicator
                 android:id="@+id/processingRequest"
+                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"
-                app:indicatorColor="?attr/progressIndicatorColor" />
+                android:visibility="gone"
+                app:indicatorColor="?attr/progressIndicatorColor"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="horizontal"
                 android:paddingStart="16dp"
-                android:paddingEnd="16dp"
                 android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                android:orientation="horizontal" >
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
 
                 <Button
                     android:id="@+id/cancel"
+                    style="?android:attr/button"
                     android:layout_width="wrap_content"
                     android:layout_height="60dp"
-                    style="?android:attr/button"
                     android:layout_alignParentStart="true"
                     android:text="@string/cancelButton"
                     android:textColor="@color/colorWhite"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
                 <Button
                     android:id="@+id/save"
+                    style="?android:attr/button"
                     android:layout_width="wrap_content"
                     android:layout_height="60dp"
-                    style="?android:attr/button"
                     android:layout_alignParentEnd="true"
                     android:text="@string/saveButton"
                     android:textColor="@color/colorWhite"
                     android:textSize="16sp"
-                    tools:ignore="RelativeOverlap" />
+                    tools:ignore="RelativeOverlap"/>
 
             </RelativeLayout>
 
diff --git a/app/src/main/res/layout/custom_repository_transfer_dialog.xml b/app/src/main/res/layout/custom_repository_transfer_dialog.xml
index 6097a731..6bd9f9a3 100644
--- a/app/src/main/res/layout/custom_repository_transfer_dialog.xml
+++ b/app/src/main/res/layout/custom_repository_transfer_dialog.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/shape_round_corners"
     android:orientation="vertical">
 
@@ -11,41 +11,41 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="16dp">
 
         <TextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:drawablePadding="16dp"
+            android:text="@string/repoSettingsTransferOwnership"
             android:textColor="?attr/primaryTextColor"
             android:textSize="20sp"
             android:textStyle="bold"
-            app:drawableStartCompat="@drawable/ic_arrow_up"
-            android:drawablePadding="16dp"
-            android:text="@string/repoSettingsTransferOwnership"
-            android:layout_marginBottom="16dp" />
+            app:drawableStartCompat="@drawable/ic_arrow_up"/>
 
         <TextView
             android:id="@+id/description"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp"
+            android:layout_marginBottom="16dp"
             android:text="@string/repoSettingsTransferOwnershipDescription"
-            android:layout_marginBottom="16dp" />
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="16sp"/>
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/repoNameForTransferLayout"
             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_marginBottom="8dp"
             android:layout_marginTop="8dp"
-            android:hint="@string/newRepoTintCopy">
+            android:layout_marginBottom="8dp"
+            android:hint="@string/newRepoTintCopy"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            app:boxStrokeErrorColor="@color/darkRed"
+            app:hintTextColor="?attr/hintColor">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/repoNameForTransfer"
@@ -54,7 +54,7 @@
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -62,13 +62,13 @@
             android:id="@+id/ownerNameForTransferLayout"
             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_marginBottom="8dp"
             android:layout_marginTop="8dp"
-            android:hint="@string/repoTransferOwnerText">
+            android:layout_marginBottom="8dp"
+            android:hint="@string/repoTransferOwnerText"
+            android:textColorHint="?attr/hintColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            app:boxStrokeErrorColor="@color/darkRed"
+            app:hintTextColor="?attr/hintColor">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/ownerNameForTransfer"
@@ -77,57 +77,57 @@
                 android:textColor="?attr/inputTextColor"
                 android:textColorHighlight="?attr/hintColor"
                 android:textColorHint="?attr/hintColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
     </LinearLayout>
 
     <View
+        android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:id="@+id/divider"
-        android:background="?attr/dividerColor" />
+        android:background="?attr/dividerColor"/>
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/processingRequest"
+        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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        android:visibility="gone"
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="horizontal"
         android:paddingStart="16dp"
-        android:paddingEnd="16dp"
         android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:orientation="horizontal" >
+        android:paddingEnd="16dp"
+        android:paddingBottom="8dp">
 
         <Button
             android:id="@+id/cancel"
+            style="?android:attr/button"
             android:layout_width="wrap_content"
             android:layout_height="60dp"
-            style="?android:attr/button"
             android:layout_alignParentStart="true"
             android:text="@string/cancelButton"
             android:textColor="@color/colorWhite"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
         <Button
             android:id="@+id/transfer"
+            style="?android:attr/button"
             android:layout_width="wrap_content"
             android:layout_height="60dp"
-            style="?android:attr/button"
             android:layout_alignParentEnd="true"
-            android:text="@string/repoTransferText"
             android:backgroundTint="@color/darkRed"
+            android:text="@string/repoTransferText"
             android:textColor="@color/colorWhite"
             android:textSize="16sp"
-            tools:ignore="RelativeOverlap" />
+            tools:ignore="RelativeOverlap"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/custom_toast_error.xml b/app/src/main/res/layout/custom_toast_error.xml
index 6b9278ca..84e2952b 100644
--- a/app/src/main/res/layout/custom_toast_error.xml
+++ b/app/src/main/res/layout/custom_toast_error.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/custom_toast_container"
-    android:orientation="horizontal"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:padding="15dp"
     android:background="@drawable/shape_full_circle"
-    android:backgroundTint="@color/colorRed">
+    android:backgroundTint="@color/colorRed"
+    android:orientation="horizontal"
+    android:padding="15dp">
 
     <TextView android:id="@+id/toastText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/colorWhite"
         android:layout_gravity="center"
-        android:gravity="center" />
+        android:gravity="center"
+        android:textColor="@color/colorWhite"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/custom_toast_info.xml b/app/src/main/res/layout/custom_toast_info.xml
index f40e04d5..084d69a1 100644
--- a/app/src/main/res/layout/custom_toast_info.xml
+++ b/app/src/main/res/layout/custom_toast_info.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/custom_toast_container"
-    android:orientation="horizontal"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:padding="15dp"
     android:background="@drawable/shape_full_circle"
-    android:backgroundTint="@color/toastBackground">
+    android:backgroundTint="@color/toastBackground"
+    android:orientation="horizontal"
+    android:padding="15dp">
 
     <TextView android:id="@+id/toastText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/colorWhite"
         android:layout_gravity="center"
-        android:gravity="center" />
+        android:gravity="center"
+        android:textColor="@color/colorWhite"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/custom_toast_success.xml b/app/src/main/res/layout/custom_toast_success.xml
index 01d3f4b2..ac7c3226 100644
--- a/app/src/main/res/layout/custom_toast_success.xml
+++ b/app/src/main/res/layout/custom_toast_success.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/custom_toast_container"
-    android:orientation="horizontal"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:padding="15dp"
     android:background="@drawable/shape_full_circle"
-    android:backgroundTint="@color/darkGreen">
+    android:backgroundTint="@color/darkGreen"
+    android:orientation="horizontal"
+    android:padding="15dp">
 
     <TextView android:id="@+id/toastText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/colorWhite"
         android:layout_gravity="center"
-        android:gravity="center" />
+        android:gravity="center"
+        android:textColor="@color/colorWhite"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/custom_toast_warning.xml b/app/src/main/res/layout/custom_toast_warning.xml
index c1ba1633..8e93b8e9 100644
--- a/app/src/main/res/layout/custom_toast_warning.xml
+++ b/app/src/main/res/layout/custom_toast_warning.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/custom_toast_container"
-    android:orientation="horizontal"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:padding="15dp"
     android:background="@drawable/shape_full_circle"
-    android:backgroundTint="@color/warningColor">
+    android:backgroundTint="@color/warningColor"
+    android:orientation="horizontal"
+    android:padding="15dp">
 
     <TextView android:id="@+id/toastText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/colorPrimary"
         android:layout_gravity="center"
-        android:gravity="center" />
+        android:gravity="center"
+        android:textColor="@color/colorPrimary"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/custom_user_accounts_dialog.xml b/app/src/main/res/layout/custom_user_accounts_dialog.xml
index 8e1ce260..f3b63b4b 100644
--- a/app/src/main/res/layout/custom_user_accounts_dialog.xml
+++ b/app/src/main/res/layout/custom_user_accounts_dialog.xml
@@ -17,15 +17,15 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </LinearLayout>
 
     <View
+        android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:id="@+id/divider"
-        android:background="?attr/dividerColor" />
+        android:background="?attr/dividerColor"/>
 
     <Button
         android:id="@+id/newAccount"
@@ -36,7 +36,7 @@
         android:paddingEnd="4dp"
         android:text="@string/addNewAccount"
         android:textColor="@color/colorWhite"
-        android:textSize="16sp" />
+        android:textSize="16sp"/>
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_administration.xml b/app/src/main/res/layout/fragment_administration.xml
index d3806d3c..f43ef49f 100644
--- a/app/src/main/res/layout/fragment_administration.xml
+++ b/app/src/main/res/layout/fragment_administration.xml
@@ -27,7 +27,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_people" />
+                    app:srcCompat="@drawable/ic_people"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -45,23 +45,23 @@
                         android:paddingEnd="12dp"
                         android:text="@string/adminUsers"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"/>
 
                 </LinearLayout>
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_chevron_right"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_chevron_right"/>
 
             </LinearLayout>
 
             <View
+                android:id="@+id/divider"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:id="@+id/divider"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"/>
 
             <LinearLayout
                 android:id="@+id/adminCronFrame"
@@ -76,7 +76,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_tasks" />
+                    app:srcCompat="@drawable/ic_tasks"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -94,22 +94,22 @@
                         android:paddingEnd="12dp"
                         android:text="@string/adminCron"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"/>
 
                 </LinearLayout>
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_chevron_right"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_chevron_right"/>
 
             </LinearLayout>
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"/>
 
             <LinearLayout
                 android:id="@+id/unadoptedReposFrame"
@@ -124,7 +124,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_directory" />
+                    app:srcCompat="@drawable/ic_directory"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -142,15 +142,15 @@
                         android:paddingEnd="12dp"
                         android:text="@string/unadoptedRepos"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"/>
 
                 </LinearLayout>
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_chevron_right"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_chevron_right"/>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_collaborators.xml b/app/src/main/res/layout/fragment_collaborators.xml
index 737e19b5..a8f149d0 100644
--- a/app/src/main/res/layout/fragment_collaborators.xml
+++ b/app/src/main/res/layout/fragment_collaborators.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,20 +10,20 @@
         android:id="@+id/gridView"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:padding="10dp"
+        android:columnWidth="80dp"
+        android:gravity="center"
         android:horizontalSpacing="10dp"
         android:numColumns="4"
-        android:columnWidth="80dp"
-        android:stretchMode="columnWidth"
-        android:gravity="center"/>
+        android:padding="10dp"
+        android:stretchMode="columnWidth"/>
 
     <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/noDataCollaborators"
@@ -34,6 +34,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_commit_details.xml b/app/src/main/res/layout/fragment_commit_details.xml
index d238179d..d96e66fc 100644
--- a/app/src/main/res/layout/fragment_commit_details.xml
+++ b/app/src/main/res/layout/fragment_commit_details.xml
@@ -52,11 +52,11 @@
 
     <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"/>
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -65,16 +65,16 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:background="?attr/primaryBackgroundColor">
+            android:background="?attr/primaryBackgroundColor"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/linearLayoutFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="16dp"
+                android:background="?attr/primaryBackgroundColor"
                 android:orientation="vertical"
-                android:background="?attr/primaryBackgroundColor">
+                android:padding="16dp">
 
                 <TextView
                     android:id="@+id/commitSubject"
@@ -83,7 +83,7 @@
                     android:layout_marginBottom="8dp"
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="18sp"
-                    tools:text="This is a test" />
+                    tools:text="This is a test"/>
 
                 <TextView
                     android:id="@+id/commitBody"
@@ -93,7 +93,7 @@
                     android:alpha=".8"
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="14sp"
-                    tools:text="This is a test commit message" />
+                    tools:text="This is a test commit message"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -116,7 +116,7 @@
                             android:layout_height="@dimen/list_avatar_size"
                             android:layout_marginEnd="5dp"
                             android:contentDescription="@string/generalImgContentText"
-                            tools:srcCompat="@tools:sample/avatars" />
+                            tools:srcCompat="@tools:sample/avatars"/>
 
                         <ImageView
                             android:id="@+id/commitCommitterAvatar"
@@ -124,16 +124,16 @@
                             android:layout_height="@dimen/list_avatar_size"
                             android:layout_marginEnd="5dp"
                             android:contentDescription="@string/generalImgContentText"
-                            tools:srcCompat="@tools:sample/avatars" />
+                            tools:srcCompat="@tools:sample/avatars"/>
 
                         <TextView
                             android:id="@+id/commitAuthorAndCommitter"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginEnd="10dp"
-                            android:textSize="12sp"
                             android:textColor="?attr/primaryTextColor"
-                            tools:text="opyale authored and opyale committed" />
+                            android:textSize="12sp"
+                            tools:text="opyale authored and opyale committed"/>
 
                     </LinearLayout>
 
@@ -141,15 +141,15 @@
                         android:id="@+id/commitSha"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginStart="10dp"
                         android:layout_weight="0"
                         android:alpha=".8"
                         android:drawablePadding="10dp"
-                        android:textSize="12sp"
-                        android:layout_marginStart="10dp"
                         android:gravity="center_vertical"
                         android:textColor="?attr/primaryTextColor"
+                        android:textSize="12sp"
                         app:drawableLeftCompat="@drawable/ic_commit"
-                        tools:text="357f3qd5s" />
+                        tools:text="357f3qd5s"/>
 
                 </LinearLayout>
             </LinearLayout>
@@ -157,16 +157,16 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"/>
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/diff_files"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
+                android:background="?attr/primaryBackgroundColor"
                 android:headerDividersEnabled="true"
                 android:nestedScrollingEnabled="false"
-                android:background="?attr/primaryBackgroundColor"
                 tools:listitem="@layout/list_diff_files"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_diff.xml b/app/src/main/res/layout/fragment_diff.xml
index f1c5216c..53b6dc51 100644
--- a/app/src/main/res/layout/fragment_diff.xml
+++ b/app/src/main/res/layout/fragment_diff.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -10,8 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -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"
@@ -41,7 +41,7 @@
                 android:ellipsize="start"
                 android:singleLine="true"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="18sp" />
+                android:textSize="18sp"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -50,6 +50,6 @@
     <ListView
         android:id="@+id/diff"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_diff_files.xml b/app/src/main/res/layout/fragment_diff_files.xml
index ceb741a4..f1abb70f 100644
--- a/app/src/main/res/layout/fragment_diff_files.xml
+++ b/app/src/main/res/layout/fragment_diff_files.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progress_bar"
@@ -11,29 +11,29 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:indeterminate="true"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/toolbar_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:text="@string/fileDiffViewHeader"
-        android:textColor="?attr/primaryTextColor"
-        android:ellipsize="none"
-        android:scrollbars="horizontal"
-        android:singleLine="true"
         android:layout_marginStart="20dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
+        android:ellipsize="none"
+        android:scrollbars="horizontal"
+        android:singleLine="true"
+        android:text="@string/fileDiffViewHeader"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="15sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/diff_files"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?attr/primaryBackgroundColor"
-        android:scrollbars="vertical" />
+        android:scrollbars="vertical"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_drafts.xml b/app/src/main/res/layout/fragment_drafts.xml
index 4a4cb6fb..a5346246 100644
--- a/app/src/main/res/layout/fragment_drafts.xml
+++ b/app/src/main/res/layout/fragment_drafts.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/draftsFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:id="@+id/draftsFrame"
     android:background="?attr/primaryBackgroundColor">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -16,7 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
@@ -25,10 +25,10 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="16dp"
+        android:gravity="center"
         android:text="@string/draftsListEmpty"
         android:textColor="?attr/primaryTextColor"
-        android:gravity="center"
         android:textSize="20sp"
-        android:visibility="visible" />
+        android:visibility="visible"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_explore.xml b/app/src/main/res/layout/fragment_explore.xml
index ce381c04..332df9ed 100644
--- a/app/src/main/res/layout/fragment_explore.xml
+++ b/app/src/main/res/layout/fragment_explore.xml
@@ -11,18 +11,18 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabsExplore"
-            app:tabTextAppearance="@style/customTabLayout"
-            app:tabMode="scrollable"
-            app:tabTextColor="?attr/primaryTextColor"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:background="?attr/primaryBackgroundColor"
             app:tabIndicatorColor="?attr/pagerTabIndicatorColor"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            app:tabMode="scrollable"
+            app:tabTextAppearance="@style/customTabLayout"
+            app:tabTextColor="?attr/primaryTextColor"/>
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -30,6 +30,6 @@
         android:id="@+id/containerExplore"
         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>
diff --git a/app/src/main/res/layout/fragment_explore_repo.xml b/app/src/main/res/layout/fragment_explore_repo.xml
index e9a6fd33..e5657ebd 100644
--- a/app/src/main/res/layout/fragment_explore_repo.xml
+++ b/app/src/main/res/layout/fragment_explore_repo.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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">
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noData"
@@ -23,7 +23,7 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/pullToRefresh"
@@ -35,7 +35,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
diff --git a/app/src/main/res/layout/fragment_explore_users.xml b/app/src/main/res/layout/fragment_explore_users.xml
index 4bb7dc8e..acc5fd11 100644
--- a/app/src/main/res/layout/fragment_explore_users.xml
+++ b/app/src/main/res/layout/fragment_explore_users.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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">
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noData"
@@ -23,7 +23,7 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/pullToRefresh"
@@ -35,7 +35,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
diff --git a/app/src/main/res/layout/fragment_files.xml b/app/src/main/res/layout/fragment_files.xml
index 0b228b3b..c68bfe3c 100644
--- a/app/src/main/res/layout/fragment_files.xml
+++ b/app/src/main/res/layout/fragment_files.xml
@@ -23,7 +23,7 @@
             android:text="@string/filesBreadcrumbRoot"
             app:CustomTextSize="16sp"
             app:SelectedTextColor="?attr/primaryTextColor"
-            app:UnSelectedTextColor="@color/lightGray" />
+            app:UnSelectedTextColor="@color/lightGray"/>
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/pullToRefresh"
@@ -35,7 +35,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="?attr/primaryBackgroundColor"
-                android:scrollbars="vertical" />
+                android:scrollbars="vertical"/>
 
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
@@ -50,7 +50,7 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progress_bar"
@@ -59,6 +59,6 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/filesFrame"
         android:indeterminate="true"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_issues.xml b/app/src/main/res/layout/fragment_issues.xml
index da920711..d72961f3 100644
--- a/app/src/main/res/layout/fragment_issues.xml
+++ b/app/src/main/res/layout/fragment_issues.xml
@@ -1,9 +1,9 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".activities.RepoDetailActivity">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -16,27 +16,27 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noDataIssues"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="15dp"
+        android:gravity="center"
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
-        android:gravity="center"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_labels.xml b/app/src/main/res/layout/fragment_labels.xml
index e6da5cc7..1123336c 100644
--- a/app/src/main/res/layout/fragment_labels.xml
+++ b/app/src/main/res/layout/fragment_labels.xml
@@ -1,9 +1,9 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".activities.RepoDetailActivity">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -16,17 +16,17 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noData"
@@ -37,6 +37,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_members_by_org.xml b/app/src/main/res/layout/fragment_members_by_org.xml
index eefa2be3..89066076 100644
--- a/app/src/main/res/layout/fragment_members_by_org.xml
+++ b/app/src/main/res/layout/fragment_members_by_org.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,20 +10,20 @@
         android:id="@+id/gridView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?attr/primaryBackgroundColor"
+        android:columnWidth="80dp"
+        android:gravity="center"
         android:horizontalSpacing="10dp"
         android:numColumns="4"
-        android:columnWidth="80dp"
-        android:stretchMode="columnWidth"
-        android:background="?attr/primaryBackgroundColor"
-        android:gravity="center" />
+        android:stretchMode="columnWidth"/>
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noDataMembers"
@@ -34,6 +34,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_milestones.xml b/app/src/main/res/layout/fragment_milestones.xml
index ae477874..8d8c371d 100644
--- a/app/src/main/res/layout/fragment_milestones.xml
+++ b/app/src/main/res/layout/fragment_milestones.xml
@@ -1,9 +1,9 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".activities.RepoDetailActivity">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -16,26 +16,26 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <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"/>
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progressLoadMore"
+        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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        android:visibility="gone"
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noDataMilestone"
@@ -46,6 +46,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml
index 6ac933ae..2f76f86f 100644
--- a/app/src/main/res/layout/fragment_notifications.xml
+++ b/app/src/main/res/layout/fragment_notifications.xml
@@ -18,17 +18,17 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noDataNotifications"
@@ -39,7 +39,7 @@
         android:text="@string/noDataNotifications"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/markAllAsRead"
@@ -47,12 +47,12 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="16dp"
-        android:text="@string/markAsRead"
-        android:contentDescription="@string/markAsRead"
-        android:textColor="@color/colorWhite"
         android:backgroundTint="?attr/fabColor"
-        app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
+        android:contentDescription="@string/markAsRead"
+        android:text="@string/markAsRead"
+        android:textColor="@color/colorWhite"
+        app:icon="@drawable/ic_done"
         app:iconTint="@color/colorWhite"
-        app:icon="@drawable/ic_done" />
+        app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_organization_info.xml b/app/src/main/res/layout/fragment_organization_info.xml
index 670da34b..11fc81f9 100644
--- a/app/src/main/res/layout/fragment_organization_info.xml
+++ b/app/src/main/res/layout/fragment_organization_info.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <ScrollView
-        android:orientation="vertical"
-        android:background="?attr/primaryBackgroundColor"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="?attr/primaryBackgroundColor"
+        android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/orgInfoLayout"
@@ -28,16 +28,16 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="30dp"
-                android:contentDescription="@string/orgContentAvatar" />
+                android:contentDescription="@string/orgContentAvatar"/>
 
             <TextView
                 android:id="@+id/orgNameInfo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="?attr/primaryTextColor"
                 android:layout_marginBottom="5dp"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="22sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"/>
 
             <TextView
                 android:id="@+id/orgDescInfo"
@@ -48,14 +48,14 @@
                 android:maxLines="3"
                 android:textColor="?attr/primaryTextColor"
                 android:textColorLink="@color/lightBlue"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:layout_marginTop="25dp"
                 android:layout_marginBottom="25dp"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -66,11 +66,11 @@
                 android:paddingRight="15dp">
 
                 <ImageView
-                    android:layout_gravity="center"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center"
                     android:contentDescription="@string/websiteText"
-                    app:srcCompat="@drawable/ic_link" />
+                    app:srcCompat="@drawable/ic_link"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -84,7 +84,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/websiteText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"/>
 
                     <TextView
                         android:id="@+id/orgWebsiteInfo"
@@ -95,7 +95,7 @@
                         android:textColor="?attr/primaryTextColor"
                         android:textColorLink="@color/lightBlue"
                         android:textSize="14sp"
-                        tools:text="29" />
+                        tools:text="29"/>
                 </LinearLayout>
 
             </LinearLayout>
@@ -109,11 +109,11 @@
                 android:paddingRight="15dp">
 
                 <ImageView
-                    android:layout_gravity="center"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center"
                     android:contentDescription="@string/locationText"
-                    app:srcCompat="@drawable/ic_location" />
+                    app:srcCompat="@drawable/ic_location"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -127,7 +127,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/locationText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"/>
 
                     <TextView
                         android:id="@+id/orgLocationInfo"
@@ -136,7 +136,7 @@
                         android:alpha="0.9"
                         android:textColor="?attr/primaryTextColor"
                         android:textSize="14sp"
-                        tools:text="29" />
+                        tools:text="29"/>
                 </LinearLayout>
 
             </LinearLayout>
@@ -147,10 +147,10 @@
 
     <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"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_organization_team_info_members.xml b/app/src/main/res/layout/fragment_organization_team_info_members.xml
index 1a3d5c0c..cbe97867 100644
--- a/app/src/main/res/layout/fragment_organization_team_info_members.xml
+++ b/app/src/main/res/layout/fragment_organization_team_info_members.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"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -23,12 +23,12 @@
             android:id="@+id/members"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/primaryBackgroundColor"
+            android:columnWidth="80dp"
+            android:gravity="center"
             android:horizontalSpacing="10dp"
             android:numColumns="4"
-            android:columnWidth="80dp"
-            android:stretchMode="columnWidth"
-            android:background="?attr/primaryBackgroundColor"
-            android:gravity="center"/>
+            android:stretchMode="columnWidth"/>
 
         <TextView
             android:id="@+id/noDataMembers"
@@ -39,7 +39,7 @@
             android:text="@string/noDataFound"
             android:textColor="?attr/primaryTextColor"
             android:textSize="18sp"
-            android:visibility="gone" />
+            android:visibility="gone"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_organization_team_info_permissions.xml b/app/src/main/res/layout/fragment_organization_team_info_permissions.xml
index c9818785..712319a9 100644
--- a/app/src/main/res/layout/fragment_organization_team_info_permissions.xml
+++ b/app/src/main/res/layout/fragment_organization_team_info_permissions.xml
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:indeterminate="true"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -28,7 +28,7 @@
             android:layout_marginBottom="10dp"
             android:textColor="?attr/primaryTextColor"
             android:textSize="15sp"
-            tools:text="• Members of this team can view team repositories." />
+            tools:text="• Members of this team can view team repositories."/>
     </LinearLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_organizations.xml b/app/src/main/res/layout/fragment_organizations.xml
index 609391b0..face4c40 100644
--- a/app/src/main/res/layout/fragment_organizations.xml
+++ b/app/src/main/res/layout/fragment_organizations.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     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:layout_height="match_parent">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/pullToRefresh"
@@ -15,28 +15,28 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noDataOrg"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="15dp"
+        android:gravity="center"
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
-        android:gravity="center"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/addNewOrganization"
@@ -44,11 +44,11 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="16dp"
-        android:text="@string/pageTitleCreateOrganization"
-        android:contentDescription="@string/pageTitleCreateOrganization"
-        android:textColor="@color/colorWhite"
         android:backgroundTint="?attr/fabColor"
-        app:iconTint="@color/colorWhite"
-        app:icon="@drawable/ic_add" />
+        android:contentDescription="@string/pageTitleCreateOrganization"
+        android:text="@string/pageTitleCreateOrganization"
+        android:textColor="@color/colorWhite"
+        app:icon="@drawable/ic_add"
+        app:iconTint="@color/colorWhite"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_pr_changes.xml b/app/src/main/res/layout/fragment_pr_changes.xml
index e725f18c..87827e77 100644
--- a/app/src/main/res/layout/fragment_pr_changes.xml
+++ b/app/src/main/res/layout/fragment_pr_changes.xml
@@ -5,16 +5,16 @@
     android:id="@+id/main_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     android:background="?attr/primaryBackgroundColor"
+    android:fitsSystemWindows="true"
     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="0dp"
-        android:theme="@style/Widget.AppCompat.SearchView">
+        android:theme="@style/Widget.AppCompat.SearchView"
+        app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -26,27 +26,27 @@
                 android:id="@+id/close"
                 android:layout_width="@dimen/close_button_size"
                 android:layout_height="@dimen/close_button_size"
-                android:layout_marginRight="15dp"
                 android:layout_marginLeft="15dp"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/close"
+                android:layout_marginRight="15dp"
                 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"/>
 
             <com.google.android.material.tabs.TabLayout
                 android:id="@+id/tabs"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="?attr/primaryBackgroundColor"
+                app:tabGravity="fill"
                 app:tabIndicatorColor="?attr/pagerTabIndicatorColor"
                 app:tabIndicatorFullWidth="false"
-                app:tabMode="fixed"
                 app:tabMaxWidth="0dp"
-                app:tabGravity="fill"
+                app:tabMode="fixed"
                 app:tabTextAppearance="@style/customTabLayout"
-                app:tabTextColor="?attr/primaryTextColor" />
+                app:tabTextColor="?attr/primaryTextColor"/>
 
         </com.google.android.material.appbar.MaterialToolbar>
 
@@ -55,6 +55,6 @@
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 75e37d69..e42e0f72 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -11,9 +11,9 @@
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/loadingIndicator"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:indeterminate="true"
-        android:visibility="gone"
-        android:layout_height="wrap_content"/>
+        android:visibility="gone"/>
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -31,7 +31,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:contentDescription="@string/generalImgContentText"
-                android:scaleType="centerCrop" />
+                android:scaleType="centerCrop"/>
 
             <LinearLayout
                 android:id="@+id/layoutFrameAccount"
@@ -47,7 +47,7 @@
                     android:layout_height="54dp"
                     android:layout_marginBottom="8dp"
                     android:contentDescription="@string/generalImgContentText"
-                    android:src="@mipmap/app_logo_round" />
+                    android:src="@mipmap/app_logo_round"/>
 
                 <TextView
                     android:id="@+id/userFullName"
@@ -55,7 +55,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/colorWhite"
                     android:textIsSelectable="true"
-                    android:textSize="18sp" />
+                    android:textSize="18sp"/>
 
                 <TextView
                     android:id="@+id/userLogin"
@@ -64,14 +64,14 @@
                     android:layout_marginBottom="10dp"
                     android:textColor="@color/colorWhite"
                     android:textIsSelectable="true"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"/>
 
                 <View
                     android:id="@+id/divider"
                     android:layout_width="50dp"
                     android:layout_height="1dp"
                     android:layout_marginBottom="10dp"
-                    android:background="@color/colorWhite" />
+                    android:background="@color/colorWhite"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -86,7 +86,7 @@
                         android:layout_marginEnd="2dp"
                         android:contentDescription="@string/generalImgContentText"
                         android:src="@drawable/ic_language"
-                        app:tint="@color/colorWhite" />
+                        app:tint="@color/colorWhite"/>
 
                     <TextView
                         android:id="@+id/userLanguage"
@@ -94,7 +94,7 @@
                         android:layout_height="wrap_content"
                         android:textColor="@color/colorWhite"
                         android:textIsSelectable="true"
-                        android:textSize="14sp" />
+                        android:textSize="14sp"/>
 
                 </LinearLayout>
 
@@ -116,19 +116,19 @@
                 android:id="@+id/profileTabFollowers"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/profileTabFollowers" />
+                android:text="@string/profileTabFollowers"/>
 
             <com.google.android.material.tabs.TabItem
                 android:id="@+id/profileTabFollowing"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/profileTabFollowing" />
+                android:text="@string/profileTabFollowing"/>
 
             <com.google.android.material.tabs.TabItem
                 android:id="@+id/profileTabEmails"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/profileTabEmails" />
+                android:text="@string/profileTabEmails"/>
 
         </com.google.android.material.tabs.TabLayout>
 
@@ -138,6 +138,6 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_profile_detail.xml b/app/src/main/res/layout/fragment_profile_detail.xml
index cf43ae81..0bfe1fe9 100644
--- a/app/src/main/res/layout/fragment_profile_detail.xml
+++ b/app/src/main/res/layout/fragment_profile_detail.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:background="?attr/primaryBackgroundColor"
+<ScrollView 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:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:background="?attr/primaryBackgroundColor"
+    android:orientation="vertical">
 
     <LinearLayout
-        android:orientation="vertical"
         android:id="@+id/userInfoLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
         <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"
-            app:indicatorColor="?attr/progressIndicatorColor" />
+            app:indicatorColor="?attr/progressIndicatorColor"/>
 
         <RelativeLayout
             android:id="@+id/profileFrame"
@@ -33,7 +33,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:contentDescription="@string/generalImgContentText"
-                android:scaleType="centerCrop" />
+                android:scaleType="centerCrop"/>
 
             <LinearLayout
                 android:id="@+id/layoutFrameAccount"
@@ -49,7 +49,7 @@
                     android:layout_width="54dp"
                     android:layout_height="54dp"
                     android:contentDescription="@string/generalImgContentText"
-                    tools:src="@mipmap/app_logo_round" />
+                    tools:src="@mipmap/app_logo_round"/>
 
                 <TextView
                     android:id="@+id/userFullName"
@@ -58,7 +58,7 @@
                     android:layout_marginTop="8dp"
                     android:textColor="@color/colorWhite"
                     android:textIsSelectable="true"
-                    android:textSize="18sp" />
+                    android:textSize="18sp"/>
 
                 <TextView
                     android:id="@+id/userLogin"
@@ -66,16 +66,16 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/colorWhite"
                     android:textIsSelectable="true"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"/>
 
             </LinearLayout>
 
         </RelativeLayout>
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:orientation="vertical"
             android:padding="15dp">
 
             <LinearLayout
@@ -87,11 +87,11 @@
                 android:paddingRight="15dp">
 
                 <ImageView
-                    android:layout_gravity="center"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_email" />
+                    app:srcCompat="@drawable/ic_email"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -105,7 +105,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/userEmail"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"/>
 
                     <TextView
                         android:id="@+id/userEmail"
@@ -113,7 +113,7 @@
                         android:layout_height="wrap_content"
                         android:alpha="0.9"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="14sp" />
+                        android:textSize="14sp"/>
                 </LinearLayout>
 
             </LinearLayout>
@@ -127,11 +127,11 @@
                 android:paddingRight="15dp">
 
                 <ImageView
-                    android:layout_gravity="center"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_language" />
+                    app:srcCompat="@drawable/ic_language"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -145,7 +145,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/settingsLanguageSelectorHeader"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"/>
 
                     <TextView
                         android:id="@+id/userLang"
@@ -153,7 +153,7 @@
                         android:layout_height="wrap_content"
                         android:alpha="0.9"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="14sp" />
+                        android:textSize="14sp"/>
                 </LinearLayout>
 
             </LinearLayout>
@@ -167,11 +167,11 @@
                 android:paddingRight="15dp">
 
                 <ImageView
-                    android:layout_gravity="center"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_calendar" />
+                    app:srcCompat="@drawable/ic_calendar"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -185,7 +185,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/joined"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"/>
 
                     <TextView
                         android:id="@+id/userJoinedOn"
@@ -193,7 +193,7 @@
                         android:layout_height="wrap_content"
                         android:alpha="0.9"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="14sp" />
+                        android:textSize="14sp"/>
                 </LinearLayout>
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_profile_emails.xml b/app/src/main/res/layout/fragment_profile_emails.xml
index fc1693c9..40ddfa1d 100644
--- a/app/src/main/res/layout/fragment_profile_emails.xml
+++ b/app/src/main/res/layout/fragment_profile_emails.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="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="wrap_content">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/pullToRefresh"
@@ -14,17 +14,17 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <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/noDataEmails"
@@ -35,6 +35,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_profile_followers_following.xml b/app/src/main/res/layout/fragment_profile_followers_following.xml
index 4ffd5b3f..3f4ae4e5 100644
--- a/app/src/main/res/layout/fragment_profile_followers_following.xml
+++ b/app/src/main/res/layout/fragment_profile_followers_following.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="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="wrap_content">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/pullToRefresh"
@@ -14,17 +14,17 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noData"
@@ -35,6 +35,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_pull_requests.xml b/app/src/main/res/layout/fragment_pull_requests.xml
index dfb16287..1123336c 100644
--- a/app/src/main/res/layout/fragment_pull_requests.xml
+++ b/app/src/main/res/layout/fragment_pull_requests.xml
@@ -1,9 +1,9 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".activities.RepoDetailActivity">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -16,27 +16,27 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noData"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="15dp"
+        android:gravity="center"
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
-        android:gravity="center"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_releases.xml b/app/src/main/res/layout/fragment_releases.xml
index 91999995..4cce780b 100644
--- a/app/src/main/res/layout/fragment_releases.xml
+++ b/app/src/main/res/layout/fragment_releases.xml
@@ -1,9 +1,9 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".activities.RepoDetailActivity">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -16,17 +16,17 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <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/noDataReleases"
@@ -37,6 +37,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_repo_info.xml b/app/src/main/res/layout/fragment_repo_info.xml
index 86341e5e..fe01fc96 100644
--- a/app/src/main/res/layout/fragment_repo_info.xml
+++ b/app/src/main/res/layout/fragment_repo_info.xml
@@ -1,34 +1,34 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <androidx.core.widget.NestedScrollView
-        android:orientation="vertical"
-        android:background="?attr/primaryBackgroundColor"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="?attr/primaryBackgroundColor"
+        android:orientation="vertical">
 
         <LinearLayout
-            android:padding="15dp"
-            android:orientation="vertical"
             android:id="@+id/repoInfoLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="15dp">
 
             <TextView
                 android:id="@+id/repoIsArchived"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
                 android:layout_gravity="center"
-                android:text="@string/archivedRepositoryMessage"
-                android:background="@drawable/shape_archived"
-                android:padding="6dp"
                 android:layout_marginBottom="8dp"
-                android:textColor="@color/colorWhite" />
+                android:background="@drawable/shape_archived"
+                android:gravity="center_vertical"
+                android:padding="6dp"
+                android:text="@string/archivedRepositoryMessage"
+                android:textColor="@color/colorWhite"/>
 
             <LinearLayout
                 android:id="@+id/repoMetaFrameHeader"
@@ -42,22 +42,22 @@
                     android:id="@+id/repoMetaData"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:text="@string/repoMetaData"
-                    android:textSize="16sp"
-                    android:paddingTop="10dp"
                     android:layout_weight="0.9"
                     android:gravity="center_vertical"
-                    android:paddingBottom="10dp"
                     android:paddingStart="0dp"
+                    android:paddingTop="10dp"
                     android:paddingEnd="0dp"
-                    android:textColor="@color/lightGray"/>
+                    android:paddingBottom="10dp"
+                    android:text="@string/repoMetaData"
+                    android:textColor="@color/lightGray"
+                    android:textSize="16sp"/>
 
                 <ImageView
                     android:id="@+id/repoMetaDataExpandCollapse"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.1"
                     android:layout_gravity="center_vertical|end"
+                    android:layout_weight="0.1"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/issueDescriptionEmpty"
                     app:srcCompat="@drawable/ic_chevron_down"/>
@@ -74,10 +74,10 @@
                     android:id="@+id/repoMetaName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="?attr/primaryTextColor"
                     android:layout_marginBottom="5dp"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="22sp"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"/>
 
                 <TextView
                     android:id="@+id/repoMetaDescription"
@@ -89,7 +89,7 @@
                     android:maxLines="3"
                     android:textColor="?attr/primaryTextColor"
                     android:textColorLink="@color/lightBlue"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -104,8 +104,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="?android:attr/selectableItemBackgroundBorderless"
-                        android:focusable="true"
                         android:clickable="true"
+                        android:focusable="true"
                         android:gravity="center"
                         android:orientation="vertical">
 
@@ -113,14 +113,14 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:contentDescription="@string/repoStargazersInMenu"
-                            app:srcCompat="@drawable/ic_star_unfilled" />
+                            app:srcCompat="@drawable/ic_star_unfilled"/>
 
                         <TextView
                             android:id="@+id/repoMetaStars"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textColor="?attr/primaryTextColor"
-                            android:textSize="14sp" />
+                            android:textSize="14sp"/>
                     </LinearLayout>
 
                     <LinearLayout
@@ -129,8 +129,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="?android:attr/selectableItemBackgroundBorderless"
-                        android:focusable="true"
                         android:clickable="true"
+                        android:focusable="true"
                         android:gravity="center"
                         android:orientation="vertical">
 
@@ -138,14 +138,14 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:contentDescription="@string/tabPullRequests"
-                            app:srcCompat="@drawable/ic_pull_request" />
+                            app:srcCompat="@drawable/ic_pull_request"/>
 
                         <TextView
                             android:id="@+id/repoMetaPullRequests"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textColor="?attr/primaryTextColor"
-                            android:textSize="14sp" />
+                            android:textSize="14sp"/>
                     </LinearLayout>
 
                     <LinearLayout
@@ -154,8 +154,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="?android:attr/selectableItemBackgroundBorderless"
-                        android:focusable="true"
                         android:clickable="true"
+                        android:focusable="true"
                         android:gravity="center"
                         android:orientation="vertical">
 
@@ -163,14 +163,14 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:contentDescription="@string/infoTabRepoForksCount"
-                            app:srcCompat="@drawable/ic_fork" />
+                            app:srcCompat="@drawable/ic_fork"/>
 
                         <TextView
                             android:id="@+id/repoMetaForks"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textColor="?attr/primaryTextColor"
-                            android:textSize="14sp" />
+                            android:textSize="14sp"/>
                     </LinearLayout>
 
                     <LinearLayout
@@ -179,8 +179,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="?android:attr/selectableItemBackgroundBorderless"
-                        android:focusable="true"
                         android:clickable="true"
+                        android:focusable="true"
                         android:gravity="center"
                         android:orientation="vertical">
 
@@ -188,14 +188,14 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:contentDescription="@string/repoWatchersInMenu"
-                            app:srcCompat="@drawable/ic_unwatch" />
+                            app:srcCompat="@drawable/ic_unwatch"/>
 
                         <TextView
                             android:id="@+id/repoMetaWatchers"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textColor="?attr/primaryTextColor"
-                            android:textSize="14sp" />
+                            android:textSize="14sp"/>
                     </LinearLayout>
                 </LinearLayout>
 
@@ -204,32 +204,32 @@
                     android:layout_height="1dp"
                     android:layout_marginTop="25dp"
                     android:layout_marginBottom="12dp"
-                    android:background="?attr/dividerColor" />
+                    android:background="?attr/dividerColor"/>
 
                 <LinearLayout
                     android:id="@+id/repo_fork_frame"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
                     android:background="?android:attr/selectableItemBackground"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
+                    android:orientation="horizontal"
                     android:paddingLeft="15dp"
-                    android:paddingRight="15dp">
+                    android:paddingTop="8dp"
+                    android:paddingRight="15dp"
+                    android:paddingBottom="8dp">
 
                     <ImageView
-                        android:layout_gravity="center"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:srcCompat="@drawable/ic_fork" />
+                        android:layout_gravity="center"
+                        app:srcCompat="@drawable/ic_fork"/>
 
                     <TextView
                         android:id="@+id/repo_fork"
-                        android:layout_marginStart="15dp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginStart="15dp"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"/>
                 </LinearLayout>
 
                 <LinearLayout
@@ -242,11 +242,11 @@
                     android:paddingRight="15dp">
 
                     <ImageView
-                        android:layout_gravity="center"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center"
                         android:contentDescription="@string/repoWatchersInMenu"
-                        app:srcCompat="@drawable/ic_download" />
+                        app:srcCompat="@drawable/ic_download"/>
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -260,7 +260,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/infoTabRepoSize"
                             android:textColor="?attr/primaryTextColor"
-                            android:textSize="16sp" />
+                            android:textSize="16sp"/>
 
                         <TextView
                             android:id="@+id/repoMetaSize"
@@ -269,7 +269,7 @@
                             android:alpha="0.9"
                             android:textColor="?attr/primaryTextColor"
                             android:textSize="14sp"
-                            tools:text="29" />
+                            tools:text="29"/>
                     </LinearLayout>
 
                 </LinearLayout>
@@ -283,11 +283,11 @@
                     android:paddingRight="15dp">
 
                     <ImageView
-                        android:layout_gravity="center"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center"
                         android:contentDescription="@string/infoTabRepoCreatedAt"
-                        app:srcCompat="@drawable/ic_calendar" />
+                        app:srcCompat="@drawable/ic_calendar"/>
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -301,7 +301,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/infoTabRepoCreatedAt"
                             android:textColor="?attr/primaryTextColor"
-                            android:textSize="16sp" />
+                            android:textSize="16sp"/>
 
                         <TextView
                             android:id="@+id/repoMetaCreatedAt"
@@ -310,7 +310,7 @@
                             android:alpha="0.9"
                             android:textColor="?attr/primaryTextColor"
                             android:textSize="14sp"
-                            tools:text="29" />
+                            tools:text="29"/>
                     </LinearLayout>
 
                 </LinearLayout>
@@ -324,11 +324,11 @@
                     android:paddingRight="15dp">
 
                     <ImageView
-                        android:layout_gravity="center"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center"
                         android:contentDescription="@string/websiteText"
-                        app:srcCompat="@drawable/ic_link" />
+                        app:srcCompat="@drawable/ic_link"/>
 
                     <LinearLayout
                         android:id="@+id/websiteFrame"
@@ -343,7 +343,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/websiteText"
                             android:textColor="?attr/primaryTextColor"
-                            android:textSize="16sp" />
+                            android:textSize="16sp"/>
 
                         <TextView
                             android:id="@+id/repoMetaWebsite"
@@ -351,10 +351,10 @@
                             android:layout_height="wrap_content"
                             android:alpha="0.9"
                             android:autoLink="web"
-                            android:textColorLink="@color/lightBlue"
                             android:textColor="?attr/primaryTextColor"
+                            android:textColorLink="@color/lightBlue"
                             android:textSize="14sp"
-                            tools:text="29" />
+                            tools:text="29"/>
                     </LinearLayout>
 
                 </LinearLayout>
@@ -367,7 +367,7 @@
                     android:layout_marginTop="5dp"
                     android:layout_marginBottom="20dp"
                     android:text="@string/infoShowMoreInformation"
-                    android:textColor="@color/btnTextColor" />
+                    android:textColor="@color/btnTextColor"/>
 
             </LinearLayout>
 
@@ -383,24 +383,24 @@
                     android:id="@+id/repoFilename"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:text="@string/defaultFilenameText"
-                    android:textSize="16sp"
-                    android:paddingTop="10dp"
                     android:layout_weight="0.9"
-                    android:gravity="center_vertical"
-                    android:paddingBottom="10dp"
-                    android:paddingStart="0dp"
-                    android:paddingEnd="0dp"
                     android:autoLink="web"
+                    android:gravity="center_vertical"
+                    android:paddingStart="0dp"
+                    android:paddingTop="10dp"
+                    android:paddingEnd="0dp"
+                    android:paddingBottom="10dp"
+                    android:text="@string/defaultFilenameText"
+                    android:textColor="@color/lightGray"
                     android:textColorLink="@color/lightBlue"
-                    android:textColor="@color/lightGray"/>
+                    android:textSize="16sp"/>
 
                 <ImageView
                     android:id="@+id/repoFilenameExpandCollapse"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.1"
                     android:layout_gravity="center_vertical|end"
+                    android:layout_weight="0.1"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/issueDescriptionEmpty"
                     app:srcCompat="@drawable/ic_chevron_up"/>
@@ -409,17 +409,17 @@
 
             <LinearLayout
                 android:id="@+id/fileContentsFrame"
-                android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/repoFileContents"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:textColor="?attr/primaryTextColor"
                     android:textIsSelectable="true"
-                    android:textSize="16sp"
-                    android:textColor="?attr/primaryTextColor"/>
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_repositories.xml b/app/src/main/res/layout/fragment_repositories.xml
index 7c3ad7de..58dba55d 100644
--- a/app/src/main/res/layout/fragment_repositories.xml
+++ b/app/src/main/res/layout/fragment_repositories.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     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:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".activities.MainActivity">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -17,17 +17,17 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noData"
@@ -38,7 +38,7 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/addNewRepo"
@@ -46,11 +46,11 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="16dp"
-        android:text="@string/pageTitleNewRepo"
-        android:contentDescription="@string/pageTitleNewRepo"
-        android:textColor="@color/colorWhite"
         android:backgroundTint="?attr/fabColor"
-        app:iconTint="@color/colorWhite"
-        app:icon="@drawable/ic_add" />
+        android:contentDescription="@string/pageTitleNewRepo"
+        android:text="@string/pageTitleNewRepo"
+        android:textColor="@color/colorWhite"
+        app:icon="@drawable/ic_add"
+        app:iconTint="@color/colorWhite"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_search_issues.xml b/app/src/main/res/layout/fragment_search_issues.xml
index 2ea4b97f..ec9fe43d 100644
--- a/app/src/main/res/layout/fragment_search_issues.xml
+++ b/app/src/main/res/layout/fragment_search_issues.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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">
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noData"
@@ -23,7 +23,7 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/pullToRefresh"
@@ -35,7 +35,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 50616bc4..e6bc82c3 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -22,17 +22,17 @@
                 android:id="@+id/generalFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp"
-                android:layout_marginBottom="5dp">
+                android:padding="15dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_otp" />
+                    app:srcCompat="@drawable/ic_otp"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -50,26 +50,26 @@
                         android:paddingEnd="12dp"
                         android:text="@string/settingsGeneralHeader"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp" />
+                        android:textSize="18sp"/>
 
                     <TextView
                         android:id="@+id/generalHintText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:paddingStart="12dp"
                         android:paddingEnd="12dp"
-                        android:layout_gravity="center_vertical"
                         android:text="@string/generalHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp" />
+                        android:textSize="12sp"/>
 
                 </LinearLayout>
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_chevron_right"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_chevron_right"/>
 
             </LinearLayout>
 
@@ -77,17 +77,17 @@
                 android:id="@+id/appearanceFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp"
-                android:layout_marginBottom="5dp">
+                android:padding="15dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_appearance" />
+                    app:srcCompat="@drawable/ic_appearance"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -105,7 +105,7 @@
                         android:paddingEnd="12dp"
                         android:text="@string/settingsAppearanceHeader"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp" />
+                        android:textSize="18sp"/>
 
                     <TextView
                         android:id="@+id/appearanceHintText"
@@ -116,15 +116,15 @@
                         android:paddingEnd="12dp"
                         android:text="@string/appearanceHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp" />
+                        android:textSize="12sp"/>
 
                 </LinearLayout>
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_chevron_right"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_chevron_right"/>
 
             </LinearLayout>
 
@@ -132,17 +132,17 @@
                 android:id="@+id/draftsFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp"
-                android:layout_marginBottom="5dp">
+                android:padding="15dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_drafts" />
+                    app:srcCompat="@drawable/ic_drafts"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -160,7 +160,7 @@
                         android:paddingEnd="12dp"
                         android:text="@string/draftsHeader"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp" />
+                        android:textSize="18sp"/>
 
                     <TextView
                         android:id="@+id/draftsHintText"
@@ -171,15 +171,15 @@
                         android:paddingEnd="12dp"
                         android:text="@string/draftsHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp" />
+                        android:textSize="12sp"/>
 
                 </LinearLayout>
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_chevron_right"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_chevron_right"/>
 
             </LinearLayout>
 
@@ -187,17 +187,17 @@
                 android:id="@+id/securityFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp"
-                android:layout_marginBottom="5dp">
+                android:padding="15dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_security" />
+                    app:srcCompat="@drawable/ic_security"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -215,7 +215,7 @@
                         android:paddingEnd="12dp"
                         android:text="@string/settingsSecurityHeader"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp" />
+                        android:textSize="18sp"/>
 
                     <TextView
                         android:id="@+id/securityHintText"
@@ -226,15 +226,15 @@
                         android:paddingEnd="12dp"
                         android:text="@string/securityHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp" />
+                        android:textSize="12sp"/>
 
                 </LinearLayout>
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_chevron_right"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_chevron_right"/>
 
             </LinearLayout>
 
@@ -242,17 +242,17 @@
                 android:id="@+id/notificationsFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp"
-                android:layout_marginBottom="5dp">
+                android:padding="15dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_notifications" />
+                    app:srcCompat="@drawable/ic_notifications"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -270,7 +270,7 @@
                         android:paddingEnd="12dp"
                         android:text="@string/pageTitleNotifications"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp" />
+                        android:textSize="18sp"/>
 
                     <TextView
                         android:id="@+id/notificationsHintText"
@@ -281,15 +281,15 @@
                         android:paddingEnd="12dp"
                         android:text="@string/notificationsHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp" />
+                        android:textSize="12sp"/>
 
                 </LinearLayout>
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_chevron_right"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_chevron_right"/>
 
             </LinearLayout>
 
@@ -297,17 +297,17 @@
                 android:id="@+id/languagesFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp"
-                android:layout_marginBottom="5dp">
+                android:padding="15dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_flag" />
+                    app:srcCompat="@drawable/ic_flag"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -325,7 +325,7 @@
                         android:paddingEnd="12dp"
                         android:text="@string/settingsLanguageHeaderText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp" />
+                        android:textSize="18sp"/>
 
                     <TextView
                         android:id="@+id/languagesHintText"
@@ -336,15 +336,15 @@
                         android:paddingEnd="12dp"
                         android:text="@string/languagesHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp" />
+                        android:textSize="12sp"/>
 
                 </LinearLayout>
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_chevron_right"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_chevron_right"/>
 
             </LinearLayout>
 
@@ -352,17 +352,17 @@
                 android:id="@+id/reportsFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp"
-                android:layout_marginBottom="5dp">
+                android:padding="15dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_bug_report" />
+                    app:srcCompat="@drawable/ic_bug_report"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -380,7 +380,7 @@
                         android:paddingEnd="12dp"
                         android:text="@string/reportViewerHeader"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp" />
+                        android:textSize="18sp"/>
 
                     <TextView
                         android:id="@+id/reportsHintText"
@@ -391,15 +391,15 @@
                         android:paddingEnd="12dp"
                         android:text="@string/reportsHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp" />
+                        android:textSize="12sp"/>
 
                 </LinearLayout>
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_chevron_right"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_chevron_right"/>
 
             </LinearLayout>
 
@@ -407,17 +407,17 @@
                 android:id="@+id/rateAppFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp"
-                android:layout_marginBottom="5dp">
+                android:padding="15dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_like" />
+                    app:srcCompat="@drawable/ic_like"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -435,7 +435,7 @@
                         android:paddingEnd="12dp"
                         android:text="@string/navRate"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp" />
+                        android:textSize="18sp"/>
 
                     <TextView
                         android:id="@+id/rateAppHintText"
@@ -446,7 +446,7 @@
                         android:paddingEnd="12dp"
                         android:text="@string/rateAppHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp" />
+                        android:textSize="12sp"/>
 
                 </LinearLayout>
 
@@ -456,17 +456,17 @@
                 android:id="@+id/aboutAppFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp"
-                android:layout_marginBottom="5dp">
+                android:padding="15dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_info" />
+                    app:srcCompat="@drawable/ic_info"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -484,7 +484,7 @@
                         android:paddingEnd="12dp"
                         android:text="@string/navAbout"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp" />
+                        android:textSize="18sp"/>
 
                     <TextView
                         android:id="@+id/aboutAppHintText"
@@ -495,7 +495,7 @@
                         android:paddingEnd="12dp"
                         android:text="@string/aboutAppHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp" />
+                        android:textSize="12sp"/>
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_teams_by_org.xml b/app/src/main/res/layout/fragment_teams_by_org.xml
index 533e1d16..818595a7 100644
--- a/app/src/main/res/layout/fragment_teams_by_org.xml
+++ b/app/src/main/res/layout/fragment_teams_by_org.xml
@@ -1,9 +1,9 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".activities.OrganizationDetailActivity">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -16,17 +16,17 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <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"
-        app:indicatorColor="?attr/progressIndicatorColor" />
+        app:indicatorColor="?attr/progressIndicatorColor"/>
 
     <TextView
         android:id="@+id/noDataTeams"
@@ -37,6 +37,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_wiki.xml b/app/src/main/res/layout/fragment_wiki.xml
index 53b50e5e..b3996f12 100644
--- a/app/src/main/res/layout/fragment_wiki.xml
+++ b/app/src/main/res/layout/fragment_wiki.xml
@@ -1,9 +1,9 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".activities.RepoDetailActivity">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -16,17 +16,17 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <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/no_data"
@@ -37,6 +37,6 @@
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_cron_task_info.xml b/app/src/main/res/layout/layout_cron_task_info.xml
index a3c2537b..8621f1f1 100644
--- a/app/src/main/res/layout/layout_cron_task_info.xml
+++ b/app/src/main/res/layout/layout_cron_task_info.xml
@@ -16,13 +16,13 @@
             android:layout_height="wrap_content"
             android:text="@string/adminCronScheduleHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/taskScheduleContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="?attr/primaryTextColor" />
+            android:textColor="?attr/primaryTextColor"/>
 
     </LinearLayout>
 
@@ -38,13 +38,13 @@
             android:layout_height="wrap_content"
             android:text="@string/adminCronNextRunHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/nextRunContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="?attr/primaryTextColor" />
+            android:textColor="?attr/primaryTextColor"/>
 
     </LinearLayout>
 
@@ -60,13 +60,13 @@
             android:layout_height="wrap_content"
             android:text="@string/adminCronLastRunHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/lastRunContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="?attr/primaryTextColor" />
+            android:textColor="?attr/primaryTextColor"/>
 
     </LinearLayout>
 
@@ -82,15 +82,15 @@
             android:layout_height="wrap_content"
             android:text="@string/adminCronExecutionHeader"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/execTimeContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="web"
-            android:textColorLink="@color/lightBlue"
-            android:textColor="?attr/primaryTextColor" />
+            android:textColor="?attr/primaryTextColor"
+            android:textColorLink="@color/lightBlue"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/layout_deprecation_dialog.xml b/app/src/main/res/layout/layout_deprecation_dialog.xml
index 8efcb173..c17ef606 100644
--- a/app/src/main/res/layout/layout_deprecation_dialog.xml
+++ b/app/src/main/res/layout/layout_deprecation_dialog.xml
@@ -15,7 +15,7 @@
         android:layout_marginTop="15dp"
         android:text="@string/screamingInFearEmoticon"
         android:textColor="?attr/primaryTextColor"
-        android:textSize="50sp" />
+        android:textSize="50sp"/>
 
     <TextView
         android:id="@+id/customTitle"
@@ -24,7 +24,7 @@
         android:layout_marginTop="15dp"
         android:gravity="center_horizontal"
         android:textColor="?attr/primaryTextColor"
-        android:textSize="16sp" />
+        android:textSize="16sp"/>
 
     <TextView
         android:id="@+id/customMessage"
@@ -32,6 +32,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         android:gravity="center_horizontal"
-        android:textColor="?attr/primaryTextColor" />
+        android:textColor="?attr/primaryTextColor"/>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_reaction_badge.xml b/app/src/main/res/layout/layout_reaction_badge.xml
index f169749e..10fb381b 100644
--- a/app/src/main/res/layout/layout_reaction_badge.xml
+++ b/app/src/main/res/layout/layout_reaction_badge.xml
@@ -19,6 +19,6 @@
         android:paddingBottom="5dp"
         android:textColor="?attr/primaryTextColor"
         android:textSize="14sp"
-        tools:text="👍" />
+        tools:text="👍"/>
 
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/layout_reaction_button.xml b/app/src/main/res/layout/layout_reaction_button.xml
index f054cdaa..0462287b 100644
--- a/app/src/main/res/layout/layout_reaction_button.xml
+++ b/app/src/main/res/layout/layout_reaction_button.xml
@@ -17,6 +17,6 @@
         android:textColor="?attr/primaryTextColor"
         android:textSize="20dp"
         tools:ignore="SpUsage"
-        tools:text="👍" />
+        tools:text="👍"/>
 
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/layout_repo_more_info.xml b/app/src/main/res/layout/layout_repo_more_info.xml
index c57914c2..81bb4a71 100644
--- a/app/src/main/res/layout/layout_repo_more_info.xml
+++ b/app/src/main/res/layout/layout_repo_more_info.xml
@@ -15,13 +15,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/defaultBranchContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="?attr/primaryTextColor" />
+            android:textColor="?attr/primaryTextColor"/>
 
     </LinearLayout>
 
@@ -36,13 +36,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/lastUpdatedContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="?attr/primaryTextColor" />
+            android:textColor="?attr/primaryTextColor"/>
 
     </LinearLayout>
 
@@ -57,13 +57,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/sshUrlContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="?attr/primaryTextColor" />
+            android:textColor="?attr/primaryTextColor"/>
 
     </LinearLayout>
 
@@ -78,15 +78,15 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/cloneUrlContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="web"
-            android:textColorLink="@color/lightBlue"
-            android:textColor="?attr/primaryTextColor" />
+            android:textColor="?attr/primaryTextColor"
+            android:textColorLink="@color/lightBlue"/>
 
     </LinearLayout>
 
@@ -101,15 +101,15 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/repoUrlContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="web"
-            android:textColorLink="@color/lightBlue"
-            android:textColor="?attr/primaryTextColor" />
+            android:textColor="?attr/primaryTextColor"
+            android:textColorLink="@color/lightBlue"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/layout_tab_text.xml b/app/src/main/res/layout/layout_tab_text.xml
index 1a24e38c..a1ad5a23 100644
--- a/app/src/main/res/layout/layout_tab_text.xml
+++ b/app/src/main/res/layout/layout_tab_text.xml
@@ -6,4 +6,4 @@
     android:maxLines="1"
     android:textAllCaps="true"
     android:textColor="?attr/primaryTextColor"
-    android:textSize="16sp" />
+    android:textSize="16sp"/>
diff --git a/app/src/main/res/layout/list_admin_cron_tasks.xml b/app/src/main/res/layout/list_admin_cron_tasks.xml
index b9ce8a73..a2528274 100644
--- a/app/src/main/res/layout/list_admin_cron_tasks.xml
+++ b/app/src/main/res/layout/list_admin_cron_tasks.xml
@@ -3,24 +3,24 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:background="?attr/primaryBackgroundColor" >
+    android:background="?attr/primaryBackgroundColor"
+    android:padding="16dp">
 
     <LinearLayout
         android:id="@+id/cronTasksRun"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginEnd="15dp">
+        android:layout_marginEnd="15dp"
+        android:orientation="vertical">
 
         <ImageView
             android:id="@+id/runTask"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:scaleType="fitCenter"
             android:contentDescription="@string/adminCron"
-            android:src="@drawable/ic_play" />
+            android:scaleType="fitCenter"
+            android:src="@drawable/ic_play"/>
 
     </LinearLayout>
 
@@ -38,7 +38,7 @@
             android:layout_marginBottom="5dp"
             android:text="@string/userName"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_admin_unadopted_repos.xml b/app/src/main/res/layout/list_admin_unadopted_repos.xml
index 2834afad..cd776e94 100644
--- a/app/src/main/res/layout/list_admin_unadopted_repos.xml
+++ b/app/src/main/res/layout/list_admin_unadopted_repos.xml
@@ -3,8 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:background="?android:attr/selectableItemBackground" >
+    android:background="?android:attr/selectableItemBackground"
+    android:padding="16dp">
 
     <TextView
         android:id="@+id/repo_name"
@@ -12,6 +12,6 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="5dp"
         android:textColor="?attr/primaryTextColor"
-        android:textSize="16sp" />
+        android:textSize="16sp"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/list_admin_users.xml b/app/src/main/res/layout/list_admin_users.xml
index b001bff8..efdcb8f0 100644
--- a/app/src/main/res/layout/list_admin_users.xml
+++ b/app/src/main/res/layout/list_admin_users.xml
@@ -3,15 +3,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:background="?android:attr/selectableItemBackground">
+    android:background="?android:attr/selectableItemBackground"
+    android:padding="16dp">
 
     <LinearLayout
         android:id="@+id/userInfoSection"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginEnd="15dp">
+        android:layout_marginEnd="15dp"
+        android:orientation="vertical">
 
         <ImageView
             android:id="@+id/userAvatar"
@@ -19,16 +19,16 @@
             android:layout_height="@dimen/list_avatar_size"
             android:layout_gravity="center"
             android:contentDescription="@string/generalImgContentText"
-            android:src="@drawable/ic_android" />
+            android:src="@drawable/ic_android"/>
 
         <ImageView
             android:id="@+id/userRole"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:scaleType="fitCenter"
             android:contentDescription="@string/userRoleAdmin"
-            android:src="@drawable/ic_android" />
+            android:scaleType="fitCenter"
+            android:src="@drawable/ic_android"/>
 
     </LinearLayout>
 
@@ -47,7 +47,7 @@
             android:text="@string/userName"
             android:textColor="?attr/primaryTextColor"
             android:textSize="14sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"/>
 
         <TextView
             android:id="@+id/userName"
@@ -56,7 +56,7 @@
             android:layout_marginBottom="4dp"
             android:text="@string/userName"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="12sp" />
+            android:textSize="12sp"/>
 
         <TextView
             android:id="@+id/userEmail"
@@ -64,7 +64,7 @@
             android:layout_height="wrap_content"
             android:text="@string/userEmail"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="12sp" />
+            android:textSize="12sp"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_collaborators.xml b/app/src/main/res/layout/list_collaborators.xml
index b7916561..46be1517 100644
--- a/app/src/main/res/layout/list_collaborators.xml
+++ b/app/src/main/res/layout/list_collaborators.xml
@@ -12,16 +12,16 @@
         android:layout_width="match_parent"
         android:layout_height="110dp"
         android:contentDescription="@string/tabTextCollaborators"
-        android:src="@drawable/ic_person" />
+        android:src="@drawable/ic_person"/>
 
     <TextView
         android:id="@+id/collaboratorName"
         android:layout_width="match_parent"
         android:layout_height="60dp"
-        android:gravity="top|center_horizontal"
         android:layout_marginTop="1dp"
+        android:gravity="top|center_horizontal"
         android:text="@string/tabTextCollaborators"
-        android:textSize="14sp"
-        android:textColor="?attr/primaryTextColor" />
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="14sp"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_collaborators_search.xml b/app/src/main/res/layout/list_collaborators_search.xml
index c6529f32..1a9a9015 100644
--- a/app/src/main/res/layout/list_collaborators_search.xml
+++ b/app/src/main/res/layout/list_collaborators_search.xml
@@ -2,11 +2,11 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="10dp"
-    android:paddingBottom="10dp"
+    android:background="?attr/primaryBackgroundColor"
     android:paddingStart="20dp"
+    android:paddingTop="10dp"
     android:paddingEnd="20dp"
-    android:background="?attr/primaryBackgroundColor" >
+    android:paddingBottom="10dp">
 
     <ImageView
         android:id="@+id/userAvatar"
@@ -14,7 +14,7 @@
         android:layout_height="@dimen/list_avatar_size"
         android:layout_marginEnd="10dp"
         android:contentDescription="@string/generalImgContentText"
-        android:src="@drawable/ic_android" />
+        android:src="@drawable/ic_android"/>
 
     <LinearLayout
         android:id="@+id/userInfoSection"
@@ -23,24 +23,24 @@
         android:layout_toEndOf="@+id/userAvatar"
         android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/userFullName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
-                android:text="@string/userName"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="14sp"
-                android:textStyle="bold" />
+        <TextView
+            android:id="@+id/userFullName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:text="@string/userName"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="14sp"
+            android:textStyle="bold"/>
 
-            <TextView
-                android:id="@+id/userName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
-                android:text="@string/addCollaboratorViewUserDesc"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="12sp" />
+        <TextView
+            android:id="@+id/userName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:text="@string/addCollaboratorViewUserDesc"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="12sp"/>
 
     </LinearLayout>
 
@@ -48,23 +48,23 @@
         android:id="@+id/frameAddCollaborator"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@+id/userInfoSection"
-        android:gravity="end"
         android:layout_marginStart="14dp"
         android:layout_marginEnd="0dp"
+        android:layout_toEndOf="@+id/userInfoSection"
+        android:gravity="end"
+        android:orientation="vertical"
         android:paddingTop="5dp"
-        android:paddingBottom="5dp"
-        android:orientation="vertical">
+        android:paddingBottom="5dp">
 
         <ImageView
             android:id="@+id/addCollaboratorButtonAdd"
             android:layout_width="28dp"
             android:layout_height="28dp"
             android:layout_gravity="end"
-            android:contentDescription="@string/addNewContent"
             android:background="@drawable/shape_circle"
-            android:src="@drawable/ic_add"
+            android:contentDescription="@string/addNewContent"
             android:padding="8dp"
+            android:src="@drawable/ic_add"
             android:visibility="gone"/>
 
         <ImageView
@@ -72,10 +72,10 @@
             android:layout_width="28dp"
             android:layout_height="28dp"
             android:layout_gravity="end"
-            android:contentDescription="@string/removeContent"
             android:background="@drawable/shape_circle_red"
-            android:src="@drawable/ic_remove"
+            android:contentDescription="@string/removeContent"
             android:padding="8dp"
+            android:src="@drawable/ic_remove"
             android:visibility="gone"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/list_commits.xml b/app/src/main/res/layout/list_commits.xml
index 151dc5b8..c14b7902 100644
--- a/app/src/main/res/layout/list_commits.xml
+++ b/app/src/main/res/layout/list_commits.xml
@@ -11,8 +11,8 @@
         android:id="@+id/linearLayoutFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="16dp">
 
         <TextView
             android:id="@+id/commitSubject"
@@ -21,7 +21,7 @@
             android:layout_marginBottom="8dp"
             android:textColor="?attr/primaryTextColor"
             android:textSize="18sp"
-            tools:text="This is a test" />
+            tools:text="This is a test"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -42,9 +42,9 @@
                     android:id="@+id/commitAuthorAvatar"
                     android:layout_width="@dimen/list_avatar_size"
                     android:layout_height="@dimen/list_avatar_size"
-                    android:contentDescription="@string/generalImgContentText"
                     android:layout_marginEnd="5dp"
-                    tools:srcCompat="@tools:sample/avatars" />
+                    android:contentDescription="@string/generalImgContentText"
+                    tools:srcCompat="@tools:sample/avatars"/>
 
                 <ImageView
                     android:id="@+id/commitCommitterAvatar"
@@ -52,16 +52,16 @@
                     android:layout_height="@dimen/list_avatar_size"
                     android:layout_marginEnd="5dp"
                     android:contentDescription="@string/generalImgContentText"
-                    tools:srcCompat="@tools:sample/avatars" />
+                    tools:srcCompat="@tools:sample/avatars"/>
 
                 <TextView
                     android:id="@+id/commitAuthorAndCommitter"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="10dp"
-                    android:textSize="12sp"
                     android:textColor="?attr/primaryTextColor"
-                    tools:text="opyale authored and opyale committed" />
+                    android:textSize="12sp"
+                    tools:text="opyale authored and opyale committed"/>
 
             </LinearLayout>
 
@@ -69,15 +69,15 @@
                 android:id="@+id/commitSha"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="0"
                 android:layout_marginStart="10dp"
+                android:layout_weight="0"
                 android:alpha=".8"
                 android:drawablePadding="10dp"
                 android:gravity="center_vertical"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="12sp"
                 app:drawableLeftCompat="@drawable/ic_commit"
-                tools:text="357f3qd5s" />
+                tools:text="357f3qd5s"/>
 
         </LinearLayout>
     </LinearLayout>
@@ -85,6 +85,6 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?attr/dividerColor" />
+        android:background="?attr/dividerColor"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_diff_files.xml b/app/src/main/res/layout/list_diff_files.xml
index d9d7e503..f5a6f834 100644
--- a/app/src/main/res/layout/list_diff_files.xml
+++ b/app/src/main/res/layout/list_diff_files.xml
@@ -14,7 +14,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/generalImgContentText"
-        app:srcCompat="@drawable/ic_diff" />
+        app:srcCompat="@drawable/ic_diff"/>
 
     <LinearLayout
         android:layout_width="0dp"
@@ -32,7 +32,7 @@
             android:singleLine="true"
             android:textColor="?attr/primaryTextColor"
             android:textSize="16sp"
-            tools:text="/src/test1/test2/test3/test4/test.txt" />
+            tools:text="/src/test1/test2/test3/test4/test.txt"/>
 
         <TextView
             android:id="@+id/fileStatistics"
@@ -40,14 +40,14 @@
             android:layout_height="wrap_content"
             android:textColor="?attr/primaryTextColor"
             android:textSize="13sp"
-            tools:text="@string/diffStatistics" />
+            tools:text="@string/diffStatistics"/>
 
     </LinearLayout>
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:srcCompat="@drawable/ic_chevron_right"
-        android:contentDescription="@string/generalImgContentText" />
+        android:contentDescription="@string/generalImgContentText"
+        app:srcCompat="@drawable/ic_chevron_right"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_drafts.xml b/app/src/main/res/layout/list_drafts.xml
index 60b71407..56bb4469 100644
--- a/app/src/main/res/layout/list_drafts.xml
+++ b/app/src/main/res/layout/list_drafts.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/layoutDraftsFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="16dp"
     android:background="?android:attr/selectableItemBackground"
     android:focusable="true"
+    android:orientation="vertical"
+    android:padding="16dp"
     tools:context=".activities.MainActivity">
 
     <LinearLayout
@@ -26,7 +26,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
         <ImageView
             android:id="@+id/editCommentStatus"
@@ -34,7 +34,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:contentDescription="@string/menuDeleteText"
-            android:src="@drawable/ic_edit" />
+            android:src="@drawable/ic_edit"/>
 
         <ImageView
             android:id="@+id/deleteDraft"
@@ -42,7 +42,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:contentDescription="@string/menuDeleteText"
-            android:src="@drawable/ic_delete" />
+            android:src="@drawable/ic_delete"/>
 
     </LinearLayout>
 
@@ -50,8 +50,8 @@
         android:id="@+id/frameDraftInfo1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         android:layout_marginBottom="10dp"
+        android:orientation="horizontal"
         tools:ignore="UseCompoundDrawables">
 
         <TextView
@@ -62,7 +62,7 @@
             android:layout_weight=".95"
             android:text="@string/noDataFound"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp" />
+            android:textSize="14sp"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_files.xml b/app/src/main/res/layout/list_files.xml
index 6c32c668..1f7c760f 100644
--- a/app/src/main/res/layout/list_files.xml
+++ b/app/src/main/res/layout/list_files.xml
@@ -4,11 +4,11 @@
     android:id="@+id/fileFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp"
     android:background="?android:attr/selectableItemBackground"
     android:focusable="true"
     android:gravity="center_vertical"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:padding="16dp">
 
     <ImageView
         android:id="@+id/fileTypeIs"
@@ -16,7 +16,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="15dp"
         android:contentDescription="@string/generalImgContentText"
-        android:src="@drawable/ic_file" />
+        android:src="@drawable/ic_file"/>
 
     <LinearLayout
         android:id="@+id/infoSection"
@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:text="@string/defaultFilename"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
         <LinearLayout
             android:id="@+id/infoRow"
@@ -46,7 +46,7 @@
                 android:textColor="?attr/hintColor"
                 android:textSize="12sp"
                 android:visibility="gone"
-                tools:visibility="visible" />
+                tools:visibility="visible"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_issue_comments.xml b/app/src/main/res/layout/list_issue_comments.xml
index 460b798e..d651e785 100644
--- a/app/src/main/res/layout/list_issue_comments.xml
+++ b/app/src/main/res/layout/list_issue_comments.xml
@@ -20,7 +20,7 @@
             android:layout_height="@dimen/list_avatar_size"
             android:layout_weight="0"
             android:contentDescription="@string/generalImgContentText"
-            tools:srcCompat="@tools:sample/avatars" />
+            tools:srcCompat="@tools:sample/avatars"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -39,7 +39,7 @@
                 android:singleLine="true"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"/>
 
             <TextView
                 android:id="@+id/information"
@@ -48,7 +48,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:textColor="?attr/hintColor"
-                android:textSize="12sp" />
+                android:textSize="12sp"/>
         </LinearLayout>
 
         <ImageView
@@ -57,9 +57,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="top"
             android:layout_weight="0"
-            android:contentDescription="@string/menuContentDesc"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            app:srcCompat="@drawable/ic_dotted_menu_horizontal" />
+            android:contentDescription="@string/menuContentDesc"
+            app:srcCompat="@drawable/ic_dotted_menu_horizontal"/>
 
     </LinearLayout>
 
@@ -68,18 +68,18 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
-        android:textColor="?attr/primaryTextColor"
-        android:textIsSelectable="true"
         android:autoLink="web"
+        android:textColor="?attr/primaryTextColor"
         android:textColorLink="@color/lightBlue"
-        android:textSize="14sp" />
+        android:textIsSelectable="true"
+        android:textSize="14sp"/>
 
     <LinearLayout
         android:id="@+id/commentReactionBadges"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
         android:layout_marginTop="16dp"
-        android:orientation="horizontal" />
+        android:orientation="horizontal"
+        android:visibility="gone"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_issues.xml b/app/src/main/res/layout/list_issues.xml
index 6fbfd5f0..d03231e6 100644
--- a/app/src/main/res/layout/list_issues.xml
+++ b/app/src/main/res/layout/list_issues.xml
@@ -5,10 +5,10 @@
     android:id="@+id/relativeLayoutFrameIssuesList"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:orientation="vertical"
     android:background="?android:attr/selectableItemBackground"
-    android:focusable="true">
+    android:focusable="true"
+    android:orientation="vertical"
+    android:padding="16dp">
 
     <LinearLayout
         android:id="@+id/infoSection"
@@ -23,7 +23,7 @@
             android:layout_height="@dimen/list_avatar_size"
             android:layout_marginEnd="10dp"
             android:contentDescription="@string/generalImgContentText"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@tools:sample/avatars"/>
 
         <LinearLayout
             android:id="@+id/titleLabelsSection"
@@ -40,24 +40,24 @@
                 android:textAlignment="gravity"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                tools:text="Id illum odio repellat omnis fuga deserunt aut. Ut est aut similique qui incidunt quia et." />
+                tools:text="Id illum odio repellat omnis fuga deserunt aut. Ut est aut similique qui incidunt quia et."/>
 
             <HorizontalScrollView
                 android:id="@+id/labelsScrollViewDots"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:foregroundGravity="right"
                 android:layout_marginBottom="8dp"
+                android:fillViewport="true"
+                android:foregroundGravity="right"
                 android:scrollbarThumbHorizontal="@android:color/transparent"
-                android:visibility="gone"
-                android:fillViewport="true">
+                android:visibility="gone">
 
                 <LinearLayout
                     android:id="@+id/frameLabelsDots"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="10dp" />
+                    android:layout_marginTop="10dp"
+                    android:orientation="horizontal"/>
 
             </HorizontalScrollView>
 
@@ -69,18 +69,18 @@
         android:id="@+id/labelsScrollViewWithText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:foregroundGravity="right"
         android:layout_marginBottom="8dp"
+        android:fillViewport="true"
+        android:foregroundGravity="right"
         android:scrollbarThumbHorizontal="@android:color/transparent"
-        android:visibility="gone"
-        android:fillViewport="true">
+        android:visibility="gone">
 
         <LinearLayout
             android:id="@+id/frameLabels"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginTop="10dp" />
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal"/>
 
     </HorizontalScrollView>
 
@@ -98,7 +98,7 @@
             android:gravity="start"
             android:textColor="?attr/hintColor"
             android:textSize="12sp"
-            tools:text="10.01.2020" />
+            tools:text="10.01.2020"/>
 
         <LinearLayout
             android:id="@+id/frameCommentsCount"
@@ -121,7 +121,7 @@
                 android:layout_marginEnd="5dp"
                 android:contentDescription="@string/generalImgContentText"
                 app:srcCompat="@drawable/ic_comment"
-                app:tint="?attr/iconsColor" />
+                app:tint="?attr/iconsColor"/>
 
             <TextView
                 android:id="@+id/issueCommentsCount"
@@ -131,7 +131,7 @@
                 android:text="@string/repoStars"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp"
-                tools:text="50" />
+                tools:text="50"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_item_suggestion.xml b/app/src/main/res/layout/list_item_suggestion.xml
index 524a08f4..5438ad8c 100644
--- a/app/src/main/res/layout/list_item_suggestion.xml
+++ b/app/src/main/res/layout/list_item_suggestion.xml
@@ -12,5 +12,5 @@
         android:padding="@dimen/dimen24dp"
         android:textColor="@color/gold"
         android:textSize="@dimen/dimen16sp"
-        tools:text="Keyword" />
+        tools:text="Keyword"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_items_autocomplete.xml b/app/src/main/res/layout/list_items_autocomplete.xml
index 91bb6f2e..a5708696 100644
--- a/app/src/main/res/layout/list_items_autocomplete.xml
+++ b/app/src/main/res/layout/list_items_autocomplete.xml
@@ -16,12 +16,12 @@
             android:layout_height="@dimen/dimen24dp"
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
+            android:contentDescription="@string/generalImgContentText"
             android:src="@drawable/ic_keyword"
             android:textColor="@color/colorWhite"
             android:textSize="@dimen/dimen20sp"
             android:textStyle="bold"
-            tools:text="K"
-            android:contentDescription="@string/generalImgContentText" />
+            tools:text="K"/>
     </RelativeLayout>
 
     <TextView
@@ -34,5 +34,5 @@
         android:paddingEnd="@dimen/dimen4dp"
         android:textColor="@color/colorWhite"
         tools:ignore="RtlSymmetry"
-        tools:text="Keyword" />
+        tools:text="Keyword"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/list_labels.xml b/app/src/main/res/layout/list_labels.xml
index fbab27ed..f34954c9 100644
--- a/app/src/main/res/layout/list_labels.xml
+++ b/app/src/main/res/layout/list_labels.xml
@@ -33,8 +33,8 @@
                 android:layout_marginBottom="4dp"
                 android:layout_weight="0"
                 android:contentDescription="@string/generalImgContentText"
-                app:tint="@color/colorWhite"
-                app:srcCompat="@drawable/ic_label" />
+                app:srcCompat="@drawable/ic_label"
+                app:tint="@color/colorWhite"/>
 
             <TextView
                 android:id="@+id/labelName"
@@ -44,7 +44,7 @@
                 android:layout_weight="1"
                 android:textColor="@color/colorWhite"
                 android:textSize="14sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"/>
         </LinearLayout>
 
     </androidx.cardview.widget.CardView>
@@ -52,16 +52,16 @@
     <androidx.legacy.widget.Space
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="1" />
+        android:layout_weight="1"/>
 
     <ImageView
         android:id="@+id/labelsOptionsMenu"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|end"
-        android:contentDescription="@string/labelMenuContentDesc"
         android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:src="@drawable/ic_dotted_menu_horizontal" />
+        android:contentDescription="@string/labelMenuContentDesc"
+        android:src="@drawable/ic_dotted_menu_horizontal"/>
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_members_by_org_preview.xml b/app/src/main/res/layout/list_members_by_org_preview.xml
index 4c50b8c8..229ddb32 100644
--- a/app/src/main/res/layout/list_members_by_org_preview.xml
+++ b/app/src/main/res/layout/list_members_by_org_preview.xml
@@ -9,6 +9,6 @@
         android:id="@+id/avatar"
         android:layout_width="@dimen/list_avatar_size"
         android:layout_height="@dimen/list_avatar_size"
-        android:contentDescription="@string/generalImgContentText" />
+        android:contentDescription="@string/generalImgContentText"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_milestones.xml b/app/src/main/res/layout/list_milestones.xml
index a4bb13ec..76aec62b 100644
--- a/app/src/main/res/layout/list_milestones.xml
+++ b/app/src/main/res/layout/list_milestones.xml
@@ -3,12 +3,12 @@
     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/milestoneFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:id="@+id/milestoneFrame"
     android:background="?attr/primaryBackgroundColor"
-    android:padding="16dp"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:padding="16dp">
 
     <LinearLayout
         android:id="@+id/mainFrame"
@@ -31,7 +31,7 @@
                 android:layout_weight="0"
                 android:textColor="?attr/primaryTextColor"
                 android:textIsSelectable="true"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
             <ProgressBar
                 android:id="@+id/milestoneProgress"
@@ -44,7 +44,7 @@
                 android:indeterminate="false"
                 android:progress="50"
                 android:progressDrawable="@drawable/progress_bar"
-                android:progressTint="@color/btnBackground" />
+                android:progressTint="@color/btnBackground"/>
 
         </LinearLayout>
 
@@ -67,7 +67,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="5dp"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_calendar" />
+                    app:srcCompat="@drawable/ic_calendar"/>
 
                 <TextView
                     android:id="@+id/milestoneDueDate"
@@ -75,7 +75,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/dueDate"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"/>
             </LinearLayout>
 
             <LinearLayout
@@ -91,7 +91,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="5dp"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_issue" />
+                    app:srcCompat="@drawable/ic_issue"/>
 
                 <TextView
                     android:id="@+id/milestoneIssuesOpen"
@@ -99,7 +99,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/repoStars"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"/>
             </LinearLayout>
 
             <LinearLayout
@@ -114,7 +114,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="5dp"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_issue_closed" />
+                    app:srcCompat="@drawable/ic_issue_closed"/>
 
                 <TextView
                     android:id="@+id/milestoneIssuesClosed"
@@ -122,7 +122,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/repoWatchers"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"/>
             </LinearLayout>
 
         </LinearLayout>
@@ -150,7 +150,7 @@
                     android:textColor="?attr/primaryTextColor"
                     android:textIsSelectable="true"
                     android:textSize="14sp"
-                    android:visibility="visible" />
+                    android:visibility="visible"/>
 
             </RelativeLayout>
 
@@ -159,10 +159,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end|bottom"
-                android:contentDescription="@string/menuContentDesc"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/menuContentDesc"
                 android:scaleType="fitEnd"
-                android:src="@drawable/ic_dotted_menu_horizontal" />
+                android:src="@drawable/ic_dotted_menu_horizontal"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_notifications.xml b/app/src/main/res/layout/list_notifications.xml
index 522c4108..b2a5cb6d 100644
--- a/app/src/main/res/layout/list_notifications.xml
+++ b/app/src/main/res/layout/list_notifications.xml
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"
-    android:padding="16dp"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:padding="16dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
                 android:contentDescription="@string/generalImgContentText"
-                app:srcCompat="@drawable/ic_pull_request" />
+                app:srcCompat="@drawable/ic_pull_request"/>
 
         </LinearLayout>
 
@@ -41,55 +41,55 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="18sp" />
+                android:textSize="18sp"/>
 
             <TextView
                 android:id="@+id/repository"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
-                android:textColor="?attr/primaryTextColor" />
+                android:textColor="?attr/primaryTextColor"/>
 
         </LinearLayout>
 
         <ImageView
             android:id="@+id/pinnedVertical"
             android:layout_width="wrap_content"
-            android:visibility="gone"
             android:layout_height="match_parent"
             android:layout_gravity="top"
             android:layout_marginStart="10dp"
             android:background="@android:color/transparent"
             android:contentDescription="@string/generalImgContentText"
-            app:srcCompat="@drawable/ic_pin" />
+            android:visibility="gone"
+            app:srcCompat="@drawable/ic_pin"/>
 
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
             <ImageView
                 android:id="@+id/pinned"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:layout_weight="0.5"
                 android:layout_gravity="top"
                 android:layout_marginStart="10dp"
+                android:layout_weight="0.5"
                 android:background="@android:color/transparent"
                 android:contentDescription="@string/generalImgContentText"
-                app:srcCompat="@drawable/ic_pin" />
+                app:srcCompat="@drawable/ic_pin"/>
 
             <ImageView
                 android:id="@+id/more"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:layout_weight="0.5"
                 android:layout_gravity="bottom"
                 android:layout_marginStart="10dp"
+                android:layout_weight="0.5"
                 android:background="@android:color/transparent"
                 android:contentDescription="@string/generalImgContentText"
-                app:srcCompat="@drawable/ic_dotted_menu_horizontal" />
+                app:srcCompat="@drawable/ic_dotted_menu_horizontal"/>
 
         </LinearLayout>
 
@@ -98,6 +98,6 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?attr/dividerColor" />
+        android:background="?attr/dividerColor"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_organizations.xml b/app/src/main/res/layout/list_organizations.xml
index af1c812d..07899aff 100644
--- a/app/src/main/res/layout/list_organizations.xml
+++ b/app/src/main/res/layout/list_organizations.xml
@@ -24,7 +24,7 @@
             android:layout_marginStart="0dp"
             android:layout_marginEnd="10dp"
             android:contentDescription="@string/repoContentAvatar"
-            android:src="@drawable/ic_android" />
+            android:src="@drawable/ic_android"/>
 
         <TextView
             android:id="@+id/orgName"
@@ -32,7 +32,7 @@
             android:layout_height="wrap_content"
             android:textColor="?attr/primaryTextColor"
             android:textSize="14sp"
-            tools:text="@string/orgName" />
+            tools:text="@string/orgName"/>
 
     </LinearLayout>
 
@@ -40,10 +40,10 @@
         android:id="@+id/orgDescription"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
         android:text="@string/noDataDescription"
         android:textColor="?attr/primaryTextColor"
-        android:visibility="gone"
-        android:layout_marginTop="8dp"
-        android:textSize="15sp" />
+        android:textSize="15sp"
+        android:visibility="gone"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_pr.xml b/app/src/main/res/layout/list_pr.xml
index 5ba6d136..ddcca8a3 100644
--- a/app/src/main/res/layout/list_pr.xml
+++ b/app/src/main/res/layout/list_pr.xml
@@ -6,10 +6,10 @@
     android:id="@+id/relativeLayoutFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:orientation="vertical"
     android:background="?android:attr/selectableItemBackground"
-    android:focusable="true">
+    android:focusable="true"
+    android:orientation="vertical"
+    android:padding="16dp">
 
     <LinearLayout
         android:id="@+id/framePrNameStatus"
@@ -25,7 +25,7 @@
             android:layout_height="@dimen/list_avatar_size"
             android:layout_marginEnd="10dp"
             android:contentDescription="@string/generalImgContentText"
-            android:src="@drawable/ic_android" />
+            android:src="@drawable/ic_android"/>
 
         <LinearLayout
             android:id="@+id/titleLabelsSection"
@@ -38,26 +38,26 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="top|center_vertical"
-                android:textAlignment="gravity"
                 android:text="@string/newIssueTitle"
+                android:textAlignment="gravity"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
             <HorizontalScrollView
                 android:id="@+id/labelsScrollViewDots"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:foregroundGravity="right"
                 android:layout_marginBottom="8dp"
-                android:scrollbarThumbHorizontal="@android:color/transparent"
-                android:fillViewport="true">
+                android:fillViewport="true"
+                android:foregroundGravity="right"
+                android:scrollbarThumbHorizontal="@android:color/transparent">
 
                 <LinearLayout
                     android:id="@+id/frameLabelsDots"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="10dp" />
+                    android:layout_marginTop="10dp"
+                    android:orientation="horizontal"/>
 
             </HorizontalScrollView>
 
@@ -69,17 +69,17 @@
         android:id="@+id/labelsScrollViewWithText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:foregroundGravity="right"
         android:layout_marginBottom="8dp"
-        android:scrollbarThumbHorizontal="@android:color/transparent"
-        android:fillViewport="true">
+        android:fillViewport="true"
+        android:foregroundGravity="right"
+        android:scrollbarThumbHorizontal="@android:color/transparent">
 
         <LinearLayout
             android:id="@+id/frameLabels"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginTop="10dp" />
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal"/>
 
     </HorizontalScrollView>
 
@@ -96,7 +96,7 @@
             android:layout_height="wrap_content"
             android:gravity="start"
             android:textColor="?attr/hintColor"
-            android:textSize="12sp" />
+            android:textSize="12sp"/>
 
         <LinearLayout
             android:id="@+id/frameCommentsCount"
@@ -119,7 +119,7 @@
                 android:layout_marginEnd="5dp"
                 android:contentDescription="@string/generalImgContentText"
                 app:srcCompat="@drawable/ic_comment"
-                app:tint="?attr/iconsColor" />
+                app:tint="?attr/iconsColor"/>
 
             <TextView
                 android:id="@+id/prCommentsCount"
@@ -128,7 +128,7 @@
                 android:gravity="center_vertical"
                 android:text="@string/repoStars"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="14sp" />
+                android:textSize="14sp"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_profile_emails.xml b/app/src/main/res/layout/list_profile_emails.xml
index 107721df..fde8e510 100644
--- a/app/src/main/res/layout/list_profile_emails.xml
+++ b/app/src/main/res/layout/list_profile_emails.xml
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:text="@string/profileEmailTitle"
         android:textColor="?attr/primaryTextColor"
-        android:textSize="16sp" />
+        android:textSize="16sp"/>
 
     <ImageView
         android:id="@+id/emailPrimary"
@@ -25,6 +25,6 @@
         android:contentDescription="@string/emailTypeText"
         android:paddingStart="20dp"
         android:paddingEnd="2dp"
-        tools:src="@drawable/ic_verified_user" />
+        tools:src="@drawable/ic_verified_user"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_reaction_authors.xml b/app/src/main/res/layout/list_reaction_authors.xml
index 2c48e72f..f6b330ed 100644
--- a/app/src/main/res/layout/list_reaction_authors.xml
+++ b/app/src/main/res/layout/list_reaction_authors.xml
@@ -17,7 +17,7 @@
         android:layout_height="@dimen/list_avatar_size_medium"
         android:layout_marginEnd="10dp"
         android:contentDescription="@string/generalImgContentText"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@tools:sample/avatars"/>
 
     <LinearLayout
         android:layout_width="0dp"
@@ -32,14 +32,14 @@
             android:textColor="?attr/primaryTextColor"
             android:textSize="14sp"
             android:textStyle="bold"
-            tools:text="opyale" />
+            tools:text="opyale"/>
 
         <TextView
             android:id="@+id/authorLogin"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?attr/primaryTextColor"
-            tools:text="opyale" />
+            tools:text="opyale"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_releases.xml b/app/src/main/res/layout/list_releases.xml
index 1c206db8..54ef0538 100644
--- a/app/src/main/res/layout/list_releases.xml
+++ b/app/src/main/res/layout/list_releases.xml
@@ -27,17 +27,17 @@
                 android:singleLine="true"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"/>
 
             <ImageView
                 android:id="@+id/releasesOptionsMenu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="0"
                 android:layout_gravity="center_vertical|end"
-                android:contentDescription="@string/labelMenuContentDesc"
+                android:layout_weight="0"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_dotted_menu_horizontal" />
+                android:contentDescription="@string/labelMenuContentDesc"
+                android:src="@drawable/ic_dotted_menu_horizontal"/>
 
         </LinearLayout>
 
@@ -57,8 +57,8 @@
                     android:id="@+id/authorAvatar"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    tools:srcCompat="@tools:sample/avatars[7]"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    tools:srcCompat="@tools:sample/avatars[7]"/>
 
                 <TextView
                     android:id="@+id/authorName"
@@ -66,7 +66,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"/>
 
             </LinearLayout>
 
@@ -79,8 +79,8 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:gravity="end|center_vertical"
                     android:layout_marginBottom="6dp"
+                    android:gravity="end|center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
@@ -91,7 +91,7 @@
                         android:paddingLeft="8dp"
                         android:paddingRight="8dp"
                         android:textColor="@color/colorWhite"
-                        android:textSize="14sp" />
+                        android:textSize="14sp"/>
 
                 </LinearLayout>
 
@@ -105,8 +105,8 @@
                     <ImageView
                         android:layout_width="18dp"
                         android:layout_height="wrap_content"
-                        app:srcCompat="@drawable/ic_label"
-                        android:contentDescription="@string/generalImgContentText" />
+                        android:contentDescription="@string/generalImgContentText"
+                        app:srcCompat="@drawable/ic_label"/>
 
                     <TextView
                         android:id="@+id/releaseTag"
@@ -115,7 +115,7 @@
                         android:layout_marginStart="8dp"
                         android:singleLine="true"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="14sp" />
+                        android:textSize="14sp"/>
 
                 </LinearLayout>
 
@@ -124,14 +124,14 @@
                     android:layout_height="wrap_content"
                     android:gravity="end|center_vertical"
                     android:orientation="horizontal"
-                    tools:ignore="UseCompoundDrawables"
-                    android:visibility="gone">
+                    android:visibility="gone"
+                    tools:ignore="UseCompoundDrawables">
 
                     <ImageView
                         android:layout_width="18dp"
                         android:layout_height="wrap_content"
-                        app:srcCompat="@drawable/ic_code"
-                        android:contentDescription="@string/generalImgContentText" />
+                        android:contentDescription="@string/generalImgContentText"
+                        app:srcCompat="@drawable/ic_code"/>
 
                     <TextView
                         android:id="@+id/releaseCommitSha"
@@ -140,7 +140,7 @@
                         android:layout_marginStart="8dp"
                         android:singleLine="true"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="14sp" />
+                        android:textSize="14sp"/>
 
                 </LinearLayout>
 
@@ -154,8 +154,8 @@
                     <ImageView
                         android:layout_width="18dp"
                         android:layout_height="wrap_content"
-                        app:srcCompat="@drawable/ic_calendar"
-                        android:contentDescription="@string/generalImgContentText" />
+                        android:contentDescription="@string/generalImgContentText"
+                        app:srcCompat="@drawable/ic_calendar"/>
 
                     <TextView
                         android:id="@+id/releaseDate"
@@ -164,7 +164,7 @@
                         android:layout_marginStart="8dp"
                         android:singleLine="true"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="14sp" />
+                        android:textSize="14sp"/>
 
                 </LinearLayout>
 
@@ -186,9 +186,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="web|email"
-            android:textColorLink="@color/lightBlue"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp" />
+            android:textColorLink="@color/lightBlue"
+            android:textSize="14sp"/>
 
     </LinearLayout>
 
@@ -212,17 +212,17 @@
                 android:layout_width="15dp"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/generalImgContentText"
-                app:tint="?attr/primaryTextColor"
                 android:src="@drawable/ic_chevron_right"
-                app:srcCompat="@drawable/ic_chevron_right" />
+                app:srcCompat="@drawable/ic_chevron_right"
+                app:tint="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="3dp"
+                android:text="@string/releaseDownloadText"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="14sp"
-                android:text="@string/releaseDownloadText" />
+                android:textSize="14sp"/>
 
         </LinearLayout>
 
@@ -232,33 +232,33 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:orientation="vertical"
-            android:visibility="gone"
-            android:paddingTop="8dp">
+            android:paddingTop="8dp"
+            android:visibility="gone">
 
             <LinearLayout
                 android:id="@+id/releaseZipDownloadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
                 android:layout_marginStart="8dp"
                 android:layout_marginBottom="8dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
                 tools:ignore="UseCompoundDrawables">
 
                 <ImageView
                     android:layout_width="16dp"
                     android:layout_height="16dp"
-                    app:srcCompat="@drawable/ic_download"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_download"/>
 
                 <TextView
                     android:id="@+id/releaseZipDownload"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
-                    android:textColor="?attr/primaryTextColor"
                     android:text="@string/zipArchiveDownloadReleasesTab"
-                    android:textSize="12sp" />
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="12sp"/>
 
             </LinearLayout>
 
@@ -266,25 +266,25 @@
                 android:id="@+id/releaseTarDownloadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:layout_marginStart="8dp"
                 tools:ignore="UseCompoundDrawables">
 
                 <ImageView
                     android:layout_width="16dp"
                     android:layout_height="16dp"
-                    app:srcCompat="@drawable/ic_download"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_download"/>
 
                 <TextView
                     android:id="@+id/releaseTarDownload"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
-                    android:textColor="?attr/primaryTextColor"
                     android:text="@string/tarArchiveDownloadReleasesTab"
-                    android:textSize="12sp" />
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="12sp"/>
 
             </LinearLayout>
 
@@ -293,7 +293,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="?attr/primaryBackgroundColor"
-                android:scrollbars="vertical" />
+                android:scrollbars="vertical"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_releases_downloads.xml b/app/src/main/res/layout/list_releases_downloads.xml
index 9981fbae..6f8a14d0 100644
--- a/app/src/main/res/layout/list_releases_downloads.xml
+++ b/app/src/main/res/layout/list_releases_downloads.xml
@@ -4,17 +4,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
     android:layout_marginStart="8dp"
     android:layout_marginTop="8dp"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
     tools:ignore="UseCompoundDrawables">
 
     <ImageView
         android:layout_width="16dp"
         android:layout_height="16dp"
-        app:srcCompat="@drawable/ic_download"
-        android:contentDescription="@string/generalImgContentText" />
+        android:contentDescription="@string/generalImgContentText"
+        app:srcCompat="@drawable/ic_download"/>
 
     <TextView
         android:id="@+id/downloadName"
@@ -23,6 +23,6 @@
         android:layout_marginStart="8dp"
         android:textColor="?attr/primaryTextColor"
         android:textSize="12sp"
-        tools:text="Source code (ZIP)" />
+        tools:text="Source code (ZIP)"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_repositories.xml b/app/src/main/res/layout/list_repositories.xml
index 8aa2ba62..b3809000 100644
--- a/app/src/main/res/layout/list_repositories.xml
+++ b/app/src/main/res/layout/list_repositories.xml
@@ -15,7 +15,7 @@
         android:layout_height="wrap_content"
         android:buttonTint="#FFFFFF"
         android:checked="false"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <LinearLayout
         android:id="@+id/orgInfoFrame"
@@ -33,7 +33,7 @@
             android:layout_marginStart="0dp"
             android:layout_marginEnd="10dp"
             android:contentDescription="@string/repoContentAvatar"
-            android:src="@drawable/ic_android" />
+            android:src="@drawable/ic_android"/>
 
         <TextView
             android:id="@+id/orgName"
@@ -41,7 +41,7 @@
             android:layout_height="wrap_content"
             android:textColor="?attr/primaryTextColor"
             android:textSize="14sp"
-            tools:text="@string/orgName" />
+            tools:text="@string/orgName"/>
 
     </LinearLayout>
 
@@ -52,23 +52,23 @@
         android:text="@string/repoName"
         android:textColor="?attr/primaryTextColor"
         android:textSize="18sp"
-        android:textStyle="bold" />
+        android:textStyle="bold"/>
 
     <TextView
         android:id="@+id/repoDescription"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
+        android:text="@string/noDataDescription"
         android:textColor="?attr/primaryTextColor"
         android:textSize="15sp"
-        android:visibility="gone"
-        android:text="@string/noDataDescription" />
+        android:visibility="gone"/>
 
     <View
         android:id="@+id/spacerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="8dp" />
+        android:layout_marginBottom="8dp"/>
 
     <LinearLayout
         android:id="@+id/repoInfoFrame"
@@ -82,7 +82,7 @@
             android:layout_height="wrap_content"
             android:textColor="?attr/hintColor"
             android:textSize="13sp"
-            tools:text="@string/lastUpdatedAt" />
+            tools:text="@string/lastUpdatedAt"/>
 
         <LinearLayout
             android:id="@+id/repoInfoStarsFrame"
@@ -101,7 +101,7 @@
                 android:layout_marginEnd="5dp"
                 android:contentDescription="@string/generalImgContentText"
                 app:srcCompat="@drawable/ic_star"
-                app:tint="?attr/iconsColor" />
+                app:tint="?attr/iconsColor"/>
 
             <TextView
                 android:id="@+id/repoStars"
@@ -110,7 +110,7 @@
                 android:gravity="center_vertical"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp"
-                tools:text="@string/repoStars" />
+                tools:text="@string/repoStars"/>
 
             <ImageView
                 android:layout_width="18dp"
@@ -120,7 +120,7 @@
                 android:contentDescription="@string/generalImgContentText"
                 android:visibility="gone"
                 app:srcCompat="@drawable/ic_star"
-                app:tint="?attr/iconsColor" />
+                app:tint="?attr/iconsColor"/>
 
             <TextView
                 android:id="@+id/repoStars2"
@@ -130,7 +130,7 @@
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp"
                 android:visibility="gone"
-                tools:text="Java" />
+                tools:text="Java"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_spinner_items.xml b/app/src/main/res/layout/list_spinner_items.xml
index cea998ae..60d4b73e 100644
--- a/app/src/main/res/layout/list_spinner_items.xml
+++ b/app/src/main/res/layout/list_spinner_items.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:padding="16dp"
     android:ellipsize="end"
     android:maxLines="1"
-    tools:ignore="MissingConstraints"
+    android:padding="16dp"
     android:textColor="?attr/primaryTextColor"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+    tools:ignore="MissingConstraints"/>
 
diff --git a/app/src/main/res/layout/list_tags.xml b/app/src/main/res/layout/list_tags.xml
index 50cb680e..03e50a73 100644
--- a/app/src/main/res/layout/list_tags.xml
+++ b/app/src/main/res/layout/list_tags.xml
@@ -18,21 +18,21 @@
             android:id="@+id/tagName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
             android:layout_weight="0.9"
             android:singleLine="true"
             android:textColor="?attr/primaryTextColor"
             android:textSize="16sp"
-            android:layout_marginBottom="10dp"
-            android:textStyle="bold" />
+            android:textStyle="bold"/>
 
         <ImageView
             android:id="@+id/tagsOptionsMenu"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|end"
-            android:contentDescription="@string/labelMenuContentDesc"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/ic_dotted_menu_horizontal" />
+            android:contentDescription="@string/labelMenuContentDesc"
+            android:src="@drawable/ic_dotted_menu_horizontal"/>
 
     </LinearLayout>
 
@@ -48,9 +48,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="web|email"
-            android:textColorLink="@color/lightBlue"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp" />
+            android:textColorLink="@color/lightBlue"
+            android:textSize="14sp"/>
 
     </LinearLayout>
 
@@ -74,17 +74,17 @@
                 android:layout_width="15dp"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/generalImgContentText"
-                app:tint="?attr/primaryTextColor"
                 android:src="@drawable/ic_chevron_right"
-                app:srcCompat="@drawable/ic_chevron_right" />
+                app:srcCompat="@drawable/ic_chevron_right"
+                app:tint="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="3dp"
+                android:text="@string/releaseDownloadText"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="14sp"
-                android:text="@string/releaseDownloadText" />
+                android:textSize="14sp"/>
 
         </LinearLayout>
 
@@ -94,33 +94,33 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:orientation="vertical"
-            android:visibility="gone"
-            android:paddingTop="8dp">
+            android:paddingTop="8dp"
+            android:visibility="gone">
 
             <LinearLayout
                 android:id="@+id/releaseZipDownloadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
                 android:layout_marginStart="8dp"
                 android:layout_marginBottom="8dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
                 tools:ignore="UseCompoundDrawables">
 
                 <ImageView
                     android:layout_width="16dp"
                     android:layout_height="16dp"
-                    app:srcCompat="@drawable/ic_download"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_download"/>
 
                 <TextView
                     android:id="@+id/releaseZipDownload"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
-                    android:textColor="?attr/primaryTextColor"
                     android:text="@string/zipArchiveDownloadReleasesTab"
-                    android:textSize="12sp" />
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="12sp"/>
 
             </LinearLayout>
 
@@ -128,25 +128,25 @@
                 android:id="@+id/releaseTarDownloadFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:layout_marginStart="8dp"
                 tools:ignore="UseCompoundDrawables">
 
                 <ImageView
                     android:layout_width="16dp"
                     android:layout_height="16dp"
-                    app:srcCompat="@drawable/ic_download"
-                    android:contentDescription="@string/generalImgContentText" />
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_download"/>
 
                 <TextView
                     android:id="@+id/releaseTarDownload"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
-                    android:textColor="?attr/primaryTextColor"
                     android:text="@string/tarArchiveDownloadReleasesTab"
-                    android:textSize="12sp" />
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="12sp"/>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_teams_by_org.xml b/app/src/main/res/layout/list_teams_by_org.xml
index 36fb54b2..e305c03c 100644
--- a/app/src/main/res/layout/list_teams_by_org.xml
+++ b/app/src/main/res/layout/list_teams_by_org.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout 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/orgTeamsFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:id="@+id/orgTeamsFrame"
-    android:padding="16dp"
-    android:orientation="vertical"
     android:background="?android:attr/selectableItemBackground"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:orientation="vertical"
+    android:padding="16dp">
 
     <TextView
         android:id="@+id/teamTitle"
@@ -17,7 +17,7 @@
         android:textColor="?attr/primaryTextColor"
         android:textSize="18sp"
         android:textStyle="bold"
-        tools:text="PR-Managers" />
+        tools:text="PR-Managers"/>
 
     <TextView
         android:id="@+id/teamDescription"
@@ -26,7 +26,7 @@
         android:text="@string/teamDescription"
         android:textColor="?attr/primaryTextColor"
         android:textSize="15sp"
-        tools:text="Managing pull requests and related issues" />
+        tools:text="Managing pull requests and related issues"/>
 
     <LinearLayout
         android:id="@+id/membersPreviewFrame"
@@ -42,7 +42,7 @@
             android:id="@+id/membersPreview"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1" />
+            android:layout_weight="1"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -52,7 +52,7 @@
             android:textColor="?attr/primaryTextColor"
             android:textSize="15sp"
             app:drawableEndCompat="@drawable/ic_chevron_right"
-            app:drawableTint="?attr/primaryTextColor" />
+            app:drawableTint="?attr/primaryTextColor"/>
     </LinearLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_user_accounts.xml b/app/src/main/res/layout/list_user_accounts.xml
index 4b235af9..9f4f7fde 100644
--- a/app/src/main/res/layout/list_user_accounts.xml
+++ b/app/src/main/res/layout/list_user_accounts.xml
@@ -4,10 +4,10 @@
     android:id="@+id/layoutFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
     android:background="?android:attr/selectableItemBackground"
     android:focusable="true"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
     android:padding="16dp">
 
     <ImageView
@@ -16,7 +16,7 @@
         android:layout_height="@dimen/list_avatar_size"
         android:layout_marginEnd="10dp"
         android:contentDescription="@string/generalImgContentText"
-        android:visibility="visible" />
+        android:visibility="visible"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -37,7 +37,7 @@
                 android:layout_weight="1"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"/>
 
             <ImageView
                 android:id="@+id/activeAccount"
@@ -47,7 +47,7 @@
                 android:contentDescription="@string/menuContentDesc"
                 android:src="@drawable/ic_check"
                 android:visibility="gone"
-                tools:visibility="visible" />
+                tools:visibility="visible"/>
 
             <ImageView
                 android:id="@+id/deleteAccount"
@@ -57,7 +57,7 @@
                 android:contentDescription="@string/menuDeleteText"
                 android:src="@drawable/ic_delete"
                 android:visibility="gone"
-                tools:visibility="visible" />
+                tools:visibility="visible"/>
 
         </LinearLayout>
 
@@ -66,7 +66,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp" />
+            android:textSize="14sp"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_users.xml b/app/src/main/res/layout/list_users.xml
index 4535a307..92a82287 100644
--- a/app/src/main/res/layout/list_users.xml
+++ b/app/src/main/res/layout/list_users.xml
@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical"
     android:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
     android:padding="16dp">
 
     <ImageView
@@ -12,7 +12,7 @@
         android:layout_height="@dimen/list_avatar_size"
         android:layout_marginEnd="10dp"
         android:contentDescription="@string/generalImgContentText"
-        android:src="@drawable/ic_android" />
+        android:src="@drawable/ic_android"/>
 
     <LinearLayout
         android:id="@+id/userInfoSection"
@@ -27,7 +27,7 @@
             android:text="@string/userName"
             android:textColor="?attr/primaryTextColor"
             android:textSize="16sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"/>
 
         <TextView
             android:id="@+id/userName"
@@ -35,7 +35,7 @@
             android:layout_height="wrap_content"
             android:text="@string/userName"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp" />
+            android:textSize="14sp"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_users_grid.xml b/app/src/main/res/layout/list_users_grid.xml
index c23843aa..614ff761 100644
--- a/app/src/main/res/layout/list_users_grid.xml
+++ b/app/src/main/res/layout/list_users_grid.xml
@@ -5,10 +5,10 @@
     android:id="@+id/gridViewData"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:orientation="vertical"
     android:paddingStart="10dp"
     android:paddingEnd="10dp"
-    android:orientation="vertical"
-    android:background="?android:attr/selectableItemBackground"
     tools:ignore="UseCompoundDrawables">
 
     <ImageView
@@ -16,16 +16,16 @@
         android:layout_width="match_parent"
         android:layout_height="110dp"
         android:contentDescription="@string/userAvatar"
-        android:src="@drawable/ic_person" />
+        android:src="@drawable/ic_person"/>
 
     <TextView
         android:id="@+id/userNameTv"
         android:layout_width="match_parent"
         android:layout_height="60dp"
-        android:gravity="top|center_horizontal"
         android:layout_marginTop="1dp"
+        android:gravity="top|center_horizontal"
         android:text="@string/userName"
         android:textColor="?attr/primaryTextColor"
-        android:textSize="14sp" />
+        android:textSize="14sp"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_wiki.xml b/app/src/main/res/layout/list_wiki.xml
index 36d298da..5eac3bfb 100644
--- a/app/src/main/res/layout/list_wiki.xml
+++ b/app/src/main/res/layout/list_wiki.xml
@@ -25,15 +25,15 @@
             android:layout_marginStart="0dp"
             android:layout_marginEnd="10dp"
             android:contentDescription="@string/wiki"
-            android:src="@drawable/ic_android" />
+            android:src="@drawable/ic_android"/>
 
         <TextView
             android:id="@+id/page_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:text="@string/wiki"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp"
-            android:text="@string/wiki" />
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
@@ -41,7 +41,7 @@
         android:id="@+id/spacerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="8dp" />
+        android:layout_marginBottom="8dp"/>
 
     <LinearLayout
         android:id="@+id/wiki_detail_info_frame"
@@ -53,9 +53,9 @@
             android:id="@+id/wiki_last_updated_by"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:text="@string/wikiAuthor"
             android:textColor="?attr/hintColor"
-            android:textSize="13sp"
-            android:text="@string/wikiAuthor" />
+            android:textSize="13sp"/>
 
         <LinearLayout
             android:id="@+id/wiki_menu_frame"
@@ -75,7 +75,7 @@
                 android:layout_marginEnd="0dp"
                 android:contentDescription="@string/generalImgContentText"
                 app:srcCompat="@drawable/ic_dotted_menu_horizontal"
-                app:tint="?attr/iconsColor" />
+                app:tint="?attr/iconsColor"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml
index 886f65c2..8e16d25f 100644
--- a/app/src/main/res/layout/nav_header.xml
+++ b/app/src/main/res/layout/nav_header.xml
@@ -12,7 +12,7 @@
         android:layout_height="match_parent"
         android:contentDescription="@string/generalImgContentText"
         android:scaleType="centerCrop"
-        tools:srcCompat="@tools:sample/backgrounds/scenic" />
+        tools:srcCompat="@tools:sample/backgrounds/scenic"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -31,7 +31,7 @@
                 android:layout_width="@dimen/list_avatar_size_large"
                 android:layout_height="@dimen/list_avatar_size_large"
                 android:contentDescription="@string/generalImgContentText"
-                tools:srcCompat="@tools:sample/avatars" />
+                tools:srcCompat="@tools:sample/avatars"/>
 
             <FrameLayout
                 android:layout_width="match_parent"
@@ -59,7 +59,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:orientation="horizontal"
-                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
                 </androidx.cardview.widget.CardView>
             </FrameLayout>
@@ -79,7 +79,7 @@
                 android:textColor="@color/colorWhite"
                 android:textIsSelectable="true"
                 android:textSize="18sp"
-                tools:text="Test user" />
+                tools:text="Test user"/>
 
             <TextView
                 android:id="@+id/userEmail"
@@ -90,7 +90,7 @@
                 android:textColor="@color/colorWhite"
                 android:textIsSelectable="true"
                 android:textSize="14sp"
-                tools:text="example@example.com" />
+                tools:text="example@example.com"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/nav_user_accounts.xml b/app/src/main/res/layout/nav_user_accounts.xml
index 23d6cac6..9641ec4b 100644
--- a/app/src/main/res/layout/nav_user_accounts.xml
+++ b/app/src/main/res/layout/nav_user_accounts.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/userAccountAvatar"
     android:layout_width="32dp"
     android:layout_height="32dp"
-    android:paddingStart="4dp"
-    android:paddingEnd="4dp"
     android:contentDescription="@string/generalImgContentText"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+    android:paddingStart="4dp"
+    android:paddingEnd="4dp"/>
diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml
index 7e79f428..1584b9df 100644
--- a/app/src/main/res/menu/drawer_menu.xml
+++ b/app/src/main/res/menu/drawer_menu.xml
@@ -1,68 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     tools:showIn="navigation_view">
 
-    <group android:checkableBehavior="single"
-        android:id="@+id/nav_main">
+    <group android:id="@+id/nav_main"
+        android:checkableBehavior="single">
 
         <item android:id="@+id/nav_home"
             android:icon="@drawable/ic_repo"
-            android:title="@string/navMyRepos" />
+            android:title="@string/navMyRepos"/>
 
         <item android:id="@+id/nav_starred_repos"
             android:icon="@drawable/ic_star_unfilled"
-            android:title="@string/navStarredRepos" />
+            android:title="@string/navStarredRepos"/>
 
         <item android:id="@+id/nav_organizations"
             android:icon="@drawable/ic_organization"
-            android:title="@string/navOrg" />
+            android:title="@string/navOrg"/>
 
         <item android:id="@+id/nav_repositories"
             android:icon="@drawable/ic_repo"
-            android:title="@string/navRepos" />
+            android:title="@string/navRepos"/>
 
         <item android:id="@+id/nav_my_issues"
             android:icon="@drawable/ic_issue"
             android:title="@string/navMyIssues"
-            android:visible="false" />
+            android:visible="false"/>
 
         <item
             android:id="@+id/nav_notifications"
             android:icon="@drawable/ic_notifications"
             android:title="@string/pageTitleNotifications"
-            app:actionLayout="@layout/badge_notification" />
+            app:actionLayout="@layout/badge_notification"/>
 
         <item android:id="@+id/nav_explore"
             android:icon="@drawable/ic_search"
-            android:title="@string/pageTitleExplore" />
+            android:title="@string/pageTitleExplore"/>
 
         <item android:id="@+id/nav_comments_draft"
             android:icon="@drawable/ic_drafts"
-            android:title="@string/titleDrafts" />
+            android:title="@string/titleDrafts"/>
 
         <item android:id="@+id/nav_profile"
             android:icon="@drawable/ic_person"
-            android:title="@string/navProfile" />
+            android:title="@string/navProfile"/>
 
         <item android:id="@+id/nav_administration"
             android:icon="@drawable/ic_tool"
             android:title="@string/navAdministration"
-            android:visible="false" />
+            android:visible="false"/>
 
     </group>
 
-    <group android:checkableBehavior="single"
-        android:id="@+id/nav_menu_settings">
+    <group android:id="@+id/nav_menu_settings"
+        android:checkableBehavior="single">
 
         <item android:id="@+id/nav_settings"
             android:icon="@drawable/ic_settings"
-            android:title="@string/navSettings" />
+            android:title="@string/navSettings"/>
 
         <item android:id="@+id/nav_logout"
             android:icon="@drawable/ic_logout"
-            android:title="@string/navLogout" />
+            android:title="@string/navLogout"/>
 
     </group>
 
diff --git a/app/src/main/res/menu/edit_menu.xml b/app/src/main/res/menu/edit_menu.xml
index e18f811a..3bac11dc 100644
--- a/app/src/main/res/menu/edit_menu.xml
+++ b/app/src/main/res/menu/edit_menu.xml
@@ -6,8 +6,8 @@
     <item
         android:id="@+id/edit"
         android:icon="@drawable/ic_edit"
-        android:title="@string/menuEditText"
         android:orderInCategory="1"
-        app:showAsAction="ifRoom" />
+        android:title="@string/menuEditText"
+        app:showAsAction="ifRoom"/>
 
 </menu>
diff --git a/app/src/main/res/menu/files_switch_branches_menu.xml b/app/src/main/res/menu/files_switch_branches_menu.xml
index b6b4a463..b0df1cfa 100644
--- a/app/src/main/res/menu/files_switch_branches_menu.xml
+++ b/app/src/main/res/menu/files_switch_branches_menu.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/mainRepoMenu"
         android:icon="@drawable/ic_dotted_menu"
-        android:title="@string/menuTitleText"
         android:orderInCategory="1"
-        app:showAsAction="always" >
+        android:title="@string/menuTitleText"
+        app:showAsAction="always">
 
         <menu>
 
             <item
                 android:id="@+id/repoMenu"
                 android:icon="@drawable/ic_dotted_menu"
-                android:title="@string/menuTitleText"
                 android:orderInCategory="0"
-                app:showAsAction="ifRoom|withText" />
+                android:title="@string/menuTitleText"
+                app:showAsAction="ifRoom|withText"/>
 
             <item
                 android:id="@+id/switchBranches"
                 android:icon="@drawable/ic_branch"
-                android:title="@string/strSwitchBranches"
                 android:orderInCategory="1"
-                app:showAsAction="ifRoom|withText" />
+                android:title="@string/strSwitchBranches"
+                app:showAsAction="ifRoom|withText"/>
 
             <item
                 android:id="@+id/branchCommits"
                 android:icon="@drawable/ic_commit"
-                android:title="@string/commitTitle"
                 android:orderInCategory="2"
-                app:showAsAction="ifRoom|withText" />
+                android:title="@string/commitTitle"
+                app:showAsAction="ifRoom|withText"/>
 
         </menu>
 
diff --git a/app/src/main/res/menu/filter_menu.xml b/app/src/main/res/menu/filter_menu.xml
index c016ab9f..1e48ca73 100644
--- a/app/src/main/res/menu/filter_menu.xml
+++ b/app/src/main/res/menu/filter_menu.xml
@@ -5,8 +5,8 @@
     <item
         android:id="@+id/filter"
         android:icon="@drawable/ic_filter"
-        android:title="@string/strFilter"
         android:orderInCategory="0"
-        app:showAsAction="ifRoom" />
+        android:title="@string/strFilter"
+        app:showAsAction="ifRoom"/>
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/filter_menu_explore.xml b/app/src/main/res/menu/filter_menu_explore.xml
index aea2842d..d4686b6f 100644
--- a/app/src/main/res/menu/filter_menu_explore.xml
+++ b/app/src/main/res/menu/filter_menu_explore.xml
@@ -5,8 +5,8 @@
     <item
         android:id="@+id/filter_explore"
         android:icon="@drawable/ic_filter"
-        android:title="@string/strFilter"
         android:orderInCategory="0"
-        app:showAsAction="ifRoom" />
+        android:title="@string/strFilter"
+        app:showAsAction="ifRoom"/>
 
 </menu>
diff --git a/app/src/main/res/menu/filter_menu_milestone.xml b/app/src/main/res/menu/filter_menu_milestone.xml
index 220affe8..98e841f1 100644
--- a/app/src/main/res/menu/filter_menu_milestone.xml
+++ b/app/src/main/res/menu/filter_menu_milestone.xml
@@ -5,8 +5,8 @@
     <item
         android:id="@+id/filterMilestone"
         android:icon="@drawable/ic_filter"
-        android:title="@string/strFilter"
         android:orderInCategory="0"
-        app:showAsAction="ifRoom" />
+        android:title="@string/strFilter"
+        app:showAsAction="ifRoom"/>
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/filter_menu_notifications.xml b/app/src/main/res/menu/filter_menu_notifications.xml
index c1eb34ed..11e6e4b5 100644
--- a/app/src/main/res/menu/filter_menu_notifications.xml
+++ b/app/src/main/res/menu/filter_menu_notifications.xml
@@ -5,8 +5,8 @@
     <item
         android:id="@+id/filterNotifications"
         android:icon="@drawable/ic_filter"
-        android:title="@string/strFilter"
         android:orderInCategory="0"
-        app:showAsAction="ifRoom" />
+        android:title="@string/strFilter"
+        app:showAsAction="ifRoom"/>
 
 </menu>
diff --git a/app/src/main/res/menu/filter_menu_pr.xml b/app/src/main/res/menu/filter_menu_pr.xml
index f2580e48..e285a1ef 100644
--- a/app/src/main/res/menu/filter_menu_pr.xml
+++ b/app/src/main/res/menu/filter_menu_pr.xml
@@ -5,8 +5,8 @@
     <item
         android:id="@+id/filterPr"
         android:icon="@drawable/ic_filter"
-        android:title="@string/strFilter"
         android:orderInCategory="0"
-        app:showAsAction="ifRoom" />
+        android:title="@string/strFilter"
+        app:showAsAction="ifRoom"/>
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/filter_menu_releases.xml b/app/src/main/res/menu/filter_menu_releases.xml
index 6ab1f1ff..d802818e 100644
--- a/app/src/main/res/menu/filter_menu_releases.xml
+++ b/app/src/main/res/menu/filter_menu_releases.xml
@@ -5,8 +5,8 @@
     <item
         android:id="@+id/filterReleases"
         android:icon="@drawable/ic_filter"
-        android:title="@string/releasesTags"
         android:orderInCategory="0"
-        app:showAsAction="ifRoom" />
+        android:title="@string/releasesTags"
+        app:showAsAction="ifRoom"/>
 
 </menu>
diff --git a/app/src/main/res/menu/generic_nav_dotted_menu.xml b/app/src/main/res/menu/generic_nav_dotted_menu.xml
index a3e7892b..5e69114b 100644
--- a/app/src/main/res/menu/generic_nav_dotted_menu.xml
+++ b/app/src/main/res/menu/generic_nav_dotted_menu.xml
@@ -5,8 +5,8 @@
     <item
         android:id="@+id/genericMenu"
         android:icon="@drawable/ic_dotted_menu"
-        android:title="@string/menuContentDesc"
         android:orderInCategory="1"
-        app:showAsAction="ifRoom" />
+        android:title="@string/menuContentDesc"
+        app:showAsAction="ifRoom"/>
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/markdown_switcher.xml b/app/src/main/res/menu/markdown_switcher.xml
index f991130b..30e3cae5 100644
--- a/app/src/main/res/menu/markdown_switcher.xml
+++ b/app/src/main/res/menu/markdown_switcher.xml
@@ -5,8 +5,8 @@
     <item
         android:id="@+id/markdown"
         android:icon="@drawable/ic_markdown"
-        android:title="@string/strMarkdown"
         android:orderInCategory="0"
-        app:showAsAction="ifRoom" />
+        android:title="@string/strMarkdown"
+        app:showAsAction="ifRoom"/>
 
 </menu>
diff --git a/app/src/main/res/menu/pr_info_menu.xml b/app/src/main/res/menu/pr_info_menu.xml
index cad29daf..966f78fb 100644
--- a/app/src/main/res/menu/pr_info_menu.xml
+++ b/app/src/main/res/menu/pr_info_menu.xml
@@ -5,8 +5,8 @@
     <item
         android:id="@+id/prInfo"
         android:icon="@drawable/ic_info"
-        android:title="@string/infoMoreInformation"
         android:orderInCategory="0"
-        app:showAsAction="ifRoom" />
+        android:title="@string/infoMoreInformation"
+        app:showAsAction="ifRoom"/>
 
 </menu>
diff --git a/app/src/main/res/menu/profile_dotted_menu.xml b/app/src/main/res/menu/profile_dotted_menu.xml
index b5bae860..5ff5df59 100644
--- a/app/src/main/res/menu/profile_dotted_menu.xml
+++ b/app/src/main/res/menu/profile_dotted_menu.xml
@@ -5,8 +5,8 @@
     <item
         android:id="@+id/profileMenu"
         android:icon="@drawable/ic_dotted_menu"
-        android:title="@string/menuTitleText"
         android:orderInCategory="1"
-        app:showAsAction="ifRoom" />
+        android:title="@string/menuTitleText"
+        app:showAsAction="ifRoom"/>
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/repo_dotted_menu.xml b/app/src/main/res/menu/repo_dotted_menu.xml
index 58c05531..70c99975 100644
--- a/app/src/main/res/menu/repo_dotted_menu.xml
+++ b/app/src/main/res/menu/repo_dotted_menu.xml
@@ -5,8 +5,8 @@
     <item
         android:id="@+id/repoMenu"
         android:icon="@drawable/ic_dotted_menu"
-        android:title="@string/menuTitleText"
         android:orderInCategory="1"
-        app:showAsAction="ifRoom" />
+        android:title="@string/menuTitleText"
+        app:showAsAction="ifRoom"/>
 
 </menu>
diff --git a/app/src/main/res/menu/save.xml b/app/src/main/res/menu/save.xml
index 0413f872..242959f1 100644
--- a/app/src/main/res/menu/save.xml
+++ b/app/src/main/res/menu/save.xml
@@ -6,8 +6,8 @@
     <item
         android:id="@+id/save"
         android:icon="@drawable/ic_save"
-        android:title="@string/saveButton"
         android:orderInCategory="1"
-        app:showAsAction="ifRoom" />
+        android:title="@string/saveButton"
+        app:showAsAction="ifRoom"/>
 
 </menu>
diff --git a/app/src/main/res/menu/search_menu.xml b/app/src/main/res/menu/search_menu.xml
index 445c1147..a78ef003 100644
--- a/app/src/main/res/menu/search_menu.xml
+++ b/app/src/main/res/menu/search_menu.xml
@@ -8,6 +8,6 @@
         android:icon="@drawable/ic_search"
         android:title="@string/search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="ifRoom|collapseActionView" />
+        app:showAsAction="ifRoom|collapseActionView"/>
 
 </menu>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index bcd8c7e6..a79e8dfe 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -52,9 +52,10 @@
     <string name="logo">لِج إلى Gitea</string>
     <string name="protocol">Protocol</string>
     <string name="urlInfoTooltip">1. پروتکل درست را انتخاب کنید (http یا https)
-2. نشانی Gitea را وارد کنید. مثلا: try.gitea.io
-3. اگر احراز هویت دو مرحله‌ای را برای حساب خود فعال کرده‌اید، رمز را در کادر OTP وارد کنید.
-4. برای احراز هویت عادی HTTP از USERNAME@DOMAIN.COM در نشانی استفاده کنید.</string>
+        2. نشانی Gitea را وارد کنید. مثلا: try.gitea.io
+        3. اگر احراز هویت دو مرحله‌ای را برای حساب خود فعال کرده‌اید، رمز را در کادر OTP وارد کنید.
+        4. برای احراز هویت عادی HTTP از USERNAME@DOMAIN.COM در نشانی استفاده کنید.
+    </string>
     <string name="malformedUrl">Couldn\'t connect to host. Please check your URL or port for any errors</string>
     <string name="protocolError">It is not recommended to use HTTP protocol unless you are testing on local network</string>
     <string name="malformedJson">Malformed JSON was received. Server response was not successful</string>
@@ -149,7 +150,8 @@
     <string name="settingsSecurityHeader">Security</string>
     <string name="settingsCertsSelectorHeader">Delete Trusted Certificates</string>
     <string name="settingsCertsPopupTitle">Delete Trusted Certificates?</string>
-    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.</string>
+    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.
+    </string>
     <string name="settingsDateTimeHeaderText">التاريخ والوقت</string>
     <string name="settingsSave">تم حفظ الإعدادات</string>
     <string name="settingsLanguageSelectorHeader">اللغة</string>
@@ -187,7 +189,9 @@
     <string name="settingsGeneralHeader">General</string>
     <string name="generalHintText">Home screen, default link handler</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect
+        you automatically.
+    </string>
     <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
@@ -207,7 +211,9 @@
     <string name="labelDeleteText">Label deleted</string>
     <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Authorization Error</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case
+        of revoked Token, please logout and login again
+    </string>
     <string name="labelDeleteMessage">Do you really want to delete this label?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">الفِرَق</string>
@@ -374,7 +380,9 @@
     <string name="doneButton">تمّ</string>
     <string name="cancelButton">إلغاء</string>
     <string name="genericError">Something went wrong, please try again</string>
-    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of Gitea.</string>
+    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of
+        Gitea.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">أضف</string>
     <string name="removeButton">أزِل</string>
@@ -425,7 +433,9 @@
     <string name="watchRepositorySuccess">تمت إضافة المستودع إلى قائمة المراقبة</string>
     <string name="unWatchRepositorySuccess">تمت إزالة المستودع مِن قائمة المراقبة</string>
     <string name="titleDrafts">Drafts</string>
-    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue, some features may not work.</string>
+    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue,
+        some features may not work.
+    </string>
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Unsupported Version of Gitea</string>
@@ -500,9 +510,14 @@
     <string name="settingsEnableReportsText">Enable Crash Reports</string>
     <string name="crashTitle">GitNex has stopped :(</string>
     <string name="setCrashReports">Crash reports</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
     <string name="forceLogoutDialogHeader">Please sign in again</string>
-    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.</string>
+    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login
+        again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.
+    </string>
     <string name="deleteAllDrafts">Delete All Drafts</string>
     <string name="draftsListEmpty">No drafts found</string>
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
@@ -519,7 +534,9 @@
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
-    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
+    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to
+        this account on the app only.
+    </string>
     <string name="addNewAccount">New Account</string>
     <string name="addNewAccountText">Add New Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
@@ -571,12 +588,20 @@
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">Repository deleted successfully</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Perform Transfer</string>
     <string name="repoTransferOwnerText">New Owner</string>
     <string name="repoTransferSuccess">Repository transferred successfully</string>
@@ -599,9 +624,13 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -640,7 +669,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index ddaf7c72..48378a37 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -51,7 +51,9 @@
     <string name="navigationDrawerClose">Zavřít navigační menu</string>
     <string name="logo">Přihlásit se do Gitea</string>
     <string name="protocol">Protokol</string>
-    <string name="urlInfoTooltip">1- Vyberte správný protokol (https nebo http). \n2- zadejte URL Gitea např.: try.gitea.io. \n3- Pokud jste pro svůj účet povolili 2FA, zadejte kód do pole OTP kód. \n4- Pro základní ověření HTTP použijte USERNAME@DOMAIN.COM v poli URL.</string>
+    <string name="urlInfoTooltip">1- Vyberte správný protokol (https nebo http). \n2- zadejte URL Gitea např.: try.gitea.io. \n3- Pokud jste pro svůj
+        účet povolili 2FA, zadejte kód do pole OTP kód. \n4- Pro základní ověření HTTP použijte USERNAME@DOMAIN.COM v poli URL.
+    </string>
     <string name="malformedUrl">Nelze se připojit k serveru. Zkontrolujte prosím URL nebo port pro případné chyby</string>
     <string name="protocolError">Není doporučeno používat HTTP protokol, pokud netestujete na místní síti</string>
     <string name="malformedJson">Byl přijat chybný JSON. Odpověď od serveru nebyla úspěšná</string>
@@ -146,7 +148,9 @@
     <string name="settingsSecurityHeader">Zabezpečení</string>
     <string name="settingsCertsSelectorHeader">Odstranit důvěryhodné certifikáty</string>
     <string name="settingsCertsPopupTitle">Smazat důvěryhodné certifikáty?</string>
-    <string name="settingsCertsPopupMessage">Opravdu chcete odstranit jakýkoli ručně důvěryhodný certifikát nebo název hostitele? \n\nBudete také odhlášeni.</string>
+    <string name="settingsCertsPopupMessage">Opravdu chcete odstranit jakýkoli ručně důvěryhodný certifikát nebo název hostitele? \n\nBudete také
+        odhlášeni.
+    </string>
     <string name="settingsDateTimeHeaderText">Datum &amp; čas</string>
     <string name="settingsSave">Nastavení uloženo</string>
     <string name="settingsLanguageSelectorHeader">Jazyk</string>
@@ -184,7 +188,9 @@
     <string name="settingsGeneralHeader">Obecné</string>
     <string name="generalHintText">Výchozí zpracovatel odkazů, domovská obrazovka</string>
     <string name="generalDeepLinkDefaultScreen">Výchozí zpracovatel odkazů</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Zvolte která obrazovka bude použita pokud aplikace nebude schopna zpracovat externí odkaz. Budete zde přesměrování automaticky.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Zvolte která obrazovka bude použita pokud aplikace nebude schopna zpracovat externí odkaz.
+        Budete zde přesměrování automaticky.
+    </string>
     <string name="generalDeepLinkSelectedText">Není k dispozici</string>
     <string name="linkSelectorDialogTitle">Zvolte výchozí obrazovku zpracování odkazů</string>
     <string name="settingsBiometricHeader">Biometrické odemknutí</string>
@@ -204,7 +210,9 @@
     <string name="labelDeleteText">Štítek byl smazán</string>
     <string name="selectBranchError">Zvolte větev k vydání</string>
     <string name="alertDialogTokenRevokedTitle">Chyba ověření</string>
-    <string name="alertDialogTokenRevokedMessage">Zdá se, že Přístupový token byl zneplatněn nebo nemáte oprávnění přístupu k těmto datům.\n\nV případě zneplatněného tokenu se prosím odhlaste a znovu přihlašte</string>
+    <string name="alertDialogTokenRevokedMessage">Zdá se, že Přístupový token byl zneplatněn nebo nemáte oprávnění přístupu k těmto datům.\n\nV
+        případě zneplatněného tokenu se prosím odhlaste a znovu přihlašte
+    </string>
     <string name="labelDeleteMessage">Opravdu chcete smazat tento štítek?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Týmy</string>
@@ -371,7 +379,9 @@
     <string name="doneButton">Done</string>
     <string name="cancelButton">Cancel</string>
     <string name="genericError">Something went wrong, please try again</string>
-    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of Gitea.</string>
+    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of
+        Gitea.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">Add</string>
     <string name="removeButton">Remove</string>
@@ -422,7 +432,9 @@
     <string name="watchRepositorySuccess">Repository added to watch list</string>
     <string name="unWatchRepositorySuccess">Repository removed from watch list</string>
     <string name="titleDrafts">Drafts</string>
-    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue, some features may not work.</string>
+    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue,
+        some features may not work.
+    </string>
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Unsupported Version of Gitea</string>
@@ -497,9 +509,14 @@
     <string name="settingsEnableReportsText">Enable Crash Reports</string>
     <string name="crashTitle">GitNex has stopped :(</string>
     <string name="setCrashReports">Crash reports</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
     <string name="forceLogoutDialogHeader">Please sign in again</string>
-    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.</string>
+    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login
+        again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.
+    </string>
     <string name="deleteAllDrafts">Delete All Drafts</string>
     <string name="draftsListEmpty">No drafts found</string>
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
@@ -516,7 +533,9 @@
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
-    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
+    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to
+        this account on the app only.
+    </string>
     <string name="addNewAccount">New Account</string>
     <string name="addNewAccountText">Add New Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
@@ -566,12 +585,20 @@
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">Repository deleted successfully</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Perform Transfer</string>
     <string name="repoTransferOwnerText">New Owner</string>
     <string name="repoTransferSuccess">Repository transferred successfully</string>
@@ -594,9 +621,13 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -635,7 +666,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 469f8d03..659ef6aa 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -51,7 +51,9 @@
     <string name="navigationDrawerClose">Navigationsleiste schließen</string>
     <string name="logo">In Gitea anmelden</string>
     <string name="protocol">Protokoll</string>
-    <string name="urlInfoTooltip">1- Wähle das richtige Protokoll (https oder http) \ N2- Gebe die Gitea-URL ein, z.B. try.gitea.io \n3- Falls du 2FA aktiviert hast, gib den Code in das OTP-Code Feld ein. \n4- Für HTTP basic auth nutze BENUTZERNAME@DOMAIN.COM im URL Feld</string>
+    <string name="urlInfoTooltip">1- Wähle das richtige Protokoll (https oder http) \ N2- Gebe die Gitea-URL ein, z.B. try.gitea.io \n3- Falls du 2FA
+        aktiviert hast, gib den Code in das OTP-Code Feld ein. \n4- Für HTTP basic auth nutze BENUTZERNAME@DOMAIN.COM im URL Feld
+    </string>
     <string name="malformedUrl">Konnte keine Verbindung zum Host herstellen. Bitte überprüfe die URL oder Port auf irgendwelche Fehler</string>
     <string name="protocolError">Es wird nicht empfohlen, das HTTP-Protokoll zu verwenden, es sei denn, du testest in einem lokalen Netzwerk</string>
     <string name="malformedJson">Fehlerhaftes JSON erhalten. Serveranfrage war nicht erfolgreich</string>
@@ -146,7 +148,9 @@
     <string name="settingsSecurityHeader">Sicherheit</string>
     <string name="settingsCertsSelectorHeader">Vertrauenswürdige Zertifikate löschen</string>
     <string name="settingsCertsPopupTitle">Vertrauenswürdige Zertifikate löschen?</string>
-    <string name="settingsCertsPopupMessage">Bist du sicher, dass du jedes manuell vertrauenswürdige Zertifikat oder Hostname löschen möchtest?\n\nDu wirst ebenfalls abgemeldet werden.</string>
+    <string name="settingsCertsPopupMessage">Bist du sicher, dass du jedes manuell vertrauenswürdige Zertifikat oder Hostname löschen möchtest?\n\nDu
+        wirst ebenfalls abgemeldet werden.
+    </string>
     <string name="settingsDateTimeHeaderText">Datum &amp; Uhrzeit</string>
     <string name="settingsSave">Einstellungen gespeichert</string>
     <string name="settingsLanguageSelectorHeader">Sprache</string>
@@ -176,7 +180,9 @@
     <string name="cacheSizeImagesSelectionHeaderText">Größe des Bilder-Caches</string>
     <string name="clearCacheSelectionHeaderText">Cache löschen</string>
     <string name="clearCacheDialogHeader">Cache löschen?</string>
-    <string name="clearCacheDialogMessage">Dadurch werden alle Cache-Daten einschließlich Dateien und Bilder gelöscht.\n\nMit dem Löschen fortfahren?</string>
+    <string name="clearCacheDialogMessage">Dadurch werden alle Cache-Daten einschließlich Dateien und Bilder gelöscht.\n\nMit dem Löschen
+        fortfahren?
+    </string>
     <string name="draftsHeader">Entwürfe</string>
     <string name="draftsHintText">Kommentarentwürfe</string>
     <string name="settingsEnableCommentsDeletionText">Entwürfe löschen aktivieren</string>
@@ -184,12 +190,15 @@
     <string name="settingsGeneralHeader">Allgemein</string>
     <string name="generalHintText">Startseite, Standard-Link-Handhaber</string>
     <string name="generalDeepLinkDefaultScreen">Standard-Link-Handhaber</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Wähle die Ansicht, welche geladen werden soll, wenn ein externer Link nicht handhabbar ist. Du wirst dann automatisch zu jener weitergeleitet.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Wähle die Ansicht, welche geladen werden soll, wenn ein externer Link nicht handhabbar ist. Du
+        wirst dann automatisch zu jener weitergeleitet.
+    </string>
     <string name="generalDeepLinkSelectedText">N/V</string>
     <string name="linkSelectorDialogTitle">Wähle Standard-Link-Handhaber</string>
     <string name="settingsBiometricHeader">Biometrisches Entsperren</string>
     <string name="settingsLabelsInListHeader">Labels mit Text</string>
-    <string name="settingsLabelsInListHint">Dies wird Labels mit Text in Issue- und Pull-Request-Lister anzeigen, Standard sind farbige Punkte</string>
+    <string name="settingsLabelsInListHint">Dies wird Labels mit Text in Issue- und Pull-Request-Lister anzeigen, Standard sind farbige Punkte
+    </string>
     <!-- settings -->
     <string name="noMoreData">Keine weiteren Daten verfügbar.</string>
     <string name="createLabel">Label erstellen</string>
@@ -204,7 +213,9 @@
     <string name="labelDeleteText">Label gelöscht!</string>
     <string name="selectBranchError">Wähle einen Branch für das Release</string>
     <string name="alertDialogTokenRevokedTitle">Autorisierungsfehler</string>
-    <string name="alertDialogTokenRevokedMessage">Es scheint, dass der Access Token widerrufen wurde ODER du diese Inhalte nicht sehen darfst.\n\nFalls der Token wiederrufen wurde, melde dich bitte ab und wieder an</string>
+    <string name="alertDialogTokenRevokedMessage">Es scheint, dass der Access Token widerrufen wurde ODER du diese Inhalte nicht sehen
+        darfst.\n\nFalls der Token wiederrufen wurde, melde dich bitte ab und wieder an
+    </string>
     <string name="labelDeleteMessage">Möchtest du dieses Label wirklich löschen?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Teams</string>
@@ -371,7 +382,9 @@
     <string name="doneButton">Fertig</string>
     <string name="cancelButton">Abbrechen</string>
     <string name="genericError">Etwas ist schief gelaufen. Bitte versuche es noch ein Mal</string>
-    <string name="apiNotFound">Diese Anfrage erfordert eine neuere Gitea-Version als die, die aktuell installiert ist. Bitte aktualisiere deine Instanz auf die neuste Version.</string>
+    <string name="apiNotFound">Diese Anfrage erfordert eine neuere Gitea-Version als die, die aktuell installiert ist. Bitte aktualisiere deine
+        Instanz auf die neuste Version.
+    </string>
     <string name="noDataFound">🌟 Hier ist nichts 🌟</string>
     <string name="addButton">Hinzufügen</string>
     <string name="removeButton">Entfernen</string>
@@ -392,7 +405,9 @@
     <string name="viewInBrowser">In Browser betrachten</string>
     <string name="isOpen">Offen</string>
     <string name="isClosed">Geschlossen</string>
-    <string name="genericServerResponseError">Wir können den Server im Moment nicht erreichen. Bitte überprüfe den Serverstatus und versuche es erneut</string>
+    <string name="genericServerResponseError">Wir können den Server im Moment nicht erreichen. Bitte überprüfe den Serverstatus und versuche es
+        erneut
+    </string>
     <string name="genericCopyUrl">Link kopieren</string>
     <string name="genericWaitFor">Laden ... ☕</string>
     <string name="file">Datei</string>
@@ -422,13 +437,17 @@
     <string name="watchRepositorySuccess">Repository zur Merkliste hinzugefügt</string>
     <string name="unWatchRepositorySuccess">Repository von der Merkliste entfernt</string>
     <string name="titleDrafts">Entwürfe</string>
-    <string name="versionUnsupportedOld">Nicht unterstützte alte Version(%1$s) von Gitea erkannt. Bitte aktualisiere die Instanz auf die neueste stabile Version. Wenn du fortfährst, funktioniert die App möglicherweise nicht ordnungsgemäß.</string>
+    <string name="versionUnsupportedOld">Nicht unterstützte alte Version(%1$s) von Gitea erkannt. Bitte aktualisiere die Instanz auf die neueste
+        stabile Version. Wenn du fortfährst, funktioniert die App möglicherweise nicht ordnungsgemäß.
+    </string>
     <string name="versionUnsupportedNew">Neue Gitea-Version erkannt! Bitte UPDATE GitNex!</string>
     <string name="versionUnknown">Keine Gitea-Instanz erkannt!</string>
     <string name="versionAlertDialogHeader">Nicht unterstützte Version von Gitea</string>
     <string name="loginViaPassword">Benutzername/Passwort</string>
     <string name="loginMethodText">Wähle deine bevorzugte Login-Methode, um auf deinen Account zuzugreifen. Token ist sicherer!</string>
-    <string name="unauthorizedApiError">Gitea hat einen Fehler zurückgegeben - Nicht autorisiert. Überprüfe deine Anmeldeinformationen und versuche es erneut</string>
+    <string name="unauthorizedApiError">Gitea hat einen Fehler zurückgegeben - Nicht autorisiert. Überprüfe deine Anmeldeinformationen und versuche es
+        erneut
+    </string>
     <string name="loginTokenError">Token ist erforderlich</string>
     <string name="prDeletedFork">Gelöschter Fork</string>
     <string name="editPrNavHeader">Bearbeite Pull-Request #%1$s</string>
@@ -444,7 +463,9 @@
     <string name="mergePullRequestButtonText">Zusammenführen</string>
     <string name="deleteBranchAfterMerge">Branch nach dem Zusammenführen löschen</string>
     <string name="mergeNoteText">Zusammenführen kann fehlschlagen, wenn du dafür nicht die Berechtigungen besitzt.</string>
-    <string name="mergeInfoDisabledMessage">Deaktivierte Merge-Schaltfläche bedeutet, dass es Konflikte oder andere Dinge gibt, die vor dem Zusammenführen behoben werden müssen</string>
+    <string name="mergeInfoDisabledMessage">Deaktivierte Merge-Schaltfläche bedeutet, dass es Konflikte oder andere Dinge gibt, die vor dem
+        Zusammenführen behoben werden müssen
+    </string>
     <string name="deleteBranchForkInfo">Dieser Branch gehört zu einem geforkten Repository</string>
     <string name="mergeCommentText">Zusammenführ-Kommentar</string>
     <string name="mergePRSuccessMsg">Dieser Pull-Request wurde erfolgreich zusammengeführt</string>
@@ -459,7 +480,9 @@
     <string name="deleteBranch">Branch löschen</string>
     <string name="waitLoadingDownloadFile">Bitte warte, bis die Datei in den Speicher geladen wurde</string>
     <string name="downloadFileSaved">Datei erfolgreich gespeichert</string>
-    <string name="excludeFilesInFileViewer">Diese(r) Dateityp / Dateigröße wird vom Dateibetrachter nicht unterstützt. Du kannst es über das Menü herunterladen.</string>
+    <string name="excludeFilesInFileViewer">Diese(r) Dateityp / Dateigröße wird vom Dateibetrachter nicht unterstützt. Du kannst es über das Menü
+        herunterladen.
+    </string>
     <string name="deleteFile">Diese Datei löschen</string>
     <string name="editFile">Diese Datei bearbeiten</string>
     <string name="deleteFileMessage">Datei zum Löschen durch Branch %1$s gesetzt</string>
@@ -497,9 +520,15 @@
     <string name="settingsEnableReportsText">Absturzberichte aktivieren</string>
     <string name="crashTitle">GitNex ist abgestürzt :(</string>
     <string name="setCrashReports">Absturzberichte</string>
-    <string name="crashMessage">Es wird empfohlen, ein Issue im Projekt zu öffnen, wie man diesen Fehler reproduzieren kann. Es ist einfacher, das Problem so zu debuggen und zu beheben.\n\nTippe auf OK, um stattdessen den Absturzbericht per E-Mail zu senden. Zusätzliche Inhalte konnten in der E-Mail hinzugefügt werden.\nVielen Dank!</string>
+    <string name="crashMessage">Es wird empfohlen, ein Issue im Projekt zu öffnen, wie man diesen Fehler reproduzieren kann. Es ist einfacher, das
+        Problem so zu debuggen und zu beheben.\n\nTippe auf OK, um stattdessen den Absturzbericht per E-Mail zu senden. Zusätzliche Inhalte konnten in
+        der E-Mail hinzugefügt werden.\nVielen Dank!
+    </string>
     <string name="forceLogoutDialogHeader">Bitte melde dich erneut an</string>
-    <string name="forceLogoutDialogDescription">Aufgrund einiger wichtiger Änderungen in Bezug auf das interne Funktionieren der App musst du dich erneut anmelden. Diese Änderungen ermöglichen es uns, die App in Zukunft flexibler zu gestalten.\n\nVielen Dank für Ihre Geduld und Entschuldigung für die Unannehmlichkeiten.</string>
+    <string name="forceLogoutDialogDescription">Aufgrund einiger wichtiger Änderungen in Bezug auf das interne Funktionieren der App musst du dich
+        erneut anmelden. Diese Änderungen ermöglichen es uns, die App in Zukunft flexibler zu gestalten.\n\nVielen Dank für Ihre Geduld und
+        Entschuldigung für die Unannehmlichkeiten.
+    </string>
     <string name="deleteAllDrafts">Alle Entwürfe löschen</string>
     <string name="draftsListEmpty">Keine Entwürfe gefunden</string>
     <string name="draftsDeleteSuccess">Entwürfe erfolgreich gelöscht</string>
@@ -516,7 +545,9 @@
     <string name="archivedRepositoryMessage">Dieses Repo ist archiviert. Du kannst Dateien anschauen, aber nichts verändern oder erstellen.</string>
     <string name="accountDeletedMessage">Konto erfolgreich gelöscht</string>
     <string name="removeAccountPopupTitle">Konto entfernen</string>
-    <string name="removeAccountPopupMessage">Bist du sicher, dieses Konto aus der App zu entfernen?\n\nDadurch werden nur alle mit diesem Konto in Verbindung stehenden Daten mit entfernt.</string>
+    <string name="removeAccountPopupMessage">Bist du sicher, dieses Konto aus der App zu entfernen?\n\nDadurch werden nur alle mit diesem Konto in
+        Verbindung stehenden Daten mit entfernt.
+    </string>
     <string name="addNewAccount">Neues Konto</string>
     <string name="addNewAccountText">Neues Konto hinzufügen</string>
     <string name="accountAlreadyExistsError">Konto existiert bereits in der App</string>
@@ -528,7 +559,9 @@
     <string name="notificationsPollingHeaderText">Benachrichtigungsverzögerung</string>
     <string name="pollingDelaySelectedText">%d Minuten</string>
     <string name="pollingDelayDialogHeaderText">Abfrageverzögerung auswählen</string>
-    <string name="pollingDelayDialogDescriptionText">Wähle eine minütige Verzögerung, die GitNex wartet, bevor erneut nach neuen Benachrichtigungen abgefragt wird</string>
+    <string name="pollingDelayDialogDescriptionText">Wähle eine minütige Verzögerung, die GitNex wartet, bevor erneut nach neuen Benachrichtigungen
+        abgefragt wird
+    </string>
     <string name="markAsRead">Als gelesen markieren</string>
     <string name="markAsUnread">Als ungelesen markieren</string>
     <string name="pinNotification">Anheften</string>
@@ -564,12 +597,20 @@
     <string name="repoPropertiesEnableSquash">Squash und Merge aktivieren</string>
     <string name="repoPropertiesEnableForceMerge">Rebase mit Merge Commits aktivieren (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository-Eigenschaften erfolgreich aktualisiert</string>
-    <string name="repoSettingsDeleteDescription">Vor dem Löschen zu erfahrende Dinge:\n\n- Dieser Vorgang kann NICHT rückgängig gemacht werden.\n- Dieser Vorgang wird das Projektarchiv dauerhaft löschen, einschließlich Code, Issues, Kommentare, Wiki-Daten und Einstellungen.\n\nGib den Repository-Namen als Bestätigung ein</string>
+    <string name="repoSettingsDeleteDescription">Vor dem Löschen zu erfahrende Dinge:\n\n- Dieser Vorgang kann NICHT rückgängig gemacht werden.\n-
+        Dieser Vorgang wird das Projektarchiv dauerhaft löschen, einschließlich Code, Issues, Kommentare, Wiki-Daten und Einstellungen.\n\nGib den
+        Repository-Namen als Bestätigung ein
+    </string>
     <string name="repoSettingsDeleteError">Repository-Name stimmt nicht überein</string>
     <string name="repoDeletionSuccess">Repository erfolgreich gelöscht</string>
     <string name="repoSettingsTransferOwnership">Besitz übertragen</string>
-    <string name="repoSettingsTransferOwnershipHint">Dieses Repository an einen Benutzer oder eine Organisation übertragen, in der du Adminrechte hast</string>
-    <string name="repoSettingsTransferOwnershipDescription">Dinge, die vor der Übertragung bekannt sein sollten:\n\n- Du verlierst den Zugriff auf das Projekt, wenn es an einen Benutzer übertragen wird.\n- Du behälst den Zugriff auf das Projekt, wenn es an eine Organisation übertragen wird, die du (mit-)besitzt.\n\nGib den Repository-Namen als Bestätigung ein</string>
+    <string name="repoSettingsTransferOwnershipHint">Dieses Repository an einen Benutzer oder eine Organisation übertragen, in der du Adminrechte
+        hast
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Dinge, die vor der Übertragung bekannt sein sollten:\n\n- Du verlierst den Zugriff auf das
+        Projekt, wenn es an einen Benutzer übertragen wird.\n- Du behälst den Zugriff auf das Projekt, wenn es an eine Organisation übertragen wird,
+        die du (mit-)besitzt.\n\nGib den Repository-Namen als Bestätigung ein
+    </string>
     <string name="repoTransferText">Übertragen</string>
     <string name="repoTransferOwnerText">Neuer Besitzer</string>
     <string name="repoTransferSuccess">Repository erfolgreich übertragen</string>
@@ -592,9 +633,13 @@
     <string name="prClosed">Pull-Request geschlossen</string>
     <string name="prReopened">Pull-Request wieder geöffnet</string>
     <string name="prMergeInfo">Pull-Request-Info</string>
-    <string name="accountDoesNotExist">Es sieht so aus als würde das Konto für den Link %1$s nicht existieren. Du kannst es hinzufügen, indem du auf \"Neues Konto hinzufügen\" klickst.</string>
+    <string name="accountDoesNotExist">Es sieht so aus als würde das Konto für den Link %1$s nicht existieren. Du kannst es hinzufügen, indem du auf
+        \"Neues Konto hinzufügen\" klickst.
+    </string>
     <string name="launchApp">App aufrufen</string>
-    <string name="noActionText">GitNex kann den Link nicht handhaben, du kannst ein Issue im Projekt-Repository öffnen, so dass es ausgebessert werden kann. Bitte gebe alle nötigen Details an. Um die Standard-Ansicht zu öffnen, einfach den Button unten anklicken.</string>
+    <string name="noActionText">GitNex kann den Link nicht handhaben, du kannst ein Issue im Projekt-Repository öffnen, so dass es ausgebessert werden
+        kann. Bitte gebe alle nötigen Details an. Um die Standard-Ansicht zu öffnen, einfach den Button unten anklicken.
+    </string>
     <string name="biometricAuthTitle">Biometrische Authentifizierung</string>
     <string name="biometricAuthSubTitle">Entsperre mittels Biometrie</string>
     <string name="biometricNotSupported">Keine biometrischen Funktionen verfügbar</string>
@@ -633,7 +678,9 @@
     <string name="tagDeleted">Tag gelöscht</string>
     <string name="tagDeleteError">Ein Tag, der zu einem Release zugewiesen ist, kann nicht gelöscht werden</string>
     <string name="useCustomTabs">Custom Tabs verwenden</string>
-    <string name="browserOpenFailed">Keine Anwendung zum Öffnen des Links gefunden. SSH-URLs und URLs mit anderen Präfixen als http:// und https:// werden von den meisten Browsern nicht unterstützt</string>
+    <string name="browserOpenFailed">Keine Anwendung zum Öffnen des Links gefunden. SSH-URLs und URLs mit anderen Präfixen als http:// und https://
+        werden von den meisten Browsern nicht unterstützt
+    </string>
     <string name="logInAgain">Erneut anmelden</string>
     <string name="notLoggedIn">%s \u25CF nicht angemeldet</string>
     <string name="followSystem">System folgen (Light/Dark)</string>
@@ -642,7 +689,9 @@
     <string name="adoptRepo">Übernehmen</string>
     <string name="repoAdopted">Repository %s wurde übernommen</string>
     <string name="unadoptedRepos">Nicht übernommene Repositories</string>
-    <string name="unadoptedReposMessage">- Übernehmen wird das Repository %s zur Organisation / zum Benutzer %s hinzufügen.\n - Löschen entfernt es aus dem System.</string>
+    <string name="unadoptedReposMessage">- Übernehmen wird das Repository %s zur Organisation / zum Benutzer %s hinzufügen.\n - Löschen entfernt es
+        aus dem System.
+    </string>
     <string name="commits">Commits</string>
     <!-- wiki -->
     <string name="wiki">Wiki</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 89863647..a45602f2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -51,7 +51,9 @@
     <string name="navigationDrawerClose">Cerrar cajón de navegación</string>
     <string name="logo">Iniciar sesión en Gitea</string>
     <string name="protocol">Protocolo</string>
-    <string name="urlInfoTooltip">1- Elige el protocolo correcto (https o http).\n2- Introduce Gitea URL p.e: try.gitea.io.\n3- Si has activado 2FA, introduce el código OTP.\n4- Para HTTP Basic Auth usa USUARIO@DOMAIN.COM en la caja de texto URL.</string>
+    <string name="urlInfoTooltip">1- Elige el protocolo correcto (https o http).\n2- Introduce Gitea URL p.e: try.gitea.io.\n3- Si has activado 2FA,
+        introduce el código OTP.\n4- Para HTTP Basic Auth usa USUARIO@DOMAIN.COM en la caja de texto URL.
+    </string>
     <string name="malformedUrl">No se ha podido conectar con el host. Por favor, compruebe su URL o puerto para ver si hay algún error</string>
     <string name="protocolError">No se recomienda usar el protocolo HTTP aparte de testos en la red de área local</string>
     <string name="malformedJson">JSON fue recibido invalido. La respuesta del servidor no tuvo éxito</string>
@@ -146,7 +148,9 @@
     <string name="settingsSecurityHeader">Seguridad</string>
     <string name="settingsCertsSelectorHeader">Eliminar certificados de confianza</string>
     <string name="settingsCertsPopupTitle">Eliminar certificados de confianza?</string>
-    <string name="settingsCertsPopupMessage">¿Está seguro de eliminar cualquier certificado o nombre de host de confianza manualmente? \n\nTambién se cerrará la sesión.</string>
+    <string name="settingsCertsPopupMessage">¿Está seguro de eliminar cualquier certificado o nombre de host de confianza manualmente? \n\nTambién se
+        cerrará la sesión.
+    </string>
     <string name="settingsDateTimeHeaderText">Fecha &amp; Hora</string>
     <string name="settingsSave">Ajustes guardados</string>
     <string name="settingsLanguageSelectorHeader">Idioma</string>
@@ -176,7 +180,8 @@
     <string name="cacheSizeImagesSelectionHeaderText">Tamaño de la caché de imágenes</string>
     <string name="clearCacheSelectionHeaderText">Limpiar cache</string>
     <string name="clearCacheDialogHeader">Limpiar cache?</string>
-    <string name="clearCacheDialogMessage">Esto borrará todos los datos de la caché, incluidos los archivos y las imágenes.\n\n¿Proceder al borrado?</string>
+    <string name="clearCacheDialogMessage">Esto borrará todos los datos de la caché, incluidos los archivos y las imágenes.\n\n¿Proceder al borrado?
+    </string>
     <string name="draftsHeader">Borradores</string>
     <string name="draftsHintText">Comentarios para el borrador</string>
     <string name="settingsEnableCommentsDeletionText">Activar el borrado de borradores</string>
@@ -184,12 +189,15 @@
     <string name="settingsGeneralHeader">General</string>
     <string name="generalHintText">Pantalla de inicio, gestor de enlaces por defecto</string>
     <string name="generalDeepLinkDefaultScreen">Gestor de enlaces por defecto</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Elija qué pantalla debe cargarse si la aplicación no puede manejar los enlaces externos. Te redirigirá automáticamente.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Elija qué pantalla debe cargarse si la aplicación no puede manejar los enlaces externos. Te
+        redirigirá automáticamente.
+    </string>
     <string name="generalDeepLinkSelectedText">N/D</string>
     <string name="linkSelectorDialogTitle">Seleccione la pantalla del gestor de enlaces por defecto</string>
     <string name="settingsBiometricHeader">Desbloqueo biométrico</string>
     <string name="settingsLabelsInListHeader">Etiquetas con soporte de texto</string>
-    <string name="settingsLabelsInListHint">Activar esto mostrará etiquetas con texto en las incidencias y PR. Por defecto son puntos de colores</string>
+    <string name="settingsLabelsInListHint">Activar esto mostrará etiquetas con texto en las incidencias y PR. Por defecto son puntos de colores
+    </string>
     <!-- settings -->
     <string name="noMoreData">No hay más datos disponibles</string>
     <string name="createLabel">Nueva etiqueta</string>
@@ -204,7 +212,9 @@
     <string name="labelDeleteText">Etiqueta borrada</string>
     <string name="selectBranchError">Seleccione una rama para el lanzamiento</string>
     <string name="alertDialogTokenRevokedTitle">Error de autorización</string>
-    <string name="alertDialogTokenRevokedMessage">Parece que el Token de acceso está revocado o no tiene permiso para ver estos contenidos. \n\nEn caso de que el Token esté revocado, por favor, cierre la sesión y vuelva a iniciarla</string>
+    <string name="alertDialogTokenRevokedMessage">Parece que el Token de acceso está revocado o no tiene permiso para ver estos contenidos. \n\nEn
+        caso de que el Token esté revocado, por favor, cierre la sesión y vuelva a iniciarla
+    </string>
     <string name="labelDeleteMessage">¿Estás seguro de borrar esta etiqueta?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Equipos</string>
@@ -215,7 +225,8 @@
     <string name="teamPermissionNone">Los miembros de este equipo no tienen permisos.</string>
     <string name="teamPermissionRead">Los miembros de este equipo pueden ver los repositorios del equipo.</string>
     <string name="teamPermissionWrite">Los miembros de este equipo pueden ver y aportar a los repositorios del equipo.</string>
-    <string name="teamPermissionAdmin">Los miembros de este equipo pueden aportar a y desde los repositorios del equipo y añadir colaboradores.</string>
+    <string name="teamPermissionAdmin">Los miembros de este equipo pueden aportar a y desde los repositorios del equipo y añadir colaboradores.
+    </string>
     <string name="teamPermissionOwner">Los miembros de este equipo tienen permisos completos.</string>
     <string name="teamShowAll">ver todo</string>
     <string name="orgMember">Miembros de la organización</string>
@@ -240,7 +251,8 @@
     <string name="newTeamPermissionWrite">Miembros pueden leer y push a los repositorios del equipo</string>
     <string name="newTeamPermissionAdmin">Miembros pueden pull y push a los repositorios del equipo y pueden añadir colaboradores</string>
     <string name="teamNameEmpty">Por favor, introduce el nombre del equipo</string>
-    <string name="teamNameError">El nombre del equipo tiene que consistir sólo en caracteres alfanuméricos, minus (-), barra baja (_) y punto (.)</string>
+    <string name="teamNameError">El nombre del equipo tiene que consistir sólo en caracteres alfanuméricos, minus (-), barra baja (_) y punto (.)
+    </string>
     <string name="teamPermissionEmpty">Por favor, selecciona un permiso</string>
     <string name="teamDescError">La descripción del equipo incluye caracteres ilegales</string>
     <string name="teamDescLimit">La descripción del equipo tiene más de 100 caracteres</string>
@@ -371,7 +383,9 @@
     <string name="doneButton">Hecho</string>
     <string name="cancelButton">Cancelar</string>
     <string name="genericError">Algo salió mal, por favor, inténtalo de nuevo</string>
-    <string name="apiNotFound">Este pedido necesita una Gitea versión más alta de la que está instalada. Por favor, actualiza tu instancia de Gitea a la versión más actual.</string>
+    <string name="apiNotFound">Este pedido necesita una Gitea versión más alta de la que está instalada. Por favor, actualiza tu instancia de Gitea a
+        la versión más actual.
+    </string>
     <string name="noDataFound">🌟 Aquí no hay nada 🌟</string>
     <string name="addButton">Añadir</string>
     <string name="removeButton">Eliminar</string>
@@ -392,7 +406,9 @@
     <string name="viewInBrowser">Ver en el navegador</string>
     <string name="isOpen">Abierto</string>
     <string name="isClosed">Cerrado</string>
-    <string name="genericServerResponseError">Por el momento no se puede contactar con el servidor. Por favor, compruebe el statús del servidor y intentalo de nuevo</string>
+    <string name="genericServerResponseError">Por el momento no se puede contactar con el servidor. Por favor, compruebe el statús del servidor y
+        intentalo de nuevo
+    </string>
     <string name="genericCopyUrl">Copiar URL</string>
     <string name="genericWaitFor">Espera ☕</string>
     <string name="file">Archivo</string>
@@ -422,13 +438,16 @@
     <string name="watchRepositorySuccess">Añadido a la lista de los repositorios seguidos</string>
     <string name="unWatchRepositorySuccess">Eliminado de la lista de los repositorios seguidos</string>
     <string name="titleDrafts">Borradores</string>
-    <string name="versionUnsupportedOld">Versión no soportada de Gitea (%1$s) detectada. Por favor actualiza a la última versión estable. Si continúas, algunas funciones pueden no funcionar.</string>
+    <string name="versionUnsupportedOld">Versión no soportada de Gitea (%1$s) detectada. Por favor actualiza a la última versión estable. Si
+        continúas, algunas funciones pueden no funcionar.
+    </string>
     <string name="versionUnsupportedNew">Se ha reconocido una nueva version de Gitea! Por favor, ACTUALICE GitNex!</string>
     <string name="versionUnknown">Gitea no reconocida!</string>
     <string name="versionAlertDialogHeader">Versión de Gitea no compatible</string>
     <string name="loginViaPassword">Usuario / contraseña</string>
     <string name="loginMethodText">Elige su método de login preferido para accesar su cuenta. Token es más seguro!</string>
-    <string name="unauthorizedApiError">La instancia ha respondido con un error - No autorizado. Verifique sus credenciales y trátalo de nuevo</string>
+    <string name="unauthorizedApiError">La instancia ha respondido con un error - No autorizado. Verifique sus credenciales y trátalo de nuevo
+    </string>
     <string name="loginTokenError">Token es necesario</string>
     <string name="prDeletedFork">Fork eliminado</string>
     <string name="editPrNavHeader">Editar pull request #%1$s</string>
@@ -444,7 +463,9 @@
     <string name="mergePullRequestButtonText">Fusionar</string>
     <string name="deleteBranchAfterMerge">Eliminar rama después de la fusión</string>
     <string name="mergeNoteText">Fusión puede fallar si no tienes el permiso de fusionar este pull request.</string>
-    <string name="mergeInfoDisabledMessage">Cuando el botón \"fusionar\" está desactivado indica que existen conflictos O otras cosas que tienen que estar resolvadas antes de la fusión</string>
+    <string name="mergeInfoDisabledMessage">Cuando el botón \"fusionar\" está desactivado indica que existen conflictos O otras cosas que tienen que
+        estar resolvadas antes de la fusión
+    </string>
     <string name="deleteBranchForkInfo">Esta rama pertenece a un repositorio forked</string>
     <string name="mergeCommentText">Comentario de la fusión</string>
     <string name="mergePRSuccessMsg">Pull Request fue fusionado con éxito</string>
@@ -459,7 +480,9 @@
     <string name="deleteBranch">Eliminar rama</string>
     <string name="waitLoadingDownloadFile">Por favor espere que el dispositivo está cargando a la memoria</string>
     <string name="downloadFileSaved">Archivo guardado con éxito</string>
-    <string name="excludeFilesInFileViewer">Este tipo o tamaño de archivo no está soportado en el visor de archivos. Puedes descargar el archivo via el menú.</string>
+    <string name="excludeFilesInFileViewer">Este tipo o tamaño de archivo no está soportado en el visor de archivos. Puedes descargar el archivo via
+        el menú.
+    </string>
     <string name="deleteFile">Eliminar este archivo</string>
     <string name="editFile">Editar este archivo</string>
     <string name="deleteFileMessage">El archivo fue definido para ser eliminado por la rama %1$s</string>
@@ -497,9 +520,15 @@
     <string name="settingsEnableReportsText">Activar reporte de errores</string>
     <string name="crashTitle">GitNex fue parado :(</string>
     <string name="setCrashReports">Reportes de errores</string>
-    <string name="crashMessage">Se recomienda abrir una incidencia en el repositorio del proyecto, sobre cómo se puede reproducir este error. Por este camino es más fácil resolver este problema.\n\nPulsa el botón \"OK\" en lugar de eso para enviar el reporte de errores via correo electrónico. Entonces más descripciones se pueden añadir al mensaje.\nMuchas gracias!</string>
+    <string name="crashMessage">Se recomienda abrir una incidencia en el repositorio del proyecto, sobre cómo se puede reproducir este error. Por este
+        camino es más fácil resolver este problema.\n\nPulsa el botón \"OK\" en lugar de eso para enviar el reporte de errores via correo electrónico.
+        Entonces más descripciones se pueden añadir al mensaje.\nMuchas gracias!
+    </string>
     <string name="forceLogoutDialogHeader">Inicie sesión de nuevo</string>
-    <string name="forceLogoutDialogDescription">A causa de importantes modificaciones en el interior de la aplicación es necesario que tu inicias sesión de nuevo. Estos cambios nos permiten programar en el futuro la aplicación más flexible.\n\nMuchas gracias por tu paciencia y disculpa las inconveniencias.</string>
+    <string name="forceLogoutDialogDescription">A causa de importantes modificaciones en el interior de la aplicación es necesario que tu inicias
+        sesión de nuevo. Estos cambios nos permiten programar en el futuro la aplicación más flexible.\n\nMuchas gracias por tu paciencia y disculpa
+        las inconveniencias.
+    </string>
     <string name="deleteAllDrafts">Eliminar todos los borradores</string>
     <string name="draftsListEmpty">Ningunos borradores encontrados</string>
     <string name="draftsDeleteSuccess">Borradores eliminados con éxito</string>
@@ -513,10 +542,14 @@
     <string name="rateAppHintText">Si te gusta GitNex, ¡deja una evaluación positiva!</string>
     <string name="aboutAppHintText">Versión de la aplicación, build, versión de Gitea</string>
     <string name="archivedRepository">Archivado</string>
-    <string name="archivedRepositoryMessage">Este repositorio está archivado. Puedes ver los archivos, pero no puedes hacer push o abrir incidencias o pull requests.</string>
+    <string name="archivedRepositoryMessage">Este repositorio está archivado. Puedes ver los archivos, pero no puedes hacer push o abrir incidencias o
+        pull requests.
+    </string>
     <string name="accountDeletedMessage">Cuenta eliminada con éxito</string>
     <string name="removeAccountPopupTitle">Eliminar cuenta</string>
-    <string name="removeAccountPopupMessage">¿Estás seguro que quieres eliminar esta cuenta de la aplicación?\n\nEsta acción va a eliminar todos los datos de la cuenta, pero sólo en esta aplicación.</string>
+    <string name="removeAccountPopupMessage">¿Estás seguro que quieres eliminar esta cuenta de la aplicación?\n\nEsta acción va a eliminar todos los
+        datos de la cuenta, pero sólo en esta aplicación.
+    </string>
     <string name="addNewAccount">Nueva cuenta</string>
     <string name="addNewAccountText">Añadir nueva cuenta</string>
     <string name="accountAlreadyExistsError">La cuenta ya existe en la aplicación</string>
@@ -528,7 +561,9 @@
     <string name="notificationsPollingHeaderText">Retraso de notificaciones</string>
     <string name="pollingDelaySelectedText">%d minutos</string>
     <string name="pollingDelayDialogHeaderText">Seleccionar cantidad del retraso</string>
-    <string name="pollingDelayDialogDescriptionText">Selecciona un retraso en minutos, después de que GitNex intenta de consultar nuevas notificaciones</string>
+    <string name="pollingDelayDialogDescriptionText">Selecciona un retraso en minutos, después de que GitNex intenta de consultar nuevas
+        notificaciones
+    </string>
     <string name="markAsRead">Mark Read</string>
     <string name="markAsUnread">Mark Unread</string>
     <string name="pinNotification">Pin</string>
@@ -564,12 +599,20 @@
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">El repositorio se ha eliminado correctamente</string>
     <string name="repoSettingsTransferOwnership">Transferir propiedad</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Perform Transfer</string>
     <string name="repoTransferOwnerText">Nuevo Propietario</string>
     <string name="repoTransferSuccess">Repository transferred successfully</string>
@@ -592,9 +635,14 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">Ir a la aplicación</string>
-    <string name="noActionText">GitNex no puede gestionar el recurso solicitado, puede abrir una incidencia en el repositorio del proyecto como mejora aportando detalles del trabajo. Por el momento, lanza una pantalla por defecto desde los botones de abajo, se puede cambiar desde la configuración.</string>
+    <string name="noActionText">GitNex no puede gestionar el recurso solicitado, puede abrir una incidencia en el repositorio del proyecto como mejora
+        aportando detalles del trabajo. Por el momento, lanza una pantalla por defecto desde los botones de abajo, se puede cambiar desde la
+        configuración.
+    </string>
     <string name="biometricAuthTitle">Autenticación biométrica</string>
     <string name="biometricAuthSubTitle">Desbloquear usando tus credenciales biométricas</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -633,7 +681,9 @@
     <string name="tagDeleted">Etiqueta eliminada</string>
     <string name="tagDeleteError">No se puede eliminar una etiqueta que está en uso</string>
     <string name="useCustomTabs">Usar pestañas personalizadas</string>
-    <string name="browserOpenFailed">No se ha encontrado una aplicación para abrir este enlace. Las direcciones SSH y cualquiera diferente a http:// o https:// no están soportadas</string>
+    <string name="browserOpenFailed">No se ha encontrado una aplicación para abrir este enlace. Las direcciones SSH y cualquiera diferente a http:// o
+        https:// no están soportadas
+    </string>
     <string name="logInAgain">Inicia sesión de nuevo</string>
     <string name="notLoggedIn">%s \u25CF no ha iniciado sesión</string>
     <string name="followSystem">Sistema (Claro / Oscuro)</string>
@@ -642,7 +692,8 @@
     <string name="adoptRepo">Adoptar</string>
     <string name="repoAdopted">Repositorio adoptado %s</string>
     <string name="unadoptedRepos">Repositorios no adoptados</string>
-    <string name="unadoptedReposMessage">- Adoptar el repositorio %s lo añadirá a la organización o usuario %s.\n - Eliminar lo borrará del sistema.</string>
+    <string name="unadoptedReposMessage">- Adoptar el repositorio %s lo añadirá a la organización o usuario %s.\n - Eliminar lo borrará del sistema.
+    </string>
     <string name="commits">Commits</string>
     <!-- wiki -->
     <string name="wiki">Wiki</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index eee3ae4b..7c009d57 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -52,9 +52,10 @@
     <string name="logo">ورود به Gitea</string>
     <string name="protocol">پروتکل</string>
     <string name="urlInfoTooltip">1. پروتوکل صحیح را انتخاب کنید (http یا https)
-2. URL گیتی را وارد کنید. مثلا: try.gitea.io
-3. اگر احراز هویت دو مرحله‌ای را برای حساب خود فعال کرده‌اید، کد را در کادر OTP وارد کنید.
-4. برای احراز هویت عادی HTTP از نام‌کاربری@دامنه در کادر URL استفاده کنید.</string>
+        2. URL گیتی را وارد کنید. مثلا: try.gitea.io
+        3. اگر احراز هویت دو مرحله‌ای را برای حساب خود فعال کرده‌اید، کد را در کادر OTP وارد کنید.
+        4. برای احراز هویت عادی HTTP از نام‌کاربری@دامنه در کادر URL استفاده کنید.
+    </string>
     <string name="malformedUrl">Couldn\'t connect to host. Please check your URL or port for any errors</string>
     <string name="protocolError">استفاده از پروتکل HTTP توصیه نمی‌شود مگر اینکه در حال آزمایش در شبکه محلی باشید</string>
     <string name="malformedJson">Malformed JSON was received. Server response was not successful</string>
@@ -149,7 +150,8 @@
     <string name="settingsSecurityHeader">امنیت</string>
     <string name="settingsCertsSelectorHeader">Delete Trusted Certificates</string>
     <string name="settingsCertsPopupTitle">Delete Trusted Certificates?</string>
-    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.</string>
+    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.
+    </string>
     <string name="settingsDateTimeHeaderText">تاریخ و زمان</string>
     <string name="settingsSave">تنظیمات ذخیره شد</string>
     <string name="settingsLanguageSelectorHeader">زبان</string>
@@ -187,7 +189,9 @@
     <string name="settingsGeneralHeader">عمومی</string>
     <string name="generalHintText">Home screen, default link handler</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect
+        you automatically.
+    </string>
     <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
@@ -207,7 +211,9 @@
     <string name="labelDeleteText">برچسب حذف شد</string>
     <string name="selectBranchError">یک شاخه را برای انتشار انتخاب کنید</string>
     <string name="alertDialogTokenRevokedTitle">خطای ورود به سامانه</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case
+        of revoked Token, please logout and login again
+    </string>
     <string name="labelDeleteMessage">آیا شما واقعا می‌خواهید این برچسب را حذف کنید؟</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">تیم‌ها</string>
@@ -374,7 +380,9 @@
     <string name="doneButton">انجام شد</string>
     <string name="cancelButton">لغو</string>
     <string name="genericError">Something went wrong, please try again</string>
-    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of Gitea.</string>
+    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of
+        Gitea.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">افزودن</string>
     <string name="removeButton">حذف</string>
@@ -425,7 +433,9 @@
     <string name="watchRepositorySuccess">Repository added to watch list</string>
     <string name="unWatchRepositorySuccess">Repository removed from watch list</string>
     <string name="titleDrafts">پیش نویس‌ها</string>
-    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue, some features may not work.</string>
+    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue,
+        some features may not work.
+    </string>
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">هیچ Gitea تشخیص داده نشد!</string>
     <string name="versionAlertDialogHeader">نگارش پشتیبانی نشده Gitea</string>
@@ -500,9 +510,14 @@
     <string name="settingsEnableReportsText">فعال‌سازی گزارش‌های خرابی</string>
     <string name="crashTitle">GitNex متوقف شد :(</string>
     <string name="setCrashReports">گزارش‌های خرابی</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
     <string name="forceLogoutDialogHeader">لطفا دوباره وارد حساب شوید</string>
-    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.</string>
+    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login
+        again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.
+    </string>
     <string name="deleteAllDrafts">حذف همه پیش نویس‌ها</string>
     <string name="draftsListEmpty">هیچ پیش نویسی یافت نشد</string>
     <string name="draftsDeleteSuccess">پیش نویس‌ها با موفقیت حذف شدند</string>
@@ -519,7 +534,9 @@
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">حساب کاربری با موفقیت حذف شد</string>
     <string name="removeAccountPopupTitle">حذف حساب</string>
-    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
+    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to
+        this account on the app only.
+    </string>
     <string name="addNewAccount">حساب جدید</string>
     <string name="addNewAccountText">افزودن حساب جدید</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
@@ -567,12 +584,20 @@
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">مخزن با موفقیت حذف شد</string>
     <string name="repoSettingsTransferOwnership">انتقال مالکیت</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Perform Transfer</string>
     <string name="repoTransferOwnerText">مالک جدید</string>
     <string name="repoTransferSuccess">Repository transferred successfully</string>
@@ -595,9 +620,13 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">برو به برنامه</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -636,7 +665,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index f27a2540..f06aa1b8 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -51,7 +51,9 @@
     <string name="navigationDrawerClose">Close Navigation Drawer</string>
     <string name="logo">Login to Gitea</string>
     <string name="protocol">Protocol</string>
-    <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter Gitea url e.g: try.gitea.io. \n3- If you have enabled 2FA for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.</string>
+    <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter Gitea url e.g: try.gitea.io. \n3- If you have enabled 2FA
+        for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.
+    </string>
     <string name="malformedUrl">Couldn\'t connect to host. Please check your URL or port for any errors</string>
     <string name="protocolError">It is not recommended to use HTTP protocol unless you are testing on local network</string>
     <string name="malformedJson">Malformed JSON was received. Server response was not successful</string>
@@ -146,7 +148,8 @@
     <string name="settingsSecurityHeader">Security</string>
     <string name="settingsCertsSelectorHeader">Delete Trusted Certificates</string>
     <string name="settingsCertsPopupTitle">Delete Trusted Certificates?</string>
-    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.</string>
+    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.
+    </string>
     <string name="settingsDateTimeHeaderText">Date &amp; Time</string>
     <string name="settingsSave">Settings saved</string>
     <string name="settingsLanguageSelectorHeader">Language</string>
@@ -184,7 +187,9 @@
     <string name="settingsGeneralHeader">General</string>
     <string name="generalHintText">Home screen, default link handler</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect
+        you automatically.
+    </string>
     <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
@@ -204,7 +209,9 @@
     <string name="labelDeleteText">Label deleted</string>
     <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Authorization Error</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case
+        of revoked Token, please logout and login again
+    </string>
     <string name="labelDeleteMessage">Do you really want to delete this label?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Teams</string>
@@ -371,7 +378,9 @@
     <string name="doneButton">Done</string>
     <string name="cancelButton">Cancel</string>
     <string name="genericError">Something went wrong, please try again</string>
-    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of Gitea.</string>
+    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of
+        Gitea.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">Add</string>
     <string name="removeButton">Remove</string>
@@ -422,7 +431,9 @@
     <string name="watchRepositorySuccess">Repository added to watch list</string>
     <string name="unWatchRepositorySuccess">Repository removed from watch list</string>
     <string name="titleDrafts">Drafts</string>
-    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue, some features may not work.</string>
+    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue,
+        some features may not work.
+    </string>
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Unsupported Version of Gitea</string>
@@ -497,9 +508,14 @@
     <string name="settingsEnableReportsText">Enable Crash Reports</string>
     <string name="crashTitle">GitNex has stopped :(</string>
     <string name="setCrashReports">Crash reports</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
     <string name="forceLogoutDialogHeader">Please sign in again</string>
-    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.</string>
+    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login
+        again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.
+    </string>
     <string name="deleteAllDrafts">Delete All Drafts</string>
     <string name="draftsListEmpty">No drafts found</string>
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
@@ -516,7 +532,9 @@
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
-    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
+    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to
+        this account on the app only.
+    </string>
     <string name="addNewAccount">New Account</string>
     <string name="addNewAccountText">Add New Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
@@ -564,12 +582,20 @@
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">Repository deleted successfully</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Perform Transfer</string>
     <string name="repoTransferOwnerText">New Owner</string>
     <string name="repoTransferSuccess">Repository transferred successfully</string>
@@ -592,9 +618,13 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -633,7 +663,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8ca213ba..f0bce3d0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -51,7 +51,10 @@
     <string name="navigationDrawerClose">Fermer le volet de navigation</string>
     <string name="logo">Se connecter à Gitea</string>
     <string name="protocol">Protocole</string>
-    <string name="urlInfoTooltip">1. Choisissez le protocole adéquat (HTTPS ou HTTP)\n2. Entrez l’URL de votre instance Gitea (ex : try.gitea.io)\n3. Si l’authentification à deux facteurs est activée pour votre compte, saisissez le code OTP\n4. Pour une authentification basique avec HTTP, utilisez NOMDUTILISATEUR@DOMAINE.COM dans le champ URL GITEA</string>
+    <string name="urlInfoTooltip">1. Choisissez le protocole adéquat (HTTPS ou HTTP)\n2. Entrez l’URL de votre instance Gitea (ex : try.gitea.io)\n3.
+        Si l’authentification à deux facteurs est activée pour votre compte, saisissez le code OTP\n4. Pour une authentification basique avec HTTP,
+        utilisez NOMDUTILISATEUR@DOMAINE.COM dans le champ URL GITEA
+    </string>
     <string name="malformedUrl">Connexion impossible. Veuillez vérifier l’URL et le port</string>
     <string name="protocolError">Le protocole HTTP est déconseillé en dehors de tests sur un réseau local</string>
     <string name="malformedJson">JSON mal formé. Le serveur ne répond pas.</string>
@@ -146,7 +149,9 @@
     <string name="settingsSecurityHeader">Sécurité</string>
     <string name="settingsCertsSelectorHeader">Supprimer les certificats</string>
     <string name="settingsCertsPopupTitle">Supprimer les certificats ?</string>
-    <string name="settingsCertsPopupMessage">Les noms d’hôtes et les certificats ajoutés manuellement seront supprimés.\n\nIl faudra vous reconnecter.</string>
+    <string name="settingsCertsPopupMessage">Les noms d’hôtes et les certificats ajoutés manuellement seront supprimés.\n\nIl faudra vous
+        reconnecter.
+    </string>
     <string name="settingsDateTimeHeaderText">Date et heure</string>
     <string name="settingsSave">Réglages enregistrés</string>
     <string name="settingsLanguageSelectorHeader">Langue</string>
@@ -176,7 +181,8 @@
     <string name="cacheSizeImagesSelectionHeaderText">Cache des images</string>
     <string name="clearCacheSelectionHeaderText">Vider le cache</string>
     <string name="clearCacheDialogHeader">Vider le cache ?</string>
-    <string name="clearCacheDialogMessage">Toutes les données du cache seront supprimées, y compris les fichiers et les images.\n\nContinuer ?</string>
+    <string name="clearCacheDialogMessage">Toutes les données du cache seront supprimées, y compris les fichiers et les images.\n\nContinuer ?
+    </string>
     <string name="draftsHeader">Brouillons</string>
     <string name="draftsHintText">Brouillon de commentaires</string>
     <string name="settingsEnableCommentsDeletionText">Supprimer les brouillons</string>
@@ -184,7 +190,9 @@
     <string name="settingsGeneralHeader">Général</string>
     <string name="generalHintText">Ouverture des liens, écran d’accueil</string>
     <string name="generalDeepLinkDefaultScreen">Écran par défaut</string>
-    <string name="generalDeepLinkDefaultScreenHintText">L’écran à afficher par défaut lorsque l’application ne parvient pas à ouvrir un lien externe.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">L’écran à afficher par défaut lorsque l’application ne parvient pas à ouvrir un lien
+        externe.
+    </string>
     <string name="generalDeepLinkSelectedText">S/O</string>
     <string name="linkSelectorDialogTitle">Écran par défaut</string>
     <string name="settingsBiometricHeader">Biométrie</string>
@@ -204,7 +212,9 @@
     <string name="labelDeleteText">Étiquette supprimée</string>
     <string name="selectBranchError">Branche de diffusion</string>
     <string name="alertDialogTokenRevokedTitle">Erreur d’autorisation</string>
-    <string name="alertDialogTokenRevokedMessage">Le jeton d’accès est peut-être révoqué ou vous n’êtes pas autorisé à voir ce contenu.\n\nEn cas de jeton révoqué, veuillez vous reconnecter</string>
+    <string name="alertDialogTokenRevokedMessage">Le jeton d’accès est peut-être révoqué ou vous n’êtes pas autorisé à voir ce contenu.\n\nEn cas de
+        jeton révoqué, veuillez vous reconnecter
+    </string>
     <string name="labelDeleteMessage">Voulez-vous vraiment supprimer cette étiquette ?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Équipes</string>
@@ -240,7 +250,8 @@
     <string name="newTeamPermissionWrite">Les membres peuvent lire et pousser dans les dépôts de l’équipe.</string>
     <string name="newTeamPermissionAdmin">Les membres peuvent tirer et pousser dans les dépôts de l’équipe ainsi qu’ajouter des participants.</string>
     <string name="teamNameEmpty">Nom d’équipe requis</string>
-    <string name="teamNameError">Le nom d’équipe peut contenir des caractères alphanumériques, des tirets (-), des soulignés (_) et des points (.).</string>
+    <string name="teamNameError">Le nom d’équipe peut contenir des caractères alphanumériques, des tirets (-), des soulignés (_) et des points (.).
+    </string>
     <string name="teamPermissionEmpty">Veuillez sélectionner une permission</string>
     <string name="teamDescError">La description contient des caractères interdits</string>
     <string name="teamDescLimit">La description de l’équipe dépasse la limite de 100 caractères</string>
@@ -392,7 +403,8 @@
     <string name="viewInBrowser">Voir dans le navigateur</string>
     <string name="isOpen">Ouvert</string>
     <string name="isClosed">Fermé</string>
-    <string name="genericServerResponseError">Impossible de se connecter au serveur pour le moment, veuillez vérifier son statut puis réessayer</string>
+    <string name="genericServerResponseError">Impossible de se connecter au serveur pour le moment, veuillez vérifier son statut puis réessayer
+    </string>
     <string name="genericCopyUrl">Copier l’URL</string>
     <string name="genericWaitFor">Attendez un instant ☕</string>
     <string name="file">Fichier</string>
@@ -422,7 +434,9 @@
     <string name="watchRepositorySuccess">Vous suivez ce dépôt</string>
     <string name="unWatchRepositorySuccess">Vous ne suivez plus ce dépôt</string>
     <string name="titleDrafts">Brouillons</string>
-    <string name="versionUnsupportedOld">Version périmée de Gitea (%1$s) détectée. Veuillez mettre à jour vers la dernière version stable. Si vous continuez, l’application peut ne pas fonctionner correctement.</string>
+    <string name="versionUnsupportedOld">Version périmée de Gitea (%1$s) détectée. Veuillez mettre à jour vers la dernière version stable. Si vous
+        continuez, l’application peut ne pas fonctionner correctement.
+    </string>
     <string name="versionUnsupportedNew">Nouvelle version de Gitea détectée ! Veuillez mettre à jour GitNex !</string>
     <string name="versionUnknown">Aucun serveur Gitea détecté !</string>
     <string name="versionAlertDialogHeader">Version de Gitea non prise en charge</string>
@@ -459,7 +473,9 @@
     <string name="deleteBranch">Supprimer la branche</string>
     <string name="waitLoadingDownloadFile">Chargement du fichier dans la mémoire</string>
     <string name="downloadFileSaved">Fichier sauvegardé</string>
-    <string name="excludeFilesInFileViewer">Le fichier incompatible ou trop grand pour la visionneuse. Vous pouvez toutefois le télécharger depuis le menu.</string>
+    <string name="excludeFilesInFileViewer">Le fichier incompatible ou trop grand pour la visionneuse. Vous pouvez toutefois le télécharger depuis le
+        menu.
+    </string>
     <string name="deleteFile">Supprimer ce fichier</string>
     <string name="editFile">Éditer ce fichier</string>
     <string name="deleteFileMessage">Fichier supprimé par la branche %1$s</string>
@@ -497,9 +513,14 @@
     <string name="settingsEnableReportsText">Rapports de plantage</string>
     <string name="crashTitle">GitNex a planté :(</string>
     <string name="setCrashReports">Débogage</string>
-    <string name="crashMessage">Il est conseillé de créer un ticket expliquant comment reproduire ce bogue pour faciliter la correction du problème.\n\nAppuyez sur « D’accord » si vous préférez envoyer le rapport de plantage par courriel. Libre à vous d’y ajouter du contenu supplémentaire.\nMerci!</string>
+    <string name="crashMessage">Il est conseillé de créer un ticket expliquant comment reproduire ce bogue pour faciliter la correction du
+        problème.\n\nAppuyez sur « D’accord » si vous préférez envoyer le rapport de plantage par courriel. Libre à vous d’y ajouter du contenu
+        supplémentaire.\nMerci!
+    </string>
     <string name="forceLogoutDialogHeader">Veuillez vous reconnecter</string>
-    <string name="forceLogoutDialogDescription">Une reconnexion est nécessaire en raison de changements majeurs du fonctionnement interne pour améliorer la souplesse de l\'application.\n\nMerci pour votre patience et toutes nos excuses pour la gêne occasionnée.</string>
+    <string name="forceLogoutDialogDescription">Une reconnexion est nécessaire en raison de changements majeurs du fonctionnement interne pour
+        améliorer la souplesse de l\'application.\n\nMerci pour votre patience et toutes nos excuses pour la gêne occasionnée.
+    </string>
     <string name="deleteAllDrafts">Supprimer tous les brouillons</string>
     <string name="draftsListEmpty">Aucun brouillon</string>
     <string name="draftsDeleteSuccess">Brouillons supprimés</string>
@@ -516,7 +537,9 @@
     <string name="archivedRepositoryMessage">Ce dépôt est archivé. Les fichiers sont accessibles, mais aucune modification n’est possible.</string>
     <string name="accountDeletedMessage">Compte supprimé</string>
     <string name="removeAccountPopupTitle">Supprimer le compte</string>
-    <string name="removeAccountPopupMessage">Êtes-vous sûr de vouloir supprimer ce compte de l’application ?\n\nSeules les données de l’application seront supprimées.</string>
+    <string name="removeAccountPopupMessage">Êtes-vous sûr de vouloir supprimer ce compte de l’application ?\n\nSeules les données de l’application
+        seront supprimées.
+    </string>
     <string name="addNewAccount">Nouveau compte</string>
     <string name="addNewAccountText">Ajouter un nouveau compte</string>
     <string name="accountAlreadyExistsError">Ce compte existe déjà dans l’application</string>
@@ -564,12 +587,19 @@
     <string name="repoPropertiesEnableSquash">Activer squash et fusion</string>
     <string name="repoPropertiesEnableForceMerge">Activer resbasage avec révision de fusion (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Propriétés du dépôt mises à jour</string>
-    <string name="repoSettingsDeleteDescription">Cette opération est IRRÉVERSIBLE.\nSoyez conscient que le dépôt et son contenu (code, tickets, commentaires, wiki, contributions…) seront définitivement supprimés.\n\nEntrez le nom du dépôt afin de confirmer cette opération.</string>
+    <string name="repoSettingsDeleteDescription">Cette opération est IRRÉVERSIBLE.\nSoyez conscient que le dépôt et son contenu (code, tickets,
+        commentaires, wiki, contributions…) seront définitivement supprimés.\n\nEntrez le nom du dépôt afin de confirmer cette opération.
+    </string>
     <string name="repoSettingsDeleteError">Nom du dépôt incorrect</string>
     <string name="repoDeletionSuccess">Dépôt supprimé</string>
     <string name="repoSettingsTransferOwnership">Changer de propriétaire</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfère le dépôt à un autre utilisateur ou une autre organisation dont vous possédez les droits d\'administrateur</string>
-    <string name="repoSettingsTransferOwnershipDescription">Choses à savoir avant le transfert :\n\n- Vous perdez l’accès au dépôt si vous le transférez à un autre utilisateur.\n- Vous conservez l’accès au dépôt si vous le transférez à une organisation que vous (co-)gérez.\n\nEntrez le nom du dépôt pour confirmer</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfère le dépôt à un autre utilisateur ou une autre organisation dont vous possédez les droits
+        d\'administrateur
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Choses à savoir avant le transfert :\n\n- Vous perdez l’accès au dépôt si vous le
+        transférez à un autre utilisateur.\n- Vous conservez l’accès au dépôt si vous le transférez à une organisation que vous (co-)gérez.\n\nEntrez
+        le nom du dépôt pour confirmer
+    </string>
     <string name="repoTransferText">Transférer</string>
     <string name="repoTransferOwnerText">Nouveau propriétaire</string>
     <string name="repoTransferSuccess">Dépôt transféré</string>
@@ -592,9 +622,13 @@
     <string name="prClosed">Demande d’ajout fermée</string>
     <string name="prReopened">Demande d’ajout rouverte</string>
     <string name="prMergeInfo">Infos sur la demande d’ajout</string>
-    <string name="accountDoesNotExist">Ce compte associé à l\'URI %1$s n\'existe pas dans l\'application. Vous pouvez l\'ajouter en appuyant sur Ajouter un nouveau compte.</string>
+    <string name="accountDoesNotExist">Ce compte associé à l\'URI %1$s n\'existe pas dans l\'application. Vous pouvez l\'ajouter en appuyant sur
+        Ajouter un nouveau compte.
+    </string>
     <string name="launchApp">Lancer l’app</string>
-    <string name="noActionText">GitNex ne prend pas en charge cette ressource, vous pouvez signaler et détailler le problème dans le dépôt du projet. Pour le moment, vous pouvez revenir à l\'écran par défaut en cliquant sur le bouton ci-dessus.</string>
+    <string name="noActionText">GitNex ne prend pas en charge cette ressource, vous pouvez signaler et détailler le problème dans le dépôt du projet.
+        Pour le moment, vous pouvez revenir à l\'écran par défaut en cliquant sur le bouton ci-dessus.
+    </string>
     <string name="biometricAuthTitle">Authentification biométrique</string>
     <string name="biometricAuthSubTitle">Déverrouiller à l’aide de vos identifiants biométriques</string>
     <string name="biometricNotSupported">Cet appareil ne permet pas la biométrie</string>
@@ -618,7 +652,8 @@
     <string name="nowFollowUser">Vous suivez @%s</string>
     <string name="unfollowingFailed">Impossible de ne plus suivre l’utilisateur</string>
     <string name="followingFailed">Impossible de suivre l’utilisateur</string>
-    <string name="updatePrConflict">La demande d’ajout est en conflit avec la branche principale. Veuillez résoudre ce conflit, puis réessayez.</string>
+    <string name="updatePrConflict">La demande d’ajout est en conflit avec la branche principale. Veuillez résoudre ce conflit, puis réessayez.
+    </string>
     <string name="updatePrSuccess">Demande d’ajout mise à jour</string>
     <string name="updateStrategyMerge">Fusionner</string>
     <string name="updateStrategyRebase">Rebaser</string>
@@ -633,7 +668,9 @@
     <string name="tagDeleted">Tag supprimé</string>
     <string name="tagDeleteError">Un tag attaché à une diffusion ne peut être directement supprimé.</string>
     <string name="useCustomTabs">Utiliser des onglets personnalisés</string>
-    <string name="browserOpenFailed">Aucune application présente ne peut ouvrir ce lien. Les URL SSH ou avec un préfixe autre que http:// ou https:// ne sont pas compatibles avec la plupart des navigateurs.</string>
+    <string name="browserOpenFailed">Aucune application présente ne peut ouvrir ce lien. Les URL SSH ou avec un préfixe autre que http:// ou https://
+        ne sont pas compatibles avec la plupart des navigateurs.
+    </string>
     <string name="logInAgain">Se reconnecter</string>
     <string name="notLoggedIn">%s \u25CF n’est pas connecté</string>
     <string name="followSystem">Suivant le système (clair/sombre)</string>
@@ -642,7 +679,8 @@
     <string name="adoptRepo">Adopter</string>
     <string name="repoAdopted">Dépôt %s adopté</string>
     <string name="unadoptedRepos">Dépôts abandonnés</string>
-    <string name="unadoptedReposMessage">- Adopter le dépôt %s l’ajoutera à l’organisation/utilisateur %s.\n- Le supprimer l’effacera du système.</string>
+    <string name="unadoptedReposMessage">- Adopter le dépôt %s l’ajoutera à l’organisation/utilisateur %s.\n- Le supprimer l’effacera du système.
+    </string>
     <string name="commits">Révisions</string>
     <!-- wiki -->
     <string name="wiki">Wiki</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 69f59ef0..605e372f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -51,12 +51,15 @@
     <string name="navigationDrawerClose">Chiudi panello Navigazione</string>
     <string name="logo">Accedi a Gitea</string>
     <string name="protocol">Protocollo</string>
-    <string name="urlInfoTooltip">1- Scegli il protocollo corretto(https or http). \n2- Enter Gitea url e.g: try.gitea.io. \n3- If you have enabled 2FA for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.</string>
+    <string name="urlInfoTooltip">1- Scegli il protocollo corretto(https or http). \n2- Enter Gitea url e.g: try.gitea.io. \n3- If you have enabled
+        2FA for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.
+    </string>
     <string name="malformedUrl">Impossibile connettersi all\'host. Controlla l\'URL o la porta per eventuali errori</string>
     <string name="protocolError">Non si consiglia di utilizzare il protocollo HTTP a meno che non si stia testando sulla rete locale</string>
     <string name="malformedJson">È stato ricevuto JSON non valido. La risposta del server non ha avuto successo</string>
-    <string name="emptyFieldURL">Istanza 
-URL è richiesto</string>
+    <string name="emptyFieldURL">Istanza
+        URL è richiesto
+    </string>
     <string name="emptyFieldUsername">Nome utente obbligatorio</string>
     <string name="emptyFieldPassword">Password obbligatoria</string>
     <string name="protocolEmptyError">Il protocollo è richiesto</string>
@@ -147,7 +150,9 @@ URL è richiesto</string>
     <string name="settingsSecurityHeader">Sicurezza</string>
     <string name="settingsCertsSelectorHeader">Elimina Certificati Attendibili</string>
     <string name="settingsCertsPopupTitle">Eliminare i Certificati Attendibili?</string>
-    <string name="settingsCertsPopupMessage">Sei sicuro di voler eliminare qualsiasi certificato attendibile o hostname aggiunti manualmente? \n\nSarai anche disconnesso.</string>
+    <string name="settingsCertsPopupMessage">Sei sicuro di voler eliminare qualsiasi certificato attendibile o hostname aggiunti manualmente?
+        \n\nSarai anche disconnesso.
+    </string>
     <string name="settingsDateTimeHeaderText">Data &amp; Ora</string>
     <string name="settingsSave">Impostazioni salvate</string>
     <string name="settingsLanguageSelectorHeader">Lingua</string>
@@ -177,7 +182,8 @@ URL è richiesto</string>
     <string name="cacheSizeImagesSelectionHeaderText">Dimensione Cache Immagini</string>
     <string name="clearCacheSelectionHeaderText">Cancella Cache</string>
     <string name="clearCacheDialogHeader">Svuotare la cache?</string>
-    <string name="clearCacheDialogMessage">Questo eliminerà tutti i dati della cache inclusi file e immagini.\n\nProcedi con la cancellazione?</string>
+    <string name="clearCacheDialogMessage">Questo eliminerà tutti i dati della cache inclusi file e immagini.\n\nProcedi con la cancellazione?
+    </string>
     <string name="draftsHeader">Bozze</string>
     <string name="draftsHintText">Bozze dei commenti</string>
     <string name="settingsEnableCommentsDeletionText">Abilita Eliminazione Bozze</string>
@@ -185,7 +191,9 @@ URL è richiesto</string>
     <string name="settingsGeneralHeader">Generale</string>
     <string name="generalHintText">Home screen, default link handler</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect
+        you automatically.
+    </string>
     <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Sblocco biometrico</string>
@@ -205,7 +213,9 @@ URL è richiesto</string>
     <string name="labelDeleteText">Label cancellato</string>
     <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Errore di autorizzazione</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case
+        of revoked Token, please logout and login again
+    </string>
     <string name="labelDeleteMessage">Si vuole veramente cancellare questo label?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Team</string>
@@ -216,7 +226,8 @@ URL è richiesto</string>
     <string name="teamPermissionNone">• I membri di questo team non hanno alcun permesso.</string>
     <string name="teamPermissionRead">• I membri di questo team possono vedere i repository del team.</string>
     <string name="teamPermissionWrite">• I membri di questo team possono vedere e fare push ai repository del team.</string>
-    <string name="teamPermissionAdmin">• I membri di questo team possono fare push da e verso i repository del team e aggiungere collaboratori.</string>
+    <string name="teamPermissionAdmin">• I membri di questo team possono fare push da e verso i repository del team e aggiungere collaboratori.
+    </string>
     <string name="teamPermissionOwner">• I membri di questo team hanno i permessi di proprietario.</string>
     <string name="teamShowAll">mostra tutto</string>
     <string name="orgMember">Membri Org</string>
@@ -242,8 +253,9 @@ URL è richiesto</string>
     <string name="newTeamPermissionAdmin">I membri possono inviare i repository del team e aggiungere loro collaboratori</string>
     <string name="teamNameEmpty">Inserisci il nome del team</string>
     <string name="teamNameError">Il nome del team deve contenere solo caratteri alfanumerici, trattino (-), trattino basso (_) e punto (.)</string>
-    <string name="teamPermissionEmpty">Seleziona 
-autorizzazione</string>
+    <string name="teamPermissionEmpty">Seleziona
+        autorizzazione
+    </string>
     <string name="teamDescError">La descrizione del team contiene caratteri non validi</string>
     <string name="teamDescLimit">La descrizione del team ha più di 100 caratteri</string>
     <string name="teamCreated">Team creato</string>
@@ -373,7 +385,9 @@ autorizzazione</string>
     <string name="doneButton">Fatto</string>
     <string name="cancelButton">Annulla</string>
     <string name="genericError">Qualcosa è andato storto, riprova</string>
-    <string name="apiNotFound">Questa richiesta richiede una versione di Gitea superiore a quella installata. Aggiorna la tua istanza all\'ultima versione di Gitea.</string>
+    <string name="apiNotFound">Questa richiesta richiede una versione di Gitea superiore a quella installata. Aggiorna la tua istanza all\'ultima
+        versione di Gitea.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">Aggiungi</string>
     <string name="removeButton">Rimuovi</string>
@@ -424,7 +438,9 @@ autorizzazione</string>
     <string name="watchRepositorySuccess">Repository aggiunto alla watch list</string>
     <string name="unWatchRepositorySuccess">Repository rimosso dalla watchlist</string>
     <string name="titleDrafts">Bozze</string>
-    <string name="versionUnsupportedOld">Vecchia versione non supportata (%1$s) di Gitea rilevata. Per favore aggiorna all\'ultima versione stabile. Se continui, alcune funzionalità potrebbero non funzionare.</string>
+    <string name="versionUnsupportedOld">Vecchia versione non supportata (%1$s) di Gitea rilevata. Per favore aggiorna all\'ultima versione stabile.
+        Se continui, alcune funzionalità potrebbero non funzionare.
+    </string>
     <string name="versionUnsupportedNew">Nuova versione di Gitea rilevata! Si prega di AGGIORNARE GitNex!</string>
     <string name="versionUnknown">Nessun Gitea rilevato!</string>
     <string name="versionAlertDialogHeader">Versione non supportata di Gitea</string>
@@ -499,9 +515,15 @@ autorizzazione</string>
     <string name="settingsEnableReportsText">Abilita Rapporti Crash</string>
     <string name="crashTitle">GitNex ha smesso di funzionare :(</string>
     <string name="setCrashReports">Rapporti crash</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
     <string name="forceLogoutDialogHeader">Per favore accedi di nuovo</string>
-    <string name="forceLogoutDialogDescription">A causa di alcune modifiche importanti riguardanti il funzionamento interno dell\'app, abbiamo bisogno che tu effettui nuovamente il login. Queste modifiche ci permettono di rendere l\'applicazione più flessibile in futuro.\n\nGrazie per la pazienza e ci scusiamo per il disagio.</string>
+    <string name="forceLogoutDialogDescription">A causa di alcune modifiche importanti riguardanti il funzionamento interno dell\'app, abbiamo bisogno
+        che tu effettui nuovamente il login. Queste modifiche ci permettono di rendere l\'applicazione più flessibile in futuro.\n\nGrazie per la
+        pazienza e ci scusiamo per il disagio.
+    </string>
     <string name="deleteAllDrafts">Elimina Tutte Le Bozze</string>
     <string name="draftsListEmpty">Nessuna bozza trovata</string>
     <string name="draftsDeleteSuccess">Bozze eliminate con successo</string>
@@ -518,7 +540,9 @@ autorizzazione</string>
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account eliminato con successo</string>
     <string name="removeAccountPopupTitle">Rimuovi l\'account</string>
-    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
+    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to
+        this account on the app only.
+    </string>
     <string name="addNewAccount">Nuovo account</string>
     <string name="addNewAccountText">Aggiungere un nuovo account</string>
     <string name="accountAlreadyExistsError">L\'account esiste già</string>
@@ -566,12 +590,20 @@ autorizzazione</string>
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">Repository deleted successfully</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Esegui Trasferimento</string>
     <string name="repoTransferOwnerText">Nuovo Proprietario</string>
     <string name="repoTransferSuccess">Repository trasferito con successo</string>
@@ -594,9 +626,13 @@ autorizzazione</string>
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">Vai all\'App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
     <string name="biometricAuthTitle">Autenticazione biometrica</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -635,7 +671,9 @@ autorizzazione</string>
     <string name="tagDeleted">Etichetta eliminata</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Usa Schede Personalizzate</string>
-    <string name="browserOpenFailed">Nessuna applicazione trovata per aprire questo collegamento. URL SSH e URL con prefissi diversi da http:// or https:// non sono supportati dalla maggior parte dei browser</string>
+    <string name="browserOpenFailed">Nessuna applicazione trovata per aprire questo collegamento. URL SSH e URL con prefissi diversi da http:// or
+        https:// non sono supportati dalla maggior parte dei browser
+    </string>
     <string name="logInAgain">Accedi di nuovo</string>
     <string name="notLoggedIn">%s \u25CF non è connesso</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index c56e576e..f1a9371e 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -51,7 +51,9 @@
     <string name="navigationDrawerClose">Close Navigation Drawer</string>
     <string name="logo">Login to Gitea</string>
     <string name="protocol">Protocol</string>
-    <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter Gitea url e.g: try.gitea.io. \n3- If you have enabled 2FA for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.</string>
+    <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter Gitea url e.g: try.gitea.io. \n3- If you have enabled 2FA
+        for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.
+    </string>
     <string name="malformedUrl">Couldn\'t connect to host. Please check your URL or port for any errors</string>
     <string name="protocolError">It is not recommended to use HTTP protocol unless you are testing on local network</string>
     <string name="malformedJson">Malformed JSON was received. Server response was not successful</string>
@@ -146,7 +148,8 @@
     <string name="settingsSecurityHeader">Security</string>
     <string name="settingsCertsSelectorHeader">Delete Trusted Certificates</string>
     <string name="settingsCertsPopupTitle">Delete Trusted Certificates?</string>
-    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.</string>
+    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.
+    </string>
     <string name="settingsDateTimeHeaderText">Date &amp; Time</string>
     <string name="settingsSave">Settings saved</string>
     <string name="settingsLanguageSelectorHeader">Language</string>
@@ -184,7 +187,9 @@
     <string name="settingsGeneralHeader">General</string>
     <string name="generalHintText">Home screen, default link handler</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect
+        you automatically.
+    </string>
     <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
@@ -204,7 +209,9 @@
     <string name="labelDeleteText">Label deleted</string>
     <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Authorization Error</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case
+        of revoked Token, please logout and login again
+    </string>
     <string name="labelDeleteMessage">Do you really want to delete this label?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Teams</string>
@@ -371,7 +378,9 @@
     <string name="doneButton">Done</string>
     <string name="cancelButton">Cancel</string>
     <string name="genericError">Something went wrong, please try again</string>
-    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of Gitea.</string>
+    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of
+        Gitea.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">Add</string>
     <string name="removeButton">Remove</string>
@@ -422,7 +431,9 @@
     <string name="watchRepositorySuccess">Repository added to watch list</string>
     <string name="unWatchRepositorySuccess">Repository removed from watch list</string>
     <string name="titleDrafts">Drafts</string>
-    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue, some features may not work.</string>
+    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue,
+        some features may not work.
+    </string>
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Unsupported Version of Gitea</string>
@@ -497,9 +508,14 @@
     <string name="settingsEnableReportsText">Enable Crash Reports</string>
     <string name="crashTitle">GitNex has stopped :(</string>
     <string name="setCrashReports">Crash reports</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
     <string name="forceLogoutDialogHeader">Please sign in again</string>
-    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.</string>
+    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login
+        again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.
+    </string>
     <string name="deleteAllDrafts">Delete All Drafts</string>
     <string name="draftsListEmpty">No drafts found</string>
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
@@ -516,7 +532,9 @@
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
-    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
+    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to
+        this account on the app only.
+    </string>
     <string name="addNewAccount">New Account</string>
     <string name="addNewAccountText">Add New Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
@@ -563,12 +581,20 @@
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">Repository deleted successfully</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Perform Transfer</string>
     <string name="repoTransferOwnerText">New Owner</string>
     <string name="repoTransferSuccess">Repository transferred successfully</string>
@@ -591,9 +617,13 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -632,7 +662,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index d16b2929..0786be51 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -51,7 +51,9 @@
     <string name="navigationDrawerClose">Close Navigation Drawer</string>
     <string name="logo">Login to Gitea</string>
     <string name="protocol">Protocol</string>
-    <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter Gitea url e.g: try.gitea.io. \n3- If you have enabled 2FA for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.</string>
+    <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter Gitea url e.g: try.gitea.io. \n3- If you have enabled 2FA
+        for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.
+    </string>
     <string name="malformedUrl">Couldn\'t connect to host. Please check your URL or port for any errors</string>
     <string name="protocolError">It is not recommended to use HTTP protocol unless you are testing on local network</string>
     <string name="malformedJson">Malformed JSON was received. Server response was not successful</string>
@@ -146,7 +148,8 @@
     <string name="settingsSecurityHeader">Security</string>
     <string name="settingsCertsSelectorHeader">Delete Trusted Certificates</string>
     <string name="settingsCertsPopupTitle">Delete Trusted Certificates?</string>
-    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.</string>
+    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.
+    </string>
     <string name="settingsDateTimeHeaderText">Date &amp; Time</string>
     <string name="settingsSave">Settings saved</string>
     <string name="settingsLanguageSelectorHeader">Language</string>
@@ -184,7 +187,9 @@
     <string name="settingsGeneralHeader">General</string>
     <string name="generalHintText">Home screen, default link handler</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect
+        you automatically.
+    </string>
     <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
@@ -204,7 +209,9 @@
     <string name="labelDeleteText">Label deleted</string>
     <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Authorization Error</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case
+        of revoked Token, please logout and login again
+    </string>
     <string name="labelDeleteMessage">Do you really want to delete this label?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Teams</string>
@@ -371,7 +378,9 @@
     <string name="doneButton">Done</string>
     <string name="cancelButton">Cancel</string>
     <string name="genericError">Something went wrong, please try again</string>
-    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of Gitea.</string>
+    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of
+        Gitea.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">Add</string>
     <string name="removeButton">Remove</string>
@@ -422,7 +431,9 @@
     <string name="watchRepositorySuccess">Repository added to watch list</string>
     <string name="unWatchRepositorySuccess">Repository removed from watch list</string>
     <string name="titleDrafts">Drafts</string>
-    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue, some features may not work.</string>
+    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue,
+        some features may not work.
+    </string>
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Unsupported Version of Gitea</string>
@@ -497,9 +508,14 @@
     <string name="settingsEnableReportsText">Enable Crash Reports</string>
     <string name="crashTitle">GitNex has stopped :(</string>
     <string name="setCrashReports">Crash reports</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
     <string name="forceLogoutDialogHeader">Please sign in again</string>
-    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.</string>
+    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login
+        again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.
+    </string>
     <string name="deleteAllDrafts">Delete All Drafts</string>
     <string name="draftsListEmpty">No drafts found</string>
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
@@ -516,7 +532,9 @@
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
-    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
+    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to
+        this account on the app only.
+    </string>
     <string name="addNewAccount">New Account</string>
     <string name="addNewAccountText">Add New Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
@@ -565,12 +583,20 @@
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">Repository deleted successfully</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Perform Transfer</string>
     <string name="repoTransferOwnerText">New Owner</string>
     <string name="repoTransferSuccess">Repository transferred successfully</string>
@@ -593,9 +619,13 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -634,7 +664,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 4fdf71ec..d0866fca 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -51,7 +51,10 @@
     <string name="navigationDrawerClose">Sluit Navigatiemenu</string>
     <string name="logo">Inloggen bij Gitea</string>
     <string name="protocol">Protocol</string>
-    <string name="urlInfoTooltip">1- Selecteer het juiste protocol (https of http). \n2- Vul Gitea url in, bijv.: try.gitea.io. \n3- Indien 2FA geactiveerd is voor jouw account, vul dan de code in bij het OTP Code veld. \n4- Voor HTTP standaard autorisatie gebruik GEBRUIKERSNAAM@DOMEIN.NL in het URL veld.</string>
+    <string name="urlInfoTooltip">1- Selecteer het juiste protocol (https of http). \n2- Vul Gitea url in, bijv.: try.gitea.io. \n3- Indien 2FA
+        geactiveerd is voor jouw account, vul dan de code in bij het OTP Code veld. \n4- Voor HTTP standaard autorisatie gebruik
+        GEBRUIKERSNAAM@DOMEIN.NL in het URL veld.
+    </string>
     <string name="malformedUrl">Kan geen verbinding maken met host. Controleer de URL en poort op fouten</string>
     <string name="protocolError">Het is afgeraden om HTTP te gebruiken tenzij je test op een lokaal netwerk</string>
     <string name="malformedJson">Incorrecte JSON ontvangen. Server reactie is niet gelukt</string>
@@ -146,7 +149,9 @@
     <string name="settingsSecurityHeader">Beveiliging</string>
     <string name="settingsCertsSelectorHeader">Verwijder Vertrouwde Certificaten</string>
     <string name="settingsCertsPopupTitle">Verwijder Vertrouwde Certificaten?</string>
-    <string name="settingsCertsPopupMessage">Weet u zeker dat u handmatig vertrouwde certificaten of hostnamen wil verwijderen? \n\nU wordt ook uitgelogd.</string>
+    <string name="settingsCertsPopupMessage">Weet u zeker dat u handmatig vertrouwde certificaten of hostnamen wil verwijderen? \n\nU wordt ook
+        uitgelogd.
+    </string>
     <string name="settingsDateTimeHeaderText">Datum &amp; Tijd</string>
     <string name="settingsSave">Instelling opgeslagen</string>
     <string name="settingsLanguageSelectorHeader">Taal</string>
@@ -184,7 +189,9 @@
     <string name="settingsGeneralHeader">Algemeen</string>
     <string name="generalHintText">Beginscherm, standaard URL afhandelaar</string>
     <string name="generalDeepLinkDefaultScreen">Standaard URL Afhandelaar</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Kies het scherm wat geopend moet worden als de app niet met de externe URL overweg kan. U zal automatisch omgeleid worden.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Kies het scherm wat geopend moet worden als de app niet met de externe URL overweg kan. U zal
+        automatisch omgeleid worden.
+    </string>
     <string name="generalDeepLinkSelectedText">N.v.t.</string>
     <string name="linkSelectorDialogTitle">Selecteer Standaard URL Afhandelaar Scherm</string>
     <string name="settingsBiometricHeader">Ondersteuning voor Biometrie</string>
@@ -204,7 +211,9 @@
     <string name="labelDeleteText">Label deleted</string>
     <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Authorization Error</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case
+        of revoked Token, please logout and login again
+    </string>
     <string name="labelDeleteMessage">Do you really want to delete this label?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Teams</string>
@@ -371,7 +380,9 @@
     <string name="doneButton">Done</string>
     <string name="cancelButton">Cancel</string>
     <string name="genericError">Something went wrong, please try again</string>
-    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of Gitea.</string>
+    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of
+        Gitea.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">Add</string>
     <string name="removeButton">Remove</string>
@@ -422,7 +433,9 @@
     <string name="watchRepositorySuccess">Repository added to watch list</string>
     <string name="unWatchRepositorySuccess">Repository removed from watch list</string>
     <string name="titleDrafts">Drafts</string>
-    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue, some features may not work.</string>
+    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue,
+        some features may not work.
+    </string>
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Unsupported Version of Gitea</string>
@@ -497,9 +510,14 @@
     <string name="settingsEnableReportsText">Enable Crash Reports</string>
     <string name="crashTitle">GitNex has stopped :(</string>
     <string name="setCrashReports">Crash reports</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
     <string name="forceLogoutDialogHeader">Please sign in again</string>
-    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.</string>
+    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login
+        again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.
+    </string>
     <string name="deleteAllDrafts">Delete All Drafts</string>
     <string name="draftsListEmpty">No drafts found</string>
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
@@ -516,7 +534,9 @@
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
-    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
+    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to
+        this account on the app only.
+    </string>
     <string name="addNewAccount">New Account</string>
     <string name="addNewAccountText">Add New Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
@@ -564,12 +584,20 @@
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">Repository deleted successfully</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Perform Transfer</string>
     <string name="repoTransferOwnerText">New Owner</string>
     <string name="repoTransferSuccess">Repository transferred successfully</string>
@@ -592,9 +620,13 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -633,7 +665,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index f6ab46a8..3ca1ec5d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -51,7 +51,9 @@
     <string name="navigationDrawerClose">Zamknij szufladę nawigacji</string>
     <string name="logo">Zaloguj się do Gitea</string>
     <string name="protocol">Protokół</string>
-    <string name="urlInfoTooltip">1- Wybierz poprawny protokół (https lub http). \n2- Wprowadź adres URL Gitea np: try.gitea.io. \n3- Jeśli włączyłeś 2FA dla swojego konta, wprowadź kod w polu OTP Code. \n4 - Dla podstawowej autoryzacji HTTP użyj NAZWAUŻYTKOWNIKA@STRONA.PL w polu URL.</string>
+    <string name="urlInfoTooltip">1- Wybierz poprawny protokół (https lub http). \n2- Wprowadź adres URL Gitea np: try.gitea.io. \n3- Jeśli włączyłeś
+        2FA dla swojego konta, wprowadź kod w polu OTP Code. \n4 - Dla podstawowej autoryzacji HTTP użyj NAZWAUŻYTKOWNIKA@STRONA.PL w polu URL.
+    </string>
     <string name="malformedUrl">Nie można połączyć się z hostem. Sprawdź czy adres URL i port są prawidłowe</string>
     <string name="protocolError">It is not recommended to use HTTP protocol unless you are testing on local network</string>
     <string name="malformedJson">Malformed JSON was received. Server response was not successful</string>
@@ -146,7 +148,9 @@
     <string name="settingsSecurityHeader">Bezpieczeństwo</string>
     <string name="settingsCertsSelectorHeader">Usuń zaufane certyfikaty</string>
     <string name="settingsCertsPopupTitle">Usunąć zaufane certyfikaty?</string>
-    <string name="settingsCertsPopupMessage">Czy na pewno chcesz usunąć wszystkie ręcznie zaufane certyfikaty lub nazwy hostów? \n\nZostaniesz również wylogowany.</string>
+    <string name="settingsCertsPopupMessage">Czy na pewno chcesz usunąć wszystkie ręcznie zaufane certyfikaty lub nazwy hostów? \n\nZostaniesz również
+        wylogowany.
+    </string>
     <string name="settingsDateTimeHeaderText">Data &amp; Czas</string>
     <string name="settingsSave">Ustawienia zapisane</string>
     <string name="settingsLanguageSelectorHeader">Język</string>
@@ -184,7 +188,9 @@
     <string name="settingsGeneralHeader">Ogólne</string>
     <string name="generalHintText">Home screen, default link handler</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect
+        you automatically.
+    </string>
     <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Obsługa biometrii</string>
@@ -204,7 +210,9 @@
     <string name="labelDeleteText">Etykieta usunięta</string>
     <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Błąd autoryzacji</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case
+        of revoked Token, please logout and login again
+    </string>
     <string name="labelDeleteMessage">Czy na pewno chcesz usunąć tę etykietę?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Zespoły</string>
@@ -371,7 +379,9 @@
     <string name="doneButton">Gotowe</string>
     <string name="cancelButton">Anuluj</string>
     <string name="genericError">Coś poszło nie tak, spróbuj ponownie</string>
-    <string name="apiNotFound">To żądanie wymaga wyższej wersji Gitea niż zainstalowana. Proszę zaktualizować swoją instancję do najnowszej wersji Gitea.</string>
+    <string name="apiNotFound">To żądanie wymaga wyższej wersji Gitea niż zainstalowana. Proszę zaktualizować swoją instancję do najnowszej wersji
+        Gitea.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">Dodaj</string>
     <string name="removeButton">Usuń</string>
@@ -422,7 +432,9 @@
     <string name="watchRepositorySuccess">Repozytorium dodane do listy obserwowanych</string>
     <string name="unWatchRepositorySuccess">Repozytorium usunięte z listy obserwacyjnej</string>
     <string name="titleDrafts">Szkice</string>
-    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue, some features may not work.</string>
+    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue,
+        some features may not work.
+    </string>
     <string name="versionUnsupportedNew">Wykryto nową wersję Gitea! Proszę ZAKTUALIZOWAĆ GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Nieobsługiwana wersja Gitea</string>
@@ -497,9 +509,14 @@
     <string name="settingsEnableReportsText">Włącz raporty awarii</string>
     <string name="crashTitle">GitNex zatrzymał się :(</string>
     <string name="setCrashReports">Raporty awarii</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
     <string name="forceLogoutDialogHeader">Please sign in again</string>
-    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.</string>
+    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login
+        again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.
+    </string>
     <string name="deleteAllDrafts">Delete All Drafts</string>
     <string name="draftsListEmpty">No drafts found</string>
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
@@ -516,7 +533,9 @@
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Usuń Konto</string>
-    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
+    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to
+        this account on the app only.
+    </string>
     <string name="addNewAccount">Nowe Konto</string>
     <string name="addNewAccountText">Dodaj Nowe Konto</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
@@ -566,12 +585,20 @@
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">Repository deleted successfully</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Perform Transfer</string>
     <string name="repoTransferOwnerText">Nowy Właściciel</string>
     <string name="repoTransferSuccess">Repository transferred successfully</string>
@@ -594,9 +621,13 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -635,7 +666,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 48832494..58ee37be 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -51,7 +51,9 @@
     <string name="navigationDrawerClose">Fechar painel de navegação</string>
     <string name="logo">Conectar no Gitea</string>
     <string name="protocol">Protocolo</string>
-    <string name="urlInfoTooltip">1- Escolha o protocolo correto (https ou http). \n2- Insira a url do Gitea. Por exemplo: try.gitea.io. \n3 - Se você habilitou 2FA para sua conta, digite o código no campo de código OTP. \n4- Para autenticação básica HTTP use USUARIO@DOMINIO.COM no campo URL.</string>
+    <string name="urlInfoTooltip">1- Escolha o protocolo correto (https ou http). \n2- Insira a url do Gitea. Por exemplo: try.gitea.io. \n3 - Se você
+        habilitou 2FA para sua conta, digite o código no campo de código OTP. \n4- Para autenticação básica HTTP use USUARIO@DOMINIO.COM no campo URL.
+    </string>
     <string name="malformedUrl">Não foi possível conectar-se ao host. Por favor verifique sua URL ou porta para ver se há algum erro</string>
     <string name="protocolError">Não é recomendado usar o protocolo HTTP a menos que você esteja testando na rede local</string>
     <string name="malformedJson">JSON malformado foi recebido. A resposta do servidor não foi bem sucedida</string>
@@ -146,7 +148,9 @@
     <string name="settingsSecurityHeader">Segurança</string>
     <string name="settingsCertsSelectorHeader">Excluir Certificados Confiáveis</string>
     <string name="settingsCertsPopupTitle">Excluir Certificados Confiáveis?</string>
-    <string name="settingsCertsPopupMessage">Tem certeza que deseja excluir qualquer certificado ou hostname confiado manualmente? \n\nVocê também será desconectado.</string>
+    <string name="settingsCertsPopupMessage">Tem certeza que deseja excluir qualquer certificado ou hostname confiado manualmente? \n\nVocê também
+        será desconectado.
+    </string>
     <string name="settingsDateTimeHeaderText">Data &amp; Hora</string>
     <string name="settingsSave">Configurações salvas</string>
     <string name="settingsLanguageSelectorHeader">Idioma</string>
@@ -176,7 +180,8 @@
     <string name="cacheSizeImagesSelectionHeaderText">Tamanho do Cache das Imagens</string>
     <string name="clearCacheSelectionHeaderText">Limpar Cache</string>
     <string name="clearCacheDialogHeader">Limpar Cache?</string>
-    <string name="clearCacheDialogMessage">Isto vai excluir todos os dados de cache, incluindo arquivos e imagens.\n\nProsseguir com a exclusão?</string>
+    <string name="clearCacheDialogMessage">Isto vai excluir todos os dados de cache, incluindo arquivos e imagens.\n\nProsseguir com a exclusão?
+    </string>
     <string name="draftsHeader">Rascunhos</string>
     <string name="draftsHintText">Rascunho dos comentários</string>
     <string name="settingsEnableCommentsDeletionText">Ativar exclusão de rascunhos</string>
@@ -184,7 +189,9 @@
     <string name="settingsGeneralHeader">Geral</string>
     <string name="generalHintText">Home screen, default link handler</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect
+        you automatically.
+    </string>
     <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
@@ -204,7 +211,9 @@
     <string name="labelDeleteText">Marcador excluído</string>
     <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Erro de autorização</string>
-    <string name="alertDialogTokenRevokedMessage">Parece que o Token de Acesso foi revogado OU você não está autorizado para ver esses conteúdos.\n\nNo caso de token ser revogado, faça o logout e login de novo</string>
+    <string name="alertDialogTokenRevokedMessage">Parece que o Token de Acesso foi revogado OU você não está autorizado para ver esses
+        conteúdos.\n\nNo caso de token ser revogado, faça o logout e login de novo
+    </string>
     <string name="labelDeleteMessage">Você realmente deseja excluir este marcador?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Equipes</string>
@@ -371,7 +380,9 @@
     <string name="doneButton">Feito</string>
     <string name="cancelButton">Cancelar</string>
     <string name="genericError">Algo deu errado, por favor, tente de novo</string>
-    <string name="apiNotFound">Esta solicitação precisa de uma versão do Gitea maior do que a instalada. Por favor, atualize sua instância para a versão mais recente do Gitea.</string>
+    <string name="apiNotFound">Esta solicitação precisa de uma versão do Gitea maior do que a instalada. Por favor, atualize sua instância para a
+        versão mais recente do Gitea.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">Adicionar</string>
     <string name="removeButton">Remover</string>
@@ -392,7 +403,9 @@
     <string name="viewInBrowser">Visualizar no Navegador</string>
     <string name="isOpen">Aberto</string>
     <string name="isClosed">Fechado</string>
-    <string name="genericServerResponseError">Não conseguimos encontrar o servidor no momento, por favor, verifique o status do seu servidor e tente novamente</string>
+    <string name="genericServerResponseError">Não conseguimos encontrar o servidor no momento, por favor, verifique o status do seu servidor e tente
+        novamente
+    </string>
     <string name="genericCopyUrl">Copiar URL</string>
     <string name="genericWaitFor">Hold on ☕</string>
     <string name="file">File</string>
@@ -422,7 +435,9 @@
     <string name="watchRepositorySuccess">Repositório adicionado à lista de observação</string>
     <string name="unWatchRepositorySuccess">Repositório removido da lista de observação</string>
     <string name="titleDrafts">Rascunhos</string>
-    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue, some features may not work.</string>
+    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue,
+        some features may not work.
+    </string>
     <string name="versionUnsupportedNew">Nova versão do Gitea detectada! Por favor, ATUALIZE o GitNex!</string>
     <string name="versionUnknown">Gitea não detectado!</string>
     <string name="versionAlertDialogHeader">Versão do Gitea não suportada</string>
@@ -444,7 +459,9 @@
     <string name="mergePullRequestButtonText">Aplicar merge</string>
     <string name="deleteBranchAfterMerge">Excluir o branch após o Merge</string>
     <string name="mergeNoteText">A aplicação do merge pode falhar se você não está autorizado a aplicar este Pull Request.</string>
-    <string name="mergeInfoDisabledMessage">O botão Merge é desativado isso pode significar que existem conflitos OU outros problemas a serem resolvidos antes de fazer Merge</string>
+    <string name="mergeInfoDisabledMessage">O botão Merge é desativado isso pode significar que existem conflitos OU outros problemas a serem
+        resolvidos antes de fazer Merge
+    </string>
     <string name="deleteBranchForkInfo">Este branch pertence a um repositórioForked</string>
     <string name="mergeCommentText">Comentário do merge</string>
     <string name="mergePRSuccessMsg">O merge da Pull Request foi aplicado com sucesso</string>
@@ -497,9 +514,15 @@
     <string name="settingsEnableReportsText">Ativar relatórios de erros</string>
     <string name="crashTitle">GitNex parou :(</string>
     <string name="setCrashReports">Relatórios de erros</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
     <string name="forceLogoutDialogHeader">Por favor, faça o login novamente</string>
-    <string name="forceLogoutDialogDescription">Devido a algumas mudanças principais no funcionamento interno do aplicativo, exigimos que você faça o login novamente. Essas alterações nos permitem tornar o aplicativo mais flexível no futuro.\n\nAgradecemos por sua paciência e lamentamos o inconveniente.</string>
+    <string name="forceLogoutDialogDescription">Devido a algumas mudanças principais no funcionamento interno do aplicativo, exigimos que você faça o
+        login novamente. Essas alterações nos permitem tornar o aplicativo mais flexível no futuro.\n\nAgradecemos por sua paciência e lamentamos o
+        inconveniente.
+    </string>
     <string name="deleteAllDrafts">Excluir Todos os Rascunhos</string>
     <string name="draftsListEmpty">Nenhum rascunho encontrado</string>
     <string name="draftsDeleteSuccess">Rascunhos excluídos com êxito</string>
@@ -516,7 +539,9 @@
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Conta excluída com êxito</string>
     <string name="removeAccountPopupTitle">Excluir Conta</string>
-    <string name="removeAccountPopupMessage">Tem certeza de que deseja excluir esta conta do aplicativo?\n\nIsso excluirá todos os dados relacionados a esta conta apenas no app.</string>
+    <string name="removeAccountPopupMessage">Tem certeza de que deseja excluir esta conta do aplicativo?\n\nIsso excluirá todos os dados relacionados
+        a esta conta apenas no app.
+    </string>
     <string name="addNewAccount">Nova Conta</string>
     <string name="addNewAccountText">Adicionar Nova Conta</string>
     <string name="accountAlreadyExistsError">Esta conta já existe no app</string>
@@ -564,12 +589,20 @@
     <string name="repoPropertiesEnableSquash">Ativar Squash e Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Propriedades do repositório atualizadas com sucesso</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">Repositório deletado com sucesso</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</string>
-    <string name="repoSettingsTransferOwnershipHint">Transferir este repositório para um outro usuário ou para uma organização onde você tem permissões de administrador</string>
-    <string name="repoSettingsTransferOwnershipDescription">Coisas para saber antes da transferência:\n\n- Você irá perder acesso ao repositório se você transferir-o para um usuário individual.\n- Você irá manter o acesso ao repositório se você transferir para uma organização que você (co-)pertence.\n\nInsira o nome do repositório como confirmação</string>
+    <string name="repoSettingsTransferOwnershipHint">Transferir este repositório para um outro usuário ou para uma organização onde você tem
+        permissões de administrador
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Coisas para saber antes da transferência:\n\n- Você irá perder acesso ao repositório se
+        você transferir-o para um usuário individual.\n- Você irá manter o acesso ao repositório se você transferir para uma organização que você
+        (co-)pertence.\n\nInsira o nome do repositório como confirmação
+    </string>
     <string name="repoTransferText">Realizar Transferência</string>
     <string name="repoTransferOwnerText">New Owner</string>
     <string name="repoTransferSuccess">Repositório transferido com sucesso</string>
@@ -592,9 +625,13 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">Parece que a conta para a URI %1$s não existe no aplicativo. Você pode adicionar uma tocando no botão de Adicionar Uma Conta.</string>
+    <string name="accountDoesNotExist">Parece que a conta para a URI %1$s não existe no aplicativo. Você pode adicionar uma tocando no botão de
+        Adicionar Uma Conta.
+    </string>
     <string name="launchApp">Ir para o Aplicativo</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -633,7 +670,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e2d6dd40..d7d85ae3 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -51,7 +51,9 @@
     <string name="navigationDrawerClose">Закрыть навигацию</string>
     <string name="logo">Войти в Gitea</string>
     <string name="protocol">Протокол</string>
-    <string name="urlInfoTooltip">1. Выберите протокол (https или http) \n2. Укажите URL Gitea, например: try.gitea.io \n3. Если для учетной записи включена 2FA, введите код OTP в соответствующее поле. \n4. Для базовой аутентификации HTTP укажите USERNAME@DOMAIN.COM в поле URL.</string>
+    <string name="urlInfoTooltip">1. Выберите протокол (https или http) \n2. Укажите URL Gitea, например: try.gitea.io \n3. Если для учетной записи
+        включена 2FA, введите код OTP в соответствующее поле. \n4. Для базовой аутентификации HTTP укажите USERNAME@DOMAIN.COM в поле URL.
+    </string>
     <string name="malformedUrl">Не удалось подключиться к хосту. Пожалуйста, проверьте URL-адрес или порт на наличие ошибок</string>
     <string name="protocolError">Не рекомендуется использовать протокол HTTP, если вы не тестируете в локальной сети</string>
     <string name="malformedJson">Получен искаженный JSON. Ответ сервера не был успешным</string>
@@ -146,7 +148,9 @@
     <string name="settingsSecurityHeader">Безопасность</string>
     <string name="settingsCertsSelectorHeader">Удалить доверенные сертификаты</string>
     <string name="settingsCertsPopupTitle">Удалить доверенные сертификаты?</string>
-    <string name="settingsCertsPopupMessage">Вы уверены, что хотите удалить любой вручную доверенный сертификат или имя хоста? \n\nВы также выйдите из системы.</string>
+    <string name="settingsCertsPopupMessage">Вы уверены, что хотите удалить любой вручную доверенный сертификат или имя хоста? \n\nВы также выйдите из
+        системы.
+    </string>
     <string name="settingsDateTimeHeaderText">Дата и время</string>
     <string name="settingsSave">Сохранено</string>
     <string name="settingsLanguageSelectorHeader">Язык</string>
@@ -184,7 +188,9 @@
     <string name="settingsGeneralHeader">Общее</string>
     <string name="generalHintText">Домашний экран, обработчик ссылок по умолчанию</string>
     <string name="generalDeepLinkDefaultScreen">Обработчик ссылок по умолчанию</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Выберите, какой экран следует загрузить, если приложение не может обрабатывать внешние ссылки. Он автоматически перенаправит вас.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Выберите, какой экран следует загрузить, если приложение не может обрабатывать внешние ссылки.
+        Он автоматически перенаправит вас.
+    </string>
     <string name="generalDeepLinkSelectedText">Н/Д</string>
     <string name="linkSelectorDialogTitle">Выбрать экран обработчика ссылок по умолчанию</string>
     <string name="settingsBiometricHeader">Поддержка биометрии</string>
@@ -204,7 +210,9 @@
     <string name="labelDeleteText">Метка удалена!</string>
     <string name="selectBranchError">Выберите ветку для релиза</string>
     <string name="alertDialogTokenRevokedTitle">Ошибка авторизации</string>
-    <string name="alertDialogTokenRevokedMessage">Похоже, токен доступа отозван, либо вам не разрешено просматривать это содержимое.\n\nВ случае отзыва токена, пожалуйста, выйдите из системы и войдите снова</string>
+    <string name="alertDialogTokenRevokedMessage">Похоже, токен доступа отозван, либо вам не разрешено просматривать это содержимое.\n\nВ случае
+        отзыва токена, пожалуйста, выйдите из системы и войдите снова
+    </string>
     <string name="labelDeleteMessage">Вы действительно хотите удалить эту метку?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Команды</string>
@@ -371,7 +379,9 @@
     <string name="doneButton">Готово</string>
     <string name="cancelButton">Закрыть</string>
     <string name="genericError">Что-то пошло не так. Пожалуйста, попытайтесь еще раз.</string>
-    <string name="apiNotFound">Для этого запроса требуется более новая версия Gitea, чем установленная. Пожалуйста, обновите свою инстанцию до последней версии Gitea.</string>
+    <string name="apiNotFound">Для этого запроса требуется более новая версия Gitea, чем установленная. Пожалуйста, обновите свою инстанцию до
+        последней версии Gitea.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">Добавить</string>
     <string name="removeButton">Удалить</string>
@@ -392,7 +402,9 @@
     <string name="viewInBrowser">Просмотреть в браузере</string>
     <string name="isOpen">Открыто</string>
     <string name="isClosed">Закрыто</string>
-    <string name="genericServerResponseError">На данный момент мы не можем подключиться к серверу, пожалуйста, проверьте статус вашего сервера и повторите попытку</string>
+    <string name="genericServerResponseError">На данный момент мы не можем подключиться к серверу, пожалуйста, проверьте статус вашего сервера и
+        повторите попытку
+    </string>
     <string name="genericCopyUrl">Копировать URL</string>
     <string name="genericWaitFor">Подождите ☕</string>
     <string name="file">File</string>
@@ -422,7 +434,9 @@
     <string name="watchRepositorySuccess">Репозиторий добавлен в список наблюдения</string>
     <string name="unWatchRepositorySuccess">Репозиторий удален из списка наблюдения</string>
     <string name="titleDrafts">Черновики</string>
-    <string name="versionUnsupportedOld">Обнаружена неподдерживаемая старая версия (%1$s) Gitea. Пожалуйста, обновите до последней стабильной версии. Если вы продолжите, некоторые функции могут работать неправильно.</string>
+    <string name="versionUnsupportedOld">Обнаружена неподдерживаемая старая версия (%1$s) Gitea. Пожалуйста, обновите до последней стабильной версии.
+        Если вы продолжите, некоторые функции могут работать неправильно.
+    </string>
     <string name="versionUnsupportedNew">Обнаружена новая версия Gitea! Пожалуйста, ОБНОВИТЕ GitNex!</string>
     <string name="versionUnknown">Gitea не обнаружен!</string>
     <string name="versionAlertDialogHeader">Неподдерживаемая версия Gitea</string>
@@ -444,7 +458,9 @@
     <string name="mergePullRequestButtonText">Слить</string>
     <string name="deleteBranchAfterMerge">Удалить ветку после слияния</string>
     <string name="mergeNoteText">Слияние может завершиться неудачей, если у вас нет прав на выполнение этого запроса на объединение.</string>
-    <string name="mergeInfoDisabledMessage">Отключенная кнопка слияния означает наличие конфликтов ИЛИ других вещей, которые необходимо исправить перед слиянием</string>
+    <string name="mergeInfoDisabledMessage">Отключенная кнопка слияния означает наличие конфликтов ИЛИ других вещей, которые необходимо исправить
+        перед слиянием
+    </string>
     <string name="deleteBranchForkInfo">Эта ветка принадлежит форкнутому репозиторию</string>
     <string name="mergeCommentText">Комментарий для слияния</string>
     <string name="mergePRSuccessMsg">Запрос на слияние был успешно выполнен</string>
@@ -459,7 +475,8 @@
     <string name="deleteBranch">Delete Branch</string>
     <string name="waitLoadingDownloadFile">Пожалуйста дождитесь загрузки файла</string>
     <string name="downloadFileSaved">Файл успешно сохранён</string>
-    <string name="excludeFilesInFileViewer">Этот тип/размер файла не поддерживается программой просмотра файлов. Вы можете скачать его из меню.</string>
+    <string name="excludeFilesInFileViewer">Этот тип/размер файла не поддерживается программой просмотра файлов. Вы можете скачать его из меню.
+    </string>
     <string name="deleteFile">Удалить этот файл</string>
     <string name="editFile">Редактировать этот файл</string>
     <string name="deleteFileMessage">Файл установлен для удаления по ветке %1$s</string>
@@ -497,9 +514,15 @@
     <string name="settingsEnableReportsText">Включить отчёты об ошибках</string>
     <string name="crashTitle">GitNex остановлен :(</string>
     <string name="setCrashReports">Отчёты об ошибках</string>
-    <string name="crashMessage">Рекомендуется открыть в репозитории проекта задачу о том, как воспроизвести эту ошибку. Таким образом легче отладить и устранить проблему.\n\nНажмите кнопку ОК, чтобы вместо этого отправить отчет о сбое по электронной почте. В электронное письмо можно добавить дополнительный контент.\nСпасибо!</string>
+    <string name="crashMessage">Рекомендуется открыть в репозитории проекта задачу о том, как воспроизвести эту ошибку. Таким образом легче отладить и
+        устранить проблему.\n\nНажмите кнопку ОК, чтобы вместо этого отправить отчет о сбое по электронной почте. В электронное письмо можно добавить
+        дополнительный контент.\nСпасибо!
+    </string>
     <string name="forceLogoutDialogHeader">Пожалуйста, войдите снова</string>
-    <string name="forceLogoutDialogDescription">В связи с некоторыми существенными изменениями, касающимися внутренней работы приложения, мы просим вас снова войти в систему. Эти изменения позволяют сделать приложение более гибким в будущем.\n\nБлагодарим вас за терпение и приносим извинения за неудобства.</string>
+    <string name="forceLogoutDialogDescription">В связи с некоторыми существенными изменениями, касающимися внутренней работы приложения, мы просим
+        вас снова войти в систему. Эти изменения позволяют сделать приложение более гибким в будущем.\n\nБлагодарим вас за терпение и приносим
+        извинения за неудобства.
+    </string>
     <string name="deleteAllDrafts">Удалить все черновики</string>
     <string name="draftsListEmpty">Черновики не найдены</string>
     <string name="draftsDeleteSuccess">Черновики успешно удалены</string>
@@ -513,10 +536,14 @@
     <string name="rateAppHintText">Если вам нравится GitNex, вы можете поставить ему палец вверх</string>
     <string name="aboutAppHintText">Версия приложения, сборка, пользовательская версия gitea</string>
     <string name="archivedRepository">Архивировано</string>
-    <string name="archivedRepositoryMessage">Этот репозиторий находится в архиве. Вы можете просматривать файлы, но не можете отправлять или открывать проблемы/запросы на слияние.</string>
+    <string name="archivedRepositoryMessage">Этот репозиторий находится в архиве. Вы можете просматривать файлы, но не можете отправлять или открывать
+        проблемы/запросы на слияние.
+    </string>
     <string name="accountDeletedMessage">Учётная запись успешно удалена</string>
     <string name="removeAccountPopupTitle">Удалить учётную запись</string>
-    <string name="removeAccountPopupMessage">Вы уверены, что хотите удалить эту учётную запись из приложения?\n\nЭто удалит все данные, связанные с этой учётной записью только в приложении.</string>
+    <string name="removeAccountPopupMessage">Вы уверены, что хотите удалить эту учётную запись из приложения?\n\nЭто удалит все данные, связанные с
+        этой учётной записью только в приложении.
+    </string>
     <string name="addNewAccount">Новая учётная запись</string>
     <string name="addNewAccountText">Добавить новую учётную запись</string>
     <string name="accountAlreadyExistsError">Учётная запись уже существует в приложении</string>
@@ -566,12 +593,18 @@
     <string name="repoPropertiesEnableSquash">Включить объединение и слияние</string>
     <string name="repoPropertiesEnableForceMerge">Включить rebase с коммитом слияния (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Свойства репозитория успешно обновлены</string>
-    <string name="repoSettingsDeleteDescription">Что нужно знать перед удалением:\n\n- Эту операцию НЕЛЬЗЯ отменить.\n- Эта операция навсегда удалит репозиторий, включая код, задачи, комментарии, данные вики и настройки соавтора.\n\nВведите имя репозитория в качестве подтверждения</string>
+    <string name="repoSettingsDeleteDescription">Что нужно знать перед удалением:\n\n- Эту операцию НЕЛЬЗЯ отменить.\n- Эта операция навсегда удалит
+        репозиторий, включая код, задачи, комментарии, данные вики и настройки соавтора.\n\nВведите имя репозитория в качестве подтверждения
+    </string>
     <string name="repoSettingsDeleteError">Имя репозитория не совпадает</string>
     <string name="repoDeletionSuccess">Репозиторий успешно удалён</string>
     <string name="repoSettingsTransferOwnership">Передать права собственности</string>
-    <string name="repoSettingsTransferOwnershipHint">Передать репозиторий другому пользователю или организации где у вас есть права администратора</string>
-    <string name="repoSettingsTransferOwnershipDescription">Что нужно знать перед передачей:\n\n- Вы потеряете доступ к репозиторию, если передадите его отдельному пользователю.\n- Вы сохраните доступ к репозиторию, если передадите его организации, которой вы (со)владеете.\n\nВведите имя репозитория в качестве подтверждения</string>
+    <string name="repoSettingsTransferOwnershipHint">Передать репозиторий другому пользователю или организации где у вас есть права администратора
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Что нужно знать перед передачей:\n\n- Вы потеряете доступ к репозиторию, если передадите
+        его отдельному пользователю.\n- Вы сохраните доступ к репозиторию, если передадите его организации, которой вы (со)владеете.\n\nВведите имя
+        репозитория в качестве подтверждения
+    </string>
     <string name="repoTransferText">Выполнить передачу</string>
     <string name="repoTransferOwnerText">Новый владелец</string>
     <string name="repoTransferSuccess">Репозиторий успешно перенесён</string>
@@ -594,9 +627,13 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">Похоже, что учётная запись для URI %1$s не существует в приложении. Вы можете добавить её, нажав кнопку «Добавить новую учётную запись».</string>
+    <string name="accountDoesNotExist">Похоже, что учётная запись для URI %1$s не существует в приложении. Вы можете добавить её, нажав кнопку
+        «Добавить новую учётную запись».
+    </string>
     <string name="launchApp">Перейти к приложению</string>
-    <string name="noActionText">GitNex не может обработать запрошенный ресурс, вы можете открыть задачу в репозитории проекта в качестве улучшения, предоставив подробную информацию о работе. Просто запустите экран по умолчанию, используя кнопки ниже, его можно изменить в настройках.</string>
+    <string name="noActionText">GitNex не может обработать запрошенный ресурс, вы можете открыть задачу в репозитории проекта в качестве улучшения,
+        предоставив подробную информацию о работе. Просто запустите экран по умолчанию, используя кнопки ниже, его можно изменить в настройках.
+    </string>
     <string name="biometricAuthTitle">Биометрическая Aутентификация</string>
     <string name="biometricAuthSubTitle">Разблокируйте с помощью биометрических данных</string>
     <string name="biometricNotSupported">На этом устройстве нет биометрических функций</string>
@@ -635,7 +672,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 328729ca..9604756a 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -51,7 +51,10 @@
     <string name="navigationDrawerClose">සංචාලන ලාච්චුව වසන්න</string>
     <string name="logo">Gitea වෙත පිවිසෙන්න</string>
     <string name="protocol">කෙටුම්පත</string>
-    <string name="urlInfoTooltip">1- නිවැරදි ප්‍රොටෝකෝලය තෝරන්න (https හෝ http). \n2- Gitea url ඇතුළු කරන්න උදා: try.gitea.io. \n3- ඔබ ඔබේ ගිණුම සඳහා 2FA සක්‍රීය කර ඇත්නම්, OTP කේත ක්ෂේත්‍රය තුළ කේතය ඇතුළත් කරන්න. \n4- HTTP මූලික සත්‍යාපනය සඳහා URL ක්ෂේත්‍රයේ USERNAME@DOMAIN.COM භාවිතා කරන්න.</string>
+    <string name="urlInfoTooltip">1- නිවැරදි ප්‍රොටෝකෝලය තෝරන්න (https හෝ http). \n2- Gitea url ඇතුළු කරන්න උදා: try.gitea.io. \n3- ඔබ ඔබේ ගිණුම සඳහා
+        2FA සක්‍රීය කර ඇත්නම්, OTP කේත ක්ෂේත්‍රය තුළ කේතය ඇතුළත් කරන්න. \n4- HTTP මූලික සත්‍යාපනය සඳහා URL ක්ෂේත්‍රයේ USERNAME@DOMAIN.COM භාවිතා
+        කරන්න.
+    </string>
     <string name="malformedUrl">සත්කාරක වෙත සම්බන්ධ වීමට නොහැකි විය. කිසියම් දෝෂයක් සඳහා කරුණාකර ඔබගේ URL හෝ තොට පරීක්ෂා කරන්න</string>
     <string name="protocolError">ඔබ දේශීය ජාලයේ පරීක්‍ෂා කරන්නේ නම් මිස HTTP ප්‍රොටෝකෝලය භාවිතා කිරීම නිර්දේශ නොකරයි</string>
     <string name="malformedJson">Malformed JSON ලැබුණි. සේවාදායක ප්‍රතිචාරය සාර්ථක නොවීය</string>
@@ -146,7 +149,8 @@
     <string name="settingsSecurityHeader">ආරක්ෂාව</string>
     <string name="settingsCertsSelectorHeader">විශ්වාසනීය සහතික මකන්න</string>
     <string name="settingsCertsPopupTitle">විශ්වාසනීය සහතික මකන්නද?</string>
-    <string name="settingsCertsPopupMessage">අතින් විශ්වාස කළ හැකි සහතිකයක් හෝ සත්කාරක නාමයක් මකා දැමීමට ඔබට විශ්වාසද? \n\nඔබ ද ලොග් අවුට් වනු ඇත.</string>
+    <string name="settingsCertsPopupMessage">අතින් විශ්වාස කළ හැකි සහතිකයක් හෝ සත්කාරක නාමයක් මකා දැමීමට ඔබට විශ්වාසද? \n\nඔබ ද ලොග් අවුට් වනු ඇත.
+    </string>
     <string name="settingsDateTimeHeaderText">දිනය &amp; වේලාව</string>
     <string name="settingsSave">සැකසුම් සුරැකිණි</string>
     <string name="settingsLanguageSelectorHeader">භාෂාව</string>
@@ -184,7 +188,9 @@
     <string name="settingsGeneralHeader">ජනරාල්</string>
     <string name="generalHintText">මුල් තිරය, පෙරනිමි සබැඳි හසුරුව</string>
     <string name="generalDeepLinkDefaultScreen">පෙරනිමි සබැඳි හසුරුවන්නා</string>
-    <string name="generalDeepLinkDefaultScreenHintText">යෙදුමට බාහිර සබැඳි හැසිරවිය නොහැකි නම් කුමන තිරය පූරණය කළ යුතුද යන්න තෝරන්න. එය ඔබව ස්වයංක්‍රීයව හරවා යවනු ඇත.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">යෙදුමට බාහිර සබැඳි හැසිරවිය නොහැකි නම් කුමන තිරය පූරණය කළ යුතුද යන්න තෝරන්න. එය ඔබව
+        ස්වයංක්‍රීයව හරවා යවනු ඇත.
+    </string>
     <string name="generalDeepLinkSelectedText">අ/නොවේ</string>
     <string name="linkSelectorDialogTitle">Default Link Handler Screen තෝරන්න</string>
     <string name="settingsBiometricHeader">ජෛවමිතික සහාය</string>
@@ -204,7 +210,9 @@
     <string name="labelDeleteText">ලේබලය මකා ඇත</string>
     <string name="selectBranchError">මුදා හැරීම සඳහා ශාඛාවක් තෝරන්න</string>
     <string name="alertDialogTokenRevokedTitle">අවසර දීමේ දෝෂය</string>
-    <string name="alertDialogTokenRevokedMessage">ප්‍රවේශ ටෝකනය අවලංගු කර ඇති බව පෙනේ, නැතහොත් ඔබට මෙම අන්තර්ගතය බැලීමට අවසර නැත.\n\nඅවලංගු කරන ලද ටෝකනයකදී, කරුණාකර ලොග් අවුට් වී නැවත පුරනය වන්න</string>
+    <string name="alertDialogTokenRevokedMessage">ප්‍රවේශ ටෝකනය අවලංගු කර ඇති බව පෙනේ, නැතහොත් ඔබට මෙම අන්තර්ගතය බැලීමට අවසර නැත.\n\nඅවලංගු කරන ලද
+        ටෝකනයකදී, කරුණාකර ලොග් අවුට් වී නැවත පුරනය වන්න
+    </string>
     <string name="labelDeleteMessage">ඔබට ඇත්තටම මෙම ලේබලය මැකීමට අවශ්‍යද?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">කණ්ඩායම්</string>
@@ -371,7 +379,9 @@
     <string name="doneButton">කළා</string>
     <string name="cancelButton">අවලංගු කරන්න</string>
     <string name="genericError">යම් දෙයක් වැරදී ඇත, කරුණාකර නැවත උත්සාහ කරන්න</string>
-    <string name="apiNotFound">මෙම ඉල්ලීම ස්ථාපනය කර ඇති එකට වඩා ඉහළ Gitea අනුවාදයක් අවශ්‍යයි. කරුණාකර ඔබගේ නිදර්ශනය Gitea හි නවතම අනුවාදයට උත්ශ්‍රේණි කරන්න.</string>
+    <string name="apiNotFound">මෙම ඉල්ලීම ස්ථාපනය කර ඇති එකට වඩා ඉහළ Gitea අනුවාදයක් අවශ්‍යයි. කරුණාකර ඔබගේ නිදර්ශනය Gitea හි නවතම අනුවාදයට උත්ශ්‍රේණි
+        කරන්න.
+    </string>
     <string name="noDataFound">🌟 මෙතන මොකුත් නෑ 🌟</string>
     <string name="addButton">එකතු කරන්න</string>
     <string name="removeButton">ඉවත් කරන්න</string>
@@ -392,7 +402,8 @@
     <string name="viewInBrowser">බ්‍රව්සරයේ බලන්න</string>
     <string name="isOpen">විවෘත</string>
     <string name="isClosed">වසා ඇත</string>
-    <string name="genericServerResponseError">අපට මේ මොහොතේ සේවාදායකය වෙත ළඟා විය නොහැක, කරුණාකර ඔබගේ සේවාදායක තත්ත්වය පරීක්ෂා කර නැවත උත්සාහ කරන්න</string>
+    <string name="genericServerResponseError">අපට මේ මොහොතේ සේවාදායකය වෙත ළඟා විය නොහැක, කරුණාකර ඔබගේ සේවාදායක තත්ත්වය පරීක්ෂා කර නැවත උත්සාහ කරන්න
+    </string>
     <string name="genericCopyUrl">URL පිටපත් කරන්න</string>
     <string name="genericWaitFor">ඉන්න ☕</string>
     <string name="file">ගොනුව</string>
@@ -422,7 +433,9 @@
     <string name="watchRepositorySuccess">ගබඩාව නැරඹුම් ලැයිස්තුවට එක් කරන ලදී</string>
     <string name="unWatchRepositorySuccess">ගබඩාව නිරීක්ෂණ ලැයිස්තුවෙන් ඉවත් කරන ලදී</string>
     <string name="titleDrafts">කෙටුම්පත්</string>
-    <string name="versionUnsupportedOld">Gitea හි සහාය නොදක්වන පැරණි අනුවාදය(%1$s) අනාවරණය විය. කරුණාකර නවතම ස්ථාවර අනුවාදයට යාවත්කාලීන කරන්න. ඔබ දිගටම කරගෙන ගියහොත්, සමහර විශේෂාංග ක්‍රියා නොකරනු ඇත.</string>
+    <string name="versionUnsupportedOld">Gitea හි සහාය නොදක්වන පැරණි අනුවාදය(%1$s) අනාවරණය විය. කරුණාකර නවතම ස්ථාවර අනුවාදයට යාවත්කාලීන කරන්න. ඔබ
+        දිගටම කරගෙන ගියහොත්, සමහර විශේෂාංග ක්‍රියා නොකරනු ඇත.
+    </string>
     <string name="versionUnsupportedNew">නව Gitea අනුවාදය අනාවරණය විය! කරුණාකර GitNex යාවත්කාලීන කරන්න!</string>
     <string name="versionUnknown">Gitea අනාවරණය කර ගත්තේ නැත!</string>
     <string name="versionAlertDialogHeader">Gitea හි සහාය නොදක්වන අනුවාදය</string>
@@ -444,7 +457,9 @@
     <string name="mergePullRequestButtonText">ඒකාබද්ධ කරන්න</string>
     <string name="deleteBranchAfterMerge">ඒකාබද්ධ කිරීමෙන් පසු ශාඛාව මකන්න</string>
     <string name="mergeNoteText">මෙම ඇදීමේ ඉල්ලීම ඒකාබද්ධ කිරීමට ඔබට අවසර නොමැති නම් ඒකාබද්ධ කිරීම අසාර්ථක විය හැක.</string>
-    <string name="mergeInfoDisabledMessage">Disabled Merge බොත්තම යන්නෙන් අදහස් වන්නේ ඒකාබද්ධ කිරීමට පෙර නිවැරදි කිරීමට ගැටුම් හෝ වෙනත් දේවල් ඇති බවයි</string>
+    <string name="mergeInfoDisabledMessage">Disabled Merge බොත්තම යන්නෙන් අදහස් වන්නේ ඒකාබද්ධ කිරීමට පෙර නිවැරදි කිරීමට ගැටුම් හෝ වෙනත් දේවල් ඇති
+        බවයි
+    </string>
     <string name="deleteBranchForkInfo">මෙම ශාඛාව දෙබලක ගබඩාවකට අයත් වේ</string>
     <string name="mergeCommentText">අදහස ඒකාබද්ධ කරන්න</string>
     <string name="mergePRSuccessMsg">ඇදීමේ ඉල්ලීම සාර්ථකව ඒකාබද්ධ කරන ලදී</string>
@@ -497,9 +512,14 @@
     <string name="settingsEnableReportsText">බිඳ වැටීම් වාර්තා සබල කරන්න</string>
     <string name="crashTitle">GitNex නැවතිලා :(</string>
     <string name="setCrashReports">බිඳ වැටීම් වාර්තා</string>
-    <string name="crashMessage">මෙම දෝෂය ප්‍රතිනිෂ්පාදනය කරන්නේ කෙසේද යන්න පිළිබඳ ගැටලුවක් ව්‍යාපෘති ගබඩාවේ විවෘත කිරීමට දිරිගන්වනු ලැබේ. ඒ ආකාරයෙන් දෝශ නිරාකරණය කර ගැටළුව විසඳා ගැනීම පහසුය.\n\nඒ වෙනුවට බිඳ වැටීම් වාර්තාව විද්‍යුත් තැපෑලෙන් යැවීමට OK බොත්තම තට්ටු කරන්න. විද්‍යුත් තැපෑලෙහි අමතර අන්තර්ගතයක් එක් කළ හැක.\nස්තූතියි!</string>
+    <string name="crashMessage">මෙම දෝෂය ප්‍රතිනිෂ්පාදනය කරන්නේ කෙසේද යන්න පිළිබඳ ගැටලුවක් ව්‍යාපෘති ගබඩාවේ විවෘත කිරීමට දිරිගන්වනු ලැබේ. ඒ ආකාරයෙන්
+        දෝශ නිරාකරණය කර ගැටළුව විසඳා ගැනීම පහසුය.\n\nඒ වෙනුවට බිඳ වැටීම් වාර්තාව විද්‍යුත් තැපෑලෙන් යැවීමට OK බොත්තම තට්ටු කරන්න. විද්‍යුත් තැපෑලෙහි
+        අමතර අන්තර්ගතයක් එක් කළ හැක.\nස්තූතියි!
+    </string>
     <string name="forceLogoutDialogHeader">කරුණාකර නැවත පුරනය වන්න</string>
-    <string name="forceLogoutDialogDescription">යෙදුමේ අභ්‍යන්තර ක්‍රියාකාරිත්වය සම්බන්ධයෙන් යම් යම් ප්‍රධාන වෙනස්කම් හේතුවෙන්, අපට ඔබ නැවත පුරනය වීමට අවශ්‍ය වේ. මෙම වෙනස්කම් අනාගතයේදී යෙදුම වඩාත් නම්‍යශීලී කිරීමට අපට ඉඩ සලසයි.\n\nඔබගේ ඉවසීමට ස්තූතියි සහ අපහසුතාවයට සමාවන්න.</string>
+    <string name="forceLogoutDialogDescription">යෙදුමේ අභ්‍යන්තර ක්‍රියාකාරිත්වය සම්බන්ධයෙන් යම් යම් ප්‍රධාන වෙනස්කම් හේතුවෙන්, අපට ඔබ නැවත පුරනය වීමට
+        අවශ්‍ය වේ. මෙම වෙනස්කම් අනාගතයේදී යෙදුම වඩාත් නම්‍යශීලී කිරීමට අපට ඉඩ සලසයි.\n\nඔබගේ ඉවසීමට ස්තූතියි සහ අපහසුතාවයට සමාවන්න.
+    </string>
     <string name="deleteAllDrafts">සියලුම කෙටුම්පත් මකන්න</string>
     <string name="draftsListEmpty">කෙටුම්පත් හමු නොවිණි</string>
     <string name="draftsDeleteSuccess">කෙටුම්පත් සාර්ථකව මකන ලදී</string>
@@ -513,10 +533,14 @@
     <string name="rateAppHintText">ඔබ GitNex වලට කැමති නම් ඔබට එය thumbs up ලබා දිය හැක</string>
     <string name="aboutAppHintText">යෙදුම් අනුවාදය, ගොඩනැගීම, පරිශීලක gitea අනුවාදය</string>
     <string name="archivedRepository">සංරක්ෂණය කර ඇත</string>
-    <string name="archivedRepositoryMessage">මෙම රෙපෝව සංරක්ෂණය කර ඇත. ඔබට ගොනු බැලිය හැක, නමුත් ගැටළු/අදින්න-ඉල්ලීම් තල්ලු කිරීමට හෝ විවෘත කිරීමට නොහැක.</string>
+    <string name="archivedRepositoryMessage">මෙම රෙපෝව සංරක්ෂණය කර ඇත. ඔබට ගොනු බැලිය හැක, නමුත් ගැටළු/අදින්න-ඉල්ලීම් තල්ලු කිරීමට හෝ විවෘත කිරීමට
+        නොහැක.
+    </string>
     <string name="accountDeletedMessage">ගිණුම සාර්ථකව මකා ඇත</string>
     <string name="removeAccountPopupTitle">ගිණුම ඉවත් කරන්න</string>
-    <string name="removeAccountPopupMessage">ඔබට මෙම ගිණුම යෙදුමෙන් ඉවත් කිරීමට අවශ්‍ය බව විශ්වාසද?\n\nමෙය යෙදුමේ පමණක් මෙම ගිණුමට අදාළ සියලුම දත්ත ඉවත් කරයි.</string>
+    <string name="removeAccountPopupMessage">ඔබට මෙම ගිණුම යෙදුමෙන් ඉවත් කිරීමට අවශ්‍ය බව විශ්වාසද?\n\nමෙය යෙදුමේ පමණක් මෙම ගිණුමට අදාළ සියලුම දත්ත
+        ඉවත් කරයි.
+    </string>
     <string name="addNewAccount">නව ගිණුම</string>
     <string name="addNewAccountText">නව ගිණුමක් එක් කරන්න</string>
     <string name="accountAlreadyExistsError">ගිණුම දැනටමත් යෙදුම තුළ පවතී</string>
@@ -564,12 +588,16 @@
     <string name="repoPropertiesEnableSquash">Squash සහ Merge සබල කරන්න</string>
     <string name="repoPropertiesEnableForceMerge">Merge Commits සමඟ Rebase සබල කරන්න (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">ගබඩා ගුණාංග සාර්ථකව යාවත්කාලීන කරන ලදී</string>
-    <string name="repoSettingsDeleteDescription">මකා දැමීමට පෙර දැනගත යුතු දේ:\n\n- මෙම මෙහෙයුම පසුගමනය කළ නොහැක.\n- මෙම මෙහෙයුම කේතය, ගැටළු, අදහස්, විකි දත්ත සහ සහකාරක සැකසුම් ඇතුළුව ගබඩාව ස්ථිරවම මකනු ඇත.\n\nතහවුරු කිරීමක් ලෙස ගබඩා නාමය ඇතුලත් කරන්න</string>
+    <string name="repoSettingsDeleteDescription">මකා දැමීමට පෙර දැනගත යුතු දේ:\n\n- මෙම මෙහෙයුම පසුගමනය කළ නොහැක.\n- මෙම මෙහෙයුම කේතය, ගැටළු, අදහස්,
+        විකි දත්ත සහ සහකාරක සැකසුම් ඇතුළුව ගබඩාව ස්ථිරවම මකනු ඇත.\n\nතහවුරු කිරීමක් ලෙස ගබඩා නාමය ඇතුලත් කරන්න
+    </string>
     <string name="repoSettingsDeleteError">ගබඩා නාමය නොගැලපේ</string>
     <string name="repoDeletionSuccess">ගබඩාව සාර්ථකව මකා ඇත</string>
     <string name="repoSettingsTransferOwnership">අයිතිය පැවරීම</string>
     <string name="repoSettingsTransferOwnershipHint">මෙම ගබඩාව පරිශීලකයෙකුට හෝ ඔබට පරිපාලක අයිතිවාසිකම් ඇති සංවිධානයකට මාරු කරන්න</string>
-    <string name="repoSettingsTransferOwnershipDescription">මාරු කිරීමට පෙර දැනගත යුතු දේ:\n\n- ඔබ එය තනි පරිශීලකයෙකුට මාරු කළහොත් ඔබට ගබඩාවට ප්‍රවේශය අහිමි වනු ඇත.\n- ඔබ ගබඩාව ඔබ සතු (සම) ආයතනයකට මාරු කළහොත් ඔබ එයට ප්‍රවේශය තබා ගනු ඇත.\n\nතහවුරු කිරීමක් ලෙස ගබඩා නාමය ඇතුලත් කරන්න</string>
+    <string name="repoSettingsTransferOwnershipDescription">මාරු කිරීමට පෙර දැනගත යුතු දේ:\n\n- ඔබ එය තනි පරිශීලකයෙකුට මාරු කළහොත් ඔබට ගබඩාවට ප්‍රවේශය
+        අහිමි වනු ඇත.\n- ඔබ ගබඩාව ඔබ සතු (සම) ආයතනයකට මාරු කළහොත් ඔබ එයට ප්‍රවේශය තබා ගනු ඇත.\n\nතහවුරු කිරීමක් ලෙස ගබඩා නාමය ඇතුලත් කරන්න
+    </string>
     <string name="repoTransferText">මාරු කිරීම සිදු කරන්න</string>
     <string name="repoTransferOwnerText">නව හිමිකරු</string>
     <string name="repoTransferSuccess">ගබඩාව සාර්ථකව මාරු කරන ලදී</string>
@@ -592,9 +620,12 @@
     <string name="prClosed">ඇදීමේ ඉල්ලීම වසා ඇත</string>
     <string name="prReopened">ඇදීමේ ඉල්ලීම නැවත විවෘත කරන ලදී</string>
     <string name="prMergeInfo">ඉල්ලීම් තොරතුරු අදින්න</string>
-    <string name="accountDoesNotExist">URI %1$s සඳහා ගිණුම යෙදුම තුළ නොමැති බව පෙනේ. නව ගිණුමක් එක් කරන්න බොත්තම තට්ටු කිරීමෙන් ඔබට එකක් එක් කළ හැක.</string>
+    <string name="accountDoesNotExist">URI %1$s සඳහා ගිණුම යෙදුම තුළ නොමැති බව පෙනේ. නව ගිණුමක් එක් කරන්න බොත්තම තට්ටු කිරීමෙන් ඔබට එකක් එක් කළ හැක.
+    </string>
     <string name="launchApp">යෙදුම වෙත යන්න</string>
-    <string name="noActionText">GitNex හට ඉල්ලූ සම්පත හැසිරවිය නොහැක, ඔබට කාර්යයේ විස්තර සැපයීම සමඟ වැඩිදියුණු කිරීමක් ලෙස ව්‍යාපෘති ගබඩාවේ ගැටලුවක් විවෘත කළ හැක. පහත බොත්තම් වලින් දැන් පෙරනිමි තිරයක් දියත් කරන්න, එය සැකසුම් වලින් වෙනස් කළ හැක.</string>
+    <string name="noActionText">GitNex හට ඉල්ලූ සම්පත හැසිරවිය නොහැක, ඔබට කාර්යයේ විස්තර සැපයීම සමඟ වැඩිදියුණු කිරීමක් ලෙස ව්‍යාපෘති ගබඩාවේ ගැටලුවක්
+        විවෘත කළ හැක. පහත බොත්තම් වලින් දැන් පෙරනිමි තිරයක් දියත් කරන්න, එය සැකසුම් වලින් වෙනස් කළ හැක.
+    </string>
     <string name="biometricAuthTitle">ජෛවමිතික සත්‍යාපනය</string>
     <string name="biometricAuthSubTitle">ඔබගේ ජෛවමිතික අක්තපත්‍ර භාවිතයෙන් අගුලු හරින්න</string>
     <string name="biometricNotSupported">මෙම උපාංගයේ ජෛවමිතික විශේෂාංග නොමැත</string>
@@ -633,7 +664,9 @@
     <string name="tagDeleted">ටැගය මකා ඇත</string>
     <string name="tagDeleteError">නිකුතුවකට අමුණා ඇති ටැගයක් කෙලින්ම මකා දැමිය නොහැක</string>
     <string name="useCustomTabs">අභිරුචි ටැබ් භාවිතා කරන්න</string>
-    <string name="browserOpenFailed">මෙම සබැඳිය විවෘත කිරීමට යෙදුමක් හමු නොවීය. SSH URLs සහ URLs වෙනත් උපසර්ගයක් සහිත http:// හෝ https:// බොහෝ බ්‍රවුසරයකින් සහාය නොදක්වයි</string>
+    <string name="browserOpenFailed">මෙම සබැඳිය විවෘත කිරීමට යෙදුමක් හමු නොවීය. SSH URLs සහ URLs වෙනත් උපසර්ගයක් සහිත http:// හෝ https:// බොහෝ
+        බ්‍රවුසරයකින් සහාය නොදක්වයි
+    </string>
     <string name="logInAgain">නැවත ලොග් වන්න</string>
     <string name="notLoggedIn">\u25CF %s වී නැත</string>
     <string name="followSystem">පද්ධතිය අනුගමනය කරන්න (ආලෝකය/අඳුරු)</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 3d7a1f33..038b62fd 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -51,7 +51,9 @@
     <string name="navigationDrawerClose">Close Navigation Drawer</string>
     <string name="logo">Prihlásiť sa do Gitea</string>
     <string name="protocol">Protocol</string>
-    <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter Gitea url e.g: try.gitea.io. \n3- If you have enabled 2FA for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.</string>
+    <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter Gitea url e.g: try.gitea.io. \n3- If you have enabled 2FA
+        for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.
+    </string>
     <string name="malformedUrl">Couldn\'t connect to host. Please check your URL or port for any errors</string>
     <string name="protocolError">It is not recommended to use HTTP protocol unless you are testing on local network</string>
     <string name="malformedJson">Malformed JSON was received. Server response was not successful</string>
@@ -146,7 +148,8 @@
     <string name="settingsSecurityHeader">Security</string>
     <string name="settingsCertsSelectorHeader">Delete Trusted Certificates</string>
     <string name="settingsCertsPopupTitle">Delete Trusted Certificates?</string>
-    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.</string>
+    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.
+    </string>
     <string name="settingsDateTimeHeaderText">Date &amp; Time</string>
     <string name="settingsSave">Settings saved</string>
     <string name="settingsLanguageSelectorHeader">Language</string>
@@ -184,7 +187,9 @@
     <string name="settingsGeneralHeader">General</string>
     <string name="generalHintText">Home screen, default link handler</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect
+        you automatically.
+    </string>
     <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
@@ -204,7 +209,9 @@
     <string name="labelDeleteText">Label deleted</string>
     <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Authorization Error</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case
+        of revoked Token, please logout and login again
+    </string>
     <string name="labelDeleteMessage">Do you really want to delete this label?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Teams</string>
@@ -371,7 +378,9 @@
     <string name="doneButton">Done</string>
     <string name="cancelButton">Cancel</string>
     <string name="genericError">Something went wrong, please try again</string>
-    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of Gitea.</string>
+    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of
+        Gitea.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">Add</string>
     <string name="removeButton">Remove</string>
@@ -422,7 +431,9 @@
     <string name="watchRepositorySuccess">Repository added to watch list</string>
     <string name="unWatchRepositorySuccess">Repository removed from watch list</string>
     <string name="titleDrafts">Drafts</string>
-    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue, some features may not work.</string>
+    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue,
+        some features may not work.
+    </string>
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Unsupported Version of Gitea</string>
@@ -497,9 +508,14 @@
     <string name="settingsEnableReportsText">Enable Crash Reports</string>
     <string name="crashTitle">GitNex has stopped :(</string>
     <string name="setCrashReports">Crash reports</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
     <string name="forceLogoutDialogHeader">Please sign in again</string>
-    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.</string>
+    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login
+        again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.
+    </string>
     <string name="deleteAllDrafts">Delete All Drafts</string>
     <string name="draftsListEmpty">No drafts found</string>
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
@@ -516,7 +532,9 @@
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
-    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
+    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to
+        this account on the app only.
+    </string>
     <string name="addNewAccount">New Account</string>
     <string name="addNewAccountText">Add New Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
@@ -566,12 +584,20 @@
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">Repository deleted successfully</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Perform Transfer</string>
     <string name="repoTransferOwnerText">New Owner</string>
     <string name="repoTransferSuccess">Repository transferred successfully</string>
@@ -594,9 +620,13 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -635,7 +665,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index b5865ffe..2e521e45 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -51,7 +51,9 @@
     <string name="navigationDrawerClose">Затвори навигацију</string>
     <string name="logo">Пријави ме</string>
     <string name="protocol">Protocol</string>
-    <string name="urlInfoTooltip">1. Одабери одговарајући протокол (HTTPS или HTTP).\n2. Унеси URL инстанце, нпр. try.gitea.io.\n3. Ако користиш 2FA, унеси OTP код.\n4. Ако користиш HTTP протокол, унеси URL инстанце у формату korisnickoime@domen.com.</string>
+    <string name="urlInfoTooltip">1. Одабери одговарајући протокол (HTTPS или HTTP).\n2. Унеси URL инстанце, нпр. try.gitea.io.\n3. Ако користиш 2FA,
+        унеси OTP код.\n4. Ако користиш HTTP протокол, унеси URL инстанце у формату korisnickoime@domen.com.
+    </string>
     <string name="malformedUrl">Couldn\'t connect to host. Please check your URL or port for any errors</string>
     <string name="protocolError">It is not recommended to use HTTP protocol unless you are testing on local network</string>
     <string name="malformedJson">Malformed JSON was received. Server response was not successful</string>
@@ -103,7 +105,7 @@
     <string name="infoMoreInformation">Више информација</string>
     <string name="timeAtText">у</string>
     <string name="issueMilestone">Фаза %1$s</string>
-    <string name="dueDate">Рок: </string>
+    <string name="dueDate">Рок:</string>
     <string name="assignedTo">Додељен: %1$s</string>
     <string name="assignedToMe">Assigned to Me</string>
     <string name="commentButtonText">Коментар</string>
@@ -184,7 +186,9 @@
     <string name="settingsGeneralHeader">General</string>
     <string name="generalHintText">Home screen, default link handler</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect
+        you automatically.
+    </string>
     <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
@@ -204,7 +208,9 @@
     <string name="labelDeleteText">Ознака је избрисана</string>
     <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Грешка приликом ауторизације</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case
+        of revoked Token, please logout and login again
+    </string>
     <string name="labelDeleteMessage">Да ли желиш да избришеш ову ознаку?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Тимови</string>
@@ -422,7 +428,9 @@
     <string name="watchRepositorySuccess">Сад пратиш овај репозиторијум</string>
     <string name="unWatchRepositorySuccess">Више не пратиш овај репозиторијум</string>
     <string name="titleDrafts">Drafts</string>
-    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue, some features may not work.</string>
+    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue,
+        some features may not work.
+    </string>
     <string name="versionUnsupportedNew">Нова верзија програма Gitea је детектована! Ажурирај GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Верзија програма Gitea коју тренутно користиш није подржана</string>
@@ -497,9 +505,14 @@
     <string name="settingsEnableReportsText">Enable Crash Reports</string>
     <string name="crashTitle">GitNex has stopped :(</string>
     <string name="setCrashReports">Crash reports</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
     <string name="forceLogoutDialogHeader">Please sign in again</string>
-    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.</string>
+    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login
+        again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.
+    </string>
     <string name="deleteAllDrafts">Delete All Drafts</string>
     <string name="draftsListEmpty">No drafts found</string>
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
@@ -516,7 +529,9 @@
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
-    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
+    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to
+        this account on the app only.
+    </string>
     <string name="addNewAccount">New Account</string>
     <string name="addNewAccountText">Add New Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
@@ -565,12 +580,20 @@
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">Repository deleted successfully</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Perform Transfer</string>
     <string name="repoTransferOwnerText">New Owner</string>
     <string name="repoTransferSuccess">Repository transferred successfully</string>
@@ -593,9 +616,13 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -634,7 +661,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index cb99aa37..58ed0df0 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -51,7 +51,10 @@
     <string name="navigationDrawerClose">Gezinme Çekmecesini Kapat</string>
     <string name="logo">Gitea\'ya Giriş Yap</string>
     <string name="protocol">Protokol</string>
-    <string name="urlInfoTooltip">1- Doğru protokolü seçin (https veya http). \n2- Gitea url girin, örneğin: try.gitea.io. \n3- Hesabınız için 2FA\'yı etkinleştirdiyseniz, kodu OTP Kodu alanına girin. \n4- HTTP temel kimlik doğrulaması için, URL alanında KULLANICIADI@DOMAIN.COM adresini kullanın.</string>
+    <string name="urlInfoTooltip">1- Doğru protokolü seçin (https veya http). \n2- Gitea url girin, örneğin: try.gitea.io. \n3- Hesabınız için 2FA\'yı
+        etkinleştirdiyseniz, kodu OTP Kodu alanına girin. \n4- HTTP temel kimlik doğrulaması için, URL alanında KULLANICIADI@DOMAIN.COM adresini
+        kullanın.
+    </string>
     <string name="malformedUrl">Sunucuya bağlanamadı. Lütfen URL\'nizde veya portunuzda hata olup olmadığını kontrol edin</string>
     <string name="protocolError">Yerel ağ üzerinde test yapmadığınız sürece HTTP protokolünü kullanmanız önerilmez</string>
     <string name="malformedJson">Malformed JSON was received. Server response was not successful</string>
@@ -146,7 +149,8 @@
     <string name="settingsSecurityHeader">Security</string>
     <string name="settingsCertsSelectorHeader">Delete Trusted Certificates</string>
     <string name="settingsCertsPopupTitle">Delete Trusted Certificates?</string>
-    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.</string>
+    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.
+    </string>
     <string name="settingsDateTimeHeaderText">Tarih ve Saat</string>
     <string name="settingsSave">Ayarlar kaydedildi</string>
     <string name="settingsLanguageSelectorHeader">Dil</string>
@@ -184,7 +188,9 @@
     <string name="settingsGeneralHeader">General</string>
     <string name="generalHintText">Home screen, default link handler</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect
+        you automatically.
+    </string>
     <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
@@ -204,7 +210,9 @@
     <string name="labelDeleteText">Etiket silindi</string>
     <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Yetkilendirme Hatası</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case
+        of revoked Token, please logout and login again
+    </string>
     <string name="labelDeleteMessage">Bu etiketi gerçekten silmek istiyor musunuz?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Takımlar</string>
@@ -371,7 +379,8 @@
     <string name="doneButton">Tamam</string>
     <string name="cancelButton">İptal</string>
     <string name="genericError">Bir şeyler ters gitti, lütfen tekrar deneyin</string>
-    <string name="apiNotFound">Bu isteğin yüklü olandan daha yüksek Gitea sürümü gerekiyor. Lütfen örneğinizi Gitea\'nin en son sürümüne yükseltin.</string>
+    <string name="apiNotFound">Bu isteğin yüklü olandan daha yüksek Gitea sürümü gerekiyor. Lütfen örneğinizi Gitea\'nin en son sürümüne yükseltin.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">Ekle</string>
     <string name="removeButton">Kaldır</string>
@@ -422,7 +431,9 @@
     <string name="watchRepositorySuccess">Depo izleme listesine eklendi</string>
     <string name="unWatchRepositorySuccess">Depo izleme listesinden kaldırıldı</string>
     <string name="titleDrafts">Drafts</string>
-    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue, some features may not work.</string>
+    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue,
+        some features may not work.
+    </string>
     <string name="versionUnsupportedNew">Yeni Gitea versiyonu tespit edildi! Lütfen GitNex\'i GÜNCELLEYİN!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Desteklenmeyen Gitea Versiyonu</string>
@@ -497,9 +508,14 @@
     <string name="settingsEnableReportsText">Enable Crash Reports</string>
     <string name="crashTitle">GitNex has stopped :(</string>
     <string name="setCrashReports">Crash reports</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
     <string name="forceLogoutDialogHeader">Please sign in again</string>
-    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.</string>
+    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login
+        again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.
+    </string>
     <string name="deleteAllDrafts">Delete All Drafts</string>
     <string name="draftsListEmpty">No drafts found</string>
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
@@ -516,7 +532,9 @@
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
-    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
+    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to
+        this account on the app only.
+    </string>
     <string name="addNewAccount">New Account</string>
     <string name="addNewAccountText">Add New Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
@@ -564,12 +582,20 @@
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">Repository deleted successfully</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Perform Transfer</string>
     <string name="repoTransferOwnerText">New Owner</string>
     <string name="repoTransferSuccess">Repository transferred successfully</string>
@@ -592,9 +618,13 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -633,7 +663,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 9748013d..cc0c943e 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -51,7 +51,10 @@
     <string name="navigationDrawerClose">Закрити панель навігації</string>
     <string name="logo">Увійти до Gitea</string>
     <string name="protocol">Protocol</string>
-    <string name="urlInfoTooltip">1. Оберіть правильний протокол (https або http). \n2. Введіть URL Gitea, наприклад: try.gitea.io. \n3. Якщо для вашого облікового запису увімкнено двофакторну аутентифікацію, введіть код OTP у відповідне поле. \n4. Для базової автентифікації HTTP використовуйте USERNAME@DOMAIN.COM в полі URL.</string>
+    <string name="urlInfoTooltip">1. Оберіть правильний протокол (https або http). \n2. Введіть URL Gitea, наприклад: try.gitea.io. \n3. Якщо для
+        вашого облікового запису увімкнено двофакторну аутентифікацію, введіть код OTP у відповідне поле. \n4. Для базової автентифікації HTTP
+        використовуйте USERNAME@DOMAIN.COM в полі URL.
+    </string>
     <string name="malformedUrl">Couldn\'t connect to host. Please check your URL or port for any errors</string>
     <string name="protocolError">It is not recommended to use HTTP protocol unless you are testing on local network</string>
     <string name="malformedJson">Malformed JSON was received. Server response was not successful</string>
@@ -146,7 +149,9 @@
     <string name="settingsSecurityHeader">Безпека</string>
     <string name="settingsCertsSelectorHeader">Видалення довірених сертифікатів</string>
     <string name="settingsCertsPopupTitle">Видалити надійні сертифікати?</string>
-    <string name="settingsCertsPopupMessage">Ви дійсно бажаєте видалити будь-який довірений сертифікат вручну або ім\'я хосту? \n\nВи також вийдете з системи.</string>
+    <string name="settingsCertsPopupMessage">Ви дійсно бажаєте видалити будь-який довірений сертифікат вручну або ім\'я хосту? \n\nВи також вийдете з
+        системи.
+    </string>
     <string name="settingsDateTimeHeaderText">Дата і час</string>
     <string name="settingsSave">Налаштування збережено</string>
     <string name="settingsLanguageSelectorHeader">Мова</string>
@@ -184,7 +189,9 @@
     <string name="settingsGeneralHeader">General</string>
     <string name="generalHintText">Home screen, default link handler</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect
+        you automatically.
+    </string>
     <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
@@ -204,7 +211,9 @@
     <string name="labelDeleteText">Мітку видалено</string>
     <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Помилка авторизації</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case
+        of revoked Token, please logout and login again
+    </string>
     <string name="labelDeleteMessage">Ви дійсно бажаєте видалити цю мітку?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Команди</string>
@@ -371,7 +380,8 @@
     <string name="doneButton">Готово</string>
     <string name="cancelButton">Скасувати</string>
     <string name="genericError">Щось пішло не так. Будь ласка, спробуйте знову</string>
-    <string name="apiNotFound">Цей запит потребує новішої за встановлену версію Gitea. Будь ласка, оновіть ваш екземпляр до останньої версії Gitea.</string>
+    <string name="apiNotFound">Цей запит потребує новішої за встановлену версію Gitea. Будь ласка, оновіть ваш екземпляр до останньої версії Gitea.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">Додати</string>
     <string name="removeButton">Видалити</string>
@@ -392,7 +402,9 @@
     <string name="viewInBrowser">Переглянути у браузері</string>
     <string name="isOpen">Відкриті</string>
     <string name="isClosed">Закриті</string>
-    <string name="genericServerResponseError">На даний момент ми не можемо зв\'язатися з сервером, будь ласка, перевірте статус вашого сервера і спробуйте ще раз</string>
+    <string name="genericServerResponseError">На даний момент ми не можемо зв\'язатися з сервером, будь ласка, перевірте статус вашого сервера і
+        спробуйте ще раз
+    </string>
     <string name="genericCopyUrl">Copy URL</string>
     <string name="genericWaitFor">Hold on ☕</string>
     <string name="file">File</string>
@@ -422,7 +434,9 @@
     <string name="watchRepositorySuccess">Репозиторій додано до списку спостереження</string>
     <string name="unWatchRepositorySuccess">Репозиторій видалено зі списку спостереження</string>
     <string name="titleDrafts">Drafts</string>
-    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue, some features may not work.</string>
+    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue,
+        some features may not work.
+    </string>
     <string name="versionUnsupportedNew">Виявлено нову версію Gitea! Будь ласка, ОНОВІТЬ GitNex!</string>
     <string name="versionUnknown">Gitea не виявлено!</string>
     <string name="versionAlertDialogHeader">Непідтримувана версія Gitea</string>
@@ -497,9 +511,14 @@
     <string name="settingsEnableReportsText">Увімкнути повідомлення про падіння</string>
     <string name="crashTitle">GitNex зупинено :(</string>
     <string name="setCrashReports">Звіти про падіння</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
     <string name="forceLogoutDialogHeader">Please sign in again</string>
-    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.</string>
+    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login
+        again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.
+    </string>
     <string name="deleteAllDrafts">Delete All Drafts</string>
     <string name="draftsListEmpty">No drafts found</string>
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
@@ -516,7 +535,9 @@
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
-    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
+    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to
+        this account on the app only.
+    </string>
     <string name="addNewAccount">New Account</string>
     <string name="addNewAccountText">Add New Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
@@ -566,12 +587,20 @@
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">Repository deleted successfully</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Perform Transfer</string>
     <string name="repoTransferOwnerText">New Owner</string>
     <string name="repoTransferSuccess">Repository transferred successfully</string>
@@ -594,9 +623,13 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -635,7 +668,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index f5411759..0f755441 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -51,7 +51,9 @@
     <string name="navigationDrawerClose">关闭导航栏</string>
     <string name="logo">登录到 Gitea</string>
     <string name="protocol">协议</string>
-    <string name="urlInfoTooltip">1- 选择协议 (https 或 http). \n2- 输入Gitea访问地址(可带端口) 例如: try.gitea.io:3000. \n3- 如已启用双重验证，请在OTP输入有效代码。 \n4- 在 URL 字段中使用 USERNAME@DOMAIN.COM 进行 HTTP 基本身份验证。</string>
+    <string name="urlInfoTooltip">1- 选择协议 (https 或 http). \n2- 输入Gitea访问地址(可带端口) 例如: try.gitea.io:3000. \n3- 如已启用双重验证，请在OTP输入有效代码。
+        \n4- 在 URL 字段中使用 USERNAME@DOMAIN.COM 进行 HTTP 基本身份验证。
+    </string>
     <string name="malformedUrl">无法连接到主机。请检查您的 URL 或端口是否有任何错误</string>
     <string name="protocolError">除非您正在本地网络上测试，否则不建议使用 HTTP 协议</string>
     <string name="malformedJson">收到格式错误的 JSON 。服务器响应不成功</string>
@@ -497,9 +499,13 @@
     <string name="settingsEnableReportsText">启用崩溃报告</string>
     <string name="crashTitle">GitNex 已停止 :(</string>
     <string name="setCrashReports">崩溃报告</string>
-    <string name="crashMessage">鼓励在项目存储库中提出一个问题，并说明如何重现这个bug。这样更容易调试和修复问题。\n\n点击OK按钮，通过电子邮件发送崩溃报告。可以在电子邮件中添加其他内容，\n谢谢！</string>
+    <string name="crashMessage">
+        鼓励在项目存储库中提出一个问题，并说明如何重现这个bug。这样更容易调试和修复问题。\n\n点击OK按钮，通过电子邮件发送崩溃报告。可以在电子邮件中添加其他内容，\n谢谢！
+    </string>
     <string name="forceLogoutDialogHeader">请重新登录</string>
-    <string name="forceLogoutDialogDescription">由于应用内部功能发生了一些重大变化，我们要求您重新登录。这些变化使我们能够使应用程序在未来更具灵活性。\n\n感谢您的耐心，对给您带来的不便我们深表歉意</string>
+    <string name="forceLogoutDialogDescription">
+        由于应用内部功能发生了一些重大变化，我们要求您重新登录。这些变化使我们能够使应用程序在未来更具灵活性。\n\n感谢您的耐心，对给您带来的不便我们深表歉意
+    </string>
     <string name="deleteAllDrafts">删除所有草稿</string>
     <string name="draftsListEmpty">未找到草稿</string>
     <string name="draftsDeleteSuccess">已成功删除草稿</string>
@@ -563,12 +569,16 @@
     <string name="repoPropertiesEnableSquash">启用压扁和合并</string>
     <string name="repoPropertiesEnableForceMerge">用合并提交(&#8212;&#8212;no-ff)启用代码变基</string>
     <string name="repoPropertiesSaveSuccess">成功更新存储库属性</string>
-    <string name="repoSettingsDeleteDescription">删除前要知道的事:\n\n-此操作无法撤消。\n-此操作将永久删除存储库，包括代码、问题、注释、Wiki数据和协作者设置。\n\n输入存储库名称作为确认</string>
+    <string name="repoSettingsDeleteDescription">
+        删除前要知道的事:\n\n-此操作无法撤消。\n-此操作将永久删除存储库，包括代码、问题、注释、Wiki数据和协作者设置。\n\n输入存储库名称作为确认
+    </string>
     <string name="repoSettingsDeleteError">存储库名称不匹配</string>
     <string name="repoDeletionSuccess">成功删除存储库</string>
     <string name="repoSettingsTransferOwnership">转移所有权</string>
     <string name="repoSettingsTransferOwnershipHint">将此存储库传输给您具有管理员权限的用户或组织</string>
-    <string name="repoSettingsTransferOwnershipDescription">转移所有权之前需要注意的事项:\n\n- 如果将存储库移交给单个用户，您将失去对该存储库的访问权。\n- 如果您将存储库转移到您和他人(共同)拥有的组织，那么您将保留对该存储库的访问权。\n\n输入存储库名称作为确认</string>
+    <string name="repoSettingsTransferOwnershipDescription">转移所有权之前需要注意的事项:\n\n- 如果将存储库移交给单个用户，您将失去对该存储库的访问权。\n-
+        如果您将存储库转移到您和他人(共同)拥有的组织，那么您将保留对该存储库的访问权。\n\n输入存储库名称作为确认
+    </string>
     <string name="repoTransferText">执行移交</string>
     <string name="repoTransferOwnerText">新所有者</string>
     <string name="repoTransferSuccess">成功移交存储库</string>
@@ -593,7 +603,9 @@
     <string name="prMergeInfo">合并请求信息</string>
     <string name="accountDoesNotExist">似乎应用程序中并不存在URI%1$s的账户。您可以通过点击添加新帐户按钮来添加一个。</string>
     <string name="launchApp">前往应用</string>
-    <string name="noActionText">GitNex无法处理所请求的资源，您可以在项目代码库中发起一个问题，提供工作细节。只需从下面的按钮启动一个默认屏幕，您可通过设置更改默认屏。</string>
+    <string name="noActionText">
+        GitNex无法处理所请求的资源，您可以在项目代码库中发起一个问题，提供工作细节。只需从下面的按钮启动一个默认屏幕，您可通过设置更改默认屏。
+    </string>
     <string name="biometricAuthTitle">生物特征认证</string>
     <string name="biometricAuthSubTitle">使用你的生物特征凭证解锁</string>
     <string name="biometricNotSupported">此设备无可用的生物特征功能</string>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 88c81ab4..3f3c3b89 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -4,16 +4,16 @@
     <attr name="diffRemovedColor" format="reference"/>
     <attr name="diffSelectedColor" format="reference"/>
     <attr name="primaryTextColor" format="reference"/>
-    <attr name="primaryBackgroundColor" format="reference" />
-    <attr name="inputBackgroundColor" format="reference" />
-    <attr name="inputSelectedColor" format="reference" />
-    <attr name="hintColor" format="reference" />
-    <attr name="inputTextColor" format="reference" />
-    <attr name="selectedTextColor" format="reference" />
-    <attr name="alertDialogTheme" format="reference" />
-    <attr name="progressIndicatorColor" format="reference" />
-    <attr name="fabColor" format="reference" />
-    <attr name="iconsColor" format="reference" />
-    <attr name="pagerTabIndicatorColor" format="reference" />
-    <attr name="isDark" format="integer" />
+    <attr name="primaryBackgroundColor" format="reference"/>
+    <attr name="inputBackgroundColor" format="reference"/>
+    <attr name="inputSelectedColor" format="reference"/>
+    <attr name="hintColor" format="reference"/>
+    <attr name="inputTextColor" format="reference"/>
+    <attr name="selectedTextColor" format="reference"/>
+    <attr name="alertDialogTheme" format="reference"/>
+    <attr name="progressIndicatorColor" format="reference"/>
+    <attr name="fabColor" format="reference"/>
+    <attr name="iconsColor" format="reference"/>
+    <attr name="pagerTabIndicatorColor" format="reference"/>
+    <attr name="isDark" format="integer"/>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5ba2e1f4..ad20b956 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,7 +8,9 @@
     <string name="commitPage" translatable="false">Your Gitea Version</string>
     <string name="supportLinkPatreon" translatable="false">https://www.patreon.com/mmarif</string>
     <string name="appVersionBuild" translatable="false">%s / %d</string>
-    <string name="appDesc" translatable="false">GitNex is a free, open-source Android client for Git repository management tool Gitea. GitNex is Licensed under GPLv3.\n\nThanks to all the contributors and donators for your generous work and donations.</string>
+    <string name="appDesc" translatable="false">GitNex is a free, open-source Android client for Git repository management tool Gitea. GitNex is
+        Licensed under GPLv3.\n\nThanks to all the contributors and donators for your generous work and donations.
+    </string>
     <string name="crowdInLink" translatable="false">https://crowdin.com/project/gitnex</string>
     <string name="crashReportEmailSubject" translatable="false">[GitNex] - Crash Report #%1$d</string>
     <string name="translateWithCrowdin" translatable="false">Crowdin</string>
@@ -75,7 +77,9 @@
     <string name="navigationDrawerClose">Close Navigation Drawer</string>
     <string name="logo">Login to Gitea</string>
     <string name="protocol">Protocol</string>
-    <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter Gitea url e.g: try.gitea.io. \n3- If you have enabled 2FA for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.</string>
+    <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter Gitea url e.g: try.gitea.io. \n3- If you have enabled 2FA
+        for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.
+    </string>
     <string name="malformedUrl">Couldn\'t connect to host. Please check your URL or port for any errors</string>
     <string name="protocolError">It is not recommended to use HTTP protocol unless you are testing on local network</string>
     <string name="malformedJson">Malformed JSON was received. Server response was not successful</string>
@@ -195,7 +199,8 @@
     <string name="settingsSecurityHeader">Security</string>
     <string name="settingsCertsSelectorHeader">Delete Trusted Certificates</string>
     <string name="settingsCertsPopupTitle">Delete Trusted Certificates?</string>
-    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.</string>
+    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.
+    </string>
     <string name="settingsDateTimeHeaderText">Date &amp; Time</string>
     <string name="settingsSave">Settings saved</string>
     <string name="settingsLanguageSelectorHeader">Language</string>
@@ -241,7 +246,9 @@
     <string name="settingsGeneralHeader">General</string>
     <string name="generalHintText">Home screen, default link handler</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect
+        you automatically.
+    </string>
     <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
@@ -266,7 +273,9 @@
     <string name="selectBranchError">Select a branch for release</string>
 
     <string name="alertDialogTokenRevokedTitle">Authorization Error</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case
+        of revoked Token, please logout and login again
+    </string>
     <string name="labelDeleteMessage">Do you really want to delete this label?</string>
 
     <!-- org tabbed layout str -->
@@ -458,7 +467,9 @@
     <string name="doneButton">Done</string>
     <string name="cancelButton">Cancel</string>
     <string name="genericError">Something went wrong, please try again</string>
-    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of Gitea.</string>
+    <string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of
+        Gitea.
+    </string>
     <string name="noDataFound">🌟 Nothing in here 🌟</string>
     <string name="addButton">Add</string>
     <string name="removeButton">Remove</string>
@@ -517,7 +528,9 @@
     <string name="titleDrafts">Drafts</string>
     <string name="filesBreadcrumbRoot" translatable="false">Root</string>
 
-    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue, some features may not work.</string>
+    <string name="versionUnsupportedOld">Unsupported old version(%1$s) of Gitea detected. Please update to latest stable version. If you continue,
+        some features may not work.
+    </string>
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Unsupported Version of Gitea</string>
@@ -601,10 +614,15 @@
     <string name="settingsEnableReportsText">Enable Crash Reports</string>
     <string name="crashTitle">GitNex has stopped :(</string>
     <string name="setCrashReports">Crash reports</string>
-    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the email.\nThank you!</string>
+    <string name="crashMessage">It is encouraged to open an issue at the project repository with how to reproduce this bug. It is easier to debug and
+        fix the problem that way.\n\nTap the OK button to send the crash report by email instead. Additional content could be added in the
+        email.\nThank you!
+    </string>
 
     <string name="forceLogoutDialogHeader">Please sign in again</string>
-    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.</string>
+    <string name="forceLogoutDialogDescription">Due to some major changes regarding the internal functioning of the app, we require you to login
+        again. These changes allow us to make the app more flexible in the future.\n\nThank you for your patience and sorry for the inconvenience.
+    </string>
 
     <string name="deleteAllDrafts">Delete All Drafts</string>
     <string name="draftsListEmpty">No drafts found</string>
@@ -625,7 +643,9 @@
 
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
-    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
+    <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to
+        this account on the app only.
+    </string>
     <string name="addNewAccount">New Account</string>
     <string name="addNewAccountText">Add New Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
@@ -677,12 +697,20 @@
     <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will
+        permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as
+        confirmation
+    </string>
     <string name="repoSettingsDeleteError">Repository name does not match</string>
     <string name="repoDeletionSuccess">Repository deleted successfully</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator
+        rights
+    </string>
+    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you
+        transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter
+        the repository name as confirmation
+    </string>
     <string name="repoTransferText">Perform Transfer</string>
     <string name="repoTransferOwnerText">New Owner</string>
     <string name="repoTransferSuccess">Repository transferred successfully</string>
@@ -708,9 +736,13 @@
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
 
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New
+        Account button.
+    </string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with
+        providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.
+    </string>
 
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
@@ -756,7 +788,9 @@
     <string name="tagDeleted">Tag deleted</string>
     <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
     <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
+    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not
+        supported by most browser
+    </string>
     <string name="logInAgain">Log in again</string>
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cef1a474..6e037cb1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -10,9 +10,9 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
 
     <style name="customTabLayout" parent="TextAppearance.Design.Tab">
         <item name="android:textSize">16sp</item>
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index bb6ab93d..115a8e89 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -2,8 +2,8 @@
 <network-security-config>
     <base-config cleartextTrafficPermitted="true">
         <trust-anchors>
-            <certificates src="system" />
-            <certificates src="user" />
+            <certificates src="system"/>
+            <certificates src="user"/>
         </trust-anchors>
     </base-config>
-</network-security-config>
\ No newline at end of file
+</network-security-config>
diff --git a/app/src/test/java/org/mian/gitnex/helpers/ParseDiffTest.java b/app/src/test/java/org/mian/gitnex/helpers/ParseDiffTest.java
index 58548772..79b588e7 100644
--- a/app/src/test/java/org/mian/gitnex/helpers/ParseDiffTest.java
+++ b/app/src/test/java/org/mian/gitnex/helpers/ParseDiffTest.java
@@ -12,8 +12,8 @@ import static org.junit.Assert.assertTrue;
 
 public class ParseDiffTest {
 
-	private String commitDiff = "diff --git a/blob.bin b/blob.bin\n" + "deleted file mode 100644\n" + "index 0d73bd2..0000000\n" + "Binary files a/blob.bin and /dev/null differ\n" + "diff --git a/newOne.txt b/newOne.txt\n" + "new file mode 100644\n" + "index 0000000..d46eed0\n" + "--- /dev/null\n" + "+++ b/newOne.txt\n" + "@@ -0,0 +1,2 @@\n" + "+a new file\n" + "+is ok\n" + "diff --git a/toDel.txt b/toDel.txt\n" + "deleted file mode 100644\n" + "index db7b61d..0000000\n" + "--- a/toDel.txt\n" + "+++ /dev/null\n" + "@@ -1,6 +0,0 @@\n" + "-fdsafew\n" + "-fcdsafd\n" + "-saf\n" + "-dsa\n" + "-fds\n" + "-af\n" + "diff --git a/wow.txt b/wow.txt\n" + "index 92e7b0a..c6f2550 100644\n" + "--- a/wow.txt\n" + "+++ b/wow.txt\n" + "@@ -1 +1 @@\n" + "-no newLN\n" + "\\ No newline at end of file\n" + "+no newLN";
-	private String pullDiff = "diff --git a/blob.bin b/blob.bin\n" + "deleted file mode 100644\n" + "index 0d73bd22356cdedbda15802490dbba5677c0bf82..0000000000000000000000000000000000000000\n" + "GIT binary patch\n" + "literal 0\n" + "HcmV?d00001\n" + "\n" + "literal 1048576\n" + "zcmV(nK=QwPuB28ikRJ&1O;k}2;ZJdPRlcSh&H3ZzL{FUXh$7I70$=OgJ&|C6l9n5^\n" + "z)($UbdKG~u1=kru;-zP`c59V|o(6s6w`nh4BZjq62uO^~OO=?T8h^2Wd<-s#e_iI~\n" + "zURkze=$MhaJ$k?4&39P$(BT6=fYUYoKa5hsMqqt;d=e0W61jUQXj5h&>9Mf9aHlLn\n" + "zL?z4mKo3>xs9>gwR}Cx#ZeNWKy0M;5CRQHq%6NVh5=X<1a8P)FsE7yASIj-Jq{{ex\n" + "z2A~tfI3XyuL5>6ot@$SpZItcakZOhIGXKm-LOOpY_XVQ@3=@2EfJq~TXJfiw$1e+3\n" + "zGr~C0-C$O1g|{ndCbn0qMk{!T3Yz523kz;7D*LkRfhH7eYxM4fpC`qUAu4irPjtJy\n" + "Jx`FK##b8Ms9rXYJ\n" + "diff --git a/newOne.txt b/newOne.txt\n" + "new file mode 100644\n" + "index 0000000..d46eed0\n" + "--- /dev/null\n" + "+++ b/newOne.txt\n" + "@@ -0,0 +1,2 @@\n" + "+a new file\n" + "+is ok\n" + "diff --git a/toDel.txt b/toDel.txt\n" + "deleted file mode 100644\n" + "index db7b61d..0000000\n" + "--- a/toDel.txt\n" + "+++ /dev/null\n" + "@@ -1,6 +0,0 @@\n" + "-fdsafew\n" + "-fcdsafd\n" + "-saf\n" + "-dsa\n" + "-fds\n" + "-af\n" + "diff --git a/wow.txt b/wow.txt\n" + "index 92e7b0a..c6f2550 100644\n" + "--- a/wow.txt\n" + "+++ b/wow.txt\n" + "@@ -1 +1 @@\n" + "-no newLN\n" + "\\ No newline at end of file\n" + "+no newLN";
+	private final String commitDiff = "diff --git a/blob.bin b/blob.bin\n" + "deleted file mode 100644\n" + "index 0d73bd2..0000000\n" + "Binary files a/blob.bin and /dev/null differ\n" + "diff --git a/newOne.txt b/newOne.txt\n" + "new file mode 100644\n" + "index 0000000..d46eed0\n" + "--- /dev/null\n" + "+++ b/newOne.txt\n" + "@@ -0,0 +1,2 @@\n" + "+a new file\n" + "+is ok\n" + "diff --git a/toDel.txt b/toDel.txt\n" + "deleted file mode 100644\n" + "index db7b61d..0000000\n" + "--- a/toDel.txt\n" + "+++ /dev/null\n" + "@@ -1,6 +0,0 @@\n" + "-fdsafew\n" + "-fcdsafd\n" + "-saf\n" + "-dsa\n" + "-fds\n" + "-af\n" + "diff --git a/wow.txt b/wow.txt\n" + "index 92e7b0a..c6f2550 100644\n" + "--- a/wow.txt\n" + "+++ b/wow.txt\n" + "@@ -1 +1 @@\n" + "-no newLN\n" + "\\ No newline at end of file\n" + "+no newLN";
+	private final String pullDiff = "diff --git a/blob.bin b/blob.bin\n" + "deleted file mode 100644\n" + "index 0d73bd22356cdedbda15802490dbba5677c0bf82..0000000000000000000000000000000000000000\n" + "GIT binary patch\n" + "literal 0\n" + "HcmV?d00001\n" + "\n" + "literal 1048576\n" + "zcmV(nK=QwPuB28ikRJ&1O;k}2;ZJdPRlcSh&H3ZzL{FUXh$7I70$=OgJ&|C6l9n5^\n" + "z)($UbdKG~u1=kru;-zP`c59V|o(6s6w`nh4BZjq62uO^~OO=?T8h^2Wd<-s#e_iI~\n" + "zURkze=$MhaJ$k?4&39P$(BT6=fYUYoKa5hsMqqt;d=e0W61jUQXj5h&>9Mf9aHlLn\n" + "zL?z4mKo3>xs9>gwR}Cx#ZeNWKy0M;5CRQHq%6NVh5=X<1a8P)FsE7yASIj-Jq{{ex\n" + "z2A~tfI3XyuL5>6ot@$SpZItcakZOhIGXKm-LOOpY_XVQ@3=@2EfJq~TXJfiw$1e+3\n" + "zGr~C0-C$O1g|{ndCbn0qMk{!T3Yz523kz;7D*LkRfhH7eYxM4fpC`qUAu4irPjtJy\n" + "Jx`FK##b8Ms9rXYJ\n" + "diff --git a/newOne.txt b/newOne.txt\n" + "new file mode 100644\n" + "index 0000000..d46eed0\n" + "--- /dev/null\n" + "+++ b/newOne.txt\n" + "@@ -0,0 +1,2 @@\n" + "+a new file\n" + "+is ok\n" + "diff --git a/toDel.txt b/toDel.txt\n" + "deleted file mode 100644\n" + "index db7b61d..0000000\n" + "--- a/toDel.txt\n" + "+++ /dev/null\n" + "@@ -1,6 +0,0 @@\n" + "-fdsafew\n" + "-fcdsafd\n" + "-saf\n" + "-dsa\n" + "-fds\n" + "-af\n" + "diff --git a/wow.txt b/wow.txt\n" + "index 92e7b0a..c6f2550 100644\n" + "--- a/wow.txt\n" + "+++ b/wow.txt\n" + "@@ -1 +1 @@\n" + "-no newLN\n" + "\\ No newline at end of file\n" + "+no newLN";
 
 	@Test
 	public void parseCommitDiff() {
diff --git a/assets/license.svg b/assets/license.svg
index a5f18961..d3081029 100644
--- a/assets/license.svg
+++ b/assets/license.svg
@@ -1 +1,21 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100" height="20" role="img" aria-label="License: GPL v3"><title>License: GPL v3</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="100" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="51" height="20" fill="#555"/><rect x="51" width="49" height="20" fill="#007ec6"/><rect width="100" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="265" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">License</text><text x="265" y="140" transform="scale(.1)" fill="#fff" textLength="410">License</text><text aria-hidden="true" x="745" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="390">GPL v3</text><text x="745" y="140" transform="scale(.1)" fill="#fff" textLength="390">GPL v3</text></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" aria-label="License: GPL v3" height="20" role="img" width="100" xmlns="http://www.w3.org/2000/svg">
+    <title>License: GPL v3</title>
+    <linearGradient id="s" x2="0" y2="100%">
+        <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+        <stop offset="1" stop-opacity=".1"/>
+    </linearGradient>
+    <clipPath id="r">
+        <rect fill="#fff" height="20" rx="3" width="100"/>
+    </clipPath>
+    <g clip-path="url(#r)">
+        <rect fill="#555" height="20" width="51"/>
+        <rect fill="#007ec6" height="20" width="49" x="51"/>
+        <rect fill="url(#s)" height="20" width="100"/>
+    </g>
+    <g fill="#fff" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="110" text-anchor="middle" text-rendering="geometricPrecision">
+        <text aria-hidden="true" fill="#010101" fill-opacity=".3" textLength="410" transform="scale(.1)" x="265" y="150">License</text>
+        <text fill="#fff" textLength="410" transform="scale(.1)" x="265" y="140">License</text>
+        <text aria-hidden="true" fill="#010101" fill-opacity=".3" textLength="390" transform="scale(.1)" x="745" y="150">GPL v3</text>
+        <text fill="#fff" textLength="390" transform="scale(.1)" x="745" y="140">GPL v3</text>
+    </g>
+</svg>
diff --git a/crowdin.example.yml b/crowdin.example.yml
index 33c7aee5..344f2fc1 100644
--- a/crowdin.example.yml
+++ b/crowdin.example.yml
@@ -1,26 +1,26 @@
-"project_id":         "375123"
-"api_token":          "-removed-"
-"base_path" : ""
-"preserve_hierarchy": false
+project_id: "375123"
+api_token: "-removed-"
+base_path: ""
+preserve_hierarchy: false
 files: [
   {
-    "source" :      "app/src/main/res/values/strings.xml",
-    "translation" : "app/src/main/res/values-%two_letters_code%/strings.xml",
+    "source": "app/src/main/res/values/strings.xml",
+    "translation": "app/src/main/res/values-%two_letters_code%/strings.xml",
   },
   {
-    "source":       "fastlane/metadata/android/en-US/short_description.txt",
-    "translation":  "fastlane/metadata/android/%locale%/short_description.txt",
+    "source": "fastlane/metadata/android/en-US/short_description.txt",
+    "translation": "fastlane/metadata/android/%locale%/short_description.txt",
   },
   {
-    "source":       "fastlane/metadata/android/en-US/full_description.txt",
-    "translation":  "fastlane/metadata/android/%locale%/full_description.txt",
+    "source": "fastlane/metadata/android/en-US/full_description.txt",
+    "translation": "fastlane/metadata/android/%locale%/full_description.txt",
   },
   {
-    "source":       "fastlane/metadata/android/en-US/title.txt",
-    "translation":  "fastlane/metadata/android/%locale%/title.txt",
+    "source": "fastlane/metadata/android/en-US/title.txt",
+    "translation": "fastlane/metadata/android/%locale%/title.txt",
   },
   {
-    "source":       "fastlane/metadata/android/en-US/changelogs/*",
-    "translation":  "fastlane/metadata/android/%locale%/changelogs/%original_file_name%",
+    "source": "fastlane/metadata/android/en-US/changelogs/*",
+    "translation": "fastlane/metadata/android/%locale%/changelogs/%original_file_name%",
   }
 ]