From 325560c08df4701a7f6d9f4918c28c63204cd431 Mon Sep 17 00:00:00 2001
From: qwerty287 <qwerty287@noreply.codeberg.org>
Date: Wed, 21 Sep 2022 07:43:00 +0200
Subject: [PATCH] Use Gradle-native formatter (#1208)

Run `gradle :app:spotlessApply` to apply formatting.

# Changes from current code format

This does not match with the old intellij based code format because I can't apply some rules there.
- newlines after `else`, `catch` etc. (means there are `} else {` statements)
- no spaces around `if` braces (there are statements like `if (true) {` instead of `if(true) {`

Closes https://codeberg.org/gitnex/GitNex/issues/1187
Closes https://codeberg.org/gitnex/GitNex/issues/1202

Co-authored-by: qwerty287 <ndev@web.de>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1208
Reviewed-by: 6543 <6543@obermui.de>
Reviewed-by: M M Arif <mmarif@noreply.codeberg.org>
Co-authored-by: qwerty287 <qwerty287@noreply.codeberg.org>
Co-committed-by: qwerty287 <qwerty287@noreply.codeberg.org>
---
 .idea/codeStyles/Project.xml                  |   20 +-
 .woodpecker/check.yml                         |   11 +-
 app/build.gradle                              |   18 +
 .../gitnex/activities/MainActivityTest.java   |    1 -
 .../org/main/gitnex/helpers/AppUtilTest.java  |   50 +-
 .../org/main/gitnex/helpers/ToastyTest.java   |    1 -
 .../org/mian/gitnex/actions/ActionResult.java |   30 +-
 .../mian/gitnex/actions/AssigneesActions.java |  152 ++-
 .../gitnex/actions/CollaboratorActions.java   |  155 ++-
 .../org/mian/gitnex/actions/IssueActions.java |  367 +++---
 .../mian/gitnex/actions/LabelsActions.java    |  194 +--
 .../mian/gitnex/actions/MilestoneActions.java |   64 +-
 .../gitnex/actions/PullRequestActions.java    |  150 ++-
 .../gitnex/actions/RepositoryActions.java     |  247 ++--
 .../org/mian/gitnex/actions/TeamActions.java  |  276 ++--
 .../AddCollaboratorToRepositoryActivity.java  |   97 +-
 .../activities/AddNewAccountActivity.java     |  336 +++--
 .../activities/AddNewTeamMemberActivity.java  |  102 +-
 .../activities/AddNewTeamRepoActivity.java    |   74 +-
 .../activities/AdminCronTasksActivity.java    |   48 +-
 .../activities/AdminGetUsersActivity.java     |  149 ++-
 .../AdminUnadoptedReposActivity.java          |   84 +-
 .../mian/gitnex/activities/BaseActivity.java  |   94 +-
 .../gitnex/activities/CodeEditorActivity.java |   52 +-
 .../activities/CommitDetailActivity.java      |   39 +-
 .../gitnex/activities/CommitsActivity.java    |  228 ++--
 .../gitnex/activities/CreateFileActivity.java |  454 ++++---
 .../activities/CreateIssueActivity.java       |  293 +++--
 .../activities/CreateLabelActivity.java       |  303 +++--
 .../activities/CreateMilestoneActivity.java   |  141 +-
 .../activities/CreateNewUserActivity.java     |   96 +-
 .../CreateOrganizationActivity.java           |  119 +-
 .../activities/CreatePullRequestActivity.java |  314 +++--
 .../activities/CreateReleaseActivity.java     |  274 ++--
 .../gitnex/activities/CreateRepoActivity.java |  230 ++--
 .../activities/CreateTeamByOrgActivity.java   |  324 +++--
 .../gitnex/activities/DeepLinksActivity.java  |  785 ++++++-----
 .../mian/gitnex/activities/DiffActivity.java  |   36 +-
 .../gitnex/activities/EditIssueActivity.java  |  411 +++---
 .../gitnex/activities/FileViewActivity.java   |  499 ++++---
 .../activities/IssueDetailActivity.java       |  986 ++++++++------
 .../mian/gitnex/activities/LoginActivity.java |  870 ++++++++-----
 .../mian/gitnex/activities/MainActivity.java  |  780 ++++++-----
 .../activities/MergePullRequestActivity.java  |  203 +--
 .../activities/MyProfileEmailActivity.java    |   98 +-
 .../OrganizationDetailActivity.java           |  135 +-
 .../OrganizationTeamInfoActivity.java         |  115 +-
 .../gitnex/activities/ProfileActivity.java    |  163 +--
 .../gitnex/activities/RepoDetailActivity.java |  647 ++++++----
 .../gitnex/activities/RepoForksActivity.java  |  197 +--
 .../activities/RepoStargazersActivity.java    |   39 +-
 .../activities/RepoWatchersActivity.java      |   39 +-
 .../RepositorySettingsActivity.java           |  329 +++--
 .../SettingsAppearanceActivity.java           |  234 ++--
 .../activities/SettingsDraftsActivity.java    |   23 +-
 .../activities/SettingsGeneralActivity.java   |  139 +-
 .../SettingsNotificationsActivity.java        |  207 +--
 .../activities/SettingsReportsActivity.java   |   23 +-
 .../activities/SettingsSecurityActivity.java  |  286 ++--
 .../SettingsTranslationActivity.java          |   78 +-
 .../mian/gitnex/activities/WikiActivity.java  |  455 ++++---
 .../adapters/AdminCronTasksAdapter.java       |  144 ++-
 .../gitnex/adapters/AdminGetUsersAdapter.java |  152 ++-
 .../adapters/AdminUnadoptedReposAdapter.java  |  185 +--
 .../gitnex/adapters/AssigneesListAdapter.java |   74 +-
 .../adapters/CollaboratorSearchAdapter.java   |  193 +--
 .../gitnex/adapters/CollaboratorsAdapter.java |   53 +-
 .../mian/gitnex/adapters/CommitsAdapter.java  |  138 +-
 .../org/mian/gitnex/adapters/DiffAdapter.java |   94 +-
 .../gitnex/adapters/DiffFilesAdapter.java     |   59 +-
 .../mian/gitnex/adapters/DraftsAdapter.java   |  128 +-
 .../gitnex/adapters/ExploreIssuesAdapter.java |  243 ++--
 .../adapters/ExploreRepositoriesAdapter.java  |  145 ++-
 .../mian/gitnex/adapters/FilesAdapter.java    |  193 +--
 .../gitnex/adapters/IssueCommentsAdapter.java | 1147 +++++++++++------
 .../mian/gitnex/adapters/IssuesAdapter.java   |  200 ++-
 .../mian/gitnex/adapters/LabelsAdapter.java   |  119 +-
 .../gitnex/adapters/LabelsListAdapter.java    |   56 +-
 .../gitnex/adapters/MilestonesAdapter.java    |  178 +--
 .../adapters/MostVisitedReposAdapter.java     |   83 +-
 .../adapters/MyProfileEmailsAdapter.java      |   47 +-
 .../gitnex/adapters/NotificationsAdapter.java |   78 +-
 ...rganizationAddUserToTeamMemberAdapter.java |  174 ++-
 ...OrganizationTeamMembersPreviewAdapter.java |   25 +-
 .../OrganizationTeamRepositoriesAdapter.java  |  152 ++-
 .../adapters/OrganizationTeamsAdapter.java    |  148 ++-
 .../adapters/OrganizationsListAdapter.java    |  109 +-
 .../gitnex/adapters/PullRequestsAdapter.java  |  162 ++-
 .../adapters/ReactionAuthorsAdapter.java      |   30 +-
 .../mian/gitnex/adapters/ReleasesAdapter.java |  274 ++--
 .../adapters/ReleasesDownloadsAdapter.java    |   32 +-
 .../gitnex/adapters/RepoForksAdapter.java     |  147 ++-
 .../gitnex/adapters/ReposListAdapter.java     |  214 +--
 .../org/mian/gitnex/adapters/TagsAdapter.java |  195 ++-
 .../gitnex/adapters/UserAccountsAdapter.java  |  229 ++--
 .../adapters/UserAccountsNavAdapter.java      |   57 +-
 .../mian/gitnex/adapters/UserGridAdapter.java |  107 +-
 .../mian/gitnex/adapters/UsersAdapter.java    |   71 +-
 .../mian/gitnex/adapters/WikiListAdapter.java |  230 ++--
 .../mian/gitnex/clients/PicassoService.java   |   30 +-
 .../mian/gitnex/clients/RetrofitClient.java   |  193 ++-
 .../org/mian/gitnex/core/MainApplication.java |   40 +-
 .../mian/gitnex/core/MainGrammarLocator.java  |   25 +-
 .../org/mian/gitnex/database/api/BaseApi.java |   22 +-
 .../mian/gitnex/database/api/DraftsApi.java   |   26 +-
 .../gitnex/database/api/RepositoriesApi.java  |   33 +-
 .../gitnex/database/api/UserAccountsApi.java  |   28 +-
 .../mian/gitnex/database/dao/DraftsDao.java   |   27 +-
 .../gitnex/database/dao/RepositoriesDao.java  |   25 +-
 .../gitnex/database/dao/UserAccountsDao.java  |   16 +-
 .../gitnex/database/db/GitnexDatabase.java    |  102 +-
 .../mian/gitnex/database/models/Draft.java    |   33 +-
 .../database/models/DraftWithRepository.java  |    2 -
 .../gitnex/database/models/Repository.java    |   15 +-
 .../gitnex/database/models/UserAccount.java   |   14 +-
 .../fragments/AdministrationFragment.java     |   32 +-
 .../BottomSheetAdminUsersFragment.java        |   27 +-
 .../fragments/BottomSheetDraftsFragment.java  |   27 +-
 .../BottomSheetFileViewerFragment.java        |   81 +-
 .../BottomSheetIssuesFilterFragment.java      |   45 +-
 .../BottomSheetMilestonesFilterFragment.java  |   34 +-
 .../BottomSheetMyIssuesFilterFragment.java    |   43 +-
 .../BottomSheetMyProfileFragment.java         |   23 +-
 ...ottomSheetNotificationsFilterFragment.java |   31 +-
 .../BottomSheetNotificationsFragment.java     |  132 +-
 .../BottomSheetOrganizationFragment.java      |   84 +-
 .../BottomSheetOrganizationTeamsFragment.java |   40 +-
 .../BottomSheetPullRequestFilterFragment.java |   34 +-
 .../BottomSheetReleasesTagsFragment.java      |   36 +-
 .../fragments/BottomSheetReplyFragment.java   |  289 +++--
 .../fragments/BottomSheetRepoFragment.java    |  221 ++--
 .../BottomSheetSingleIssueFragment.java       |  279 ++--
 .../BottomSheetUserProfileFragment.java       |   38 +-
 .../fragments/BottomSheetWikiFragment.java    |   34 +-
 .../fragments/CollaboratorsFragment.java      |   49 +-
 .../fragments/CommitDetailFragment.java       |  384 ++++--
 .../gitnex/fragments/DiffFilesFragment.java   |  157 ++-
 .../mian/gitnex/fragments/DiffFragment.java   |   48 +-
 .../mian/gitnex/fragments/DraftsFragment.java |  106 +-
 .../gitnex/fragments/ExploreFragment.java     |   37 +-
 .../fragments/ExploreIssuesFragment.java      |  119 +-
 .../ExplorePublicOrganizationsFragment.java   |  174 +--
 .../ExploreRepositoriesFragment.java          |  297 +++--
 .../fragments/ExploreUsersFragment.java       |  230 ++--
 .../mian/gitnex/fragments/FilesFragment.java  |  309 +++--
 .../mian/gitnex/fragments/IssuesFragment.java |  413 ++++--
 .../mian/gitnex/fragments/LabelsFragment.java |   64 +-
 .../gitnex/fragments/MilestonesFragment.java  |  172 +--
 .../fragments/MostVisitedReposFragment.java   |  121 +-
 .../gitnex/fragments/MyIssuesFragment.java    |  154 ++-
 .../fragments/MyProfileEmailsFragment.java    |   58 +-
 .../fragments/MyProfileFollowersFragment.java |  157 +--
 .../fragments/MyProfileFollowingFragment.java |  157 +--
 .../gitnex/fragments/MyProfileFragment.java   |  126 +-
 .../fragments/MyRepositoriesFragment.java     |  147 ++-
 .../fragments/NotificationsFragment.java      |  292 +++--
 .../fragments/OrganizationInfoFragment.java   |  109 +-
 .../fragments/OrganizationLabelsFragment.java |   66 +-
 .../OrganizationMembersFragment.java          |   81 +-
 .../OrganizationRepositoriesFragment.java     |  139 +-
 .../OrganizationTeamInfoMembersFragment.java  |   61 +-
 ...ganizationTeamInfoPermissionsFragment.java |   20 +-
 .../OrganizationTeamInfoReposFragment.java    |  129 +-
 .../fragments/OrganizationTeamsFragment.java  |  103 +-
 .../fragments/OrganizationsFragment.java      |  133 +-
 .../fragments/PullRequestChangesFragment.java |   51 +-
 .../fragments/PullRequestCommitsFragment.java |  234 ++--
 .../fragments/PullRequestsFragment.java       |  308 +++--
 .../gitnex/fragments/ReleasesFragment.java    |  444 ++++---
 .../gitnex/fragments/RepoInfoFragment.java    |  358 ++---
 .../fragments/RepositoriesFragment.java       |  139 +-
 .../gitnex/fragments/SettingsFragment.java    |  108 +-
 .../StarredRepositoriesFragment.java          |  141 +-
 .../mian/gitnex/fragments/WikiFragment.java   |   97 +-
 .../fragments/profile/DetailFragment.java     |  177 ++-
 .../fragments/profile/FollowersFragment.java  |  284 ++--
 .../fragments/profile/FollowingFragment.java  |  284 ++--
 .../profile/OrganizationsFragment.java        |  293 +++--
 .../profile/RepositoriesFragment.java         |  292 +++--
 .../profile/StarredRepositoriesFragment.java  |  294 +++--
 .../org/mian/gitnex/helpers/AlertDialogs.java |  178 ++-
 .../java/org/mian/gitnex/helpers/AppUtil.java |  338 +++--
 .../org/mian/gitnex/helpers/ChangeLog.java    |   48 +-
 .../mian/gitnex/helpers/ClickListener.java    |    7 +-
 .../mian/gitnex/helpers/ColorInverter.java    |   21 +-
 .../org/mian/gitnex/helpers/Constants.java    |   11 +-
 .../org/mian/gitnex/helpers/FileDiffView.java |   36 +-
 .../org/mian/gitnex/helpers/FilesData.java    |    7 +-
 .../mian/gitnex/helpers/FontsOverride.java    |    9 +-
 .../java/org/mian/gitnex/helpers/Images.java  |   25 +-
 .../gitnex/helpers/LabelWidthCalculator.java  |    6 +-
 .../org/mian/gitnex/helpers/Markdown.java     |  630 +++++----
 .../helpers/MergePullRequestSpinner.java      |    6 +-
 .../gitnex/helpers/NetworkStatusObserver.java |   76 +-
 .../org/mian/gitnex/helpers/ParseDiff.java    |   91 +-
 .../java/org/mian/gitnex/helpers/Path.java    |   37 +-
 .../org/mian/gitnex/helpers/PathsHelper.java  |   13 +-
 .../org/mian/gitnex/helpers/PicassoCache.java |   67 +-
 .../helpers/RecyclerViewEmptySupport.java     |   40 +-
 .../gitnex/helpers/RoundedTransformation.java |   13 +-
 .../mian/gitnex/helpers/SimpleCallback.java   |    7 +-
 .../org/mian/gitnex/helpers/SnackBar.java     |    2 -
 .../org/mian/gitnex/helpers/TimeHelper.java   |   68 +-
 .../java/org/mian/gitnex/helpers/TinyDB.java  |   71 +-
 .../java/org/mian/gitnex/helpers/Toasty.java  |   22 +-
 .../org/mian/gitnex/helpers/UrlHelper.java    |   14 +-
 .../java/org/mian/gitnex/helpers/Version.java |   76 +-
 .../codeeditor/CustomCodeViewAdapter.java     |   10 +-
 .../helpers/codeeditor/LanguageManager.java   |   24 +-
 .../helpers/codeeditor/LanguageName.java      |    1 -
 .../codeeditor/SourcePositionListener.java    |   35 +-
 .../gitnex/helpers/codeeditor/ThemeName.java  |    1 -
 .../codeeditor/languages/GoLanguage.java      |   57 +-
 .../codeeditor/languages/HtmlLanguage.java    |   57 +-
 .../codeeditor/languages/JavaLanguage.java    |   62 +-
 .../codeeditor/languages/PhpLanguage.java     |   59 +-
 .../codeeditor/languages/PythonLanguage.java  |   51 +-
 .../codeeditor/languages/XmlLanguage.java     |   52 +-
 .../helpers/contexts/AccountContext.java      |   17 +-
 .../gitnex/helpers/contexts/IssueContext.java |   24 +-
 .../helpers/contexts/RepositoryContext.java   |   43 +-
 .../mian/gitnex/helpers/ssl/MTMDecision.java  |    8 +-
 .../helpers/ssl/MemorizingTrustManager.java   |  330 ++---
 .../gitnex/notifications/Notifications.java   |   78 +-
 .../notifications/NotificationsWorker.java    |  146 ++-
 .../gitnex/structs/BottomSheetListener.java   |    1 -
 .../structs/FragmentRefreshListener.java      |    1 -
 .../org/mian/gitnex/structs/Protocol.java     |    5 +-
 .../viewmodels/AdminCronTasksViewModel.java   |   51 +-
 .../viewmodels/AdminGetUsersViewModel.java    |   94 +-
 .../AdminUnadoptedReposViewModel.java         |   78 +-
 .../viewmodels/CollaboratorsViewModel.java    |   39 +-
 .../gitnex/viewmodels/FilesViewModel.java     |  130 +-
 .../viewmodels/IssueCommentsViewModel.java    |  122 +-
 .../gitnex/viewmodels/IssuesViewModel.java    |  151 ++-
 .../gitnex/viewmodels/LabelsViewModel.java    |   39 +-
 .../viewmodels/MembersByOrgViewModel.java     |   39 +-
 .../viewmodels/MilestonesViewModel.java       |  111 +-
 .../OrganizationLabelsViewModel.java          |   49 +-
 .../viewmodels/OrganizationsViewModel.java    |   96 +-
 .../viewmodels/ProfileEmailsViewModel.java    |   36 +-
 .../gitnex/viewmodels/ReleasesViewModel.java  |  184 +--
 .../viewmodels/RepoStargazersViewModel.java   |   40 +-
 .../viewmodels/RepoWatchersViewModel.java     |   40 +-
 .../viewmodels/RepositoriesViewModel.java     |  133 +-
 .../viewmodels/TeamsByOrgViewModel.java       |   62 +-
 .../mian/gitnex/viewmodels/WikiViewModel.java |  143 +-
 .../org/mian/gitnex/views/ReactionList.java   |  217 ++--
 .../mian/gitnex/views/ReactionSpinner.java    |  284 ++--
 .../gitnex/views/SyntaxHighlightedArea.java   |  121 +-
 .../org/mian/gitnex/helpers/AppUtilTest.java  |   24 +-
 .../mian/gitnex/helpers/ParseDiffTest.java    |   86 +-
 .../mian/gitnex/helpers/PathsHelperTest.java  |   10 +-
 .../org/mian/gitnex/helpers/VersionTest.java  |   12 +-
 254 files changed, 20604 insertions(+), 14474 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 9287cdc6..2d0d8196 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -31,17 +31,17 @@
             <option name="BLANK_LINES_AROUND_FIELD_IN_INTERFACE" value="1"/>
             <option name="BLANK_LINES_AFTER_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"/>
-            <option name="FINALLY_ON_NEW_LINE" value="true"/>
+            <option name="ELSE_ON_NEW_LINE" value="false"/>
+            <option name="CATCH_ON_NEW_LINE" value="false"/>
+            <option name="FINALLY_ON_NEW_LINE" value="false"/>
             <option name="ALIGN_MULTILINE_PARAMETERS" value="false"/>
-            <option name="SPACE_BEFORE_IF_PARENTHESES" value="false"/>
-            <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false"/>
-            <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false"/>
-            <option name="SPACE_BEFORE_TRY_PARENTHESES" value="false"/>
-            <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false"/>
-            <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false"/>
-            <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false"/>
+            <option name="SPACE_BEFORE_IF_PARENTHESES" value="true"/>
+            <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="true"/>
+            <option name="SPACE_BEFORE_FOR_PARENTHESES" value="true"/>
+            <option name="SPACE_BEFORE_TRY_PARENTHESES" value="true"/>
+            <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="true"/>
+            <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="true"/>
+            <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="true"/>
             <option name="CALL_PARAMETERS_WRAP" value="1"/>
             <option name="METHOD_PARAMETERS_WRAP" value="1"/>
             <option name="THROWS_LIST_WRAP" value="1"/>
diff --git a/.woodpecker/check.yml b/.woodpecker/check.yml
index 678558cb..97d2ee11 100644
--- a/.woodpecker/check.yml
+++ b/.woodpecker/check.yml
@@ -7,12 +7,11 @@ pipeline:
       regex: " \\\\* \\\\@author [\\\\S\\\\s]+"
       must_contain: true
 
-  #style:
-    #image: qwerty287/woodpecker-intellij-formatter
-    #group: check
-   # settings:
-      #file_pattern: "*.java"
-      #path: "app/"
+  style:
+    image: alvrme/alpine-android:android-31-jdk11
+    group: check
+    commands:
+      - ./gradlew :app:spotlessCheck
 
   test:
     image: alvrme/alpine-android:android-31-jdk11
diff --git a/app/build.gradle b/app/build.gradle
index 33704555..2fc74cce 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,6 @@
+plugins {
+    id "com.diffplug.spotless" version "6.11.0"
+}
 apply plugin: 'com.android.application'
 
 android {
@@ -118,3 +121,18 @@ dependencies {
     }
     implementation 'io.github.amrdeveloper:codeview:1.3.5'
 }
+
+spotless {
+    java {
+        target 'src/**/*.java'
+
+        importOrder('android', 'androidx', 'com', 'junit', 'net', 'org', 'java', 'javax', '', '\\#')
+        removeUnusedImports()
+
+        googleJavaFormat().aosp()
+
+        indentWithTabs()
+
+        formatAnnotations()
+    }
+}
diff --git a/app/src/androidTest/java/org/main/gitnex/activities/MainActivityTest.java b/app/src/androidTest/java/org/main/gitnex/activities/MainActivityTest.java
index c12f24cc..b9dd01c4 100644
--- a/app/src/androidTest/java/org/main/gitnex/activities/MainActivityTest.java
+++ b/app/src/androidTest/java/org/main/gitnex/activities/MainActivityTest.java
@@ -18,5 +18,4 @@ public class MainActivityTest {
 		ActivityScenario<MainActivity> a = ActivityScenario.launch(MainActivity.class);
 		a.close();
 	}
-
 }
diff --git a/app/src/androidTest/java/org/main/gitnex/helpers/AppUtilTest.java b/app/src/androidTest/java/org/main/gitnex/helpers/AppUtilTest.java
index d8b19d11..53154070 100644
--- a/app/src/androidTest/java/org/main/gitnex/helpers/AppUtilTest.java
+++ b/app/src/androidTest/java/org/main/gitnex/helpers/AppUtilTest.java
@@ -1,5 +1,7 @@
 package org.main.gitnex.helpers;
 
+import static org.junit.Assert.*;
+
 import android.content.Context;
 import android.net.Uri;
 import android.view.View;
@@ -8,7 +10,6 @@ import androidx.test.platform.app.InstrumentationRegistry;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mian.gitnex.helpers.AppUtil;
-import static org.junit.Assert.*;
 
 /**
  * @author qwerty287
@@ -91,22 +92,43 @@ public class AppUtilTest {
 
 	@Test
 	public void getUriFromGitUrlTest() {
-		assertEquals("https://git@codeberg.org/gitnex/GitNex", AppUtil.getUriFromGitUrl("ssh://git@codeberg.org:gitnex/GitNex").toString());
-		assertEquals("https://codeberg.org/gitnex/GitNex", AppUtil.getUriFromGitUrl("codeberg.org:gitnex/GitNex").toString());
-		assertEquals("ssh://git@codeberg.org/gitnex/GitNex", AppUtil.getUriFromGitUrl("ssh://git@codeberg.org/gitnex/GitNex").toString());
-		assertEquals("https://git@codeberg.org/gitnex/GitNex.git", AppUtil.getUriFromGitUrl("ssh://git@codeberg.org:gitnex/GitNex.git").toString());
-		assertEquals("https://codeberg.org/gitnex/GitNex.git", AppUtil.getUriFromGitUrl("codeberg.org:gitnex/GitNex.git").toString());
-		assertEquals("https://codeberg.org/gitnex/GitNex.git", AppUtil.getUriFromGitUrl("https://codeberg.org/gitnex/GitNex.git").toString());
-		assertEquals("https://gitnex.com", AppUtil.getUriFromGitUrl("https://gitnex.com").toString());
-		assertEquals("https://gitnex.com:3000", AppUtil.getUriFromGitUrl("https://gitnex.com:3000").toString());
+		assertEquals(
+				"https://git@codeberg.org/gitnex/GitNex",
+				AppUtil.getUriFromGitUrl("ssh://git@codeberg.org:gitnex/GitNex").toString());
+		assertEquals(
+				"https://codeberg.org/gitnex/GitNex",
+				AppUtil.getUriFromGitUrl("codeberg.org:gitnex/GitNex").toString());
+		assertEquals(
+				"ssh://git@codeberg.org/gitnex/GitNex",
+				AppUtil.getUriFromGitUrl("ssh://git@codeberg.org/gitnex/GitNex").toString());
+		assertEquals(
+				"https://git@codeberg.org/gitnex/GitNex.git",
+				AppUtil.getUriFromGitUrl("ssh://git@codeberg.org:gitnex/GitNex.git").toString());
+		assertEquals(
+				"https://codeberg.org/gitnex/GitNex.git",
+				AppUtil.getUriFromGitUrl("codeberg.org:gitnex/GitNex.git").toString());
+		assertEquals(
+				"https://codeberg.org/gitnex/GitNex.git",
+				AppUtil.getUriFromGitUrl("https://codeberg.org/gitnex/GitNex.git").toString());
+		assertEquals(
+				"https://gitnex.com", AppUtil.getUriFromGitUrl("https://gitnex.com").toString());
+		assertEquals(
+				"https://gitnex.com:3000",
+				AppUtil.getUriFromGitUrl("https://gitnex.com:3000").toString());
 	}
 
 	@Test
 	public void changeSchemeTest() {
-		assertEquals("https://codeberg.org/gitnex/GitNex", AppUtil.changeScheme(Uri.parse("ssh://codeberg.org/gitnex/GitNex"), "https").toString());
-		assertEquals("https://gitnex.com", AppUtil.changeScheme(Uri.parse("http://gitnex.com"), "https").toString());
-		assertEquals("ssh://codeberg.org/gitnex/GitNex", AppUtil.changeScheme(Uri.parse("http://codeberg.org/gitnex/GitNex"), "ssh").toString());
+		assertEquals(
+				"https://codeberg.org/gitnex/GitNex",
+				AppUtil.changeScheme(Uri.parse("ssh://codeberg.org/gitnex/GitNex"), "https")
+						.toString());
+		assertEquals(
+				"https://gitnex.com",
+				AppUtil.changeScheme(Uri.parse("http://gitnex.com"), "https").toString());
+		assertEquals(
+				"ssh://codeberg.org/gitnex/GitNex",
+				AppUtil.changeScheme(Uri.parse("http://codeberg.org/gitnex/GitNex"), "ssh")
+						.toString());
 	}
-
 }
-
diff --git a/app/src/androidTest/java/org/main/gitnex/helpers/ToastyTest.java b/app/src/androidTest/java/org/main/gitnex/helpers/ToastyTest.java
index ca0b94de..e43299f2 100644
--- a/app/src/androidTest/java/org/main/gitnex/helpers/ToastyTest.java
+++ b/app/src/androidTest/java/org/main/gitnex/helpers/ToastyTest.java
@@ -45,5 +45,4 @@ public class ToastyTest {
 		Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
 		Toasty.success(context, "GitNex success test");
 	}
-
 }
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 3fe1077d..f2d94eee 100644
--- a/app/src/main/java/org/mian/gitnex/actions/ActionResult.java
+++ b/app/src/main/java/org/mian/gitnex/actions/ActionResult.java
@@ -11,7 +11,6 @@ import java.util.concurrent.TimeUnit;
 /**
  * @author opyale
  */
-
 public class ActionResult<R> {
 
 	private final BlockingQueue<Boolean> blockingQueue;
@@ -22,7 +21,6 @@ public class ActionResult<R> {
 
 		blockingQueue = new ArrayBlockingQueue<>(1);
 		onFinishedListeners = new ArrayList<>();
-
 	}
 
 	public void finish(@NonNull Status status) {
@@ -33,54 +31,48 @@ public class ActionResult<R> {
 	public void finish(@NonNull Status status, R result) {
 
 		try {
-			if(blockingQueue.poll(5, TimeUnit.SECONDS)) {
+			if (blockingQueue.poll(5, TimeUnit.SECONDS)) {
 
-				for(OnFinishedListener<R> onFinishedListener : onFinishedListeners)
+				for (OnFinishedListener<R> onFinishedListener : onFinishedListeners)
 					onFinishedListener.onFinished(status, result);
 			}
 
+		} catch (InterruptedException ignored) {
 		}
-		catch(InterruptedException ignored) {
-		}
-
 	}
 
 	public void invalidate() {
 
-		if(invalidated) {
+		if (invalidated) {
 			throw new IllegalStateException("Already invalidated");
 		}
 		this.invalidated = true;
-
 	}
 
 	@SafeVarargs
-	public synchronized final void accept(@NonNull OnFinishedListener<R>... onFinishedListeners) {
+	public final synchronized void accept(@NonNull OnFinishedListener<R>... onFinishedListeners) {
 
 		invalidate();
 
 		this.blockingQueue.add(true);
 		this.onFinishedListeners.addAll(Arrays.asList(onFinishedListeners));
-
 	}
 
-	public synchronized final void discard() {
+	public final synchronized void discard() {
 
 		invalidate();
 		this.blockingQueue.add(false);
-
 	}
 
-	public enum Status {SUCCESS, FAILED}
+	public enum Status {
+		SUCCESS,
+		FAILED
+	}
 
 	public interface OnFinishedListener<R> {
 
 		void onFinished(Status status, R result);
-
-	}
-
-	public static class None {
-
 	}
 
+	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 1bf05b25..d0df8d69 100644
--- a/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.widget.ProgressBar;
 import androidx.annotation.NonNull;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Issue;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
@@ -12,103 +13,130 @@ import org.mian.gitnex.adapters.AssigneesListAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.CustomAssigneesSelectionDialogBinding;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class AssigneesActions {
 
-	public static void getCurrentIssueAssignees(Context ctx, String repoOwner, String repoName, int issueIndex, List<String> currentAssignees) {
+	public static void getCurrentIssueAssignees(
+			Context ctx,
+			String repoOwner,
+			String repoName,
+			int issueIndex,
+			List<String> currentAssignees) {
 
-		Call<Issue> callSingleIssueLabels = RetrofitClient.getApiInterface(ctx).issueGetIssue(repoOwner, repoName, (long) issueIndex);
+		Call<Issue> callSingleIssueLabels =
+				RetrofitClient.getApiInterface(ctx)
+						.issueGetIssue(repoOwner, repoName, (long) issueIndex);
 
-		callSingleIssueLabels.enqueue(new Callback<>() {
+		callSingleIssueLabels.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Issue> call, @NonNull retrofit2.Response<Issue> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Issue> call,
+							@NonNull retrofit2.Response<Issue> response) {
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					Issue issueAssigneesList = response.body();
-					assert issueAssigneesList != null;
+							Issue issueAssigneesList = response.body();
+							assert issueAssigneesList != null;
 
-					if(issueAssigneesList.getAssignees() != null) {
+							if (issueAssigneesList.getAssignees() != null) {
 
-						if(issueAssigneesList.getAssignees().size() > 0) {
+								if (issueAssigneesList.getAssignees().size() > 0) {
 
-							for(int i = 0; i < issueAssigneesList.getAssignees().size(); i++) {
+									for (int i = 0;
+											i < issueAssigneesList.getAssignees().size();
+											i++) {
 
-								currentAssignees.add(issueAssigneesList.getAssignees().get(i).getLogin());
+										currentAssignees.add(
+												issueAssigneesList
+														.getAssignees()
+														.get(i)
+														.getLogin());
+									}
+								}
 							}
+						} else {
+
+							Toasty.error(ctx, ctx.getResources().getString(R.string.genericError));
 						}
 					}
-				}
-				else {
 
-					Toasty.error(ctx, ctx.getResources().getString(R.string.genericError));
-				}
-			}
+					@Override
+					public void onFailure(@NonNull Call<Issue> call, @NonNull Throwable t) {
 
-			@Override
-			public void onFailure(@NonNull Call<Issue> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(
+								ctx,
+								ctx.getResources().getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	public static void getRepositoryAssignees(Context ctx, String repoOwner, String repoName, List<User> assigneesList, MaterialAlertDialogBuilder materialAlertDialogBuilder, AssigneesListAdapter assigneesAdapter,
-		CustomAssigneesSelectionDialogBinding assigneesBinding, ProgressBar progressBar) {
+	public static void getRepositoryAssignees(
+			Context ctx,
+			String repoOwner,
+			String repoName,
+			List<User> assigneesList,
+			MaterialAlertDialogBuilder materialAlertDialogBuilder,
+			AssigneesListAdapter assigneesAdapter,
+			CustomAssigneesSelectionDialogBinding assigneesBinding,
+			ProgressBar progressBar) {
 
-		Call<List<User>> call = RetrofitClient.getApiInterface(ctx).repoGetAssignees(repoOwner, repoName);
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(ctx).repoGetAssignees(repoOwner, repoName);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull retrofit2.Response<List<User>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull retrofit2.Response<List<User>> response) {
 
-				assigneesList.clear();
-				List<User> assigneesList_ = response.body();
+						assigneesList.clear();
+						List<User> assigneesList_ = response.body();
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					assert assigneesList_ != null;
+							assert assigneesList_ != null;
 
-					if(assigneesList_.size() > 0) {
+							if (assigneesList_.size() > 0) {
 
-						assigneesList.addAll(assigneesList_);
-						materialAlertDialogBuilder.show();
-					}
-					else {
+								assigneesList.addAll(assigneesList_);
+								materialAlertDialogBuilder.show();
+							} else {
 
-						Toasty.warning(ctx, ctx.getResources().getString(R.string.noAssigneesFound));
+								Toasty.warning(
+										ctx,
+										ctx.getResources().getString(R.string.noAssigneesFound));
+							}
+
+							assigneesBinding.assigneesRecyclerView.setAdapter(assigneesAdapter);
+
+						} else {
+
+							Toasty.error(ctx, ctx.getResources().getString(R.string.genericError));
+						}
+						if (progressBar != null) {
+							progressBar.setVisibility(View.GONE);
+						}
 					}
 
-					assigneesBinding.assigneesRecyclerView.setAdapter(assigneesAdapter);
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
 
-				}
-				else {
-
-					Toasty.error(ctx, ctx.getResources().getString(R.string.genericError));
-				}
-				if(progressBar != null) {
-					progressBar.setVisibility(View.GONE);
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
-
-				if(progressBar != null) {
-					progressBar.setVisibility(View.GONE);
-				}
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+						if (progressBar != null) {
+							progressBar.setVisibility(View.GONE);
+						}
+						Toasty.error(
+								ctx,
+								ctx.getResources().getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
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 bccf8195..cb24e580 100644
--- a/app/src/main/java/org/mian/gitnex/actions/CollaboratorActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/CollaboratorActions.java
@@ -16,97 +16,114 @@ import retrofit2.Callback;
 /**
  * @author M M Arif
  */
-
 public class CollaboratorActions {
 
-	public static void deleteCollaborator(final Context context, String userName, RepositoryContext repository) {
+	public static void deleteCollaborator(
+			final Context context, String userName, RepositoryContext repository) {
 
-		Call<Void> call = RetrofitClient.getApiInterface(context).repoDeleteCollaborator(repository.getOwner(), repository.getName(), userName);
+		Call<Void> call =
+				RetrofitClient.getApiInterface(context)
+						.repoDeleteCollaborator(
+								repository.getOwner(), repository.getName(), userName);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.isSuccessful()) {
-					if(response.code() == 204) {
+						if (response.isSuccessful()) {
+							if (response.code() == 204) {
 
-						CollaboratorsFragment.refreshCollaborators = true;
-						Toasty.success(context, context.getString(R.string.removeCollaboratorToastText));
-						((AddCollaboratorToRepositoryActivity) context).finish();
+								CollaboratorsFragment.refreshCollaborators = true;
+								Toasty.success(
+										context,
+										context.getString(R.string.removeCollaboratorToastText));
+								((AddCollaboratorToRepositoryActivity) context).finish();
+							}
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(context);
+						} else if (response.code() == 403) {
+
+							Toasty.error(context, context.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
+
+							Toasty.warning(context, context.getString(R.string.apiNotFound));
+						} else {
+
+							Toasty.error(context, context.getString(R.string.genericError));
+						}
 					}
-				}
-				else if(response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(context);
-				}
-				else if(response.code() == 403) {
-
-					Toasty.error(context, context.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(context, context.getString(R.string.apiNotFound));
-				}
-				else {
-
-					Toasty.error(context, context.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
+						Toasty.error(
+								context,
+								context.getResources()
+										.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	public static void addCollaborator(final Context context, String permission, String userName, RepositoryContext repository) {
+	public static void addCollaborator(
+			final Context context,
+			String permission,
+			String userName,
+			RepositoryContext repository) {
 
 		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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.isSuccessful()) {
-					if(response.code() == 204) {
+						if (response.isSuccessful()) {
+							if (response.code() == 204) {
 
-						CollaboratorsFragment.refreshCollaborators = true;
-						Toasty.success(context, context.getString(R.string.addCollaboratorToastText));
-						((AddCollaboratorToRepositoryActivity) context).finish();
+								CollaboratorsFragment.refreshCollaborators = true;
+								Toasty.success(
+										context,
+										context.getString(R.string.addCollaboratorToastText));
+								((AddCollaboratorToRepositoryActivity) context).finish();
+							}
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(context);
+						} else if (response.code() == 403) {
+
+							Toasty.error(context, context.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
+
+							Toasty.warning(context, context.getString(R.string.apiNotFound));
+						} else {
+
+							Toasty.error(context, context.getString(R.string.genericError));
+						}
 					}
-				}
-				else if(response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(context);
-				}
-				else if(response.code() == 403) {
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-					Toasty.error(context, context.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(context, context.getString(R.string.apiNotFound));
-				}
-				else {
-
-					Toasty.error(context, context.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(
+								context,
+								context.getResources()
+										.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
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 ff8fbe1a..2f5de64e 100644
--- a/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
@@ -25,243 +25,288 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class IssueActions {
 
-	public static ActionResult<Response<?>> edit(Context context, String comment, int commentId, IssueContext issue) {
+	public static ActionResult<Response<?>> edit(
+			Context context, String comment, int commentId, IssueContext issue) {
 
 		ActionResult<Response<?>> actionResult = new ActionResult<>();
 
 		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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Comment> call, @NonNull retrofit2.Response<Comment> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Comment> call,
+							@NonNull retrofit2.Response<Comment> response) {
 
-				switch(response.code()) {
+						switch (response.code()) {
+							case 200:
+								actionResult.finish(ActionResult.Status.SUCCESS);
+								break;
 
-					case 200:
-						actionResult.finish(ActionResult.Status.SUCCESS);
-						break;
+							case 401:
+								actionResult.finish(ActionResult.Status.FAILED, response);
+								AlertDialogs.authorizationTokenRevokedDialog(context);
+								break;
 
-					case 401:
-						actionResult.finish(ActionResult.Status.FAILED, response);
-						AlertDialogs.authorizationTokenRevokedDialog(context);
-						break;
+							default:
+								actionResult.finish(ActionResult.Status.FAILED, response);
+								break;
+						}
+					}
 
-					default:
-						actionResult.finish(ActionResult.Status.FAILED, response);
-						break;
+					@Override
+					public void onFailure(@NonNull Call<Comment> call, @NonNull Throwable t) {
 
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Comment> call, @NonNull Throwable t) {
-
-				actionResult.finish(ActionResult.Status.FAILED);
-			}
-		});
+						actionResult.finish(ActionResult.Status.FAILED);
+					}
+				});
 
 		return actionResult;
 	}
 
-	public static void closeReopenIssue(final Context ctx, final String issueState, IssueContext issue) {
+	public static void closeReopenIssue(
+			final Context ctx, final String issueState, IssueContext issue) {
 
 		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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Issue> call, @NonNull retrofit2.Response<Issue> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Issue> call,
+							@NonNull retrofit2.Response<Issue> response) {
 
-				if(response.isSuccessful()) {
-					if(response.code() == 201) {
+						if (response.isSuccessful()) {
+							if (response.code() == 201) {
 
-						if(issue.hasIssue()) {
-							IssuesFragment.resumeIssues = issue.getIssue().getPullRequest() == null;
-							PullRequestsFragment.resumePullRequests = issue.getIssue().getPullRequest() != null;
-						}
-						if(issue.getIssueType().equalsIgnoreCase("Pull")) {
-							if(issueState.equals("closed")) {
-								Toasty.success(ctx, ctx.getString(R.string.prClosed));
+								if (issue.hasIssue()) {
+									IssuesFragment.resumeIssues =
+											issue.getIssue().getPullRequest() == null;
+									PullRequestsFragment.resumePullRequests =
+											issue.getIssue().getPullRequest() != null;
+								}
+								if (issue.getIssueType().equalsIgnoreCase("Pull")) {
+									if (issueState.equals("closed")) {
+										Toasty.success(ctx, ctx.getString(R.string.prClosed));
+									} else if (issueState.equals("open")) {
+										Toasty.success(ctx, ctx.getString(R.string.prReopened));
+									}
+								} else {
+									if (issueState.equals("closed")) {
+										Toasty.success(
+												ctx, ctx.getString(R.string.issueStateClosed));
+									} else if (issueState.equals("open")) {
+										Toasty.success(
+												ctx, ctx.getString(R.string.issueStateReopened));
+									}
+								}
+
+								IssueDetailActivity.singleIssueUpdate = true;
+								((IssueDetailActivity) ctx).onResume();
+								if (((Activity) ctx).getIntent().getStringExtra("openedFromLink")
+												== null
+										|| !((Activity) ctx)
+												.getIntent()
+												.getStringExtra("openedFromLink")
+												.equals("true")) {
+									RepoDetailActivity.updateRepo = true;
+								}
 							}
-							else if(issueState.equals("open")) {
-								Toasty.success(ctx, ctx.getString(R.string.prReopened));
-							}
-						}
-						else {
-							if(issueState.equals("closed")) {
-								Toasty.success(ctx, ctx.getString(R.string.issueStateClosed));
-							}
-							else if(issueState.equals("open")) {
-								Toasty.success(ctx, ctx.getString(R.string.issueStateReopened));
-							}
-						}
+						} else if (response.code() == 401) {
 
-						IssueDetailActivity.singleIssueUpdate = true;
-						((IssueDetailActivity) ctx).onResume();
-						if(((Activity) ctx).getIntent().getStringExtra("openedFromLink") == null || !((Activity) ctx).getIntent().getStringExtra("openedFromLink").equals("true")) {
-							RepoDetailActivity.updateRepo = true;
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else if (response.code() == 403) {
+
+							Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
+
+							Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+						} else {
+
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
 						}
 					}
-				}
-				else if(response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else if(response.code() == 403) {
-
-					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-				}
-				else {
-
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Issue> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<Issue> call, @NonNull Throwable t) {
 
+						Toasty.error(
+								ctx,
+								ctx.getResources().getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	public static void subscribe(final Context ctx, IssueContext issue) {
 
 		Call<Void> call;
 
-		call = RetrofitClient.getApiInterface(ctx)
-			.issueAddSubscription(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(), ((BaseActivity) ctx).getAccount().getAccount().getUserName());
+		call =
+				RetrofitClient.getApiInterface(ctx)
+						.issueAddSubscription(
+								issue.getRepository().getOwner(),
+								issue.getRepository().getName(),
+								(long) issue.getIssueIndex(),
+								((BaseActivity) ctx).getAccount().getAccount().getUserName());
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.code() == 201) {
+							if (response.code() == 201) {
 
-						Toasty.success(ctx, ctx.getString(R.string.subscribedSuccessfully));
+								Toasty.success(ctx, ctx.getString(R.string.subscribedSuccessfully));
+							} else if (response.code() == 200) {
+
+								Toasty.success(ctx, ctx.getString(R.string.alreadySubscribed));
+							}
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else {
+
+							Toasty.error(ctx, ctx.getString(R.string.subscriptionError));
+						}
 					}
-					else if(response.code() == 200) {
 
-						Toasty.success(ctx, ctx.getString(R.string.alreadySubscribed));
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+
+						Toasty.error(
+								ctx,
+								ctx.getResources().getString(R.string.genericServerResponseError));
 					}
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else {
-
-					Toasty.error(ctx, ctx.getString(R.string.subscriptionError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
 
 	public static void unsubscribe(final Context ctx, IssueContext issue) {
 
 		Call<Void> call;
 
-		call = RetrofitClient.getApiInterface(ctx)
-			.issueDeleteSubscription(issue.getRepository().getOwner(), issue.getRepository().getName(), (long) issue.getIssueIndex(), ((BaseActivity) ctx).getAccount().getAccount().getUserName());
+		call =
+				RetrofitClient.getApiInterface(ctx)
+						.issueDeleteSubscription(
+								issue.getRepository().getOwner(),
+								issue.getRepository().getName(),
+								(long) issue.getIssueIndex(),
+								((BaseActivity) ctx).getAccount().getAccount().getUserName());
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.code() == 201) {
+							if (response.code() == 201) {
 
-						Toasty.success(ctx, ctx.getString(R.string.unsubscribedSuccessfully));
+								Toasty.success(
+										ctx, ctx.getString(R.string.unsubscribedSuccessfully));
+							} else if (response.code() == 200) {
+
+								Toasty.success(ctx, ctx.getString(R.string.alreadyUnsubscribed));
+							}
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else {
+
+							Toasty.error(ctx, ctx.getString(R.string.unSubscriptionError));
+						}
 					}
-					else if(response.code() == 200) {
 
-						Toasty.success(ctx, ctx.getString(R.string.alreadyUnsubscribed));
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+
+						Toasty.error(
+								ctx,
+								ctx.getResources().getString(R.string.genericServerResponseError));
 					}
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else {
-
-					Toasty.error(ctx, ctx.getString(R.string.unSubscriptionError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
 
-	public static ActionResult<ActionResult.None> reply(Context context, String comment, IssueContext issue) {
+	public static ActionResult<ActionResult.None> reply(
+			Context context, String comment, IssueContext issue) {
 
 		ActionResult<ActionResult.None> actionResult = new ActionResult<>();
 
 		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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Comment> call, @NonNull retrofit2.Response<Comment> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Comment> call,
+							@NonNull retrofit2.Response<Comment> response) {
 
-				if(response.code() == 201) {
-					actionResult.finish(ActionResult.Status.SUCCESS);
+						if (response.code() == 201) {
+							actionResult.finish(ActionResult.Status.SUCCESS);
 
-					if(issue.hasIssue()) {
-						IssuesFragment.resumeIssues = issue.getIssue().getPullRequest() == null;
-						PullRequestsFragment.resumePullRequests = issue.getIssue().getPullRequest() != null;
+							if (issue.hasIssue()) {
+								IssuesFragment.resumeIssues =
+										issue.getIssue().getPullRequest() == null;
+								PullRequestsFragment.resumePullRequests =
+										issue.getIssue().getPullRequest() != null;
+							}
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(context);
+
+						} else {
+
+							actionResult.finish(ActionResult.Status.FAILED);
+						}
 					}
-				}
-				else if(response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(context);
+					@Override
+					public void onFailure(@NonNull Call<Comment> call, @NonNull Throwable t) {
 
-				}
-				else {
-
-					actionResult.finish(ActionResult.Status.FAILED);
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Comment> call, @NonNull Throwable t) {
-
-				Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(
+								context,
+								context.getResources()
+										.getString(R.string.genericServerResponseError));
+					}
+				});
 
 		return actionResult;
 	}
-
 }
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 c020a977..84bfda13 100644
--- a/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java
@@ -5,124 +5,160 @@ import android.view.View;
 import android.widget.ProgressBar;
 import androidx.annotation.NonNull;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Label;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.LabelsListAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class LabelsActions {
 
-	public static void getCurrentIssueLabels(Context ctx, String repoOwner, String repoName, int issueIndex, List<Integer> currentLabelsIds) {
+	public static void getCurrentIssueLabels(
+			Context ctx,
+			String repoOwner,
+			String repoName,
+			int issueIndex,
+			List<Integer> currentLabelsIds) {
 
-		Call<List<Label>> callSingleIssueLabels = RetrofitClient.getApiInterface(ctx).issueGetLabels(repoOwner, repoName, (long) issueIndex);
+		Call<List<Label>> callSingleIssueLabels =
+				RetrofitClient.getApiInterface(ctx)
+						.issueGetLabels(repoOwner, repoName, (long) issueIndex);
 
-		callSingleIssueLabels.enqueue(new Callback<>() {
+		callSingleIssueLabels.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Label>> call, @NonNull retrofit2.Response<List<Label>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Label>> call,
+							@NonNull retrofit2.Response<List<Label>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					List<Label> issueLabelsList = response.body();
+							List<Label> issueLabelsList = response.body();
 
-					assert issueLabelsList != null;
+							assert issueLabelsList != null;
 
-					if(issueLabelsList.size() > 0) {
+							if (issueLabelsList.size() > 0) {
 
-						for(int i = 0; i < issueLabelsList.size(); i++) {
+								for (int i = 0; i < issueLabelsList.size(); i++) {
 
-							currentLabelsIds.add(Math.toIntExact(issueLabelsList.get(i).getId()));
+									currentLabelsIds.add(
+											Math.toIntExact(issueLabelsList.get(i).getId()));
+								}
+							}
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
 						}
 					}
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Label>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<Label>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	public static void getRepositoryLabels(Context ctx, String repoOwner, String repoName, List<Label> labelsList, MaterialAlertDialogBuilder materialAlertDialogBuilder, LabelsListAdapter labelsAdapter,
-		CustomLabelsSelectionDialogBinding labelsBinding, ProgressBar progressBar) {
+	public static void getRepositoryLabels(
+			Context ctx,
+			String repoOwner,
+			String repoName,
+			List<Label> labelsList,
+			MaterialAlertDialogBuilder materialAlertDialogBuilder,
+			LabelsListAdapter labelsAdapter,
+			CustomLabelsSelectionDialogBinding labelsBinding,
+			ProgressBar progressBar) {
 
-		Call<List<Label>> call = RetrofitClient.getApiInterface(ctx).issueListLabels(repoOwner, repoName, null, null);
+		Call<List<Label>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.issueListLabels(repoOwner, repoName, null, null);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Label>> call, @NonNull retrofit2.Response<List<Label>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Label>> call,
+							@NonNull retrofit2.Response<List<Label>> response) {
 
-				labelsList.clear();
+						labelsList.clear();
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.body() != null) {
+							if (response.body() != null) {
 
-						labelsList.addAll(response.body());
+								labelsList.addAll(response.body());
+							}
+
+							// Load organization labels
+							Call<List<Label>> callOrgLabels =
+									RetrofitClient.getApiInterface(ctx)
+											.orgListLabels(repoOwner, null, null);
+
+							callOrgLabels.enqueue(
+									new Callback<>() {
+
+										@Override
+										public void onResponse(
+												@NonNull Call<List<Label>> call,
+												@NonNull retrofit2.Response<List<Label>>
+																responseOrg) {
+
+											if (responseOrg.body() != null) {
+
+												labelsList.addAll(responseOrg.body());
+												materialAlertDialogBuilder.show();
+											}
+
+											if (labelsList.isEmpty()) {
+
+												Toasty.warning(
+														ctx,
+														ctx.getResources()
+																.getString(R.string.noDataFound));
+											}
+
+											labelsBinding.labelsRecyclerView.setAdapter(
+													labelsAdapter);
+										}
+
+										@Override
+										public void onFailure(
+												@NonNull Call<List<Label>> call,
+												@NonNull Throwable t) {
+
+											Toasty.error(
+													ctx,
+													ctx.getString(
+															R.string.genericServerResponseError));
+										}
+									});
+						} else {
+
+							Toasty.error(ctx, ctx.getResources().getString(R.string.genericError));
+						}
+						if (progressBar != null) {
+							progressBar.setVisibility(View.GONE);
+						}
 					}
 
-					// Load organization labels
-					Call<List<Label>> callOrgLabels = RetrofitClient.getApiInterface(ctx).orgListLabels(repoOwner, null, null);
+					@Override
+					public void onFailure(@NonNull Call<List<Label>> call, @NonNull Throwable t) {
 
-					callOrgLabels.enqueue(new Callback<>() {
-
-						@Override
-						public void onResponse(@NonNull Call<List<Label>> call, @NonNull retrofit2.Response<List<Label>> responseOrg) {
-
-							if(responseOrg.body() != null) {
-
-								labelsList.addAll(responseOrg.body());
-								materialAlertDialogBuilder.show();
-							}
-
-							if(labelsList.isEmpty()) {
-
-								Toasty.warning(ctx, ctx.getResources().getString(R.string.noDataFound));
-							}
-
-							labelsBinding.labelsRecyclerView.setAdapter(labelsAdapter);
+						if (progressBar != null) {
+							progressBar.setVisibility(View.GONE);
 						}
-
-						@Override
-						public void onFailure(@NonNull Call<List<Label>> call, @NonNull Throwable t) {
-
-							Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-						}
-					});
-				}
-				else {
-
-					Toasty.error(ctx, ctx.getResources().getString(R.string.genericError));
-				}
-				if(progressBar != null) {
-					progressBar.setVisibility(View.GONE);
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Label>> call, @NonNull Throwable t) {
-
-				if(progressBar != null) {
-					progressBar.setVisibility(View.GONE);
-				}
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(
+								ctx,
+								ctx.getResources().getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
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 f1cc3da7..cba30a07 100644
--- a/app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
@@ -15,58 +15,60 @@ import retrofit2.Callback;
 /**
  * @author M M Arif
  */
-
 public class MilestoneActions {
 
-	static final private String TAG = "MilestoneActions : ";
+	private static final String TAG = "MilestoneActions : ";
 
-	public static void closeMilestone(final Context ctx, int milestoneId_, RepositoryContext repository) {
+	public static void closeMilestone(
+			final Context ctx, int milestoneId_, RepositoryContext repository) {
 		updateMilestoneState(ctx, milestoneId_, repository, "closed");
 	}
 
-	public static void openMilestone(final Context ctx, int milestoneId_, RepositoryContext repository) {
+	public static void openMilestone(
+			final Context ctx, int milestoneId_, RepositoryContext repository) {
 		updateMilestoneState(ctx, milestoneId_, repository, "open");
 	}
 
-	private static void updateMilestoneState(final Context ctx, int milestoneId_, RepositoryContext repository, String state) {
+	private static void updateMilestoneState(
+			final Context ctx, int milestoneId_, RepositoryContext repository, String state) {
 
 		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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Milestone> call, @NonNull retrofit2.Response<Milestone> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Milestone> call,
+							@NonNull retrofit2.Response<Milestone> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					Toasty.success(ctx, ctx.getString(R.string.milestoneStatusUpdate));
+							Toasty.success(ctx, ctx.getString(R.string.milestoneStatusUpdate));
 
-				}
-				else if(response.code() == 401) {
+						} else if (response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
 
-				}
-				else {
+						} else {
 
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Milestone> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericError));
-
-			}
-
-		});
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
+					@Override
+					public void onFailure(@NonNull Call<Milestone> call, @NonNull Throwable t) {
 
+						Toasty.error(ctx, ctx.getString(R.string.genericError));
+					}
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/actions/PullRequestActions.java b/app/src/main/java/org/mian/gitnex/actions/PullRequestActions.java
index 6035ee3b..007c7f14 100644
--- a/app/src/main/java/org/mian/gitnex/actions/PullRequestActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/PullRequestActions.java
@@ -13,97 +13,107 @@ import retrofit2.Response;
 /**
  * @author qwerty287
  */
-
 public class PullRequestActions {
 
-	public static void deleteHeadBranch(Context context, String repoOwner, String repoName, String headBranch, boolean showToasts) {
-		Call<Void> call = RetrofitClient.getApiInterface(context).repoDeleteBranch(repoOwner, repoName, headBranch);
+	public static void deleteHeadBranch(
+			Context context,
+			String repoOwner,
+			String repoName,
+			String headBranch,
+			boolean showToasts) {
+		Call<Void> call =
+				RetrofitClient.getApiInterface(context)
+						.repoDeleteBranch(repoOwner, repoName, headBranch);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.code() == 204) {
+						if (response.code() == 204) {
 
-					if(showToasts) {
-						Toasty.success(context, context.getString(R.string.deleteBranchSuccess));
+							if (showToasts) {
+								Toasty.success(
+										context, context.getString(R.string.deleteBranchSuccess));
+							}
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(context);
+						} else if (response.code() == 403) {
+
+							if (showToasts) {
+								Toasty.error(context, context.getString(R.string.authorizeError));
+							}
+						} else if (response.code() == 404) {
+
+							if (showToasts) {
+								Toasty.warning(
+										context,
+										context.getString(R.string.deleteBranchErrorNotFound));
+							}
+						} else {
+
+							if (showToasts) {
+								Toasty.error(context, context.getString(R.string.genericError));
+							}
+						}
 					}
-				}
-				else if(response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(context);
-				}
-				else if(response.code() == 403) {
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-					if(showToasts) {
-						Toasty.error(context, context.getString(R.string.authorizeError));
+						if (showToasts) {
+							Toasty.error(context, context.getString(R.string.deleteBranchError));
+						}
 					}
-				}
-				else if(response.code() == 404) {
-
-					if(showToasts) {
-						Toasty.warning(context, context.getString(R.string.deleteBranchErrorNotFound));
-					}
-				}
-				else {
-
-					if(showToasts) {
-						Toasty.error(context, context.getString(R.string.genericError));
-					}
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				if(showToasts) {
-					Toasty.error(context, context.getString(R.string.deleteBranchError));
-				}
-			}
-
-		});
+				});
 	}
 
-	public static void updatePr(Context context, String repoOwner, String repoName, String index, Boolean rebase) {
+	public static void updatePr(
+			Context context, String repoOwner, String repoName, String index, Boolean rebase) {
 
 		String strategy;
-		if(rebase == null) {
+		if (rebase == null) {
 			strategy = null;
-		}
-		else if(!rebase) {
+		} else if (!rebase) {
 			strategy = "merge";
-		}
-		else {
+		} else {
 			strategy = "rebase";
 		}
-		RetrofitClient.getApiInterface(context).repoUpdatePullRequest(repoOwner, repoName, Long.valueOf(index), strategy).enqueue(new Callback<>() {
+		RetrofitClient.getApiInterface(context)
+				.repoUpdatePullRequest(repoOwner, repoName, Long.valueOf(index), strategy)
+				.enqueue(
+						new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call call, @NonNull Response response) {
+							@Override
+							public void onResponse(@NonNull Call call, @NonNull Response response) {
 
-				if(response.isSuccessful()) {
-					Toasty.success(context, context.getString(R.string.updatePrSuccess));
-				}
-				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.updatePrConflict));
-					}
-					else {
-						Toasty.error(context, context.getString(R.string.genericError));
-					}
-				}
-			}
+								if (response.isSuccessful()) {
+									Toasty.success(
+											context, context.getString(R.string.updatePrSuccess));
+								} 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.updatePrConflict));
+									} else {
+										Toasty.error(
+												context, context.getString(R.string.genericError));
+									}
+								}
+							}
 
-			@Override
-			public void onFailure(@NonNull Call call, @NonNull Throwable t) {
+							@Override
+							public void onFailure(@NonNull Call call, @NonNull Throwable t) {
 
-				Toasty.error(context, context.getString(R.string.genericError));
-			}
-		});
+								Toasty.error(context, context.getString(R.string.genericError));
+							}
+						});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/actions/RepositoryActions.java b/app/src/main/java/org/mian/gitnex/actions/RepositoryActions.java
index 900b3856..9e795bae 100644
--- a/app/src/main/java/org/mian/gitnex/actions/RepositoryActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/RepositoryActions.java
@@ -15,173 +15,180 @@ import retrofit2.Callback;
 /**
  * @author M M Arif
  */
-
 public class RepositoryActions {
 
 	public static void starRepository(final Context context, RepositoryContext repository) {
 
-		Call<Void> call = RetrofitClient.getApiInterface(context).userCurrentPutStar(repository.getOwner(), repository.getName());
+		Call<Void> call =
+				RetrofitClient.getApiInterface(context)
+						.userCurrentPutStar(repository.getOwner(), repository.getName());
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.isSuccessful()) {
-					if(response.code() == 204) {
+						if (response.isSuccessful()) {
+							if (response.code() == 204) {
 
-						MainActivity.reloadRepos = true;
-						Toasty.success(context, context.getString(R.string.starRepositorySuccess));
+								MainActivity.reloadRepos = true;
+								Toasty.success(
+										context, context.getString(R.string.starRepositorySuccess));
+							}
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(context);
+						} else if (response.code() == 403) {
+
+							Toasty.error(context, context.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
+
+							Toasty.warning(context, context.getString(R.string.apiNotFound));
+						} else {
+
+							Toasty.error(context, context.getString(R.string.genericError));
+						}
 					}
-				}
-				else if(response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(context);
-				}
-				else if(response.code() == 403) {
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-					Toasty.error(context, context.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(context, context.getString(R.string.apiNotFound));
-				}
-				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.genericServerResponseError));
-			}
-		});
+						Toasty.error(
+								context, context.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	public static void unStarRepository(final Context context, RepositoryContext repository) {
 
-		Call<Void> call = RetrofitClient.getApiInterface(context).userCurrentDeleteStar(repository.getOwner(), repository.getName());
+		Call<Void> call =
+				RetrofitClient.getApiInterface(context)
+						.userCurrentDeleteStar(repository.getOwner(), repository.getName());
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.isSuccessful()) {
-					if(response.code() == 204) {
+						if (response.isSuccessful()) {
+							if (response.code() == 204) {
 
-						MainActivity.reloadRepos = true;
-						Toasty.success(context, context.getString(R.string.unStarRepositorySuccess));
+								MainActivity.reloadRepos = true;
+								Toasty.success(
+										context,
+										context.getString(R.string.unStarRepositorySuccess));
+							}
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(context);
+						} else if (response.code() == 403) {
+
+							Toasty.error(context, context.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
+
+							Toasty.warning(context, context.getString(R.string.apiNotFound));
+						} else {
+
+							Toasty.error(context, context.getString(R.string.genericError));
+						}
 					}
-				}
-				else if(response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(context);
-				}
-				else if(response.code() == 403) {
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-					Toasty.error(context, context.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(context, context.getString(R.string.apiNotFound));
-				}
-				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.genericServerResponseError));
-			}
-		});
+						Toasty.error(
+								context, context.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	public static void watchRepository(final Context context, RepositoryContext repository) {
 
-		Call<WatchInfo> call = RetrofitClient.getApiInterface(context).userCurrentPutSubscription(repository.getOwner(), repository.getName());
+		Call<WatchInfo> call =
+				RetrofitClient.getApiInterface(context)
+						.userCurrentPutSubscription(repository.getOwner(), repository.getName());
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<WatchInfo> call,
+							@NonNull retrofit2.Response<WatchInfo> response) {
 
-				if(response.isSuccessful()) {
-					if(response.code() == 200) {
+						if (response.isSuccessful()) {
+							if (response.code() == 200) {
 
-						Toasty.success(context, context.getString(R.string.watchRepositorySuccess));
+								Toasty.success(
+										context,
+										context.getString(R.string.watchRepositorySuccess));
+							}
+						} else if (response.code() == 401) {
 
+							AlertDialogs.authorizationTokenRevokedDialog(context);
+						} else if (response.code() == 403) {
+
+							Toasty.error(context, context.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
+
+							Toasty.warning(context, context.getString(R.string.apiNotFound));
+						} else {
+
+							Toasty.error(context, context.getString(R.string.genericError));
+						}
 					}
-				}
-				else if(response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(context);
-				}
-				else if(response.code() == 403) {
+					@Override
+					public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
 
-					Toasty.error(context, context.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(context, context.getString(R.string.apiNotFound));
-				}
-				else {
-
-					Toasty.error(context, context.getString(R.string.genericError));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
-
-				Toasty.error(context, context.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(
+								context, context.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	public static void unWatchRepository(final Context context, RepositoryContext repository) {
 
-		Call<Void> call = RetrofitClient.getApiInterface(context).userCurrentDeleteStar(repository.getOwner(), repository.getName());
+		Call<Void> call =
+				RetrofitClient.getApiInterface(context)
+						.userCurrentDeleteStar(repository.getOwner(), repository.getName());
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.code() == 204) {
+						if (response.code() == 204) {
 
-					Toasty.success(context, context.getString(R.string.unWatchRepositorySuccess));
-				}
-				else if(response.code() == 401) {
+							Toasty.success(
+									context, context.getString(R.string.unWatchRepositorySuccess));
+						} else if (response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(context);
-				}
-				else if(response.code() == 403) {
+							AlertDialogs.authorizationTokenRevokedDialog(context);
+						} else if (response.code() == 403) {
 
-					Toasty.error(context, context.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
+							Toasty.error(context, context.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
 
-					Toasty.warning(context, context.getString(R.string.apiNotFound));
-				}
-				else {
+							Toasty.warning(context, context.getString(R.string.apiNotFound));
+						} else {
 
-					Toasty.error(context, context.getString(R.string.genericError));
-				}
-			}
+							Toasty.error(context, context.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-				Toasty.error(context, context.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(
+								context, context.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/actions/TeamActions.java b/app/src/main/java/org/mian/gitnex/actions/TeamActions.java
index 7ee82dcc..c1c2cac1 100644
--- a/app/src/main/java/org/mian/gitnex/actions/TeamActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/TeamActions.java
@@ -15,183 +15,197 @@ import retrofit2.Callback;
 /**
  * @author M M Arif
  */
-
 public class TeamActions {
 
 	public static void removeTeamMember(final Context context, String userName, int teamId) {
 
-		Call<Void> call = RetrofitClient.getApiInterface(context).orgRemoveTeamMember((long) teamId, userName);
+		Call<Void> call =
+				RetrofitClient.getApiInterface(context)
+						.orgRemoveTeamMember((long) teamId, userName);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.code() == 204) {
+							if (response.code() == 204) {
 
-						Toasty.success(context, context.getString(R.string.memberRemovedMessage));
-						((AddNewTeamMemberActivity) context).finish();
+								Toasty.success(
+										context, context.getString(R.string.memberRemovedMessage));
+								((AddNewTeamMemberActivity) context).finish();
+							}
+
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(context);
+						} else if (response.code() == 403) {
+
+							Toasty.error(context, context.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
+
+							Toasty.warning(context, context.getString(R.string.apiNotFound));
+						} else {
+
+							Toasty.error(context, context.getString(R.string.genericError));
+						}
 					}
 
-				}
-				else if(response.code() == 401) {
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(context);
-				}
-				else if(response.code() == 403) {
-
-					Toasty.error(context, context.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(context, context.getString(R.string.apiNotFound));
-				}
-				else {
-
-					Toasty.error(context, context.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(
+								context,
+								context.getResources()
+										.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	public static void addTeamMember(final Context context, String userName, int teamId) {
 
-		Call<Void> call = RetrofitClient.getApiInterface(context).orgAddTeamMember((long) teamId, userName);
+		Call<Void> call =
+				RetrofitClient.getApiInterface(context).orgAddTeamMember((long) teamId, userName);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.code() == 204) {
+							if (response.code() == 204) {
 
-						Toasty.success(context, context.getString(R.string.memberAddedMessage));
-						((AddNewTeamMemberActivity) context).finish();
+								Toasty.success(
+										context, context.getString(R.string.memberAddedMessage));
+								((AddNewTeamMemberActivity) context).finish();
+							}
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(context);
+						} else if (response.code() == 403) {
+
+							Toasty.error(context, context.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
+
+							Toasty.warning(context, context.getString(R.string.apiNotFound));
+						} else {
+
+							Toasty.error(context, context.getString(R.string.genericError));
+						}
 					}
-				}
-				else if(response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(context);
-				}
-				else if(response.code() == 403) {
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-					Toasty.error(context, context.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(context, context.getString(R.string.apiNotFound));
-				}
-				else {
-
-					Toasty.error(context, context.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(
+								context,
+								context.getResources()
+										.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	public static void removeTeamRepo(final Context context, String orgName, int teamId, String repo) {
+	public static void removeTeamRepo(
+			final Context context, String orgName, int teamId, String repo) {
 
-		Call<Void> call = RetrofitClient.getApiInterface(context).orgRemoveTeamRepository((long) teamId, orgName, repo);
+		Call<Void> call =
+				RetrofitClient.getApiInterface(context)
+						.orgRemoveTeamRepository((long) teamId, orgName, repo);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.code() == 204) {
+							if (response.code() == 204) {
 
-						OrganizationTeamInfoReposFragment.repoAdded = true;
-						Toasty.success(context, context.getString(R.string.repoRemovedMessage));
-						((AddNewTeamRepoActivity) context).finish();
+								OrganizationTeamInfoReposFragment.repoAdded = true;
+								Toasty.success(
+										context, context.getString(R.string.repoRemovedMessage));
+								((AddNewTeamRepoActivity) context).finish();
+							}
+
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(context);
+						} else if (response.code() == 403) {
+
+							Toasty.error(context, context.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
+
+							Toasty.warning(context, context.getString(R.string.apiNotFound));
+						} else {
+
+							Toasty.error(context, context.getString(R.string.genericError));
+						}
 					}
 
-				}
-				else if(response.code() == 401) {
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(context);
-				}
-				else if(response.code() == 403) {
-
-					Toasty.error(context, context.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(context, context.getString(R.string.apiNotFound));
-				}
-				else {
-
-					Toasty.error(context, context.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(
+								context,
+								context.getResources()
+										.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	public static void addTeamRepo(final Context context, String orgName, int teamId, String repo) {
 
-		Call<Void> call = RetrofitClient.getApiInterface(context).orgAddTeamRepository((long) teamId, orgName, repo);
+		Call<Void> call =
+				RetrofitClient.getApiInterface(context)
+						.orgAddTeamRepository((long) teamId, orgName, repo);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.code() == 204) {
+							if (response.code() == 204) {
 
-						OrganizationTeamInfoReposFragment.repoAdded = true;
-						Toasty.success(context, context.getString(R.string.repoAddedMessage));
-						((AddNewTeamRepoActivity) context).finish();
+								OrganizationTeamInfoReposFragment.repoAdded = true;
+								Toasty.success(
+										context, context.getString(R.string.repoAddedMessage));
+								((AddNewTeamRepoActivity) context).finish();
+							}
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(context);
+						} else if (response.code() == 403) {
+
+							Toasty.error(context, context.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
+
+							Toasty.warning(context, context.getString(R.string.apiNotFound));
+						} else {
+
+							Toasty.error(context, context.getString(R.string.genericError));
+						}
 					}
-				}
-				else if(response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(context);
-				}
-				else if(response.code() == 403) {
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-					Toasty.error(context, context.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(context, context.getString(R.string.apiNotFound));
-				}
-				else {
-
-					Toasty.error(context, context.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(
+								context,
+								context.getResources()
+										.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
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 7638c825..b2590c63 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
@@ -7,6 +7,8 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.List;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.InlineResponse2001;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
@@ -15,8 +17,6 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.ActivityAddCollaboratorToRepositoryBinding;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -24,7 +24,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class AddCollaboratorToRepositoryActivity extends BaseActivity {
 
 	private ActivityAddCollaboratorToRepositoryBinding activityAddCollaboratorToRepositoryBinding;
@@ -36,79 +35,98 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		activityAddCollaboratorToRepositoryBinding = ActivityAddCollaboratorToRepositoryBinding.inflate(getLayoutInflater());
+		activityAddCollaboratorToRepositoryBinding =
+				ActivityAddCollaboratorToRepositoryBinding.inflate(getLayoutInflater());
 		setContentView(activityAddCollaboratorToRepositoryBinding.getRoot());
 
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager imm =
+				(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
 		repository = RepositoryContext.fromIntent(getIntent());
 
 		activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch.requestFocus();
 		assert imm != null;
-		imm.showSoftInput(activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch, InputMethodManager.SHOW_IMPLICIT);
+		imm.showSoftInput(
+				activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch,
+				InputMethodManager.SHOW_IMPLICIT);
 
 		initCloseListener();
 		activityAddCollaboratorToRepositoryBinding.close.setOnClickListener(onClickListener);
 
-		activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch.setOnEditorActionListener((v, actionId, event) -> {
+		activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch.setOnEditorActionListener(
+				(v, actionId, event) -> {
+					if (actionId == EditorInfo.IME_ACTION_SEND) {
 
-			if(actionId == EditorInfo.IME_ACTION_SEND) {
+						if (!Objects.requireNonNull(
+										activityAddCollaboratorToRepositoryBinding
+												.addCollaboratorSearch.getText())
+								.toString()
+								.equals("")) {
 
-				if(!Objects.requireNonNull(activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch.getText()).toString().equals("")) {
+							activityAddCollaboratorToRepositoryBinding.progressBar.setVisibility(
+									View.VISIBLE);
+							loadUserSearchList(
+									activityAddCollaboratorToRepositoryBinding
+											.addCollaboratorSearch
+											.getText()
+											.toString());
+						}
+					}
 
-					activityAddCollaboratorToRepositoryBinding.progressBar.setVisibility(View.VISIBLE);
-					loadUserSearchList(activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch.getText().toString());
-				}
-			}
-
-			return false;
-		});
+					return false;
+				});
 	}
 
 	public void loadUserSearchList(String searchKeyword) {
 
-		Call<InlineResponse2001> call = RetrofitClient.getApiInterface(ctx).userSearch(searchKeyword, null, 1, 10);
+		Call<InlineResponse2001> call =
+				RetrofitClient.getApiInterface(ctx).userSearch(searchKeyword, null, 1, 10);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<InlineResponse2001> call, @NonNull Response<InlineResponse2001> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<InlineResponse2001> call,
+							@NonNull Response<InlineResponse2001> response) {
 
-				activityAddCollaboratorToRepositoryBinding.progressBar.setVisibility(View.GONE);
+						activityAddCollaboratorToRepositoryBinding.progressBar.setVisibility(
+								View.GONE);
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					assert response.body() != null;
-					getUsersList(response.body().getData(), ctx);
-				}
-				else {
+							assert response.body() != null;
+							getUsersList(response.body().getData(), ctx);
+						} else {
 
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<InlineResponse2001> call, @NonNull Throwable t) {
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<InlineResponse2001> call, @NonNull Throwable t) {
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	private void getUsersList(List<User> dataList, Context context) {
 
-		CollaboratorSearchAdapter adapter = new CollaboratorSearchAdapter(dataList, context, repository);
+		CollaboratorSearchAdapter adapter =
+				new CollaboratorSearchAdapter(dataList, context, repository);
 
 		activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch.setHasFixedSize(true);
-		activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch.setLayoutManager(new LinearLayoutManager(ctx));
+		activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch.setLayoutManager(
+				new LinearLayoutManager(ctx));
 
 		activityAddCollaboratorToRepositoryBinding.progressBar.setVisibility(View.VISIBLE);
 
-		if(adapter.getItemCount() > 0) {
+		if (adapter.getItemCount() > 0) {
 
 			activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch.setAdapter(adapter);
 			activityAddCollaboratorToRepositoryBinding.noData.setVisibility(View.GONE);
-		}
-		else {
+		} else {
 
 			activityAddCollaboratorToRepositoryBinding.noData.setVisibility(View.VISIBLE);
 		}
@@ -125,5 +143,4 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
 		super.onResume();
 		repository.checkAccountSwitch(this);
 	}
-
 }
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 c54c2265..822d7453 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
@@ -8,6 +8,9 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import io.mikael.urlbuilder.UrlBuilder;
+import java.net.URI;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.GeneralAPISettings;
 import org.gitnex.tea4j.v2.models.ServerVersion;
 import org.gitnex.tea4j.v2.models.User;
@@ -23,16 +26,12 @@ import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.UrlHelper;
 import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.structs.Protocol;
-import java.net.URI;
-import java.util.Objects;
-import io.mikael.urlbuilder.UrlBuilder;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class AddNewAccountActivity extends BaseActivity {
 
 	private View.OnClickListener onClickListener;
@@ -58,235 +57,292 @@ public class AddNewAccountActivity extends BaseActivity {
 		viewBinding.instanceUrl.setText(getIntent().getStringExtra("instanceUrl"));
 		viewBinding.loginToken.setText(getIntent().getStringExtra("token"));
 		String scheme = getIntent().getStringExtra("scheme");
-		if(scheme != null && scheme.equals("http")) {
+		if (scheme != null && scheme.equals("http")) {
 			viewBinding.protocolSpinner.setText(Protocol.HTTP.toString());
 			spinnerSelectedValue = Protocol.HTTP.toString();
-		}
-		else { // default is https
+		} else { // default is https
 			viewBinding.protocolSpinner.setText(Protocol.HTTPS.toString());
 			spinnerSelectedValue = Protocol.HTTPS.toString();
 		}
 
-		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(ctx, R.layout.list_spinner_items, Protocol.values());
+		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.addNewAccount.setOnClickListener(login -> {
+		viewBinding.protocolSpinner.setOnItemClickListener(
+				(parent, view1, position, id) ->
+						spinnerSelectedValue = String.valueOf(parent.getItemAtPosition(position)));
+		viewBinding.addNewAccount.setOnClickListener(
+				login -> {
+					boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-			boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+					if (!connToInternet) {
 
-			if(!connToInternet) {
-
-				Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
-			}
-			else {
-
-				processLogin();
-			}
-		});
+						Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+					} else {
 
+						processLogin();
+					}
+				});
 	}
 
 	private void processLogin() {
 
 		try {
 
-			String instanceUrlET = String.valueOf(viewBinding.instanceUrl.getText()).replaceAll("[\\uFEFF|#]", "").trim();
-			String loginToken = String.valueOf(viewBinding.loginToken.getText()).replaceAll("[\\uFEFF|#]", "").trim();
+			String instanceUrlET =
+					String.valueOf(viewBinding.instanceUrl.getText())
+							.replaceAll("[\\uFEFF|#]", "")
+							.trim();
+			String loginToken =
+					String.valueOf(viewBinding.loginToken.getText())
+							.replaceAll("[\\uFEFF|#]", "")
+							.trim();
 			String protocol = spinnerSelectedValue;
 
-			if(protocol == null) {
+			if (protocol == null) {
 
 				Toasty.error(ctx, getResources().getString(R.string.protocolEmptyError));
 				return;
 			}
 
-			if(instanceUrlET.equals("")) {
+			if (instanceUrlET.equals("")) {
 
 				Toasty.error(ctx, getResources().getString(R.string.emptyFieldURL));
 				return;
 			}
 
-			if(loginToken.equals("")) {
+			if (loginToken.equals("")) {
 
 				Toasty.error(ctx, getResources().getString(R.string.loginTokenError));
 				return;
 			}
 
-			URI rawInstanceUrl = UrlBuilder.fromString(UrlHelper.fixScheme(instanceUrlET, "http")).toUri();
+			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();
 
-		}
-		catch(Exception e) {
+		} catch (Exception e) {
 
 			Toasty.error(ctx, getResources().getString(R.string.malformedUrl));
 		}
-
 	}
 
 	private void versionCheck(final String instanceUrl, final String loginToken) {
 
-		Call<ServerVersion> callVersion = RetrofitClient.getApiInterface(ctx, instanceUrl, "token " + loginToken, null).getVersion();
-		callVersion.enqueue(new Callback<>() {
+		Call<ServerVersion> callVersion =
+				RetrofitClient.getApiInterface(ctx, instanceUrl, "token " + loginToken, null)
+						.getVersion();
+		callVersion.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull final Call<ServerVersion> callVersion, @NonNull retrofit2.Response<ServerVersion> responseVersion) {
+					@Override
+					public void onResponse(
+							@NonNull final Call<ServerVersion> callVersion,
+							@NonNull retrofit2.Response<ServerVersion> responseVersion) {
 
-				if(responseVersion.code() == 200) {
+						if (responseVersion.code() == 200) {
 
-					ServerVersion version = responseVersion.body();
+							ServerVersion version = responseVersion.body();
 
-					assert version != null;
+							assert version != null;
 
-					if(!Version.valid(version.getVersion())) {
+							if (!Version.valid(version.getVersion())) {
 
-						Toasty.error(ctx, getResources().getString(R.string.versionUnknown));
-						return;
-					}
+								Toasty.error(
+										ctx, getResources().getString(R.string.versionUnknown));
+								return;
+							}
 
-					giteaVersion = new Version(version.getVersion());
+							giteaVersion = new Version(version.getVersion());
 
-					if(giteaVersion.less(getString(R.string.versionLow))) {
+							if (giteaVersion.less(getString(R.string.versionLow))) {
 
-						MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(getString(R.string.versionAlertDialogHeader))
-							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setNeutralButton(getString(R.string.cancelButton), null)
-							.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
+								MaterialAlertDialogBuilder materialAlertDialogBuilder =
+										new MaterialAlertDialogBuilder(ctx)
+												.setTitle(
+														getString(
+																R.string.versionAlertDialogHeader))
+												.setMessage(
+														getResources()
+																.getString(
+																		R.string
+																				.versionUnsupportedOld,
+																		version.getVersion()))
+												.setNeutralButton(
+														getString(R.string.cancelButton), null)
+												.setPositiveButton(
+														getString(R.string.textContinue),
+														(dialog, which) -> {
+															dialog.dismiss();
+															login(instanceUrl, loginToken);
+														});
+
+								materialAlertDialogBuilder.create().show();
+							} else if (giteaVersion.lessOrEqual(getString(R.string.versionHigh))) {
 
-								dialog.dismiss();
 								login(instanceUrl, loginToken);
-							});
+							} else {
 
-						materialAlertDialogBuilder.create().show();
-					}
-					else if(giteaVersion.lessOrEqual(getString(R.string.versionHigh))) {
+								Toasty.warning(
+										ctx,
+										getResources().getString(R.string.versionUnsupportedNew));
+								login(instanceUrl, loginToken);
+							}
 
-						login(instanceUrl, loginToken);
-					}
-					else {
+						} else if (responseVersion.code() == 403) {
 
-						Toasty.warning(ctx, getResources().getString(R.string.versionUnsupportedNew));
-						login(instanceUrl, loginToken);
+							login(instanceUrl, loginToken);
+						}
 					}
 
-				}
-				else if(responseVersion.code() == 403) {
+					private void login(String instanceUrl, String loginToken) {
 
-					login(instanceUrl, loginToken);
-				}
-			}
+						setupNewAccountWithToken(instanceUrl, loginToken);
+					}
 
-			private void login(String instanceUrl, String loginToken) {
+					@Override
+					public void onFailure(
+							@NonNull Call<ServerVersion> callVersion, @NonNull Throwable t) {
 
-				setupNewAccountWithToken(instanceUrl, loginToken);
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<ServerVersion> callVersion, @NonNull Throwable t) {
-
-				Log.e("onFailure-versionCheck", t.toString());
-				Toasty.error(ctx, getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+						Log.e("onFailure-versionCheck", t.toString());
+						Toasty.error(
+								ctx, getResources().getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	private void serverPageLimitSettings() {
 
-		Call<GeneralAPISettings> generalAPISettings = RetrofitClient.getApiInterface(ctx).getGeneralAPISettings();
-		generalAPISettings.enqueue(new Callback<>() {
+		Call<GeneralAPISettings> generalAPISettings =
+				RetrofitClient.getApiInterface(ctx).getGeneralAPISettings();
+		generalAPISettings.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull final Call<GeneralAPISettings> generalAPISettings, @NonNull retrofit2.Response<GeneralAPISettings> response) {
+					@Override
+					public void onResponse(
+							@NonNull final Call<GeneralAPISettings> generalAPISettings,
+							@NonNull retrofit2.Response<GeneralAPISettings> response) {
 
-				if(response.code() == 200 && response.body() != null) {
+						if (response.code() == 200 && response.body() != null) {
 
-					if(response.body().getMaxResponseItems() != null) {
-						maxResponseItems = Math.toIntExact(response.body().getMaxResponseItems());
+							if (response.body().getMaxResponseItems() != null) {
+								maxResponseItems =
+										Math.toIntExact(response.body().getMaxResponseItems());
+							}
+							if (response.body().getDefaultPagingNum() != null) {
+								defaultPagingNumber =
+										Math.toIntExact(response.body().getDefaultPagingNum());
+							}
+						}
 					}
-					if(response.body().getDefaultPagingNum() != null) {
-						defaultPagingNumber = Math.toIntExact(response.body().getDefaultPagingNum());
-					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<GeneralAPISettings> generalAPISettings, @NonNull Throwable t) {
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<GeneralAPISettings> generalAPISettings,
+							@NonNull Throwable t) {}
+				});
 	}
 
 	private void setupNewAccountWithToken(String instanceUrl, final String loginToken) {
 
-		Call<User> call = RetrofitClient.getApiInterface(ctx, instanceUrl, "token " + loginToken, null).userGetCurrent();
+		Call<User> call =
+				RetrofitClient.getApiInterface(ctx, instanceUrl, "token " + loginToken, null)
+						.userGetCurrent();
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<User> call, @NonNull retrofit2.Response<User> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<User> call, @NonNull retrofit2.Response<User> response) {
 
-				User userDetails = response.body();
+						User userDetails = response.body();
 
-				switch(response.code()) {
+						switch (response.code()) {
+							case 200:
+								assert userDetails != null;
+								// insert new account to db if does not exist
+								String accountName = userDetails.getLogin() + "@" + instanceUrl;
+								UserAccountsApi userAccountsApi =
+										BaseApi.getInstance(ctx, UserAccountsApi.class);
+								boolean userAccountExists =
+										Objects.requireNonNull(userAccountsApi)
+												.userAccountExists(accountName);
 
-					case 200:
+								if (!userAccountExists) {
 
-						assert userDetails != null;
-						// insert new account to db if does not exist
-						String accountName = userDetails.getLogin() + "@" + instanceUrl;
-						UserAccountsApi userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
-						boolean userAccountExists = Objects.requireNonNull(userAccountsApi).userAccountExists(accountName);
+									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));
+									MainActivity.refActivity = true;
+									finish();
+								} else {
+									UserAccount account =
+											userAccountsApi.getAccountByName(accountName);
+									if (account.isLoggedIn()) {
+										Toasty.warning(
+												ctx,
+												getResources()
+														.getString(
+																R.string
+																		.accountAlreadyExistsError));
+										AppUtil.switchToAccount(ctx, account);
+									} else {
+										userAccountsApi.updateTokenByAccountName(
+												accountName, loginToken);
+										userAccountsApi.login(account.getAccountId());
+										AppUtil.switchToAccount(
+												AddNewAccountActivity.this, account);
+									}
+								}
+								finish();
+								break;
 
-						if(!userAccountExists) {
+							case 401:
+								Toasty.error(
+										ctx,
+										getResources().getString(R.string.unauthorizedApiError));
+								break;
 
-							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));
-							MainActivity.refActivity = true;
-							finish();
+							default:
+								Toasty.error(
+										ctx,
+										getResources()
+												.getString(
+														R.string.genericApiError, response.code()));
 						}
-						else {
-							UserAccount account = userAccountsApi.getAccountByName(accountName);
-							if(account.isLoggedIn()) {
-								Toasty.warning(ctx, getResources().getString(R.string.accountAlreadyExistsError));
-								AppUtil.switchToAccount(ctx, account);
-							}
-							else {
-								userAccountsApi.updateTokenByAccountName(accountName, loginToken);
-								userAccountsApi.login(account.getAccountId());
-								AppUtil.switchToAccount(AddNewAccountActivity.this, account);
-							}
-						}
-						finish();
-						break;
+					}
 
-					case 401:
-
-						Toasty.error(ctx, getResources().getString(R.string.unauthorizedApiError));
-						break;
-
-					default:
-
-						Toasty.error(ctx, getResources().getString(R.string.genericApiError, response.code()));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getResources().getString(R.string.genericError));
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {
 
+						Toasty.error(ctx, getResources().getString(R.string.genericError));
+					}
+				});
 	}
 
 	private void initCloseListener() {
 
 		onClickListener = view -> finish();
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java
index 553c6d96..ec13050a 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java
@@ -13,13 +13,13 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.InlineResponse2001;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.adapters.OrganizationAddUserToTeamMemberAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.ActivityAddNewTeamMemberBinding;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -27,7 +27,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class AddNewTeamMemberActivity extends BaseActivity {
 
 	private View.OnClickListener onClickListener;
@@ -46,10 +45,12 @@ public class AddNewTeamMemberActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityAddNewTeamMemberBinding activityAddNewTeamMemberBinding = ActivityAddNewTeamMemberBinding.inflate(getLayoutInflater());
+		ActivityAddNewTeamMemberBinding activityAddNewTeamMemberBinding =
+				ActivityAddNewTeamMemberBinding.inflate(getLayoutInflater());
 		setContentView(activityAddNewTeamMemberBinding.getRoot());
 
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager imm =
+				(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
 		ImageView closeActivity = activityAddNewTeamMemberBinding.close;
 		addNewTeamMember = activityAddNewTeamMemberBinding.addNewTeamMember;
@@ -71,72 +72,77 @@ public class AddNewTeamMemberActivity extends BaseActivity {
 
 		dataList = new ArrayList<>();
 
-		addNewTeamMember.addTextChangedListener(new TextWatcher() {
+		addNewTeamMember.addTextChangedListener(
+				new TextWatcher() {
 
-			@Override
-			public void onTextChanged(CharSequence s, int start, int before, int count) {
+					@Override
+					public void onTextChanged(CharSequence s, int start, int before, int count) {
 
-				if(!addNewTeamMember.getText().toString().equals("") && addNewTeamMember.getText().toString().length() > 1) {
+						if (!addNewTeamMember.getText().toString().equals("")
+								&& addNewTeamMember.getText().toString().length() > 1) {
 
-					adapter = new OrganizationAddUserToTeamMemberAdapter(dataList, ctx, Math.toIntExact(teamId), getIntent().getStringExtra("orgName"));
-					loadUserSearchList(addNewTeamMember.getText().toString());
-				}
-			}
+							adapter =
+									new OrganizationAddUserToTeamMemberAdapter(
+											dataList,
+											ctx,
+											Math.toIntExact(teamId),
+											getIntent().getStringExtra("orgName"));
+							loadUserSearchList(addNewTeamMember.getText().toString());
+						}
+					}
 
-			@Override
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-			}
-
-			@Override
-			public void afterTextChanged(Editable s) {
-			}
-
-		});
+					@Override
+					public void beforeTextChanged(
+							CharSequence s, int start, int count, int after) {}
 
+					@Override
+					public void afterTextChanged(Editable s) {}
+				});
 	}
 
 	public void loadUserSearchList(String searchKeyword) {
 
-		Call<InlineResponse2001> call = RetrofitClient.getApiInterface(ctx).userSearch(searchKeyword, null, 1, 10);
+		Call<InlineResponse2001> call =
+				RetrofitClient.getApiInterface(ctx).userSearch(searchKeyword, null, 1, 10);
 
 		mProgressBar.setVisibility(View.VISIBLE);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<InlineResponse2001> call, @NonNull Response<InlineResponse2001> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<InlineResponse2001> call,
+							@NonNull Response<InlineResponse2001> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					assert response.body() != null;
-					if(response.body().getData().size() > 0) {
+							assert response.body() != null;
+							if (response.body().getData().size() > 0) {
 
-						dataList.clear();
-						dataList.addAll(response.body().getData());
-						mRecyclerView.setAdapter(adapter);
-						noData.setVisibility(View.GONE);
-					}
-					else {
+								dataList.clear();
+								dataList.addAll(response.body().getData());
+								mRecyclerView.setAdapter(adapter);
+								noData.setVisibility(View.GONE);
+							} else {
 
-						noData.setVisibility(View.VISIBLE);
+								noData.setVisibility(View.VISIBLE);
+							}
+
+							mProgressBar.setVisibility(View.GONE);
+						}
 					}
 
-					mProgressBar.setVisibility(View.GONE);
-				}
+					@Override
+					public void onFailure(
+							@NonNull Call<InlineResponse2001> call, @NonNull Throwable t) {
 
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<InlineResponse2001> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-			}
-
-		});
+						Log.e("onFailure", t.toString());
+					}
+				});
 	}
 
 	private void initCloseListener() {
 		onClickListener = view -> finish();
 	}
-
 }
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 c1eb6a1f..0a136ad3 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddNewTeamRepoActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddNewTeamRepoActivity.java
@@ -4,6 +4,8 @@ import android.os.Bundle;
 import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Repository;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.OrganizationTeamRepositoriesAdapter;
@@ -11,8 +13,6 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.AddNewTeamRepositoryBinding;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -20,7 +20,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class AddNewTeamRepoActivity extends BaseActivity {
 
 	private AddNewTeamRepositoryBinding addNewTeamRepositoryBinding;
@@ -48,7 +47,8 @@ public class AddNewTeamRepoActivity extends BaseActivity {
 		teamName = getIntent().getStringExtra("teamName");
 
 		addNewTeamRepositoryBinding.recyclerViewTeamRepos.setHasFixedSize(true);
-		addNewTeamRepositoryBinding.recyclerViewTeamRepos.setLayoutManager(new LinearLayoutManager(ctx));
+		addNewTeamRepositoryBinding.recyclerViewTeamRepos.setLayoutManager(
+				new LinearLayoutManager(ctx));
 
 		dataList = new ArrayList<>();
 
@@ -57,49 +57,59 @@ public class AddNewTeamRepoActivity extends BaseActivity {
 
 	public void loadRepos() {
 
-		Call<List<Repository>> call = RetrofitClient.getApiInterface(ctx).orgListRepos(getIntent().getStringExtra("orgName"), 1, resultLimit);
+		Call<List<Repository>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.orgListRepos(getIntent().getStringExtra("orgName"), 1, resultLimit);
 
 		addNewTeamRepositoryBinding.progressBar.setVisibility(View.VISIBLE);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Repository>> call, @NonNull Response<List<Repository>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Repository>> call,
+							@NonNull Response<List<Repository>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					assert response.body() != null;
-					if(response.body().size() > 0) {
+							assert response.body() != null;
+							if (response.body().size() > 0) {
 
-						dataList.clear();
-						dataList.addAll(response.body());
+								dataList.clear();
+								dataList.addAll(response.body());
 
-						adapter = new OrganizationTeamRepositoriesAdapter(dataList, ctx, Math.toIntExact(teamId), getIntent().getStringExtra("orgName"), teamName);
+								adapter =
+										new OrganizationTeamRepositoriesAdapter(
+												dataList,
+												ctx,
+												Math.toIntExact(teamId),
+												getIntent().getStringExtra("orgName"),
+												teamName);
 
-						addNewTeamRepositoryBinding.recyclerViewTeamRepos.setAdapter(adapter);
-						addNewTeamRepositoryBinding.noData.setVisibility(View.GONE);
-					}
-					else {
+								addNewTeamRepositoryBinding.recyclerViewTeamRepos.setAdapter(
+										adapter);
+								addNewTeamRepositoryBinding.noData.setVisibility(View.GONE);
+							} else {
 
-						addNewTeamRepositoryBinding.noData.setVisibility(View.VISIBLE);
+								addNewTeamRepositoryBinding.noData.setVisibility(View.VISIBLE);
+							}
+
+							addNewTeamRepositoryBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
 					}
 
-					addNewTeamRepositoryBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	private void initCloseListener() {
 		onClickListener = view -> finish();
 	}
-
 }
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 8c8f2b1d..0683a3ea 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AdminCronTasksActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AdminCronTasksActivity.java
@@ -16,7 +16,6 @@ import org.mian.gitnex.viewmodels.AdminCronTasksViewModel;
 /**
  * @author M M Arif
  */
-
 public class AdminCronTasksActivity extends BaseActivity {
 
 	private AdminCronTasksViewModel adminCronTasksViewModel;
@@ -47,36 +46,43 @@ public class AdminCronTasksActivity extends BaseActivity {
 		activityAdminCronTasksBinding.recyclerView.setHasFixedSize(true);
 		activityAdminCronTasksBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
 
-		activityAdminCronTasksBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			activityAdminCronTasksBinding.progressBar.setVisibility(View.VISIBLE);
-			activityAdminCronTasksBinding.pullToRefresh.setRefreshing(false);
-			adminCronTasksViewModel.loadCronTasksList(ctx, PAGE, resultLimit);
-
-		}, 500));
+		activityAdminCronTasksBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											activityAdminCronTasksBinding.progressBar.setVisibility(
+													View.VISIBLE);
+											activityAdminCronTasksBinding.pullToRefresh
+													.setRefreshing(false);
+											adminCronTasksViewModel.loadCronTasksList(
+													ctx, PAGE, resultLimit);
+										},
+										500));
 
 		fetchDataAsync(ctx);
 	}
 
 	private void fetchDataAsync(Context ctx) {
 
-		adminCronTasksViewModel.getCronTasksList(ctx, PAGE, resultLimit).observe(this, cronTasksListMain -> {
+		adminCronTasksViewModel
+				.getCronTasksList(ctx, PAGE, resultLimit)
+				.observe(
+						this,
+						cronTasksListMain -> {
+							adapter = new AdminCronTasksAdapter(cronTasksListMain);
 
-			adapter = new AdminCronTasksAdapter(cronTasksListMain);
-
-			if(adapter.getItemCount() > 0) {
-				activityAdminCronTasksBinding.recyclerView.setAdapter(adapter);
-				activityAdminCronTasksBinding.noData.setVisibility(View.GONE);
-				activityAdminCronTasksBinding.progressBar.setVisibility(View.GONE);
-			}
-			else {
-				activityAdminCronTasksBinding.noData.setVisibility(View.VISIBLE);
-			}
-		});
+							if (adapter.getItemCount() > 0) {
+								activityAdminCronTasksBinding.recyclerView.setAdapter(adapter);
+								activityAdminCronTasksBinding.noData.setVisibility(View.GONE);
+								activityAdminCronTasksBinding.progressBar.setVisibility(View.GONE);
+							} else {
+								activityAdminCronTasksBinding.noData.setVisibility(View.VISIBLE);
+							}
+						});
 	}
 
 	private void initCloseListener() {
 		onClickListener = view -> finish();
 	}
-
 }
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 e8ca6b6e..58fd3a46 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java
@@ -25,7 +25,6 @@ import org.mian.gitnex.viewmodels.AdminGetUsersViewModel;
 /**
  * @author M M Arif
  */
-
 public class AdminGetUsersActivity extends BaseActivity implements BottomSheetListener {
 
 	private AdminGetUsersViewModel adminGetUsersViewModel;
@@ -55,56 +54,69 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetLi
 		activityAdminGetUsersBinding.recyclerView.setHasFixedSize(true);
 		activityAdminGetUsersBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
 
-		activityAdminGetUsersBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			page = 1;
-			activityAdminGetUsersBinding.pullToRefresh.setRefreshing(false);
-			fetchDataAsync();
-			activityAdminGetUsersBinding.progressBar.setVisibility(View.VISIBLE);
-		}, 50));
+		activityAdminGetUsersBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											page = 1;
+											activityAdminGetUsersBinding.pullToRefresh
+													.setRefreshing(false);
+											fetchDataAsync();
+											activityAdminGetUsersBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										},
+										50));
 
 		fetchDataAsync();
 	}
-
 	;
 
 	private void fetchDataAsync() {
 
-		AdminGetUsersViewModel adminUsersModel = new ViewModelProvider(this).get(AdminGetUsersViewModel.class);
+		AdminGetUsersViewModel adminUsersModel =
+				new ViewModelProvider(this).get(AdminGetUsersViewModel.class);
 
-		adminUsersModel.getUsersList(page, resultLimit, ctx).observe(this, adminUsersListMain -> {
+		adminUsersModel
+				.getUsersList(page, resultLimit, ctx)
+				.observe(
+						this,
+						adminUsersListMain -> {
+							adapter = new AdminGetUsersAdapter(adminUsersListMain, ctx);
+							adapter.setLoadMoreListener(
+									new AdminGetUsersAdapter.OnLoadMoreListener() {
 
-			adapter = new AdminGetUsersAdapter(adminUsersListMain, ctx);
-			adapter.setLoadMoreListener(new AdminGetUsersAdapter.OnLoadMoreListener() {
+										@Override
+										public void onLoadMore() {
 
-				@Override
-				public void onLoadMore() {
+											page += 1;
+											adminGetUsersViewModel.loadMoreUsersList(
+													page, resultLimit, ctx, adapter);
+											activityAdminGetUsersBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										}
 
-					page += 1;
-					adminGetUsersViewModel.loadMoreUsersList(page, resultLimit, ctx, adapter);
-					activityAdminGetUsersBinding.progressBar.setVisibility(View.VISIBLE);
-				}
+										@Override
+										public void onLoadFinished() {
 
-				@Override
-				public void onLoadFinished() {
+											activityAdminGetUsersBinding.progressBar.setVisibility(
+													View.GONE);
+										}
+									});
 
-					activityAdminGetUsersBinding.progressBar.setVisibility(View.GONE);
-				}
-			});
+							if (adapter.getItemCount() > 0) {
+								activityAdminGetUsersBinding.recyclerView.setAdapter(adapter);
+								activityAdminGetUsersBinding.noDataUsers.setVisibility(View.GONE);
+								searchFilter = true;
+							} else {
+								adapter.notifyDataChanged();
+								activityAdminGetUsersBinding.recyclerView.setAdapter(adapter);
+								activityAdminGetUsersBinding.noDataUsers.setVisibility(
+										View.VISIBLE);
+							}
 
-			if(adapter.getItemCount() > 0) {
-				activityAdminGetUsersBinding.recyclerView.setAdapter(adapter);
-				activityAdminGetUsersBinding.noDataUsers.setVisibility(View.GONE);
-				searchFilter = true;
-			}
-			else {
-				adapter.notifyDataChanged();
-				activityAdminGetUsersBinding.recyclerView.setAdapter(adapter);
-				activityAdminGetUsersBinding.noDataUsers.setVisibility(View.VISIBLE);
-			}
-
-			activityAdminGetUsersBinding.progressBar.setVisibility(View.GONE);
-		});
+							activityAdminGetUsersBinding.progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	@Override
@@ -113,38 +125,42 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetLi
 		final MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
 
-		new Handler(Looper.getMainLooper()).postDelayed(() -> {
+		new Handler(Looper.getMainLooper())
+				.postDelayed(
+						() -> {
+							if (searchFilter) {
 
-			if(searchFilter) {
+								boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-				boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+								inflater.inflate(R.menu.search_menu, menu);
 
-				inflater.inflate(R.menu.search_menu, menu);
+								MenuItem searchItem = menu.findItem(R.id.action_search);
+								SearchView searchView = (SearchView) searchItem.getActionView();
+								searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-				MenuItem searchItem = menu.findItem(R.id.action_search);
-				SearchView searchView = (SearchView) searchItem.getActionView();
-				searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+								if (!connToInternet) {
+									return;
+								}
 
-				if(!connToInternet) {
-					return;
-				}
+								searchView.setOnQueryTextListener(
+										new androidx.appcompat.widget.SearchView
+												.OnQueryTextListener() {
 
-				searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+											@Override
+											public boolean onQueryTextSubmit(String query) {
+												return true;
+											}
 
-					@Override
-					public boolean onQueryTextSubmit(String query) {
-						return true;
-					}
+											@Override
+											public boolean onQueryTextChange(String newText) {
 
-					@Override
-					public boolean onQueryTextChange(String newText) {
-
-						adapter.getFilter().filter(newText);
-						return false;
-					}
-				});
-			}
-		}, 500);
+												adapter.getFilter().filter(newText);
+												return false;
+											}
+										});
+							}
+						},
+						500);
 
 		return true;
 	}
@@ -154,18 +170,16 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetLi
 
 		int id = item.getItemId();
 
-		if(id == android.R.id.home) {
+		if (id == android.R.id.home) {
 
 			finish();
 			return true;
-		}
-		else if(id == R.id.genericMenu) {
+		} else if (id == R.id.genericMenu) {
 
 			BottomSheetAdminUsersFragment bottomSheet = new BottomSheetAdminUsersFragment();
 			bottomSheet.show(getSupportFragmentManager(), "usersBottomSheet");
 			return true;
-		}
-		else {
+		} else {
 
 			return super.onOptionsItemSelected(item);
 		}
@@ -174,7 +188,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetLi
 	@Override
 	public void onButtonClicked(String text) {
 
-		if("newUser".equals(text)) {
+		if ("newUser".equals(text)) {
 			startActivity(new Intent(AdminGetUsersActivity.this, CreateNewUserActivity.class));
 		}
 	}
@@ -182,5 +196,4 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetLi
 	private void initCloseListener() {
 		onClickListener = view -> finish();
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/activities/AdminUnadoptedReposActivity.java b/app/src/main/java/org/mian/gitnex/activities/AdminUnadoptedReposActivity.java
index a65ef17e..d3a7a5af 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AdminUnadoptedReposActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AdminUnadoptedReposActivity.java
@@ -8,19 +8,18 @@ import android.view.View;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.AdminUnadoptedReposAdapter;
 import org.mian.gitnex.databinding.ActivityAdminCronTasksBinding;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.viewmodels.AdminUnadoptedReposViewModel;
-import java.util.ArrayList;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @author M M Arif
  * @author qwerty287
  */
-
 public class AdminUnadoptedReposActivity extends BaseActivity {
 
 	private AdminUnadoptedReposViewModel viewModel;
@@ -54,26 +53,34 @@ public class AdminUnadoptedReposActivity extends BaseActivity {
 		binding.recyclerView.setHasFixedSize(true);
 		binding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
 
-		binding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+		binding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											binding.pullToRefresh.setRefreshing(false);
+											PAGE = 1;
+											binding.progressBar.setVisibility(View.VISIBLE);
+											reload = true;
+											viewModel.loadRepos(ctx, PAGE, resultLimit, null);
+										},
+										500));
 
-			binding.pullToRefresh.setRefreshing(false);
-			PAGE = 1;
-			binding.progressBar.setVisibility(View.VISIBLE);
-			reload = true;
-			viewModel.loadRepos(ctx, PAGE, resultLimit, null);
-
-		}, 500));
-
-		adapter = new AdminUnadoptedReposAdapter(new ArrayList<>(), () -> {
-			PAGE = 1;
-			binding.progressBar.setVisibility(View.VISIBLE);
-			reload = true;
-			viewModel.loadRepos(ctx, PAGE, resultLimit, null);
-		}, () -> {
-			PAGE += 1;
-			binding.progressBar.setVisibility(View.VISIBLE);
-			viewModel.loadRepos(ctx, PAGE, resultLimit, null);
-		}, binding);
+		adapter =
+				new AdminUnadoptedReposAdapter(
+						new ArrayList<>(),
+						() -> {
+							PAGE = 1;
+							binding.progressBar.setVisibility(View.VISIBLE);
+							reload = true;
+							viewModel.loadRepos(ctx, PAGE, resultLimit, null);
+						},
+						() -> {
+							PAGE += 1;
+							binding.progressBar.setVisibility(View.VISIBLE);
+							viewModel.loadRepos(ctx, PAGE, resultLimit, null);
+						},
+						binding);
 
 		binding.recyclerView.setAdapter(adapter);
 
@@ -84,28 +91,29 @@ public class AdminUnadoptedReposActivity extends BaseActivity {
 
 		AtomicInteger prevSize = new AtomicInteger();
 
-		viewModel.getUnadoptedRepos(ctx, PAGE, resultLimit, null).observe(this, list -> {
+		viewModel
+				.getUnadoptedRepos(ctx, PAGE, resultLimit, null)
+				.observe(
+						this,
+						list -> {
+							binding.progressBar.setVisibility(View.GONE);
 
-			binding.progressBar.setVisibility(View.GONE);
+							boolean hasMore = reload || list.size() > prevSize.get();
+							reload = false;
 
-			boolean hasMore = reload || list.size() > prevSize.get();
-			reload = false;
+							prevSize.set(list.size());
 
-			prevSize.set(list.size());
-
-			if(list.size() > 0) {
-				adapter.updateList(list);
-				adapter.setHasMore(hasMore);
-				binding.noData.setVisibility(View.GONE);
-			}
-			else {
-				binding.noData.setVisibility(View.VISIBLE);
-			}
-		});
+							if (list.size() > 0) {
+								adapter.updateList(list);
+								adapter.setHasMore(hasMore);
+								binding.noData.setVisibility(View.GONE);
+							} else {
+								binding.noData.setVisibility(View.VISIBLE);
+							}
+						});
 	}
 
 	private void initCloseListener() {
 		onClickListener = view -> finish();
 	}
-
 }
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 63f5c619..0d9cd7fe 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -6,6 +6,8 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.biometric.BiometricPrompt;
 import androidx.core.content.ContextCompat;
+import java.util.Locale;
+import java.util.concurrent.Executor;
 import org.mian.gitnex.R;
 import org.mian.gitnex.core.MainApplication;
 import org.mian.gitnex.helpers.AppUtil;
@@ -13,13 +15,10 @@ import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.AccountContext;
 import org.mian.gitnex.notifications.Notifications;
-import java.util.Locale;
-import java.util.concurrent.Executor;
 
 /**
  * @author M M Arif
  */
-
 public abstract class BaseActivity extends AppCompatActivity {
 
 	protected TinyDB tinyDB;
@@ -35,41 +34,43 @@ public abstract class BaseActivity extends AppCompatActivity {
 		this.appCtx = getApplicationContext();
 		this.tinyDB = TinyDB.getInstance(appCtx);
 
-		switch(tinyDB.getInt("themeId", 6)) {
+		switch (tinyDB.getInt("themeId", 6)) {
 			case 0:
 				setTheme(R.style.AppTheme);
 				break;
 			case 1:
-
 				setTheme(R.style.AppThemeLight);
 				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);
-				}
-				else {
+				} else {
 
 					setTheme(R.style.AppThemeLight);
 				}
 				break;
 			case 3:
-
 				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);
-				}
-				else {
+				} else {
 
 					setTheme(R.style.AppThemeRetro);
 				}
 				break;
 			case 5:
-
 				setTheme(R.style.AppThemePitchBlack);
 				break;
 			case 7:
@@ -81,10 +82,9 @@ public abstract class BaseActivity extends AppCompatActivity {
 		}
 
 		String locale = tinyDB.getString("locale");
-		if(locale.isEmpty()) {
+		if (locale.isEmpty()) {
 			AppUtil.setAppLocale(getResources(), Locale.getDefault().getLanguage());
-		}
-		else {
+		} else {
 			AppUtil.setAppLocale(getResources(), locale);
 		}
 
@@ -94,48 +94,54 @@ public abstract class BaseActivity extends AppCompatActivity {
 	public void onResume() {
 		super.onResume();
 
-		if(tinyDB.getBoolean("biometricStatus", false) && !tinyDB.getBoolean("biometricLifeCycle")) {
+		if (tinyDB.getBoolean("biometricStatus", false)
+				&& !tinyDB.getBoolean("biometricLifeCycle")) {
 
 			Executor executor = ContextCompat.getMainExecutor(this);
 
-			BiometricPrompt biometricPrompt = new BiometricPrompt(this, executor, new BiometricPrompt.AuthenticationCallback() {
+			BiometricPrompt biometricPrompt =
+					new BiometricPrompt(
+							this,
+							executor,
+							new BiometricPrompt.AuthenticationCallback() {
 
-				@Override
-				public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
+								@Override
+								public void onAuthenticationError(
+										int errorCode, @NonNull CharSequence errString) {
 
-					super.onAuthenticationError(errorCode, errString);
+									super.onAuthenticationError(errorCode, errString);
 
-					// Authentication error, close the app
-					finish();
-				}
+									// Authentication error, close the app
+									finish();
+								}
 
-				// Authentication succeeded, continue to app
-				@Override
-				public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) {
-					super.onAuthenticationSucceeded(result);
-					tinyDB.putBoolean("biometricLifeCycle", true);
-				}
+								// Authentication succeeded, continue to app
+								@Override
+								public void onAuthenticationSucceeded(
+										@NonNull BiometricPrompt.AuthenticationResult result) {
+									super.onAuthenticationSucceeded(result);
+									tinyDB.putBoolean("biometricLifeCycle", true);
+								}
 
-				// Authentication failed, close the app
-				@Override
-				public void onAuthenticationFailed() {
-					super.onAuthenticationFailed();
-				}
+								// Authentication failed, close the app
+								@Override
+								public void onAuthenticationFailed() {
+									super.onAuthenticationFailed();
+								}
+							});
 
-			});
-
-			BiometricPrompt.PromptInfo biometricPromptBuilder = new BiometricPrompt.PromptInfo.Builder().setTitle(getString(R.string.biometricAuthTitle)).setSubtitle(getString(R.string.biometricAuthSubTitle))
-				.setNegativeButtonText(getString(R.string.cancelButton)).build();
+			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);
-
 		}
 	}
 
 	public AccountContext getAccount() {
 		return ((MainApplication) getApplication()).currentAccount;
 	}
-
 }
-
-
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 c60da848..fb007158 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CodeEditorActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CodeEditorActivity.java
@@ -7,6 +7,9 @@ import android.graphics.Typeface;
 import android.os.Bundle;
 import android.widget.ArrayAdapter;
 import com.amrdeveloper.codeview.Code;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.apache.commons.lang3.EnumUtils;
 import org.mian.gitnex.R;
 import org.mian.gitnex.databinding.ActivityCodeEditorBinding;
@@ -15,15 +18,11 @@ import org.mian.gitnex.helpers.codeeditor.LanguageManager;
 import org.mian.gitnex.helpers.codeeditor.LanguageName;
 import org.mian.gitnex.helpers.codeeditor.SourcePositionListener;
 import org.mian.gitnex.helpers.codeeditor.ThemeName;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author AmrDeveloper
  * @author M M Arif
  */
-
 public class CodeEditorActivity extends BaseActivity {
 
 	private final ThemeName currentTheme = ThemeName.FIVE_COLOR;
@@ -37,21 +36,21 @@ public class CodeEditorActivity extends BaseActivity {
 		binding = ActivityCodeEditorBinding.inflate(getLayoutInflater());
 		setContentView(binding.getRoot());
 
-		binding.close.setOnClickListener(view -> {
-			sendResults();
-			finish();
-		});
+		binding.close.setOnClickListener(
+				view -> {
+					sendResults();
+					finish();
+				});
 
 		String fileContent = getIntent().getStringExtra("fileContent");
 		String fileExtension;
 
-		if(getIntent().getStringExtra("fileExtension") != null) {
+		if (getIntent().getStringExtra("fileExtension") != null) {
 			fileExtension = getIntent().getStringExtra("fileExtension").toUpperCase();
 
-			if(EnumUtils.isValidEnum(LanguageName.class, fileExtension)) {
+			if (EnumUtils.isValidEnum(LanguageName.class, fileExtension)) {
 				currentLanguage = LanguageName.valueOf(fileExtension);
-			}
-			else {
+			} else {
 				currentLanguage = LanguageName.UNKNOWN;
 			}
 		}
@@ -68,7 +67,8 @@ public class CodeEditorActivity extends BaseActivity {
 
 	private void configCodeView(LanguageName currentLanguage, String fileContent) {
 
-		binding.codeView.setTypeface(Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf"));
+		binding.codeView.setTypeface(
+				Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf"));
 
 		// Setup Line number feature
 		binding.codeView.setEnableLineNumber(true);
@@ -105,28 +105,30 @@ public class CodeEditorActivity extends BaseActivity {
 	private void configLanguageAutoComplete() {
 
 		boolean useModernAutoCompleteAdapter = true;
-		if(useModernAutoCompleteAdapter) {
+		if (useModernAutoCompleteAdapter) {
 			List<Code> codeList = languageManager.getLanguageCodeList(currentLanguage);
 
 			CustomCodeViewAdapter adapter = new CustomCodeViewAdapter(this, codeList);
 
 			binding.codeView.setAdapter(adapter);
-		}
-		else {
+		} else {
 			String[] languageKeywords = languageManager.getLanguageKeywords(currentLanguage);
 
 			final int layoutId = R.layout.list_item_suggestion;
 
 			final int viewId = R.id.suggestItemTextView;
-			ArrayAdapter<String> adapter = new ArrayAdapter<>(this, layoutId, viewId, languageKeywords);
+			ArrayAdapter<String> adapter =
+					new ArrayAdapter<>(this, layoutId, viewId, languageKeywords);
 
 			binding.codeView.setAdapter(adapter);
 		}
 	}
 
 	private void configLanguageAutoIndentation() {
-		binding.codeView.setIndentationStarts(languageManager.getLanguageIndentationStarts(currentLanguage));
-		binding.codeView.setIndentationEnds(languageManager.getLanguageIndentationEnds(currentLanguage));
+		binding.codeView.setIndentationStarts(
+				languageManager.getLanguageIndentationStarts(currentLanguage));
+		binding.codeView.setIndentationEnds(
+				languageManager.getLanguageIndentationEnds(currentLanguage));
 	}
 
 	private void configCodeViewPlugins() {
@@ -141,10 +143,12 @@ public class CodeEditorActivity extends BaseActivity {
 	}
 
 	private void configSourcePositionListener() {
-		SourcePositionListener sourcePositionListener = new SourcePositionListener(binding.codeView);
-		sourcePositionListener.setOnPositionChanged((line, column) -> {
-			binding.sourcePosition.setText(getString(R.string.sourcePosition, line, column));
-		});
+		SourcePositionListener sourcePositionListener =
+				new SourcePositionListener(binding.codeView);
+		sourcePositionListener.setOnPositionChanged(
+				(line, column) -> {
+					binding.sourcePosition.setText(
+							getString(R.string.sourcePosition, line, column));
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/activities/CommitDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/CommitDetailActivity.java
index c4321795..23fae905 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CommitDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CommitDetailActivity.java
@@ -10,7 +10,6 @@ import org.mian.gitnex.fragments.DiffFragment;
 /**
  * @author qwerty287
  */
-
 public class CommitDetailActivity extends BaseActivity {
 
 	@Override
@@ -18,27 +17,35 @@ public class CommitDetailActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityCommitDetailsBinding binding = ActivityCommitDetailsBinding.inflate(getLayoutInflater());
+		ActivityCommitDetailsBinding binding =
+				ActivityCommitDetailsBinding.inflate(getLayoutInflater());
 
 		setContentView(binding.getRoot());
 
 		CommitDetailFragment fragment = CommitDetailFragment.newInstance();
 
-		getOnBackPressedDispatcher().addCallback(new OnBackPressedCallback(true) {
+		getOnBackPressedDispatcher()
+				.addCallback(
+						new OnBackPressedCallback(true) {
 
-			@Override
-			public void handleOnBackPressed() {
-				if(getSupportFragmentManager().findFragmentById(R.id.fragment_container) instanceof DiffFragment) {
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, fragment).commit();
-				}
-				else {
-					finish();
-				}
-			}
-		});
-
-		getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, fragment).commit();
+							@Override
+							public void handleOnBackPressed() {
+								if (getSupportFragmentManager()
+												.findFragmentById(R.id.fragment_container)
+										instanceof DiffFragment) {
+									getSupportFragmentManager()
+											.beginTransaction()
+											.replace(R.id.fragment_container, fragment)
+											.commit();
+								} else {
+									finish();
+								}
+							}
+						});
 
+		getSupportFragmentManager()
+				.beginTransaction()
+				.replace(R.id.fragment_container, fragment)
+				.commit();
 	}
-
 }
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 3e870922..bc303b41 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
@@ -18,6 +18,8 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Commit;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.CommitsAdapter;
@@ -26,8 +28,6 @@ import org.mian.gitnex.databinding.ActivityCommitsBinding;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -35,7 +35,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class CommitsActivity extends BaseActivity {
 
 	private final String TAG = "CommitsActivity";
@@ -55,7 +54,8 @@ public class CommitsActivity extends BaseActivity {
 		super.onCreate(savedInstanceState);
 		this.getClass().getName();
 
-		ActivityCommitsBinding activityCommitsBinding = ActivityCommitsBinding.inflate(getLayoutInflater());
+		ActivityCommitsBinding activityCommitsBinding =
+				ActivityCommitsBinding.inflate(getLayoutInflater());
 		setContentView(activityCommitsBinding.getRoot());
 
 		Toolbar toolbar = activityCommitsBinding.toolbar;
@@ -81,22 +81,38 @@ public class CommitsActivity extends BaseActivity {
 		recyclerView = activityCommitsBinding.recyclerView;
 		commitsList = new ArrayList<>();
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			swipeRefresh.setRefreshing(false);
-			loadInitial(repository.getOwner(), repository.getName(), branchName, resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
+		swipeRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											swipeRefresh.setRefreshing(false);
+											loadInitial(
+													repository.getOwner(),
+													repository.getName(),
+													branchName,
+													resultLimit);
+											adapter.notifyDataChanged();
+										},
+										200));
 
 		adapter = new CommitsAdapter(ctx, commitsList);
-		adapter.setLoadMoreListener(() -> recyclerView.post(() -> {
+		adapter.setLoadMoreListener(
+				() ->
+						recyclerView.post(
+								() -> {
+									if (commitsList.size() == resultLimit
+											|| pageSize == resultLimit) {
 
-			if(commitsList.size() == resultLimit || pageSize == resultLimit) {
-
-				int page = (commitsList.size() + resultLimit) / resultLimit;
-				loadMore(repository.getOwner(), repository.getName(), page, branchName, resultLimit);
-			}
-		}));
+										int page = (commitsList.size() + resultLimit) / resultLimit;
+										loadMore(
+												repository.getOwner(),
+												repository.getName(),
+												page,
+												branchName,
+												resultLimit);
+									}
+								}));
 
 		recyclerView.setHasFixedSize(true);
 		recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
@@ -105,98 +121,105 @@ public class CommitsActivity extends BaseActivity {
 		loadInitial(repository.getOwner(), repository.getName(), branchName, resultLimit);
 	}
 
-	private void loadInitial(String repoOwner, String repoName, String branchName, int resultLimit) {
+	private void loadInitial(
+			String repoOwner, String repoName, String branchName, int resultLimit) {
 
-		Call<List<Commit>> call = RetrofitClient.getApiInterface(ctx).repoGetAllCommits(repoOwner, repoName, branchName, null, 1, resultLimit);
+		Call<List<Commit>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoGetAllCommits(repoOwner, repoName, branchName, null, 1, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Commit>> call, @NonNull Response<List<Commit>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Commit>> call,
+							@NonNull Response<List<Commit>> response) {
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					assert response.body() != null;
-					if(response.body().size() > 0) {
+							assert response.body() != null;
+							if (response.body().size() > 0) {
 
-						commitsList.clear();
-						commitsList.addAll(response.body());
-						adapter.notifyDataChanged();
-						noData.setVisibility(View.GONE);
+								commitsList.clear();
+								commitsList.addAll(response.body());
+								adapter.notifyDataChanged();
+								noData.setVisibility(View.GONE);
+							} else {
+
+								commitsList.clear();
+								adapter.notifyDataChanged();
+								noData.setVisibility(View.VISIBLE);
+							}
+						}
+						if (response.code() == 409) {
+
+							noData.setVisibility(View.VISIBLE);
+						} else {
+
+							Log.e(TAG, String.valueOf(response.code()));
+						}
+
+						progressBar.setVisibility(View.GONE);
 					}
-					else {
 
-						commitsList.clear();
-						adapter.notifyDataChanged();
-						noData.setVisibility(View.VISIBLE);
+					@Override
+					public void onFailure(@NonNull Call<List<Commit>> call, @NonNull Throwable t) {
+
+						Toasty.error(
+								ctx, getResources().getString(R.string.genericServerResponseError));
 					}
-				}
-				if(response.code() == 409) {
-
-					noData.setVisibility(View.VISIBLE);
-				}
-				else {
-
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-
-				progressBar.setVisibility(View.GONE);
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Commit>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getResources().getString(R.string.genericServerResponseError));
-			}
-
-		});
-
+				});
 	}
 
-	private void loadMore(String repoOwner, String repoName, final int page, String branchName, int resultLimit) {
+	private void loadMore(
+			String repoOwner, String repoName, final int page, String branchName, int resultLimit) {
 
 		progressBar.setVisibility(View.VISIBLE);
 
-		Call<List<Commit>> call = RetrofitClient.getApiInterface(ctx).repoGetAllCommits(repoOwner, repoName, branchName, null, page, resultLimit);
+		Call<List<Commit>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoGetAllCommits(
+								repoOwner, repoName, branchName, null, page, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Commit>> call, @NonNull Response<List<Commit>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Commit>> call,
+							@NonNull Response<List<Commit>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					List<Commit> result = response.body();
-					assert result != null;
+							List<Commit> result = response.body();
+							assert result != null;
 
-					if(result.size() > 0) {
+							if (result.size() > 0) {
 
-						pageSize = result.size();
-						commitsList.addAll(result);
-					}
-					else {
+								pageSize = result.size();
+								commitsList.addAll(result);
+							} else {
 
-						adapter.setMoreDataAvailable(false);
+								adapter.setMoreDataAvailable(false);
+							}
+
+							adapter.notifyDataChanged();
+						} else {
+
+							Log.e(TAG, String.valueOf(response.code()));
+						}
+
+						progressBar.setVisibility(View.GONE);
 					}
 
-					adapter.notifyDataChanged();
-				}
-				else {
-
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-
-				progressBar.setVisibility(View.GONE);
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Commit>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getResources().getString(R.string.genericServerResponseError));
-			}
-
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<Commit>> call, @NonNull Throwable t) {
 
+						Toasty.error(
+								ctx, getResources().getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	@Override
@@ -206,25 +229,26 @@ public class CommitsActivity extends BaseActivity {
 		inflater.inflate(R.menu.search_menu, menu);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
+					@Override
+					public boolean onQueryTextSubmit(String query) {
 
-				return false;
-			}
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
+					@Override
+					public boolean onQueryTextChange(String newText) {
 
-				filter(newText);
-				return true;
-			}
-
-		});
+						filter(newText);
+						return true;
+					}
+				});
 
 		return super.onCreateOptionsMenu(menu);
 	}
@@ -233,9 +257,10 @@ public class CommitsActivity extends BaseActivity {
 
 		List<Commit> arr = new ArrayList<>();
 
-		for(Commit d : commitsList) {
+		for (Commit d : commitsList) {
 
-			if(d.getCommit().getMessage().toLowerCase().contains(text) || d.getSha().toLowerCase().contains(text)) {
+			if (d.getCommit().getMessage().toLowerCase().contains(text)
+					|| d.getSha().toLowerCase().contains(text)) {
 
 				arr.add(d);
 			}
@@ -254,7 +279,4 @@ public class CommitsActivity extends BaseActivity {
 		super.onResume();
 		repository.checkAccountSwitch(this);
 	}
-
 }
-
-
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 2dc2e8d7..8ee2b557 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
@@ -14,6 +14,9 @@ import android.widget.TextView;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import org.apache.commons.io.FilenameUtils;
 import org.gitnex.tea4j.v2.models.Branch;
 import org.gitnex.tea4j.v2.models.CreateFileOptions;
@@ -29,16 +32,12 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.NetworkStatusObserver;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class CreateFileActivity extends BaseActivity {
 
 	public static final int FILE_ACTION_CREATE = 0;
@@ -46,13 +45,17 @@ public class CreateFileActivity extends BaseActivity {
 	public static final int FILE_ACTION_EDIT = 2;
 	private final List<String> branches = new ArrayList<>();
 	private ActivityCreateFileBinding binding;
-	ActivityResultLauncher<Intent> codeEditorActivityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
-		if(result.getResultCode() == Activity.RESULT_OK) {
-			Intent data = result.getData();
-			assert data != null;
-			binding.newFileContent.setText(data.getStringExtra("fileContentFromActivity"));
-		}
-	});
+	ActivityResultLauncher<Intent> codeEditorActivityResultLauncher =
+			registerForActivityResult(
+					new ActivityResultContracts.StartActivityForResult(),
+					result -> {
+						if (result.getResultCode() == Activity.RESULT_OK) {
+							Intent data = result.getData();
+							assert data != null;
+							binding.newFileContent.setText(
+									data.getStringExtra("fileContentFromActivity"));
+						}
+					});
 	private int fileAction = FILE_ACTION_CREATE;
 	private String filePath;
 	private String fileSha;
@@ -73,25 +76,28 @@ public class CreateFileActivity extends BaseActivity {
 
 		binding.newFileName.requestFocus();
 
-		InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager inputMethodManager =
+				(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 		assert inputMethodManager != null;
 		inputMethodManager.showSoftInput(binding.newFileName, InputMethodManager.SHOW_IMPLICIT);
 
 		binding.close.setOnClickListener(view -> finish());
-		binding.newFileContent.setOnTouchListener((touchView, motionEvent) -> {
+		binding.newFileContent.setOnTouchListener(
+				(touchView, motionEvent) -> {
+					touchView.getParent().requestDisallowInterceptTouchEvent(true);
 
-			touchView.getParent().requestDisallowInterceptTouchEvent(true);
+					if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0
+							&& (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
 
-			if((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
+						touchView.getParent().requestDisallowInterceptTouchEvent(false);
+					}
 
-				touchView.getParent().requestDisallowInterceptTouchEvent(false);
-			}
+					return false;
+				});
 
-			return false;
-
-		});
-
-		if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", FILE_ACTION_DELETE) == FILE_ACTION_DELETE) {
+		if (getIntent().getStringExtra("filePath") != null
+				&& getIntent().getIntExtra("fileAction", FILE_ACTION_DELETE)
+						== FILE_ACTION_DELETE) {
 
 			fileAction = getIntent().getIntExtra("fileAction", FILE_ACTION_DELETE);
 			filePath = getIntent().getStringExtra("filePath");
@@ -105,7 +111,8 @@ public class CreateFileActivity extends BaseActivity {
 			binding.newFileContentLayout.setVisibility(View.GONE);
 		}
 
-		if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", FILE_ACTION_EDIT) == FILE_ACTION_EDIT) {
+		if (getIntent().getStringExtra("filePath") != null
+				&& getIntent().getIntExtra("fileAction", FILE_ACTION_EDIT) == FILE_ACTION_EDIT) {
 
 			fileAction = getIntent().getIntExtra("fileAction", FILE_ACTION_EDIT);
 			filePath = getIntent().getStringExtra("filePath");
@@ -126,10 +133,17 @@ public class CreateFileActivity extends BaseActivity {
 		disableProcessButton();
 
 		binding.openCodeEditor.setOnClickListener(
-			v -> launchCodeEditorActivityForResult(Objects.requireNonNull(binding.newFileContent.getText()).toString(), FilenameUtils.getExtension(String.valueOf(binding.newFileName.getText()))));
+				v ->
+						launchCodeEditorActivityForResult(
+								Objects.requireNonNull(binding.newFileContent.getText()).toString(),
+								FilenameUtils.getExtension(
+										String.valueOf(binding.newFileName.getText()))));
 
 		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());
 	}
@@ -143,254 +157,327 @@ public class CreateFileActivity extends BaseActivity {
 
 	private void processNewFile() {
 
-		String newFileName = binding.newFileName.getText() != null ? binding.newFileName.getText().toString() : "";
-		String newFileContent = binding.newFileContent.getText() != null ? binding.newFileContent.getText().toString() : "";
-		String newFileBranchName = binding.newFileBranches.getText() != null ? binding.newFileBranches.getText().toString() : "";
-		String newFileCommitMessage = binding.newFileCommitMessage.getText() != null ? binding.newFileCommitMessage.getText().toString() : "";
+		String newFileName =
+				binding.newFileName.getText() != null
+						? binding.newFileName.getText().toString()
+						: "";
+		String newFileContent =
+				binding.newFileContent.getText() != null
+						? binding.newFileContent.getText().toString()
+						: "";
+		String newFileBranchName =
+				binding.newFileBranches.getText() != null
+						? binding.newFileBranches.getText().toString()
+						: "";
+		String newFileCommitMessage =
+				binding.newFileCommitMessage.getText() != null
+						? binding.newFileCommitMessage.getText().toString()
+						: "";
 
-		if(!AppUtil.hasNetworkConnection(appCtx)) {
+		if (!AppUtil.hasNetworkConnection(appCtx)) {
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 		}
 
-		if(((newFileName.isEmpty() || newFileContent.isEmpty()) && fileAction != FILE_ACTION_DELETE) || newFileCommitMessage.isEmpty()) {
+		if (((newFileName.isEmpty() || newFileContent.isEmpty())
+						&& fileAction != FILE_ACTION_DELETE)
+				|| newFileCommitMessage.isEmpty()) {
 			Toasty.error(ctx, getString(R.string.newFileRequiredFields));
 			return;
 		}
 
-		if(!AppUtil.checkStringsWithDash(newFileBranchName)) {
+		if (!AppUtil.checkStringsWithDash(newFileBranchName)) {
 			Toasty.error(ctx, getString(R.string.newFileInvalidBranchName));
 			return;
 		}
 
-		if(newFileCommitMessage.length() > 255) {
+		if (newFileCommitMessage.length() > 255) {
 			Toasty.warning(ctx, getString(R.string.newFileCommitMessageError));
 			return;
 		}
 
 		disableProcessButton();
 
-		switch(fileAction) {
-
+		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:
-				deleteFile(repository.getOwner(), repository.getName(), filePath, newFileCommitMessage, newFileBranchName, fileSha);
+				deleteFile(
+						repository.getOwner(),
+						repository.getName(),
+						filePath,
+						newFileCommitMessage,
+						newFileBranchName,
+						fileSha);
 				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;
 		}
 	}
 
-	private void createNewFile(String repoOwner, String repoName, String fileName, String fileContent, String fileCommitMessage, String branchName) {
+	private void createNewFile(
+			String repoOwner,
+			String repoName,
+			String fileName,
+			String fileContent,
+			String fileCommitMessage,
+			String branchName) {
 
 		CreateFileOptions createNewFileJsonStr = new CreateFileOptions();
 		createNewFileJsonStr.setContent(fileContent);
 		createNewFileJsonStr.setMessage(fileCommitMessage);
 
-		if(branches.contains(branchName)) {
+		if (branches.contains(branchName)) {
 			createNewFileJsonStr.setBranch(branchName);
-		}
-		else {
+		} else {
 			createNewFileJsonStr.setNewBranch(branchName);
 		}
 
-		Call<FileResponse> call = RetrofitClient.getApiInterface(ctx).repoCreateFile(createNewFileJsonStr, repoOwner, repoName, fileName);
+		Call<FileResponse> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoCreateFile(createNewFileJsonStr, repoOwner, repoName, fileName);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<FileResponse> call, @NonNull retrofit2.Response<FileResponse> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<FileResponse> call,
+							@NonNull retrofit2.Response<FileResponse> response) {
 
-				switch(response.code()) {
+						switch (response.code()) {
+							case 201:
+								enableProcessButton();
+								Toasty.success(ctx, getString(R.string.newFileSuccessMessage));
+								Intent result = new Intent();
+								result.putExtra("fileModified", true);
+								result.putExtra("fileAction", fileAction);
+								setResult(200, result);
+								finish();
+								break;
 
-					case 201:
+							case 401:
+								enableProcessButton();
+								AlertDialogs.authorizationTokenRevokedDialog(ctx);
+								break;
+
+							case 404:
+								enableProcessButton();
+								Toasty.warning(ctx, getString(R.string.apiNotFound));
+								break;
+
+							default:
+								enableProcessButton();
+								Toasty.error(ctx, getString(R.string.genericError));
+								break;
+						}
+					}
+
+					@Override
+					public void onFailure(@NonNull Call<FileResponse> call, @NonNull Throwable t) {
+
+						Log.e("onFailure", t.toString());
 						enableProcessButton();
-						Toasty.success(ctx, getString(R.string.newFileSuccessMessage));
-						Intent result = new Intent();
-						result.putExtra("fileModified", true);
-						result.putExtra("fileAction", fileAction);
-						setResult(200, result);
-						finish();
-						break;
-
-					case 401:
-						enableProcessButton();
-						AlertDialogs.authorizationTokenRevokedDialog(ctx);
-						break;
-
-					case 404:
-						enableProcessButton();
-						Toasty.warning(ctx, getString(R.string.apiNotFound));
-						break;
-
-					default:
-						enableProcessButton();
-						Toasty.error(ctx, getString(R.string.genericError));
-						break;
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<FileResponse> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
+					}
+				});
 	}
 
-	private void deleteFile(String repoOwner, String repoName, String fileName, String fileCommitMessage, String branchName, String fileSha) {
+	private void deleteFile(
+			String repoOwner,
+			String repoName,
+			String fileName,
+			String fileCommitMessage,
+			String branchName,
+			String fileSha) {
 
 		DeleteFileOptions deleteFileJsonStr = new DeleteFileOptions();
 		deleteFileJsonStr.setMessage(fileCommitMessage);
 		deleteFileJsonStr.setSha(fileSha);
 
-		if(branches.contains(branchName)) {
+		if (branches.contains(branchName)) {
 			deleteFileJsonStr.setBranch(branchName);
-		}
-		else {
+		} else {
 			deleteFileJsonStr.setNewBranch(branchName);
 		}
 
-		Call<FileDeleteResponse> call = RetrofitClient.getApiInterface(ctx).repoDeleteFileWithBody(repoOwner, repoName, fileName, deleteFileJsonStr);
+		Call<FileDeleteResponse> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoDeleteFileWithBody(repoOwner, repoName, fileName, deleteFileJsonStr);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<FileDeleteResponse> call, @NonNull retrofit2.Response<FileDeleteResponse> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<FileDeleteResponse> call,
+							@NonNull retrofit2.Response<FileDeleteResponse> response) {
 
-				switch(response.code()) {
+						switch (response.code()) {
+							case 200:
+								enableProcessButton();
+								Toasty.info(
+										ctx,
+										getString(
+												R.string.deleteFileMessage,
+												repository.getBranchRef()));
+								Intent result = new Intent();
+								result.putExtra("fileModified", true);
+								result.putExtra("fileAction", fileAction);
+								setResult(200, result);
+								finish();
+								break;
 
-					case 200:
+							case 401:
+								enableProcessButton();
+								AlertDialogs.authorizationTokenRevokedDialog(ctx);
+								break;
+
+							case 404:
+								enableProcessButton();
+								Toasty.info(ctx, getString(R.string.apiNotFound));
+								break;
+
+							default:
+								enableProcessButton();
+								Toasty.info(ctx, getString(R.string.genericError));
+								break;
+						}
+					}
+
+					@Override
+					public void onFailure(
+							@NonNull Call<FileDeleteResponse> call, @NonNull Throwable t) {
+
+						Log.e("onFailure", t.toString());
 						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.deleteFileMessage, repository.getBranchRef()));
-						Intent result = new Intent();
-						result.putExtra("fileModified", true);
-						result.putExtra("fileAction", fileAction);
-						setResult(200, result);
-						finish();
-						break;
-
-					case 401:
-						enableProcessButton();
-						AlertDialogs.authorizationTokenRevokedDialog(ctx);
-						break;
-
-					case 404:
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.apiNotFound));
-						break;
-
-					default:
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.genericError));
-						break;
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<FileDeleteResponse> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
+					}
+				});
 	}
 
-	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);
 		editFileJsonStr.setMessage(fileCommitMessage);
 		editFileJsonStr.setSha(fileSha);
 
-		if(branches.contains(branchName)) {
+		if (branches.contains(branchName)) {
 			editFileJsonStr.setBranch(branchName);
-		}
-		else {
+		} else {
 			editFileJsonStr.setNewBranch(branchName);
 		}
 
-		Call<FileResponse> call = RetrofitClient.getApiInterface(ctx).repoUpdateFile(editFileJsonStr, repoOwner, repoName, fileName);
+		Call<FileResponse> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoUpdateFile(editFileJsonStr, repoOwner, repoName, fileName);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<FileResponse> call, @NonNull retrofit2.Response<FileResponse> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<FileResponse> call,
+							@NonNull retrofit2.Response<FileResponse> response) {
 
-				switch(response.code()) {
+						switch (response.code()) {
+							case 200:
+								enableProcessButton();
+								Toasty.info(ctx, getString(R.string.editFileMessage, branchName));
+								Intent result = new Intent();
+								result.putExtra("fileModified", true);
+								result.putExtra("fileAction", fileAction);
+								setResult(200, result);
+								finish();
+								break;
 
-					case 200:
+							case 401:
+								enableProcessButton();
+								AlertDialogs.authorizationTokenRevokedDialog(ctx);
+								break;
+
+							case 404:
+								enableProcessButton();
+								Toasty.info(ctx, getString(R.string.apiNotFound));
+								break;
+
+							default:
+								enableProcessButton();
+								Toasty.info(ctx, getString(R.string.genericError));
+								break;
+						}
+					}
+
+					@Override
+					public void onFailure(@NonNull Call<FileResponse> call, @NonNull Throwable t) {
+
+						Log.e("onFailure", t.toString());
 						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.editFileMessage, branchName));
-						Intent result = new Intent();
-						result.putExtra("fileModified", true);
-						result.putExtra("fileAction", fileAction);
-						setResult(200, result);
-						finish();
-						break;
-
-					case 401:
-						enableProcessButton();
-						AlertDialogs.authorizationTokenRevokedDialog(ctx);
-						break;
-
-					case 404:
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.apiNotFound));
-						break;
-
-					default:
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.genericError));
-						break;
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<FileResponse> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
+					}
+				});
 	}
 
 	private void getBranches(String repoOwner, String repoName) {
 
-		Call<List<Branch>> call = RetrofitClient.getApiInterface(ctx).repoListBranches(repoOwner, repoName, null, null);
+		Call<List<Branch>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoListBranches(repoOwner, repoName, null, null);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Branch>> call, @NonNull retrofit2.Response<List<Branch>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Branch>> call,
+							@NonNull retrofit2.Response<List<Branch>> response) {
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					assert response.body() != null;
-					for(Branch branch : response.body())
-						branches.add(branch.getName());
+							assert response.body() != null;
+							for (Branch branch : response.body()) branches.add(branch.getName());
 
-					ArrayAdapter<String> adapter = new ArrayAdapter<>(CreateFileActivity.this, R.layout.list_spinner_items, branches);
+							ArrayAdapter<String> adapter =
+									new ArrayAdapter<>(
+											CreateFileActivity.this,
+											R.layout.list_spinner_items,
+											branches);
 
-					binding.newFileBranches.setAdapter(adapter);
-					binding.newFileBranches.setText(repository.getBranchRef(), false);
+							binding.newFileBranches.setAdapter(adapter);
+							binding.newFileBranches.setText(repository.getBranchRef(), false);
 
-					enableProcessButton();
-				}
-			}
+							enableProcessButton();
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Branch>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<Branch>> call, @NonNull Throwable t) {
 
-				Log.e("onFailure", t.toString());
-			}
-		});
+						Log.e("onFailure", t.toString());
+					}
+				});
 	}
 
 	private void disableProcessButton() {
@@ -406,5 +493,4 @@ public class CreateFileActivity extends BaseActivity {
 		super.onResume();
 		repository.checkAccountSwitch(this);
 	}
-
 }
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 b78fb61f..31d07e44 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
@@ -12,6 +12,12 @@ import android.widget.ArrayAdapter;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.CreateIssueOption;
 import org.gitnex.tea4j.v2.models.Issue;
 import org.gitnex.tea4j.v2.models.Label;
@@ -32,20 +38,16 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
-public class CreateIssueActivity extends BaseActivity implements View.OnClickListener, LabelsListAdapter.LabelsListAdapterListener, AssigneesListAdapter.AssigneesListAdapterListener {
+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<>();
@@ -72,9 +74,11 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager imm =
+				(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-		materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
 		repository = RepositoryContext.fromIntent(getIntent());
 
@@ -84,19 +88,22 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 		assert imm != null;
 		imm.showSoftInput(viewBinding.newIssueTitle, InputMethodManager.SHOW_IMPLICIT);
 
-		viewBinding.newIssueDescription.setOnTouchListener((touchView, motionEvent) -> {
+		viewBinding.newIssueDescription.setOnTouchListener(
+				(touchView, motionEvent) -> {
+					touchView.getParent().requestDisallowInterceptTouchEvent(true);
 
-			touchView.getParent().requestDisallowInterceptTouchEvent(true);
+					if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0
+							&& (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
 
-			if((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
-
-				touchView.getParent().requestDisallowInterceptTouchEvent(false);
-			}
-			return false;
-		});
+						touchView.getParent().requestDisallowInterceptTouchEvent(false);
+					}
+					return false;
+				});
 
 		labelsAdapter = new LabelsListAdapter(labelsList, CreateIssueActivity.this, labelsIds);
-		assigneesAdapter = new AssigneesListAdapter(ctx, assigneesList, CreateIssueActivity.this, assigneesListData);
+		assigneesAdapter =
+				new AssigneesListAdapter(
+						ctx, assigneesList, CreateIssueActivity.this, assigneesListData);
 
 		initCloseListener();
 		viewBinding.close.setOnClickListener(onClickListener);
@@ -111,31 +118,31 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
 		viewBinding.newIssueLabels.setOnClickListener(newIssueLabels -> showLabels());
 
-		viewBinding.newIssueAssigneesList.setOnClickListener(newIssueAssigneesList -> showAssignees());
+		viewBinding.newIssueAssigneesList.setOnClickListener(
+				newIssueAssigneesList -> showAssignees());
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			viewBinding.createNewIssueButton.setEnabled(false);
-		}
-		else {
+		} else {
 
 			viewBinding.createNewIssueButton.setOnClickListener(this);
 		}
 
-		if(!repository.getPermissions().isPush()) {
+		if (!repository.getPermissions().isPush()) {
 			viewBinding.newIssueAssigneesListLayout.setVisibility(View.GONE);
 			viewBinding.newIssueMilestoneSpinnerLayout.setVisibility(View.GONE);
 			viewBinding.newIssueLabelsLayout.setVisibility(View.GONE);
 			viewBinding.newIssueDueDateLayout.setVisibility(View.GONE);
 		}
-
 	}
 
 	@Override
 	public void assigneesInterface(List<String> data) {
 
 		String assigneesSetter = String.valueOf(data);
-		viewBinding.newIssueAssigneesList.setText(assigneesSetter.replace("]", "").replace("[", ""));
+		viewBinding.newIssueAssigneesList.setText(
+				assigneesSetter.replace("]", "").replace("[", ""));
 		assigneesListData = data;
 	}
 
@@ -156,56 +163,87 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
 		viewBinding.progressBar.setVisibility(View.VISIBLE);
 
-		CustomAssigneesSelectionDialogBinding assigneesBinding = CustomAssigneesSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
+		CustomAssigneesSelectionDialogBinding assigneesBinding =
+				CustomAssigneesSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
 		View view = assigneesBinding.getRoot();
 		materialAlertDialogBuilder.setView(view);
 
 		materialAlertDialogBuilder.setNeutralButton(R.string.close, null);
 
-		AssigneesActions.getRepositoryAssignees(ctx, repository.getOwner(), repository.getName(), assigneesList, materialAlertDialogBuilder, assigneesAdapter, assigneesBinding, viewBinding.progressBar);
+		AssigneesActions.getRepositoryAssignees(
+				ctx,
+				repository.getOwner(),
+				repository.getName(),
+				assigneesList,
+				materialAlertDialogBuilder,
+				assigneesAdapter,
+				assigneesBinding,
+				viewBinding.progressBar);
 	}
 
 	private void showLabels() {
 
 		viewBinding.progressBar.setVisibility(View.VISIBLE);
 
-		CustomLabelsSelectionDialogBinding labelsBinding = CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
+		CustomLabelsSelectionDialogBinding labelsBinding =
+				CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
 		View view = labelsBinding.getRoot();
 		materialAlertDialogBuilder.setView(view);
 
 		materialAlertDialogBuilder.setNeutralButton(R.string.close, null);
 
-		LabelsActions.getRepositoryLabels(ctx, repository.getOwner(), repository.getName(), labelsList, materialAlertDialogBuilder, labelsAdapter, labelsBinding, viewBinding.progressBar);
+		LabelsActions.getRepositoryLabels(
+				ctx,
+				repository.getOwner(),
+				repository.getName(),
+				labelsList,
+				materialAlertDialogBuilder,
+				labelsAdapter,
+				labelsBinding,
+				viewBinding.progressBar);
 	}
 
 	private void processNewIssue() {
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-		String newIssueTitleForm = Objects.requireNonNull(viewBinding.newIssueTitle.getText()).toString();
-		String newIssueDescriptionForm = Objects.requireNonNull(viewBinding.newIssueDescription.getText()).toString();
-		String newIssueDueDateForm = Objects.requireNonNull(viewBinding.newIssueDueDate.getText()).toString();
+		String newIssueTitleForm =
+				Objects.requireNonNull(viewBinding.newIssueTitle.getText()).toString();
+		String newIssueDescriptionForm =
+				Objects.requireNonNull(viewBinding.newIssueDescription.getText()).toString();
+		String newIssueDueDateForm =
+				Objects.requireNonNull(viewBinding.newIssueDueDate.getText()).toString();
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 		}
 
-		if(newIssueTitleForm.equals("")) {
+		if (newIssueTitleForm.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.issueTitleEmpty));
 			return;
 		}
 
 		disableProcessButton();
-		createNewIssueFunc(repository.getOwner(), repository.getName(), newIssueDescriptionForm, milestoneId, newIssueTitleForm);
+		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) {
+		for (Integer i : labelsIds) {
 			labelIds.add((long) i);
 		}
 
@@ -217,43 +255,45 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 		createNewIssueJson.setAssignees(assigneesListData);
 		createNewIssueJson.setLabels(labelIds);
 
-		Call<Issue> call3 = RetrofitClient.getApiInterface(ctx).issueCreateIssue(repoOwner, repoName, createNewIssueJson);
+		Call<Issue> call3 =
+				RetrofitClient.getApiInterface(ctx)
+						.issueCreateIssue(repoOwner, repoName, createNewIssueJson);
 
-		call3.enqueue(new Callback<>() {
+		call3.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Issue> call, @NonNull retrofit2.Response<Issue> response2) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Issue> call,
+							@NonNull retrofit2.Response<Issue> response2) {
 
-				if(response2.code() == 201) {
+						if (response2.code() == 201) {
 
-					IssuesFragment.resumeIssues = true;
+							IssuesFragment.resumeIssues = true;
 
-					Toasty.success(ctx, getString(R.string.issueCreated));
-					enableProcessButton();
-					RepoDetailActivity.updateRepo = true;
-					MainActivity.reloadRepos = true;
-					finish();
-				}
-				else if(response2.code() == 401) {
+							Toasty.success(ctx, getString(R.string.issueCreated));
+							enableProcessButton();
+							RepoDetailActivity.updateRepo = true;
+							MainActivity.reloadRepos = true;
+							finish();
+						} else if (response2.code() == 401) {
 
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else {
+							enableProcessButton();
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else {
 
-					Toasty.error(ctx, getString(R.string.genericError));
-					enableProcessButton();
-				}
+							Toasty.error(ctx, getString(R.string.genericError));
+							enableProcessButton();
+						}
+					}
 
-			}
+					@Override
+					public void onFailure(@NonNull Call<Issue> call, @NonNull Throwable t) {
 
-			@Override
-			public void onFailure(@NonNull Call<Issue> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-				enableProcessButton();
-			}
-		});
+						Toasty.error(ctx, getString(R.string.genericServerResponseError));
+						enableProcessButton();
+					}
+				});
 	}
 
 	private void initCloseListener() {
@@ -264,80 +304,106 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 	private void getMilestones(String repoOwner, String repoName, int resultLimit) {
 
 		String msState = "open";
-		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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Milestone>> call, @NonNull retrofit2.Response<List<Milestone>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Milestone>> call,
+							@NonNull retrofit2.Response<List<Milestone>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.code() == 200) {
+							if (response.code() == 200) {
 
-						List<Milestone> milestonesList_ = response.body();
+								List<Milestone> milestonesList_ = response.body();
 
-						Milestone ms = new Milestone();
-						ms.setId(0L);
-						ms.setTitle(getString(R.string.issueCreatedNoMilestone));
-						milestonesList.put(ms.getTitle(), ms);
-						assert milestonesList_ != null;
+								Milestone ms = new Milestone();
+								ms.setId(0L);
+								ms.setTitle(getString(R.string.issueCreatedNoMilestone));
+								milestonesList.put(ms.getTitle(), ms);
+								assert milestonesList_ != null;
 
-						if(milestonesList_.size() > 0) {
+								if (milestonesList_.size() > 0) {
 
-							for(Milestone milestone : milestonesList_) {
+									for (Milestone milestone : milestonesList_) {
 
-								//Don't translate "open" is a enum
-								if(milestone.getState().equals("open")) {
-									milestonesList.put(milestone.getTitle(), milestone);
+										// Don't translate "open" is a enum
+										if (milestone.getState().equals("open")) {
+											milestonesList.put(milestone.getTitle(), milestone);
+										}
+									}
 								}
+
+								ArrayAdapter<String> adapter =
+										new ArrayAdapter<>(
+												CreateIssueActivity.this,
+												R.layout.list_spinner_items,
+												new ArrayList<>(milestonesList.keySet()));
+
+								viewBinding.newIssueMilestoneSpinner.setAdapter(adapter);
+								enableProcessButton();
+
+								viewBinding.newIssueMilestoneSpinner.setOnItemClickListener(
+										(parent, view, position, id) -> {
+											if (position == 0) {
+												milestoneId = 0;
+											} else if (view instanceof TextView) {
+												milestoneId =
+														Math.toIntExact(
+																Objects.requireNonNull(
+																				milestonesList.get(
+																						((TextView)
+																										view)
+																								.getText()
+																								.toString()))
+																		.getId());
+											}
+										});
 							}
 						}
-
-						ArrayAdapter<String> adapter = new ArrayAdapter<>(CreateIssueActivity.this, R.layout.list_spinner_items, new ArrayList<>(milestonesList.keySet()));
-
-						viewBinding.newIssueMilestoneSpinner.setAdapter(adapter);
-						enableProcessButton();
-
-						viewBinding.newIssueMilestoneSpinner.setOnItemClickListener((parent, view, position, id) -> {
-							if(position == 0) {
-								milestoneId = 0;
-							}
-							else if(view instanceof TextView) {
-								milestoneId = Math.toIntExact(Objects.requireNonNull(milestonesList.get(((TextView) view).getText().toString())).getId());
-							}
-						});
-
 					}
-				}
 
-			}
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Milestone>> call, @NonNull Throwable t) {
 
-			@Override
-			public void onFailure(@NonNull Call<List<Milestone>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	@Override
 	public void onClick(View v) {
 
-		if(v == viewBinding.newIssueDueDate) {
+		if (v == viewBinding.newIssueDueDate) {
 
 			final Calendar c = Calendar.getInstance();
 			int mYear = c.get(Calendar.YEAR);
 			final int mMonth = c.get(Calendar.MONTH);
 			final int mDay = c.get(Calendar.DAY_OF_MONTH);
 
-			DatePickerDialog datePickerDialog = new DatePickerDialog(this, (view, year, monthOfYear, dayOfMonth) -> {
-				viewBinding.newIssueDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth));
-				currentDate = new Date(year - 1900, monthOfYear, dayOfMonth);
-			}, mYear, mMonth, mDay);
+			DatePickerDialog datePickerDialog =
+					new DatePickerDialog(
+							this,
+							(view, year, monthOfYear, dayOfMonth) -> {
+								viewBinding.newIssueDueDate.setText(
+										getString(
+												R.string.setDueDate,
+												year,
+												(monthOfYear + 1),
+												dayOfMonth));
+								currentDate = new Date(year - 1900, monthOfYear, dayOfMonth);
+							},
+							mYear,
+							mMonth,
+							mDay);
 			datePickerDialog.show();
-		}
-		else if(v == viewBinding.createNewIssueButton) {
+		} else if (v == viewBinding.createNewIssueButton) {
 
 			processNewIssue();
 		}
@@ -358,5 +424,4 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 		super.onResume();
 		repository.checkAccountSwitch(this);
 	}
-
 }
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 ed6f852d..3c95a899 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 import com.pes.androidmaterialcolorpickerdialog.ColorPicker;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.CreateLabelOption;
 import org.gitnex.tea4j.v2.models.EditLabelOption;
 import org.gitnex.tea4j.v2.models.Label;
@@ -22,14 +23,12 @@ import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.mian.gitnex.viewmodels.LabelsViewModel;
 import org.mian.gitnex.viewmodels.OrganizationLabelsViewModel;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class CreateLabelActivity extends BaseActivity {
 
 	public static boolean refreshLabels = false;
@@ -51,13 +50,18 @@ public class CreateLabelActivity extends BaseActivity {
 		activityCreateLabelBinding = ActivityCreateLabelBinding.inflate(getLayoutInflater());
 		setContentView(activityCreateLabelBinding.getRoot());
 
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager imm =
+				(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
 		repository = RepositoryContext.fromIntent(getIntent());
 
-		if(getIntent().getStringExtra("labelAction") != null && Objects.requireNonNull(getIntent().getStringExtra("labelAction")).equals("delete")) {
+		if (getIntent().getStringExtra("labelAction") != null
+				&& Objects.requireNonNull(getIntent().getStringExtra("labelAction"))
+						.equals("delete")) {
 
-			deleteLabel(Integer.parseInt(Objects.requireNonNull(getIntent().getStringExtra("labelId"))));
+			deleteLabel(
+					Integer.parseInt(
+							Objects.requireNonNull(getIntent().getStringExtra("labelId"))));
 			finish();
 			return;
 		}
@@ -74,15 +78,18 @@ public class CreateLabelActivity extends BaseActivity {
 		activityCreateLabelBinding.close.setOnClickListener(onClickListener);
 		activityCreateLabelBinding.colorPicker.setOnClickListener(v -> cp.show());
 
-		cp.setCallback(color -> {
+		cp.setCallback(
+				color -> {
 
-			//Log.i("#Hex no alpha", String.format("#%06X", (0xFFFFFF & color)));
-			activityCreateLabelBinding.colorPicker.setBackgroundColor(color);
-			labelColor = String.format("#%06X", (0xFFFFFF & color));
-			cp.dismiss();
-		});
+					// Log.i("#Hex no alpha", String.format("#%06X", (0xFFFFFF & color)));
+					activityCreateLabelBinding.colorPicker.setBackgroundColor(color);
+					labelColor = String.format("#%06X", (0xFFFFFF & color));
+					cp.dismiss();
+				});
 
-		if(getIntent().getStringExtra("labelAction") != null && Objects.requireNonNull(getIntent().getStringExtra("labelAction")).equals("edit")) {
+		if (getIntent().getStringExtra("labelAction") != null
+				&& Objects.requireNonNull(getIntent().getStringExtra("labelAction"))
+						.equals("edit")) {
 
 			activityCreateLabelBinding.labelName.setText(getIntent().getStringExtra("labelTitle"));
 			int labelColor_ = Color.parseColor("#" + getIntent().getStringExtra("labelColor"));
@@ -91,17 +98,17 @@ public class CreateLabelActivity extends BaseActivity {
 
 			TextView toolbar_title = activityCreateLabelBinding.toolbarTitle;
 			toolbar_title.setText(getResources().getString(R.string.pageTitleLabelUpdate));
-			activityCreateLabelBinding.createLabelButton.setText(getResources().getString(R.string.newUpdateButtonCopy));
+			activityCreateLabelBinding.createLabelButton.setText(
+					getResources().getString(R.string.newUpdateButtonCopy));
 
 			activityCreateLabelBinding.createLabelButton.setOnClickListener(updateLabelListener);
 			return;
 		}
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			activityCreateLabelBinding.createLabelButton.setEnabled(false);
-		}
-		else {
+		} else {
 
 			activityCreateLabelBinding.createLabelButton.setOnClickListener(createLabelListener);
 		}
@@ -111,69 +118,75 @@ public class CreateLabelActivity extends BaseActivity {
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-		String updateLabelName = Objects.requireNonNull(activityCreateLabelBinding.labelName.getText()).toString();
+		String updateLabelName =
+				Objects.requireNonNull(activityCreateLabelBinding.labelName.getText()).toString();
 
 		String updateLabelColor;
-		if(labelColor.isEmpty()) {
+		if (labelColor.isEmpty()) {
 
 			updateLabelColor = labelColorDefault;
-		}
-		else {
+		} else {
 
 			updateLabelColor = labelColor;
 		}
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 		}
 
-		if(updateLabelName.equals("")) {
+		if (updateLabelName.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.labelEmptyError));
 			return;
 		}
 
-		if(!AppUtil.checkStrings(updateLabelName)) {
+		if (!AppUtil.checkStrings(updateLabelName)) {
 
 			Toasty.error(ctx, getString(R.string.labelNameError));
 			return;
 		}
 
 		disableProcessButton();
-		patchLabel(repository, updateLabelName, updateLabelColor, Integer.parseInt(Objects.requireNonNull(getIntent().getStringExtra("labelId"))));
+		patchLabel(
+				repository,
+				updateLabelName,
+				updateLabelColor,
+				Integer.parseInt(Objects.requireNonNull(getIntent().getStringExtra("labelId"))));
 	}
 
 	private void processCreateLabel() {
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-		String newLabelName = Objects.requireNonNull(activityCreateLabelBinding.labelName.getText()).toString();
+		String newLabelName =
+				Objects.requireNonNull(activityCreateLabelBinding.labelName.getText()).toString();
 		String newLabelColor;
 
-		if(labelColor.isEmpty()) {
+		if (labelColor.isEmpty()) {
 
-			newLabelColor = String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(ctx, R.color.releasePre)));
-		}
-		else {
+			newLabelColor =
+					String.format(
+							"#%06X", (0xFFFFFF & ContextCompat.getColor(ctx, R.color.releasePre)));
+		} else {
 
 			newLabelColor = labelColor;
 		}
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 		}
 
-		if(newLabelName.equals("")) {
+		if (newLabelName.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.labelEmptyError));
 			return;
 		}
 
-		if(!AppUtil.checkStrings(newLabelName)) {
+		if (!AppUtil.checkStrings(newLabelName)) {
 
 			Toasty.error(ctx, getString(R.string.labelNameError));
 			return;
@@ -191,52 +204,61 @@ public class CreateLabelActivity extends BaseActivity {
 
 		Call<Label> call;
 
-		if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
+		if (getIntent().getStringExtra("type") != null
+				&& Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
 
-			call = RetrofitClient.getApiInterface(ctx).orgCreateLabel(getIntent().getStringExtra("orgName"), createLabelFunc);
-		}
-		else if(repository != null) {
+			call =
+					RetrofitClient.getApiInterface(ctx)
+							.orgCreateLabel(getIntent().getStringExtra("orgName"), createLabelFunc);
+		} else if (repository != null) {
 
-			call = RetrofitClient.getApiInterface(ctx).issueCreateLabel(repository.getOwner(), repository.getName(), createLabelFunc);
-		}
-		else {
+			call =
+					RetrofitClient.getApiInterface(ctx)
+							.issueCreateLabel(
+									repository.getOwner(), repository.getName(), createLabelFunc);
+		} else {
 			return;
 		}
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Label> call, @NonNull retrofit2.Response<Label> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Label> call,
+							@NonNull retrofit2.Response<Label> response) {
 
-				if(response.code() == 201) {
+						if (response.code() == 201) {
 
-					Toasty.success(ctx, getString(R.string.labelCreated));
-					refreshLabels = true;
-					finish();
-				}
-				else if(response.code() == 401) {
+							Toasty.success(ctx, getString(R.string.labelCreated));
+							refreshLabels = true;
+							finish();
+						} else if (response.code() == 401) {
 
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else {
+							enableProcessButton();
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else {
 
-					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
+							enableProcessButton();
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<Label> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<Label> call, @NonNull Throwable t) {
 
-				labelColor = "";
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
+						labelColor = "";
+						Log.e("onFailure", t.toString());
+						enableProcessButton();
+					}
+				});
 	}
 
-	private void patchLabel(RepositoryContext repository, String updateLabelName, String updateLabelColor, int labelId) {
+	private void patchLabel(
+			RepositoryContext repository,
+			String updateLabelName,
+			String updateLabelColor,
+			int labelId) {
 
 		EditLabelOption createLabelFunc = new EditLabelOption();
 		createLabelFunc.setColor(updateLabelColor);
@@ -244,50 +266,62 @@ public class CreateLabelActivity extends BaseActivity {
 
 		Call<Label> call;
 
-		if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
+		if (getIntent().getStringExtra("type") != null
+				&& Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
 
-			call = RetrofitClient.getApiInterface(ctx).orgEditLabel(getIntent().getStringExtra("orgName"), (long) labelId, createLabelFunc);
-		}
-		else {
+			call =
+					RetrofitClient.getApiInterface(ctx)
+							.orgEditLabel(
+									getIntent().getStringExtra("orgName"),
+									(long) labelId,
+									createLabelFunc);
+		} else {
 
-			call = RetrofitClient.getApiInterface(ctx).issueEditLabel(repository.getOwner(), repository.getName(), (long) labelId, createLabelFunc);
+			call =
+					RetrofitClient.getApiInterface(ctx)
+							.issueEditLabel(
+									repository.getOwner(),
+									repository.getName(),
+									(long) labelId,
+									createLabelFunc);
 		}
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Label> call, @NonNull retrofit2.Response<Label> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Label> call,
+							@NonNull retrofit2.Response<Label> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.code() == 200) {
+							if (response.code() == 200) {
 
-						Toasty.success(ctx, getString(R.string.labelUpdated));
-						refreshLabels = true;
-						finish();
+								Toasty.success(ctx, getString(R.string.labelUpdated));
+								refreshLabels = true;
+								finish();
+							}
+						} else if (response.code() == 401) {
+
+							enableProcessButton();
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else {
+
+							enableProcessButton();
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
 					}
-				}
-				else if(response.code() == 401) {
 
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else {
+					@Override
+					public void onFailure(@NonNull Call<Label> call, @NonNull Throwable t) {
 
-					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Label> call, @NonNull Throwable t) {
-
-				labelColor = "";
-				labelColorDefault = "";
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
+						labelColor = "";
+						labelColorDefault = "";
+						Log.e("onFailure", t.toString());
+						enableProcessButton();
+					}
+				});
 	}
 
 	private void initCloseListener() {
@@ -299,51 +333,59 @@ public class CreateLabelActivity extends BaseActivity {
 
 		Call<Void> call;
 
-		if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
+		if (getIntent().getStringExtra("type") != null
+				&& Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
 
-			call = RetrofitClient.getApiInterface(ctx).orgDeleteLabel(getIntent().getStringExtra("orgName"), (long) labelId);
-		}
-		else {
+			call =
+					RetrofitClient.getApiInterface(ctx)
+							.orgDeleteLabel(getIntent().getStringExtra("orgName"), (long) labelId);
+		} else {
 
-			call = RetrofitClient.getApiInterface(ctx).issueDeleteLabel(repository.getOwner(), repository.getName(), (long) labelId);
+			call =
+					RetrofitClient.getApiInterface(ctx)
+							.issueDeleteLabel(
+									repository.getOwner(), repository.getName(), (long) labelId);
 		}
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.code() == 204) {
+							if (response.code() == 204) {
 
-						Toasty.success(ctx, getString(R.string.labelDeleteText));
-						if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
+								Toasty.success(ctx, getString(R.string.labelDeleteText));
+								if (getIntent().getStringExtra("type") != null
+										&& Objects.requireNonNull(
+														getIntent().getStringExtra("type"))
+												.equals("org")) {
 
-							OrganizationLabelsViewModel.loadOrgLabelsList(getIntent().getStringExtra("orgName"), ctx, null, null);
-						}
-						else {
+									OrganizationLabelsViewModel.loadOrgLabelsList(
+											getIntent().getStringExtra("orgName"), ctx, null, null);
+								} else {
 
-							LabelsViewModel.loadLabelsList(repository.getOwner(), repository.getName(), ctx);
+									LabelsViewModel.loadLabelsList(
+											repository.getOwner(), repository.getName(), ctx);
+								}
+							}
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else {
+
+							Toasty.error(ctx, getString(R.string.genericError));
 						}
 					}
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else {
-
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-				Log.e("onFailure", t.toString());
-			}
-		});
 
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+						Log.e("onFailure", t.toString());
+					}
+				});
 	}
 
 	private void disableProcessButton() {
@@ -359,10 +401,9 @@ public class CreateLabelActivity extends BaseActivity {
 	@Override
 	public void onResume() {
 		super.onResume();
-		if(repository == null) {
+		if (repository == null) {
 			return;
 		}
 		repository.checkAccountSwitch(this);
 	}
-
 }
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 5e82990d..f05117c8 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
@@ -13,6 +13,8 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
+import java.util.Calendar;
+import java.util.Date;
 import org.gitnex.tea4j.v2.models.CreateMilestoneOption;
 import org.gitnex.tea4j.v2.models.Milestone;
 import org.mian.gitnex.R;
@@ -22,15 +24,12 @@ import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.Calendar;
-import java.util.Date;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class CreateMilestoneActivity extends BaseActivity implements View.OnClickListener {
 
 	private EditText milestoneDueDate;
@@ -49,12 +48,14 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
 		super.onCreate(savedInstanceState);
 
-		ActivityCreateMilestoneBinding activityCreateMilestoneBinding = ActivityCreateMilestoneBinding.inflate(getLayoutInflater());
+		ActivityCreateMilestoneBinding activityCreateMilestoneBinding =
+				ActivityCreateMilestoneBinding.inflate(getLayoutInflater());
 		setContentView(activityCreateMilestoneBinding.getRoot());
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager imm =
+				(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
 		milestoneDueDate = activityCreateMilestoneBinding.milestoneDueDate;
 		ImageView closeActivity = activityCreateMilestoneBinding.close;
@@ -67,30 +68,29 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 		assert imm != null;
 		imm.showSoftInput(milestoneTitle, InputMethodManager.SHOW_IMPLICIT);
 
-		milestoneDescription.setOnTouchListener((touchView, motionEvent) -> {
+		milestoneDescription.setOnTouchListener(
+				(touchView, motionEvent) -> {
+					touchView.getParent().requestDisallowInterceptTouchEvent(true);
 
-			touchView.getParent().requestDisallowInterceptTouchEvent(true);
+					if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0
+							&& (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
 
-			if((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
-
-				touchView.getParent().requestDisallowInterceptTouchEvent(false);
-			}
-			return false;
-		});
+						touchView.getParent().requestDisallowInterceptTouchEvent(false);
+					}
+					return false;
+				});
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 		milestoneDueDate.setOnClickListener(this);
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			createNewMilestoneButton.setEnabled(false);
-		}
-		else {
+		} else {
 
 			createNewMilestoneButton.setOnClickListener(createMilestoneListener);
 		}
-
 	}
 
 	private void processNewMilestone() {
@@ -100,21 +100,21 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 		String newMilestoneTitle = milestoneTitle.getText().toString();
 		String newMilestoneDescription = milestoneDescription.getText().toString();
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 		}
 
-		if(newMilestoneTitle.equals("")) {
+		if (newMilestoneTitle.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.milestoneNameErrorEmpty));
 			return;
 		}
 
-		if(!newMilestoneDescription.equals("")) {
+		if (!newMilestoneDescription.equals("")) {
 
-			if(newMilestoneDescription.length() > 255) {
+			if (newMilestoneDescription.length() > 255) {
 
 				Toasty.warning(ctx, getString(R.string.milestoneDescError));
 				return;
@@ -122,10 +122,18 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 		}
 
 		disableProcessButton();
-		createNewMilestone(repository.getOwner(), repository.getName(), newMilestoneTitle, newMilestoneDescription);
+		createNewMilestone(
+				repository.getOwner(),
+				repository.getName(),
+				newMilestoneTitle,
+				newMilestoneDescription);
 	}
 
-	private void createNewMilestone(String repoOwner, String repoName, String newMilestoneTitle, String newMilestoneDescription) {
+	private void createNewMilestone(
+			String repoOwner,
+			String repoName,
+			String newMilestoneTitle,
+			String newMilestoneDescription) {
 
 		CreateMilestoneOption createMilestone = new CreateMilestoneOption();
 		createMilestone.setDescription(newMilestoneDescription);
@@ -134,64 +142,76 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
 		Call<Milestone> call;
 
-		call = RetrofitClient.getApiInterface(ctx).issueCreateMilestone(repoOwner, repoName, createMilestone);
+		call =
+				RetrofitClient.getApiInterface(ctx)
+						.issueCreateMilestone(repoOwner, repoName, createMilestone);
 
-		call.enqueue(new Callback<Milestone>() {
+		call.enqueue(
+				new Callback<Milestone>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Milestone> call, @NonNull retrofit2.Response<Milestone> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Milestone> call,
+							@NonNull retrofit2.Response<Milestone> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.code() == 201) {
+							if (response.code() == 201) {
 
-						Intent result = new Intent();
-						result.putExtra("milestoneCreated", true);
-						setResult(201, result);
-						Toasty.success(ctx, getString(R.string.milestoneCreated));
-						enableProcessButton();
-						finish();
+								Intent result = new Intent();
+								result.putExtra("milestoneCreated", true);
+								setResult(201, result);
+								Toasty.success(ctx, getString(R.string.milestoneCreated));
+								enableProcessButton();
+								finish();
+							}
+						} else if (response.code() == 401) {
+
+							enableProcessButton();
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else {
+
+							enableProcessButton();
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
 					}
-				}
-				else if(response.code() == 401) {
 
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else {
-
-					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Milestone> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<Milestone> call, @NonNull Throwable t) {
 
+						Log.e("onFailure", t.toString());
+						enableProcessButton();
+					}
+				});
 	}
 
 	@Override
 	public void onClick(View v) {
 
-		if(v == milestoneDueDate) {
+		if (v == milestoneDueDate) {
 
 			final Calendar c = Calendar.getInstance();
 			int mYear = c.get(Calendar.YEAR);
 			final int mMonth = c.get(Calendar.MONTH);
 			final int mDay = c.get(Calendar.DAY_OF_MONTH);
 
-			DatePickerDialog datePickerDialog = new DatePickerDialog(this, (view, year, monthOfYear, dayOfMonth) -> {
-				milestoneDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth));
-				currentDate = new Date(year - 1900, monthOfYear, dayOfMonth);
-			}, mYear, mMonth, mDay);
+			DatePickerDialog datePickerDialog =
+					new DatePickerDialog(
+							this,
+							(view, year, monthOfYear, dayOfMonth) -> {
+								milestoneDueDate.setText(
+										getString(
+												R.string.setDueDate,
+												year,
+												(monthOfYear + 1),
+												dayOfMonth));
+								currentDate = new Date(year - 1900, monthOfYear, dayOfMonth);
+							},
+							mYear,
+							mMonth,
+							mDay);
 			datePickerDialog.show();
 		}
-
 	}
 
 	private void initCloseListener() {
@@ -214,5 +234,4 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 		super.onResume();
 		repository.checkAccountSwitch(this);
 	}
-
 }
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 cde022a3..6d28d3c6 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
@@ -24,7 +24,6 @@ import retrofit2.Callback;
 /**
  * @author M M Arif
  */
-
 public class CreateNewUserActivity extends BaseActivity {
 
 	private View.OnClickListener onClickListener;
@@ -40,12 +39,14 @@ public class CreateNewUserActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityCreateNewUserBinding activityCreateNewUserBinding = ActivityCreateNewUserBinding.inflate(getLayoutInflater());
+		ActivityCreateNewUserBinding activityCreateNewUserBinding =
+				ActivityCreateNewUserBinding.inflate(getLayoutInflater());
 		setContentView(activityCreateNewUserBinding.getRoot());
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager imm =
+				(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
 		ImageView closeActivity = activityCreateNewUserBinding.close;
 		createUserButton = activityCreateNewUserBinding.createUserButton;
@@ -61,11 +62,10 @@ public class CreateNewUserActivity extends BaseActivity {
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			disableProcessButton();
-		}
-		else {
+		} else {
 
 			createUserButton.setOnClickListener(createNewUserListener);
 		}
@@ -80,31 +80,33 @@ public class CreateNewUserActivity extends BaseActivity {
 		String newUserEmail = userEmail.getText().toString().trim();
 		String newUserPassword = userPassword.getText().toString();
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 		}
 
-		if(newFullName.equals("") || newUserName.equals("") | newUserEmail.equals("") || newUserPassword.equals("")) {
+		if (newFullName.equals("")
+				|| newUserName.equals("") | newUserEmail.equals("")
+				|| newUserPassword.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.emptyFields));
 			return;
 		}
 
-		if(!AppUtil.checkStrings(newFullName)) {
+		if (!AppUtil.checkStrings(newFullName)) {
 
 			Toasty.error(ctx, getString(R.string.userInvalidFullName));
 			return;
 		}
 
-		if(!AppUtil.checkStringsWithAlphaNumeric(newUserName)) {
+		if (!AppUtil.checkStringsWithAlphaNumeric(newUserName)) {
 
 			Toasty.error(ctx, getString(R.string.userInvalidUserName));
 			return;
 		}
 
-		if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {
+		if (!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {
 
 			Toasty.error(ctx, getString(R.string.userInvalidEmail));
 			return;
@@ -114,7 +116,8 @@ public class CreateNewUserActivity extends BaseActivity {
 		createNewUser(newFullName, newUserName, newUserEmail, newUserPassword);
 	}
 
-	private void createNewUser(String newFullName, String newUserName, String newUserEmail, String newUserPassword) {
+	private void createNewUser(
+			String newFullName, String newUserName, String newUserEmail, String newUserPassword) {
 
 		CreateUserOption createUser = new CreateUserOption();
 		createUser.setEmail(newUserEmail);
@@ -125,52 +128,48 @@ public class CreateNewUserActivity extends BaseActivity {
 
 		Call<User> call = RetrofitClient.getApiInterface(ctx).adminCreateUser(createUser);
 
-		call.enqueue(new Callback<User>() {
+		call.enqueue(
+				new Callback<User>() {
 
-			@Override
-			public void onResponse(@NonNull Call<User> call, @NonNull retrofit2.Response<User> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<User> call, @NonNull retrofit2.Response<User> response) {
 
-				if(response.code() == 201) {
+						if (response.code() == 201) {
 
-					Toasty.success(ctx, getString(R.string.userCreatedText));
-					enableProcessButton();
-					finish();
-				}
-				else if(response.code() == 401) {
+							Toasty.success(ctx, getString(R.string.userCreatedText));
+							enableProcessButton();
+							finish();
+						} else if (response.code() == 401) {
 
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else if(response.code() == 403) {
+							enableProcessButton();
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else if (response.code() == 403) {
 
-					enableProcessButton();
-					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
+							enableProcessButton();
+							Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
 
-					enableProcessButton();
-					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-				}
-				else if(response.code() == 422) {
+							enableProcessButton();
+							Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+						} else if (response.code() == 422) {
 
-					enableProcessButton();
-					Toasty.warning(ctx, ctx.getString(R.string.userExistsError));
-				}
-				else {
+							enableProcessButton();
+							Toasty.warning(ctx, ctx.getString(R.string.userExistsError));
+						} else {
 
-					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
+							enableProcessButton();
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {
 
+						Log.e("onFailure", t.toString());
+						enableProcessButton();
+					}
+				});
 	}
 
 	private void initCloseListener() {
@@ -187,5 +186,4 @@ public class CreateNewUserActivity extends BaseActivity {
 
 		createUserButton.setEnabled(true);
 	}
-
 }
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 e8707827..342cfd3f 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java
@@ -26,7 +26,6 @@ import retrofit2.Callback;
 /**
  * @author M M Arif
  */
-
 public class CreateOrganizationActivity extends BaseActivity {
 
 	public ImageView closeActivity;
@@ -43,12 +42,14 @@ public class CreateOrganizationActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityCreateOrganizationBinding activityCreateOrganizationBinding = ActivityCreateOrganizationBinding.inflate(getLayoutInflater());
+		ActivityCreateOrganizationBinding activityCreateOrganizationBinding =
+				ActivityCreateOrganizationBinding.inflate(getLayoutInflater());
 		setContentView(activityCreateOrganizationBinding.getRoot());
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager imm =
+				(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
 		closeActivity = activityCreateOrganizationBinding.close;
 		orgName = activityCreateOrganizationBinding.newOrganizationName;
@@ -58,31 +59,30 @@ public class CreateOrganizationActivity extends BaseActivity {
 		assert imm != null;
 		imm.showSoftInput(orgName, InputMethodManager.SHOW_IMPLICIT);
 
-		orgDesc.setOnTouchListener((touchView, motionEvent) -> {
+		orgDesc.setOnTouchListener(
+				(touchView, motionEvent) -> {
+					touchView.getParent().requestDisallowInterceptTouchEvent(true);
 
-			touchView.getParent().requestDisallowInterceptTouchEvent(true);
+					if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0
+							&& (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
 
-			if((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
-
-				touchView.getParent().requestDisallowInterceptTouchEvent(false);
-			}
-			return false;
-		});
+						touchView.getParent().requestDisallowInterceptTouchEvent(false);
+					}
+					return false;
+				});
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
 		createOrganizationButton = activityCreateOrganizationBinding.createNewOrganizationButton;
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			createOrganizationButton.setEnabled(false);
-		}
-		else {
+		} else {
 
 			createOrganizationButton.setOnClickListener(createOrgListener);
 		}
-
 	}
 
 	private void initCloseListener() {
@@ -97,35 +97,32 @@ public class CreateOrganizationActivity extends BaseActivity {
 		String newOrgName = orgName.getText().toString();
 		String newOrgDesc = orgDesc.getText().toString();
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 		}
 
-		if(!newOrgDesc.equals("")) {
+		if (!newOrgDesc.equals("")) {
 
-			if(newOrgDesc.length() > 255) {
+			if (newOrgDesc.length() > 255) {
 
 				Toasty.warning(ctx, getString(R.string.orgDescError));
 				return;
 			}
 		}
 
-		if(newOrgName.equals("")) {
+		if (newOrgName.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.orgNameErrorEmpty));
-		}
-		else if(!AppUtil.checkStrings(newOrgName)) {
+		} else if (!AppUtil.checkStrings(newOrgName)) {
 
 			Toasty.warning(ctx, getString(R.string.orgNameErrorInvalid));
-		}
-		else {
+		} else {
 
 			disableProcessButton();
 			createNewOrganization(newOrgName, newOrgDesc);
 		}
-
 	}
 
 	private void createNewOrganization(String orgName, String orgDesc) {
@@ -136,55 +133,52 @@ public class CreateOrganizationActivity extends BaseActivity {
 
 		Call<Organization> call = RetrofitClient.getApiInterface(ctx).orgCreate(createOrganization);
 
-		call.enqueue(new Callback<Organization>() {
+		call.enqueue(
+				new Callback<Organization>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Organization> call, @NonNull retrofit2.Response<Organization> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Organization> call,
+							@NonNull retrofit2.Response<Organization> response) {
 
-				if(response.code() == 201) {
-					OrganizationsFragment.orgCreated = true;
-					enableProcessButton();
-					Toasty.success(ctx, getString(R.string.orgCreated));
-					finish();
-				}
-				else if(response.code() == 401) {
+						if (response.code() == 201) {
+							OrganizationsFragment.orgCreated = true;
+							enableProcessButton();
+							Toasty.success(ctx, getString(R.string.orgCreated));
+							finish();
+						} else if (response.code() == 401) {
 
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else if(response.code() == 409) {
+							enableProcessButton();
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else if (response.code() == 409) {
 
-					enableProcessButton();
-					Toasty.warning(ctx, getString(R.string.orgExistsError));
-				}
-				else if(response.code() == 422) {
+							enableProcessButton();
+							Toasty.warning(ctx, getString(R.string.orgExistsError));
+						} else if (response.code() == 422) {
 
-					enableProcessButton();
-					Toasty.warning(ctx, getString(R.string.orgExistsError));
-				}
-				else {
+							enableProcessButton();
+							Toasty.warning(ctx, getString(R.string.orgExistsError));
+						} else {
 
-					if(response.code() == 404) {
+							if (response.code() == 404) {
 
-						enableProcessButton();
-						Toasty.warning(ctx, getString(R.string.apiNotFound));
+								enableProcessButton();
+								Toasty.warning(ctx, getString(R.string.apiNotFound));
+							} else {
+
+								enableProcessButton();
+								Toasty.error(ctx, getString(R.string.genericError));
+							}
+						}
 					}
-					else {
 
+					@Override
+					public void onFailure(@NonNull Call<Organization> call, @NonNull Throwable t) {
+
+						Log.e("onFailure", t.toString());
 						enableProcessButton();
-						Toasty.error(ctx, getString(R.string.genericError));
 					}
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Organization> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
-
+				});
 	}
 
 	private void disableProcessButton() {
@@ -196,5 +190,4 @@ public class CreateOrganizationActivity extends BaseActivity {
 
 		createOrganizationButton.setEnabled(true);
 	}
-
 }
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 951238cf..d5642df9 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java
@@ -11,6 +11,12 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.Branch;
 import org.gitnex.tea4j.v2.models.CreatePullRequestOption;
 import org.gitnex.tea4j.v2.models.Label;
@@ -26,20 +32,14 @@ import org.mian.gitnex.fragments.PullRequestsFragment;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
-public class CreatePullRequestActivity extends BaseActivity implements LabelsListAdapter.LabelsListAdapterListener {
+public class CreatePullRequestActivity extends BaseActivity
+		implements LabelsListAdapter.LabelsListAdapterListener {
 
 	private final List<String> assignees = new ArrayList<>();
 	LinkedHashMap<String, Milestone> milestonesList = new LinkedHashMap<>();
@@ -63,24 +63,27 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 		viewBinding = ActivityCreatePrBinding.inflate(getLayoutInflater());
 		setContentView(viewBinding.getRoot());
 
-		materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
 		repository = RepositoryContext.fromIntent(getIntent());
 
 		int resultLimit = Constants.getCurrentResultLimit(ctx);
 
-		viewBinding.prBody.setOnTouchListener((touchView, motionEvent) -> {
+		viewBinding.prBody.setOnTouchListener(
+				(touchView, motionEvent) -> {
+					touchView.getParent().requestDisallowInterceptTouchEvent(true);
 
-			touchView.getParent().requestDisallowInterceptTouchEvent(true);
+					if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0
+							&& (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
 
-			if((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
+						touchView.getParent().requestDisallowInterceptTouchEvent(false);
+					}
+					return false;
+				});
 
-				touchView.getParent().requestDisallowInterceptTouchEvent(false);
-			}
-			return false;
-		});
-
-		labelsAdapter = new LabelsListAdapter(labelsList, CreatePullRequestActivity.this, labelsIds);
+		labelsAdapter =
+				new LabelsListAdapter(labelsList, CreatePullRequestActivity.this, labelsIds);
 
 		ImageView closeActivity = findViewById(R.id.close);
 
@@ -98,7 +101,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 
 		viewBinding.createPr.setOnClickListener(createPr -> processPullRequest());
 
-		if(!repository.getPermissions().isPush()) {
+		if (!repository.getPermissions().isPush()) {
 			viewBinding.prDueDateLayout.setVisibility(View.GONE);
 			viewBinding.prLabelsLayout.setVisibility(View.GONE);
 			viewBinding.milestonesSpinnerLayout.setVisibility(View.GONE);
@@ -114,37 +117,39 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 
 		assignees.add("");
 
-		if(labelsIds.size() == 0) {
+		if (labelsIds.size() == 0) {
 
 			labelsIds.add(0);
 		}
 
-		if(prTitle.matches("")) {
+		if (prTitle.matches("")) {
 
 			Toasty.error(ctx, getString(R.string.titleError));
-		}
-		else if(mergeInto.matches("")) {
+		} else if (mergeInto.matches("")) {
 
 			Toasty.error(ctx, getString(R.string.mergeIntoError));
-		}
-		else if(pullFrom.matches("")) {
+		} else if (pullFrom.matches("")) {
 
 			Toasty.error(ctx, getString(R.string.pullFromError));
-		}
-		else if(pullFrom.equals(mergeInto)) {
+		} else if (pullFrom.equals(mergeInto)) {
 
 			Toasty.error(ctx, getString(R.string.sameBranchesError));
-		}
-		else {
+		} else {
 
 			createPullRequest(prTitle, prDescription, mergeInto, pullFrom, milestoneId, assignees);
 		}
 	}
 
-	private void createPullRequest(String prTitle, String prDescription, String mergeInto, String pullFrom, int milestoneId, List<String> assignees) {
+	private void createPullRequest(
+			String prTitle,
+			String prDescription,
+			String mergeInto,
+			String pullFrom,
+			int milestoneId,
+			List<String> assignees) {
 
 		ArrayList<Long> labelIds = new ArrayList<>();
-		for(Integer i : labelsIds) {
+		for (Integer i : labelsIds) {
 			labelIds.add((long) i);
 		}
 
@@ -158,47 +163,51 @@ 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<>() {
+		transferCall.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<PullRequest> call, @NonNull retrofit2.Response<PullRequest> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<PullRequest> call,
+							@NonNull retrofit2.Response<PullRequest> response) {
 
-				disableProcessButton();
+						disableProcessButton();
 
-				if(response.code() == 201) {
+						if (response.code() == 201) {
 
-					Toasty.success(ctx, getString(R.string.prCreateSuccess));
-					RepoDetailActivity.updateRepo = true;
-					PullRequestsFragment.resumePullRequests = true;
-					MainActivity.reloadRepos = true;
-					finish();
-				}
-				else if(response.code() == 409 || response.message().equals("Conflict")) {
+							Toasty.success(ctx, getString(R.string.prCreateSuccess));
+							RepoDetailActivity.updateRepo = true;
+							PullRequestsFragment.resumePullRequests = true;
+							MainActivity.reloadRepos = true;
+							finish();
+						} else if (response.code() == 409
+								|| response.message().equals("Conflict")) {
 
-					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.prAlreadyExists));
-				}
-				else if(response.code() == 404) {
+							enableProcessButton();
+							Toasty.error(ctx, getString(R.string.prAlreadyExists));
+						} else if (response.code() == 404) {
 
-					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.apiNotFound));
-				}
-				else {
+							enableProcessButton();
+							Toasty.error(ctx, getString(R.string.apiNotFound));
+						} else {
 
-					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
+							enableProcessButton();
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<PullRequest> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<PullRequest> call, @NonNull Throwable t) {
 
-				enableProcessButton();
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
+						enableProcessButton();
+						Toasty.error(ctx, getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	@Override
@@ -217,104 +226,141 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 	private void showLabels() {
 
 		viewBinding.progressBar.setVisibility(View.VISIBLE);
-		CustomLabelsSelectionDialogBinding labelsBinding = CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
+		CustomLabelsSelectionDialogBinding labelsBinding =
+				CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
 		View view = labelsBinding.getRoot();
 		materialAlertDialogBuilder.setView(view);
 
 		materialAlertDialogBuilder.setNeutralButton(R.string.close, null);
-		LabelsActions.getRepositoryLabels(ctx, repository.getOwner(), repository.getName(), labelsList, materialAlertDialogBuilder, labelsAdapter, labelsBinding, viewBinding.progressBar);
+		LabelsActions.getRepositoryLabels(
+				ctx,
+				repository.getOwner(),
+				repository.getName(),
+				labelsList,
+				materialAlertDialogBuilder,
+				labelsAdapter,
+				labelsBinding,
+				viewBinding.progressBar);
 	}
 
 	private void getBranches(String repoOwner, String repoName) {
 
-		Call<List<Branch>> call = RetrofitClient.getApiInterface(ctx).repoListBranches(repoOwner, repoName, null, null);
+		Call<List<Branch>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoListBranches(repoOwner, repoName, null, null);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Branch>> call, @NonNull retrofit2.Response<List<Branch>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Branch>> call,
+							@NonNull retrofit2.Response<List<Branch>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.code() == 200) {
+							if (response.code() == 200) {
 
-						List<Branch> branchesList_ = response.body();
-						assert branchesList_ != null;
+								List<Branch> branchesList_ = response.body();
+								assert branchesList_ != null;
 
-						for(Branch i : branchesList_) {
-							branchesList.add(i.getName());
+								for (Branch i : branchesList_) {
+									branchesList.add(i.getName());
+								}
+
+								ArrayAdapter<String> adapter =
+										new ArrayAdapter<>(
+												CreatePullRequestActivity.this,
+												R.layout.list_spinner_items,
+												branchesList);
+
+								viewBinding.mergeIntoBranchSpinner.setAdapter(adapter);
+								viewBinding.pullFromBranchSpinner.setAdapter(adapter);
+								enableProcessButton();
+							}
 						}
-
-						ArrayAdapter<String> adapter = new ArrayAdapter<>(CreatePullRequestActivity.this, R.layout.list_spinner_items, branchesList);
-
-						viewBinding.mergeIntoBranchSpinner.setAdapter(adapter);
-						viewBinding.pullFromBranchSpinner.setAdapter(adapter);
-						enableProcessButton();
-
 					}
-				}
 
-			}
+					@Override
+					public void onFailure(@NonNull Call<List<Branch>> call, @NonNull Throwable t) {
 
-			@Override
-			public void onFailure(@NonNull Call<List<Branch>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	private void getMilestones(String repoOwner, String repoName, int resultLimit) {
 
 		String msState = "open";
-		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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Milestone>> call, @NonNull retrofit2.Response<List<Milestone>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Milestone>> call,
+							@NonNull retrofit2.Response<List<Milestone>> response) {
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					List<Milestone> milestonesList_ = response.body();
+							List<Milestone> milestonesList_ = response.body();
 
-					milestonesList.put(getString(R.string.issueCreatedNoMilestone), new Milestone().id(0L).title(getString(R.string.issueCreatedNoMilestone)));
-					assert milestonesList_ != null;
+							milestonesList.put(
+									getString(R.string.issueCreatedNoMilestone),
+									new Milestone()
+											.id(0L)
+											.title(getString(R.string.issueCreatedNoMilestone)));
+							assert milestonesList_ != null;
 
-					if(milestonesList_.size() > 0) {
+							if (milestonesList_.size() > 0) {
 
-						for(Milestone milestone : milestonesList_) {
+								for (Milestone milestone : milestonesList_) {
 
-							//Don't translate "open" is a enum
-							if(milestone.getState().equals("open")) {
-								milestonesList.put(milestone.getTitle(), milestone);
+									// Don't translate "open" is a enum
+									if (milestone.getState().equals("open")) {
+										milestonesList.put(milestone.getTitle(), milestone);
+									}
+								}
 							}
+
+							ArrayAdapter<String> adapter =
+									new ArrayAdapter<>(
+											CreatePullRequestActivity.this,
+											R.layout.list_spinner_items,
+											new ArrayList<>(milestonesList.keySet()));
+
+							viewBinding.milestonesSpinner.setAdapter(adapter);
+							enableProcessButton();
+
+							viewBinding.milestonesSpinner.setOnItemClickListener(
+									(parent, view, position, id) -> {
+										if (position == 0) {
+											milestoneId = 0;
+										} else if (view instanceof TextView) {
+											milestoneId =
+													Math.toIntExact(
+															Objects.requireNonNull(
+																			milestonesList.get(
+																					((TextView)
+																									view)
+																							.getText()
+																							.toString()))
+																	.getId());
+										}
+									});
 						}
 					}
 
-					ArrayAdapter<String> adapter = new ArrayAdapter<>(CreatePullRequestActivity.this, R.layout.list_spinner_items, new ArrayList<>(milestonesList.keySet()));
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Milestone>> call, @NonNull Throwable t) {
 
-					viewBinding.milestonesSpinner.setAdapter(adapter);
-					enableProcessButton();
-
-					viewBinding.milestonesSpinner.setOnItemClickListener((parent, view, position, id) -> {
-						if(position == 0) {
-							milestoneId = 0;
-						}
-						else if(view instanceof TextView) {
-							milestoneId = Math.toIntExact(Objects.requireNonNull(milestonesList.get(((TextView) view).getText().toString())).getId());
-						}
-					});
-
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Milestone>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	private void setDueDate() {
@@ -324,10 +370,21 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 		final int mMonth = c.get(Calendar.MONTH);
 		final int mDay = c.get(Calendar.DAY_OF_MONTH);
 
-		DatePickerDialog datePickerDialog = new DatePickerDialog(this, (view, year, monthOfYear, dayOfMonth) -> {
-			viewBinding.prDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth));
-			currentDate = new Date(year - 1900, monthOfYear, dayOfMonth);
-		}, mYear, mMonth, mDay);
+		DatePickerDialog datePickerDialog =
+				new DatePickerDialog(
+						this,
+						(view, year, monthOfYear, dayOfMonth) -> {
+							viewBinding.prDueDate.setText(
+									getString(
+											R.string.setDueDate,
+											year,
+											(monthOfYear + 1),
+											dayOfMonth));
+							currentDate = new Date(year - 1900, monthOfYear, dayOfMonth);
+						},
+						mYear,
+						mMonth,
+						mDay);
 		datePickerDialog.show();
 	}
 
@@ -351,5 +408,4 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 		super.onResume();
 		repository.checkAccountSwitch(this);
 	}
-
 }
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 8fa49cb9..027abe58 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
@@ -15,6 +15,8 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Branch;
 import org.gitnex.tea4j.v2.models.CreateReleaseOption;
 import org.gitnex.tea4j.v2.models.CreateTagOption;
@@ -27,15 +29,12 @@ import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class CreateReleaseActivity extends BaseActivity {
 
 	public ImageView closeActivity;
@@ -59,12 +58,14 @@ public class CreateReleaseActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityCreateReleaseBinding activityCreateReleaseBinding = ActivityCreateReleaseBinding.inflate(getLayoutInflater());
+		ActivityCreateReleaseBinding activityCreateReleaseBinding =
+				ActivityCreateReleaseBinding.inflate(getLayoutInflater());
 		setContentView(activityCreateReleaseBinding.getRoot());
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager imm =
+				(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
 		repository = RepositoryContext.fromIntent(getIntent());
 
@@ -79,16 +80,17 @@ public class CreateReleaseActivity extends BaseActivity {
 		assert imm != null;
 		imm.showSoftInput(releaseTitle, InputMethodManager.SHOW_IMPLICIT);
 
-		releaseContent.setOnTouchListener((touchView, motionEvent) -> {
+		releaseContent.setOnTouchListener(
+				(touchView, motionEvent) -> {
+					touchView.getParent().requestDisallowInterceptTouchEvent(true);
 
-			touchView.getParent().requestDisallowInterceptTouchEvent(true);
+					if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0
+							&& (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
 
-			if((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
-
-				touchView.getParent().requestDisallowInterceptTouchEvent(false);
-			}
-			return false;
-		});
+						touchView.getParent().requestDisallowInterceptTouchEvent(false);
+					}
+					return false;
+				});
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
@@ -100,11 +102,10 @@ public class CreateReleaseActivity extends BaseActivity {
 		createNewTag = activityCreateReleaseBinding.createNewTag;
 		disableProcessButton();
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			disableProcessButton();
-		}
-		else {
+		} else {
 
 			createNewRelease.setOnClickListener(createReleaseListener);
 		}
@@ -116,19 +117,20 @@ public class CreateReleaseActivity extends BaseActivity {
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
 		String tagName = releaseTagName.getText().toString();
-		String message = releaseTitle.getText().toString() + "\n\n" + releaseContent.getText().toString();
+		String message =
+				releaseTitle.getText().toString() + "\n\n" + releaseContent.getText().toString();
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 		}
 
-		if(tagName.equals("")) {
+		if (tagName.equals("")) {
 			Toasty.error(ctx, getString(R.string.tagNameErrorEmpty));
 			return;
 		}
 
-		if(selectedBranch == null) {
+		if (selectedBranch == null) {
 			Toasty.error(ctx, getString(R.string.selectBranchError));
 			return;
 		}
@@ -140,45 +142,46 @@ public class CreateReleaseActivity extends BaseActivity {
 		createReleaseJson.setTagName(tagName);
 		createReleaseJson.setTarget(selectedBranch);
 
-		Call<Tag> call = RetrofitClient.getApiInterface(ctx).repoCreateTag(repository.getOwner(), repository.getName(), createReleaseJson);
+		Call<Tag> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoCreateTag(
+								repository.getOwner(), repository.getName(), createReleaseJson);
 
-		call.enqueue(new Callback<Tag>() {
+		call.enqueue(
+				new Callback<Tag>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Tag> call, @NonNull retrofit2.Response<Tag> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Tag> call, @NonNull retrofit2.Response<Tag> response) {
 
-				if(response.code() == 201) {
+						if (response.code() == 201) {
 
-					Intent result = new Intent();
-					result.putExtra("updateReleases", true);
-					setResult(201, result);
-					Toasty.success(ctx, getString(R.string.tagCreated));
-					finish();
-				}
-				else if(response.code() == 401) {
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else if(response.code() == 403) {
-					enableProcessButton();
-					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-					enableProcessButton();
-					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-				}
-				else {
-					enableProcessButton();
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+							Intent result = new Intent();
+							result.putExtra("updateReleases", true);
+							setResult(201, result);
+							Toasty.success(ctx, getString(R.string.tagCreated));
+							finish();
+						} else if (response.code() == 401) {
+							enableProcessButton();
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else if (response.code() == 403) {
+							enableProcessButton();
+							Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
+							enableProcessButton();
+							Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+						} else {
+							enableProcessButton();
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<Tag> call, @NonNull Throwable t) {
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<Tag> call, @NonNull Throwable t) {
+						Log.e("onFailure", t.toString());
+						enableProcessButton();
+					}
+				});
 	}
 
 	private void processNewRelease() {
@@ -192,36 +195,51 @@ public class CreateReleaseActivity extends BaseActivity {
 		boolean newReleaseType = releaseType.isChecked();
 		boolean newReleaseDraft = releaseDraft.isChecked();
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 		}
 
-		if(newReleaseTitle.equals("")) {
+		if (newReleaseTitle.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.titleErrorEmpty));
 			return;
 		}
 
-		if(newReleaseTagName.equals("")) {
+		if (newReleaseTagName.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.tagNameErrorEmpty));
 			return;
 		}
 
-		if(checkBranch == null) {
+		if (checkBranch == null) {
 
 			Toasty.error(ctx, getString(R.string.selectBranchError));
 			return;
 		}
 
 		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);
@@ -231,91 +249,98 @@ public class CreateReleaseActivity extends BaseActivity {
 		createReleaseJson.setPrerelease(newReleaseType);
 		createReleaseJson.setTargetCommitish(selectedBranch);
 
-		Call<Release> call = RetrofitClient.getApiInterface(ctx).repoCreateRelease(repoOwner, repoName, createReleaseJson);
+		Call<Release> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoCreateRelease(repoOwner, repoName, createReleaseJson);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Release> call, @NonNull retrofit2.Response<Release> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Release> call,
+							@NonNull retrofit2.Response<Release> response) {
 
-				if(response.code() == 201) {
+						if (response.code() == 201) {
 
-					Intent result = new Intent();
-					result.putExtra("updateReleases", true);
-					setResult(201, result);
-					Toasty.success(ctx, getString(R.string.releaseCreatedText));
-					finish();
-				}
-				else if(response.code() == 401) {
+							Intent result = new Intent();
+							result.putExtra("updateReleases", true);
+							setResult(201, result);
+							Toasty.success(ctx, getString(R.string.releaseCreatedText));
+							finish();
+						} else if (response.code() == 401) {
 
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else if(response.code() == 403) {
+							enableProcessButton();
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else if (response.code() == 403) {
 
-					enableProcessButton();
-					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
+							enableProcessButton();
+							Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
 
-					enableProcessButton();
-					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-				}
-				else {
+							enableProcessButton();
+							Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+						} else {
 
-					enableProcessButton();
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Release> call, @NonNull Throwable t) {
-				enableProcessButton();
-			}
-		});
+							enableProcessButton();
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
+					@Override
+					public void onFailure(@NonNull Call<Release> call, @NonNull Throwable t) {
+						enableProcessButton();
+					}
+				});
 	}
 
 	private void getBranches(final String repoOwner, final String repoName) {
 
-		Call<List<Branch>> call = RetrofitClient.getApiInterface(ctx).repoListBranches(repoOwner, repoName, null, null);
+		Call<List<Branch>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoListBranches(repoOwner, repoName, null, null);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Branch>> call, @NonNull retrofit2.Response<List<Branch>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Branch>> call,
+							@NonNull retrofit2.Response<List<Branch>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.code() == 200) {
+							if (response.code() == 200) {
 
-						List<Branch> branchesList_ = response.body();
+								List<Branch> branchesList_ = response.body();
 
-						assert branchesList_ != null;
-						for(Branch i : branchesList_) {
-							branchesList.add(i.getName());
+								assert branchesList_ != null;
+								for (Branch i : branchesList_) {
+									branchesList.add(i.getName());
+								}
+
+								ArrayAdapter<String> adapter =
+										new ArrayAdapter<>(
+												CreateReleaseActivity.this,
+												R.layout.list_spinner_items,
+												branchesList);
+
+								releaseBranch.setAdapter(adapter);
+								enableProcessButton();
+
+								releaseBranch.setOnItemClickListener(
+										(parent, view, position, id) ->
+												selectedBranch = branchesList.get(position));
+							}
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
 						}
-
-						ArrayAdapter<String> adapter = new ArrayAdapter<>(CreateReleaseActivity.this, R.layout.list_spinner_items, branchesList);
-
-						releaseBranch.setAdapter(adapter);
-						enableProcessButton();
-
-						releaseBranch.setOnItemClickListener((parent, view, position, id) -> selectedBranch = branchesList.get(position));
 					}
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Branch>> call, @NonNull Throwable t) {
-			}
-		});
 
+					@Override
+					public void onFailure(@NonNull Call<List<Branch>> call, @NonNull Throwable t) {}
+				});
 	}
 
 	private void initCloseListener() {
@@ -338,5 +363,4 @@ public class CreateReleaseActivity extends BaseActivity {
 		super.onResume();
 		repository.checkAccountSwitch(this);
 	}
-
 }
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 46431ecb..67f266ea 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
@@ -14,6 +14,10 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
 import org.gitnex.tea4j.v2.models.CreateRepoOption;
 import org.gitnex.tea4j.v2.models.Organization;
 import org.gitnex.tea4j.v2.models.Repository;
@@ -23,20 +27,15 @@ import org.mian.gitnex.databinding.ActivityCreateRepoBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Pattern;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class CreateRepoActivity extends BaseActivity {
 
-	//https://github.com/go-gitea/gitea/blob/52cfd2743c0e85b36081cf80a850e6a5901f1865/models/repo.go#L964-L967
+	// 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;
@@ -56,14 +55,16 @@ public class CreateRepoActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityCreateRepoBinding activityCreateRepoBinding = ActivityCreateRepoBinding.inflate(getLayoutInflater());
+		ActivityCreateRepoBinding activityCreateRepoBinding =
+				ActivityCreateRepoBinding.inflate(getLayoutInflater());
 		setContentView(activityCreateRepoBinding.getRoot());
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(ctx);
 
 		loginUid = getAccount().getAccount().getUserName();
 
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager imm =
+				(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
 		closeActivity = activityCreateRepoBinding.close;
 		repoName = activityCreateRepoBinding.newRepoName;
@@ -83,11 +84,10 @@ public class CreateRepoActivity extends BaseActivity {
 		createRepo = activityCreateRepoBinding.createNewRepoButton;
 		disableProcessButton();
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			disableProcessButton();
-		}
-		else {
+		} else {
 
 			createRepo.setOnClickListener(createRepoListener);
 		}
@@ -101,49 +101,49 @@ public class CreateRepoActivity extends BaseActivity {
 		String newRepoDesc = repoDesc.getText().toString();
 		boolean newRepoAccess = repoAccess.isChecked();
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 		}
 
-		if(!newRepoDesc.equals("")) {
+		if (!newRepoDesc.equals("")) {
 
-			if(newRepoDesc.length() > 255) {
+			if (newRepoDesc.length() > 255) {
 
 				Toasty.warning(ctx, getString(R.string.repoDescError));
 				return;
 			}
 		}
 
-		if(newRepoName.equals("")) {
+		if (newRepoName.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.repoNameErrorEmpty));
-		}
-		else if(!AppUtil.checkStrings(newRepoName)) {
+		} else if (!AppUtil.checkStrings(newRepoName)) {
 
 			Toasty.warning(ctx, getString(R.string.repoNameErrorInvalid));
-		}
-		else if(reservedRepoNames.contains(newRepoName)) {
+		} else if (reservedRepoNames.contains(newRepoName)) {
 
 			Toasty.warning(ctx, getString(R.string.repoNameErrorReservedName));
-		}
-		else if(reservedRepoPatterns.matcher(newRepoName).find()) {
+		} else if (reservedRepoPatterns.matcher(newRepoName).find()) {
 
 			Toasty.warning(ctx, getString(R.string.repoNameErrorReservedPatterns));
-		}
-		else if(selectedOwner == null) {
+		} else if (selectedOwner == null) {
 
 			Toasty.error(ctx, getString(R.string.repoOwnerError));
-		}
-		else {
+		} else {
 
 			disableProcessButton();
 			createNewRepository(loginUid, newRepoName, newRepoDesc, selectedOwner, newRepoAccess);
 		}
 	}
 
-	private void createNewRepository(String loginUid, String repoName, String repoDesc, String selectedOwner, boolean isPrivate) {
+	private void createNewRepository(
+			String loginUid,
+			String repoName,
+			String repoDesc,
+			String selectedOwner,
+			boolean isPrivate) {
 
 		CreateRepoOption createRepository = new CreateRepoOption();
 		createRepository.setAutoInit(true);
@@ -153,119 +153,138 @@ public class CreateRepoActivity extends BaseActivity {
 		createRepository.setName(repoName);
 
 		Call<Repository> call;
-		if(selectedOwner.equals(loginUid)) {
+		if (selectedOwner.equals(loginUid)) {
 
 			call = RetrofitClient.getApiInterface(ctx).createCurrentUserRepo(createRepository);
-		}
-		else {
+		} else {
 
-			call = RetrofitClient.getApiInterface(ctx).createOrgRepo(selectedOwner, createRepository);
+			call =
+					RetrofitClient.getApiInterface(ctx)
+							.createOrgRepo(selectedOwner, createRepository);
 		}
 
-		call.enqueue(new Callback<Repository>() {
+		call.enqueue(
+				new Callback<Repository>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Repository> call, @NonNull retrofit2.Response<Repository> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Repository> call,
+							@NonNull retrofit2.Response<Repository> response) {
 
-				if(response.code() == 201) {
+						if (response.code() == 201) {
 
-					MainActivity.reloadRepos = true;
-					Toasty.success(ctx, getString(R.string.repoCreated));
-					enableProcessButton();
-					finish();
-				}
-				else if(response.code() == 401) {
+							MainActivity.reloadRepos = true;
+							Toasty.success(ctx, getString(R.string.repoCreated));
+							enableProcessButton();
+							finish();
+						} else if (response.code() == 401) {
 
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else if(response.code() == 409) {
+							enableProcessButton();
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else if (response.code() == 409) {
 
-					enableProcessButton();
-					Toasty.warning(ctx, getString(R.string.repoExistsError));
-				}
-				else {
+							enableProcessButton();
+							Toasty.warning(ctx, getString(R.string.repoExistsError));
+						} else {
 
-					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
+							enableProcessButton();
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<Repository> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<Repository> call, @NonNull Throwable t) {
 
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
+						Log.e("onFailure", t.toString());
+						enableProcessButton();
+					}
+				});
 	}
 
 	private void getOrganizations(final String userLogin) {
 
-		Call<List<Organization>> call = RetrofitClient.getApiInterface(ctx).orgListCurrentUserOrgs(1, 50);
+		Call<List<Organization>> call =
+				RetrofitClient.getApiInterface(ctx).orgListCurrentUserOrgs(1, 50);
 
-		call.enqueue(new Callback<List<Organization>>() {
+		call.enqueue(
+				new Callback<List<Organization>>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Organization>> call, @NonNull retrofit2.Response<List<Organization>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Organization>> call,
+							@NonNull retrofit2.Response<List<Organization>> response) {
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					int organizationId = 0;
+							int organizationId = 0;
 
-					List<Organization> organizationsList_ = response.body();
+							List<Organization> organizationsList_ = response.body();
 
-					organizationsList.add(userLogin);
-					assert organizationsList_ != null;
+							organizationsList.add(userLogin);
+							assert organizationsList_ != null;
 
-					if(organizationsList_.size() > 0) {
+							if (organizationsList_.size() > 0) {
 
-						for(int i = 0; i < organizationsList_.size(); i++) {
+								for (int i = 0; i < organizationsList_.size(); i++) {
 
-							if(getIntent().getStringExtra("orgName") != null && !"".equals(getIntent().getStringExtra("orgName"))) {
-								if(getIntent().getStringExtra("orgName").equals(organizationsList_.get(i).getUsername())) {
-									organizationId = i + 1;
+									if (getIntent().getStringExtra("orgName") != null
+											&& !"".equals(getIntent().getStringExtra("orgName"))) {
+										if (getIntent()
+												.getStringExtra("orgName")
+												.equals(organizationsList_.get(i).getUsername())) {
+											organizationId = i + 1;
+										}
+									}
+
+									organizationsList.add(organizationsList_.get(i).getUsername());
 								}
 							}
 
-							organizationsList.add(organizationsList_.get(i).getUsername());
+							ArrayAdapter<String> adapter =
+									new ArrayAdapter<>(
+											CreateRepoActivity.this,
+											R.layout.list_spinner_items,
+											organizationsList);
+
+							spinner.setAdapter(adapter);
+
+							spinner.setOnItemClickListener(
+									(parent, view, position, id) ->
+											selectedOwner = organizationsList.get(position));
+
+							if (getIntent().getBooleanExtra("organizationAction", false)
+									&& organizationId != 0) {
+
+								int selectOwnerById = organizationId;
+								new Handler(Looper.getMainLooper())
+										.postDelayed(
+												() -> {
+													spinner.setText(
+															organizationsList.get(selectOwnerById),
+															false);
+													selectedOwner =
+															organizationsList.get(selectOwnerById);
+												},
+												500);
+								getIntent().removeExtra("organizationAction");
+							}
+
+							enableProcessButton();
+						} else if (response.code() == 401) {
+
+							enableProcessButton();
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
 						}
 					}
 
-					ArrayAdapter<String> adapter = new ArrayAdapter<>(CreateRepoActivity.this, R.layout.list_spinner_items, organizationsList);
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
 
-					spinner.setAdapter(adapter);
-
-					spinner.setOnItemClickListener((parent, view, position, id) -> selectedOwner = organizationsList.get(position));
-
-					if(getIntent().getBooleanExtra("organizationAction", false) && organizationId != 0) {
-
-						int selectOwnerById = organizationId;
-						new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-							spinner.setText(organizationsList.get(selectOwnerById), false);
-							selectedOwner = organizationsList.get(selectOwnerById);
-						}, 500);
-						getIntent().removeExtra("organizationAction");
+						Log.e("onFailure", t.toString());
+						enableProcessButton();
 					}
-
-					enableProcessButton();
-				}
-
-				else if(response.code() == 401) {
-
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
+				});
 	}
 
 	private void initCloseListener() {
@@ -282,5 +301,4 @@ public class CreateRepoActivity extends BaseActivity {
 
 		createRepo.setEnabled(true);
 	}
-
 }
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 2c2b467c..d92d0b82 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
@@ -12,6 +12,9 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.CreateTeamOption;
 import org.gitnex.tea4j.v2.models.Team;
 import org.mian.gitnex.R;
@@ -21,16 +24,12 @@ import org.mian.gitnex.fragments.OrganizationTeamsFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClickListener {
 
 	private View.OnClickListener onClickListener;
@@ -44,23 +43,35 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 	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 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};
+	private final boolean[] selectedAccessControlsTrueFalse =
+			new boolean[] {false, false, false, false, false, false, false};
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityCreateTeamByOrgBinding activityCreateTeamByOrgBinding = ActivityCreateTeamByOrgBinding.inflate(getLayoutInflater());
+		ActivityCreateTeamByOrgBinding activityCreateTeamByOrgBinding =
+				ActivityCreateTeamByOrgBinding.inflate(getLayoutInflater());
 		setContentView(activityCreateTeamByOrgBinding.getRoot());
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager imm =
+				(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
 		ImageView closeActivity = activityCreateTeamByOrgBinding.close;
 		teamName = activityCreateTeamByOrgBinding.teamName;
@@ -78,116 +89,152 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		teamPermission.setOnClickListener(view -> {
+		teamPermission.setOnClickListener(
+				view -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilderPerm =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.newTeamPermission)
+									.setCancelable(permissionSelectedChoice != -1)
+									.setSingleChoiceItems(
+											permissionList,
+											permissionSelectedChoice,
+											(dialogInterface, i) -> {
+												permissionSelectedChoice = i;
+												teamPermission.setText(permissionList[i]);
 
+												switch (permissionList[i]) {
+													case "Read":
+														teamPermissionDetail.setVisibility(
+																View.VISIBLE);
+														teamPermissionDetail.setText(
+																R.string.newTeamPermissionRead);
+														break;
+													case "Write":
+														teamPermissionDetail.setVisibility(
+																View.VISIBLE);
+														teamPermissionDetail.setText(
+																R.string.newTeamPermissionWrite);
+														break;
+													case "Admin":
+														teamPermissionDetail.setVisibility(
+																View.VISIBLE);
+														teamPermissionDetail.setText(
+																R.string.newTeamPermissionAdmin);
+														break;
+													default:
+														teamPermissionDetail.setVisibility(
+																View.GONE);
+														break;
+												}
 
-			MaterialAlertDialogBuilder materialAlertDialogBuilderPerm = new MaterialAlertDialogBuilder(ctx).setTitle(R.string.newTeamPermission).setCancelable(permissionSelectedChoice != -1)
-				.setSingleChoiceItems(permissionList, permissionSelectedChoice, (dialogInterface, i) -> {
+												dialogInterface.dismiss();
+											});
 
-					permissionSelectedChoice = i;
-					teamPermission.setText(permissionList[i]);
-
-					switch(permissionList[i]) {
-						case "Read":
-
-							teamPermissionDetail.setVisibility(View.VISIBLE);
-							teamPermissionDetail.setText(R.string.newTeamPermissionRead);
-							break;
-						case "Write":
-
-							teamPermissionDetail.setVisibility(View.VISIBLE);
-							teamPermissionDetail.setText(R.string.newTeamPermissionWrite);
-							break;
-						case "Admin":
-
-							teamPermissionDetail.setVisibility(View.VISIBLE);
-							teamPermissionDetail.setText(R.string.newTeamPermissionAdmin);
-							break;
-						default:
-
-							teamPermissionDetail.setVisibility(View.GONE);
-							break;
-					}
-
-					dialogInterface.dismiss();
+					materialAlertDialogBuilderPerm.create().show();
 				});
 
-			materialAlertDialogBuilderPerm.create().show();
-		});
+		teamAccessControls.setOnClickListener(
+				v -> {
+					teamAccessControls.setText("");
+					teamAccessControlsArray.setText("");
+					pushAccessList = Arrays.asList(accessControlsList);
 
-		teamAccessControls.setOnClickListener(v -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setMultiChoiceItems(
+											accessControlsList,
+											selectedAccessControlsTrueFalse,
+											(dialog, which, isChecked) -> {})
+									.setTitle(R.string.newTeamAccessControls)
+									.setPositiveButton(
+											R.string.okButton,
+											(dialog, which) -> {
+												int selectedVal = 0;
+												while (selectedVal
+														< selectedAccessControlsTrueFalse.length) {
+													boolean value =
+															selectedAccessControlsTrueFalse[
+																	selectedVal];
 
-			teamAccessControls.setText("");
-			teamAccessControlsArray.setText("");
-			pushAccessList = Arrays.asList(accessControlsList);
+													String repoCode = "";
+													if (selectedVal == 0) {
+														repoCode = "repo.code";
+													}
+													if (selectedVal == 1) {
+														repoCode = "repo.issues";
+													}
+													if (selectedVal == 2) {
+														repoCode = "repo.pulls";
+													}
+													if (selectedVal == 3) {
+														repoCode = "repo.releases";
+													}
+													if (selectedVal == 4) {
+														repoCode = "repo.wiki";
+													}
+													if (selectedVal == 5) {
+														repoCode = "repo.ext_wiki";
+													}
+													if (selectedVal == 6) {
+														repoCode = "repo.ext_issues";
+													}
 
-			MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setMultiChoiceItems(accessControlsList, selectedAccessControlsTrueFalse, (dialog, which, isChecked) -> {
-			}).setTitle(R.string.newTeamAccessControls).setPositiveButton(R.string.okButton, (dialog, which) -> {
+													if (value) {
 
-				int selectedVal = 0;
-				while(selectedVal < selectedAccessControlsTrueFalse.length) {
-					boolean value = selectedAccessControlsTrueFalse[selectedVal];
+														teamAccessControls.setText(
+																getString(
+																		R.string
+																				.newTeamPermissionValues,
+																		teamAccessControls
+																				.getText(),
+																		pushAccessList.get(
+																				selectedVal)));
+														teamAccessControlsArray.setText(
+																getString(
+																		R.string
+																				.newTeamPermissionValuesFinal,
+																		teamAccessControlsArray
+																				.getText(),
+																		repoCode));
+													}
 
-					String repoCode = "";
-					if(selectedVal == 0) {
-						repoCode = "repo.code";
-					}
-					if(selectedVal == 1) {
-						repoCode = "repo.issues";
-					}
-					if(selectedVal == 2) {
-						repoCode = "repo.pulls";
-					}
-					if(selectedVal == 3) {
-						repoCode = "repo.releases";
-					}
-					if(selectedVal == 4) {
-						repoCode = "repo.wiki";
-					}
-					if(selectedVal == 5) {
-						repoCode = "repo.ext_wiki";
-					}
-					if(selectedVal == 6) {
-						repoCode = "repo.ext_issues";
-					}
+													selectedVal++;
+												}
 
-					if(value) {
+												String data =
+														String.valueOf(
+																teamAccessControls.getText());
+												if (!data.equals("")) {
 
-						teamAccessControls.setText(getString(R.string.newTeamPermissionValues, teamAccessControls.getText(), pushAccessList.get(selectedVal)));
-						teamAccessControlsArray.setText(getString(R.string.newTeamPermissionValuesFinal, teamAccessControlsArray.getText(), repoCode));
-					}
+													teamAccessControls.setText(
+															data.substring(0, data.length() - 2));
+												}
 
-					selectedVal++;
-				}
+												String dataArray =
+														String.valueOf(
+																teamAccessControlsArray.getText());
 
-				String data = String.valueOf(teamAccessControls.getText());
-				if(!data.equals("")) {
+												if (!dataArray.equals("")) {
 
-					teamAccessControls.setText(data.substring(0, data.length() - 2));
-				}
+													teamAccessControlsArray.setText(
+															dataArray.substring(
+																	0, dataArray.length() - 2));
+												}
+											});
 
-				String dataArray = String.valueOf(teamAccessControlsArray.getText());
-
-				if(!dataArray.equals("")) {
-
-					teamAccessControlsArray.setText(dataArray.substring(0, dataArray.length() - 2));
-				}
-			});
-
-			materialAlertDialogBuilder.create().show();
-		});
+					materialAlertDialogBuilder.create().show();
+				});
 
 		createTeamButton.setEnabled(false);
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			createTeamButton.setEnabled(false);
 			GradientDrawable shape = new GradientDrawable();
 			shape.setCornerRadius(8);
 			shape.setColor(ResourcesCompat.getColor(getResources(), R.color.hintColor, null));
 			createTeamButton.setBackground(shape);
-		}
-		else {
+		} else {
 
 			createTeamButton.setEnabled(true);
 			createTeamButton.setOnClickListener(this);
@@ -204,61 +251,68 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 		String newTeamPermission = teamPermission.getText().toString().toLowerCase();
 		String newTeamAccessControls = teamAccessControlsArray.getText().toString();
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 		}
 
-		if(newTeamName.equals("")) {
+		if (newTeamName.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.teamNameEmpty));
 			return;
 		}
 
-		if(!AppUtil.checkStringsWithAlphaNumericDashDotUnderscore(newTeamName)) {
+		if (!AppUtil.checkStringsWithAlphaNumericDashDotUnderscore(newTeamName)) {
 
 			Toasty.warning(ctx, getString(R.string.teamNameError));
 			return;
 		}
 
-		if(!newTeamDesc.equals("")) {
+		if (!newTeamDesc.equals("")) {
 
-			if(!AppUtil.checkStrings(newTeamDesc)) {
+			if (!AppUtil.checkStrings(newTeamDesc)) {
 
 				Toasty.warning(ctx, getString(R.string.teamDescError));
 				return;
 			}
 
-			if(newTeamDesc.length() > 100) {
+			if (newTeamDesc.length() > 100) {
 
 				Toasty.warning(ctx, getString(R.string.teamDescLimit));
 				return;
 			}
 		}
 
-		if(newTeamPermission.equals("")) {
+		if (newTeamPermission.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.teamPermissionEmpty));
 			return;
 		}
 
-		List<String> newTeamAccessControls_ = new ArrayList<>(Arrays.asList(newTeamAccessControls.split(",")));
+		List<String> newTeamAccessControls_ =
+				new ArrayList<>(Arrays.asList(newTeamAccessControls.split(",")));
 
-		for(int i = 0; i < newTeamAccessControls_.size(); i++) {
+		for (int i = 0; i < newTeamAccessControls_.size(); i++) {
 
 			newTeamAccessControls_.set(i, newTeamAccessControls_.get(i).trim());
 		}
 
-		createNewTeamCall(orgName, newTeamName, newTeamDesc, newTeamPermission, newTeamAccessControls_);
+		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);
 		createNewTeamJson.setDescription(newTeamDesc);
-		switch(newTeamPermission) {
+		switch (newTeamPermission) {
 			case "Read":
 				createNewTeamJson.setPermission(CreateTeamOption.PermissionEnum.READ);
 				break;
@@ -271,49 +325,48 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 		}
 		createNewTeamJson.setUnits(newTeamAccessControls);
 
-		Call<Team> call3 = RetrofitClient.getApiInterface(ctx).orgCreateTeam(orgName, createNewTeamJson);
+		Call<Team> call3 =
+				RetrofitClient.getApiInterface(ctx).orgCreateTeam(orgName, createNewTeamJson);
 
-		call3.enqueue(new Callback<Team>() {
+		call3.enqueue(
+				new Callback<Team>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Team> call, @NonNull retrofit2.Response<Team> response2) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Team> call, @NonNull retrofit2.Response<Team> response2) {
 
-				if(response2.isSuccessful()) {
+						if (response2.isSuccessful()) {
 
-					if(response2.code() == 201) {
+							if (response2.code() == 201) {
 
-						OrganizationTeamsFragment.resumeTeams = true;
+								OrganizationTeamsFragment.resumeTeams = true;
 
-						Toasty.success(ctx, getString(R.string.teamCreated));
-						finish();
+								Toasty.success(ctx, getString(R.string.teamCreated));
+								finish();
+							}
+						} else if (response2.code() == 404) {
+
+							Toasty.warning(ctx, getString(R.string.apiNotFound));
+						} else if (response2.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else {
+
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
 					}
-				}
-				else if(response2.code() == 404) {
-
-					Toasty.warning(ctx, getString(R.string.apiNotFound));
-				}
-				else if(response2.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else {
-
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Team> call, @NonNull Throwable t) {
-				Log.e("onFailure", t.toString());
-			}
-		});
 
+					@Override
+					public void onFailure(@NonNull Call<Team> call, @NonNull Throwable t) {
+						Log.e("onFailure", t.toString());
+					}
+				});
 	}
 
 	@Override
 	public void onClick(View v) {
 
-		if(v == createTeamButton) {
+		if (v == createTeamButton) {
 
 			processCreateTeam();
 		}
@@ -323,5 +376,4 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
 		onClickListener = view -> finish();
 	}
-
 }
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 42b54b10..7300363c 100644
--- a/app/src/main/java/org/mian/gitnex/activities/DeepLinksActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/DeepLinksActivity.java
@@ -8,6 +8,11 @@ import android.os.Looper;
 import android.util.Log;
 import android.view.View;
 import androidx.annotation.NonNull;
+import io.mikael.urlbuilder.UrlBuilder;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import org.apache.commons.lang3.StringUtils;
 import org.gitnex.tea4j.v2.models.ContentsResponse;
 import org.gitnex.tea4j.v2.models.Organization;
@@ -24,11 +29,6 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.UrlHelper;
 import org.mian.gitnex.helpers.contexts.IssueContext;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import io.mikael.urlbuilder.UrlBuilder;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -36,7 +36,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class DeepLinksActivity extends BaseActivity {
 
 	private ActivityDeeplinksBinding viewBinding;
@@ -67,7 +66,7 @@ public class DeepLinksActivity extends BaseActivity {
 		assert data != null;
 
 		// check for login
-		if(tinyDB.getInt("currentActiveAccountId", -1) <= -1) {
+		if (tinyDB.getInt("currentActiveAccountId", -1) <= -1) {
 			Intent loginIntent = new Intent(ctx, LoginActivity.class);
 			loginIntent.putExtra("instanceUrl", data.getHost());
 			ctx.startActivity(loginIntent);
@@ -80,7 +79,7 @@ public class DeepLinksActivity extends BaseActivity {
 		assert userAccountsApi != null;
 		List<UserAccount> userAccounts = userAccountsApi.loggedInUserAccounts();
 
-		for(UserAccount userAccount : userAccounts) {
+		for (UserAccount userAccount : userAccounts) {
 
 			String hostUri = userAccount.getInstanceUrl();
 
@@ -88,18 +87,17 @@ public class DeepLinksActivity extends BaseActivity {
 			int portExternal = data.getPort();
 
 			String hostUrlExternal;
-			if(portExternal > 0) {
+			if (portExternal > 0) {
 				hostUrlExternal = hostExternal + ":" + portExternal;
-			}
-			else {
+			} else {
 				hostUrlExternal = hostExternal;
 			}
 
-			if(hostUrlExternal == null) {
+			if (hostUrlExternal == null) {
 				hostUrlExternal = "";
 			}
 
-			if(hostUri.toLowerCase().contains(hostUrlExternal.toLowerCase())) {
+			if (hostUri.toLowerCase().contains(hostUrlExternal.toLowerCase())) {
 
 				accountFound = true;
 
@@ -108,82 +106,92 @@ public class DeepLinksActivity extends BaseActivity {
 			}
 		}
 
-		if(accountFound) {
+		if (accountFound) {
 
-			// redirect to proper fragment/activity, if no action is there, show options where user to want to go like repos, profile, notifications etc
-			if(data.getPathSegments().size() == 1) {
-				if(data.getLastPathSegment().equals("notifications")) { // notifications
+			// redirect to proper fragment/activity, if no action is there, show options where user
+			// to want to go like repos, profile, notifications etc
+			if (data.getPathSegments().size() == 1) {
+				if (data.getLastPathSegment().equals("notifications")) { // notifications
 					mainIntent.putExtra("launchFragmentByLinkHandler", "notification");
 					ctx.startActivity(mainIntent);
 					finish();
-				}
-				else if(data.getLastPathSegment().equals("explore")) { // explore
+				} else if (data.getLastPathSegment().equals("explore")) { // explore
 					mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
 					ctx.startActivity(mainIntent);
 					finish();
-				}
-				else if(data.getLastPathSegment().equals(getAccount().getAccount().getUserName())) { // your user profile
+				} else if (data.getLastPathSegment()
+						.equals(getAccount().getAccount().getUserName())) { // your user profile
 					mainIntent.putExtra("launchFragmentByLinkHandler", "profile");
 					ctx.startActivity(mainIntent);
 					finish();
-				}
-				else if(data.getLastPathSegment().equals("admin")) {
+				} else if (data.getLastPathSegment().equals("admin")) {
 					mainIntent.putExtra("launchFragmentByLinkHandler", "admin");
 					ctx.startActivity(mainIntent);
 					finish();
+				} else {
+					new Handler(Looper.getMainLooper())
+							.postDelayed(() -> getUserOrOrg(data.getLastPathSegment()), 500);
 				}
-				else {
-					new Handler(Looper.getMainLooper()).postDelayed(() -> getUserOrOrg(data.getLastPathSegment()), 500);
-				}
-			}
-			else if(data.getPathSegments().size() == 2) {
-				if(data.getPathSegments().get(0).equals("explore")) { // specific explore tab
-					if(data.getPathSegments().get(1).equals("organizations")) { // orgs
+			} else if (data.getPathSegments().size() == 2) {
+				if (data.getPathSegments().get(0).equals("explore")) { // specific explore tab
+					if (data.getPathSegments().get(1).equals("organizations")) { // orgs
 						mainIntent.putExtra("exploreOrgs", true);
 					}
 					mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
 					ctx.startActivity(mainIntent);
 					finish();
-				}
-				else if(data.getPathSegments().get(0).equals("user") && data.getPathSegments().get(1).equals("login")) { // open login
+				} else if (data.getPathSegments().get(0).equals("user")
+						&& data.getPathSegments().get(1).equals("login")) { // open login
 					Intent loginIntent = new Intent(ctx, AddNewAccountActivity.class);
 					loginIntent.putExtra("instanceUrl", data.getHost());
 					loginIntent.putExtra("instanceProtocol", data.getScheme());
 					ctx.startActivity(loginIntent);
 					finish();
-				}
-				else if(data.getPathSegments().get(0).equals("admin")) {
+				} else if (data.getPathSegments().get(0).equals("admin")) {
 					mainIntent.putExtra("launchFragmentByLinkHandler", "admin");
 					mainIntent.putExtra("giteaAdminAction", data.getLastPathSegment());
 					ctx.startActivity(mainIntent);
 					finish();
-				}
-				else if(!data.getPathSegments().get(0).equals("") & !data.getLastPathSegment().equals("")) { // go to repo
+				} else if (!data.getPathSegments().get(0).equals("")
+						& !data.getLastPathSegment().equals("")) { // go to repo
 					String repo = data.getLastPathSegment();
-					if(repo.endsWith(".git")) { // Git clone URL
+					if (repo.endsWith(".git")) { // Git clone URL
 						repo = repo.substring(0, repo.length() - 4);
 					}
 					String finalRepo = repo;
-					new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), finalRepo, "repo"), 500);
-				}
-				else { // no action, show options
+					new Handler(Looper.getMainLooper())
+							.postDelayed(
+									() ->
+											goToRepoSection(
+													data.getPathSegments().get(0),
+													finalRepo,
+													"repo"),
+									500);
+				} else { // no action, show options
 					showNoActionButtons();
 				}
-			}
-			else if(data.getPathSegments().size() >= 3) {
-				if(data.getPathSegments().get(2).equals("issues")) { // issue
+			} else if (data.getPathSegments().size() >= 3) {
+				if (data.getPathSegments().get(2).equals("issues")) { // issue
 
-					if(!Objects.requireNonNull(data.getLastPathSegment()).contains("issues") & StringUtils.isNumeric(data.getLastPathSegment())) {
+					if (!Objects.requireNonNull(data.getLastPathSegment()).contains("issues")
+							& StringUtils.isNumeric(data.getLastPathSegment())) {
 
 						issueIntent.putExtra("issueNumber", data.getLastPathSegment());
 						issueIntent.putExtra("openedFromLink", "true");
 
 						String[] urlSplitted = data.toString().split("#");
-						if(urlSplitted.length == 2) {
+						if (urlSplitted.length == 2) {
 							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);
 
@@ -191,336 +199,478 @@ public class DeepLinksActivity extends BaseActivity {
 
 						ctx.startActivity(issueIntent);
 						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);
-					}
-					else if(data.getLastPathSegment().equals("new")) {
-						new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "issueNew"), 500);
-					}
-					else {
+					} else if (Objects.requireNonNull(data.getLastPathSegment())
+							.contains("issues")) {
+						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);
+					} else {
 						ctx.startActivity(mainIntent);
 						finish();
 					}
-				}
-				else if(data.getPathSegments().get(2).equals("pulls")) { // pr
+				} else if (data.getPathSegments().get(2).equals("pulls")) { // pr
 
-					if(!Objects.requireNonNull(data.getLastPathSegment()).contains("pulls") & StringUtils.isNumeric(data.getLastPathSegment())) {
+					if (!Objects.requireNonNull(data.getLastPathSegment()).contains("pulls")
+							& StringUtils.isNumeric(data.getLastPathSegment())) {
 
-						new Handler(Looper.getMainLooper()).postDelayed(() -> {
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											String[] urlSplitted = data.toString().split("#");
+											if (urlSplitted.length == 2) {
+												issueIntent.putExtra(
+														"issueComment", urlSplitted[1]);
+											}
 
-							String[] urlSplitted = data.toString().split("#");
-							if(urlSplitted.length == 2) {
-								issueIntent.putExtra("issueComment", urlSplitted[1]);
-							}
+											getPullRequest(
+													data.getPathSegments().get(0),
+													data.getPathSegments().get(1),
+													Integer.parseInt(data.getLastPathSegment()));
+										},
+										500);
 
-							getPullRequest(data.getPathSegments().get(0), data.getPathSegments().get(1), Integer.parseInt(data.getLastPathSegment()));
-						}, 500);
-
-					}
-					else if(Objects.requireNonNull(data.getLastPathSegment()).contains("pulls")) {
-						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)));
-						}, 500);
-					}
-					else {
+					} else if (Objects.requireNonNull(data.getLastPathSegment())
+							.contains("pulls")) {
+						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)));
+										},
+										500);
+					} else {
 						ctx.startActivity(mainIntent);
 						finish();
 					}
-				}
-
-				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);
-				}
-				else if(data.getPathSegments().get(2).equals("commit")) {
+				} 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);
+				} 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);
-				}
-				else if(data.getPathSegments().get(2).equals("commits")) { // commits list
+					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);
-				}
-				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);
-				}
-				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);
-				}
-				else if(data.getPathSegments().get(2).equals("milestone")) { // milestone
+					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);
+				} 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);
+				} 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);
-				}
-				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);
-				}
-				else if(data.getPathSegments().get(2).equals("releases")) { // releases
-					if(data.getPathSegments().size() == 5) {
-						if(data.getPathSegments().get(2).equals("releases") && data.getPathSegments().get(3).equals("tag")) {
+					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);
+				} else if (data.getPathSegments().get(2).equals("releases")) { // releases
+					if (data.getPathSegments().size() == 5) {
+						if (data.getPathSegments().get(2).equals("releases")
+								&& data.getPathSegments().get(3).equals("tag")) {
 							repoIntent.putExtra("releaseTagName", data.getLastPathSegment());
 						}
 					}
-					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);
-				}
-				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);
-				}
-				else if(data.getLastPathSegment().equals("branches")) { // branches list
-					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
+					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);
+				} 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);
+				} else if (data.getLastPathSegment().equals("branches")) { // branches list
+					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
 					repoIntent.putExtra("selectedBranch", data.getLastPathSegment());
-					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
+					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();
 					ArrayList<String> segments = new ArrayList<>(data.getPathSegments());
 					segments.subList(0, 5).clear();
-					for(String item : segments) {
+					for (String item : segments) {
 						filePath.append(item);
 						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);
-				}
-				else if(data.getPathSegments().get(2).equals("wiki")) { // wiki
+					new Handler(Looper.getMainLooper())
+							.postDelayed(
+									() ->
+											getFile(
+													data.getPathSegments().get(0),
+													data.getPathSegments().get(1),
+													filePath.toString(),
+													data.getPathSegments().get(4)),
+									500);
+				} else if (data.getPathSegments().get(2).equals("wiki")) { // wiki
 
-					if(data.getQueryParameter("action") != null && data.getQueryParameter("action").equalsIgnoreCase("_new")) {
-						new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "wikiNew"), 500);
+					if (data.getQueryParameter("action") != null
+							&& data.getQueryParameter("action").equalsIgnoreCase("_new")) {
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() ->
+												goToRepoSection(
+														data.getPathSegments().get(0),
+														data.getPathSegments().get(1),
+														"wikiNew"),
+										500);
+					} else {
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() ->
+												goToRepoSection(
+														data.getPathSegments().get(0),
+														data.getPathSegments().get(1),
+														"wiki"),
+										500);
 					}
-					else {
-						new Handler(Looper.getMainLooper()).postDelayed(() -> goToRepoSection(data.getPathSegments().get(0), data.getPathSegments().get(1), "wiki"), 500);
-					}
-				}
-				else { // no action, show options
+				} else { // no action, show options
 					showNoActionButtons();
 				}
-			}
-			else {
+			} else {
 
 				startActivity(mainIntent);
 				finish();
 			}
-		}
-		else {
+		} else {
 
 			viewBinding.progressBar.setVisibility(View.GONE);
 			viewBinding.addNewAccountFrame.setVisibility(View.VISIBLE);
 			viewBinding.noActionFrame.setVisibility(View.GONE);
-			viewBinding.addAccountText.setText(String.format(getResources().getString(R.string.accountDoesNotExist), data.getHost()));
+			viewBinding.addAccountText.setText(
+					String.format(
+							getResources().getString(R.string.accountDoesNotExist),
+							data.getHost()));
 
-			viewBinding.addNewAccount.setOnClickListener(addNewAccount -> {
+			viewBinding.addNewAccount.setOnClickListener(
+					addNewAccount -> {
+						Intent accountIntent = new Intent(ctx, AddNewAccountActivity.class);
+						accountIntent.putExtra("instanceUrl", data.getHost());
+						startActivity(accountIntent);
+						finish();
+					});
 
-				Intent accountIntent = new Intent(ctx, AddNewAccountActivity.class);
-				accountIntent.putExtra("instanceUrl", data.getHost());
-				startActivity(accountIntent);
-				finish();
-			});
+			viewBinding.openInBrowser.setOnClickListener(
+					addNewAccount -> {
+						Integer port = data.getPort() >= 0 ? data.getPort() : null;
 
-			viewBinding.openInBrowser.setOnClickListener(addNewAccount -> {
+						URI host =
+								UrlBuilder.fromString(UrlHelper.fixScheme(data.getHost(), "https"))
+										.withPort(port)
+										.toUri();
 
-				Integer port = data.getPort() >= 0 ? data.getPort() : null;
+						AppUtil.openUrlInBrowser(this, String.valueOf(host));
+						finish();
+					});
 
-				URI host = UrlBuilder.fromString(UrlHelper.fixScheme(data.getHost(), "https")).withPort(port).toUri();
-
-				AppUtil.openUrlInBrowser(this, String.valueOf(host));
-				finish();
-
-			});
-
-			viewBinding.launchApp.setOnClickListener(launchApp -> {
-
-				startActivity(mainIntent);
-				finish();
-			});
+			viewBinding.launchApp.setOnClickListener(
+					launchApp -> {
+						startActivity(mainIntent);
+						finish();
+					});
 		}
 	}
 
 	private void getPullRequest(String repoOwner, String repoName, int index) {
 
-		Call<PullRequest> call = RetrofitClient.getApiInterface(ctx).repoGetPullRequest(repoOwner, repoName, (long) index);
+		Call<PullRequest> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoGetPullRequest(repoOwner, repoName, (long) index);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<PullRequest> call, @NonNull retrofit2.Response<PullRequest> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<PullRequest> call,
+							@NonNull retrofit2.Response<PullRequest> response) {
 
-				PullRequest prInfo = response.body();
+						PullRequest prInfo = response.body();
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					assert prInfo != null;
+							assert prInfo != null;
 
-					issueIntent.putExtra("openedFromLink", "true");
+							issueIntent.putExtra("openedFromLink", "true");
 
-					IssueContext issue = new IssueContext(prInfo, new RepositoryContext(repoOwner, repoName, ctx));
+							IssueContext issue =
+									new IssueContext(
+											prInfo,
+											new RepositoryContext(repoOwner, repoName, ctx));
 
-					issue.getRepository().saveToDB(ctx);
+							issue.getRepository().saveToDB(ctx);
 
-					issueIntent.putExtra(IssueContext.INTENT_EXTRA, issue);
-					ctx.startActivity(issueIntent);
-					finish();
-				}
+							issueIntent.putExtra(IssueContext.INTENT_EXTRA, issue);
+							ctx.startActivity(issueIntent);
+							finish();
+						} else {
 
-				else {
+							ctx.startActivity(mainIntent);
+							finish();
+							Log.e("onFailure-links-pr", String.valueOf(response.code()));
+						}
+					}
 
-					ctx.startActivity(mainIntent);
-					finish();
-					Log.e("onFailure-links-pr", String.valueOf(response.code()));
-				}
-			}
+					@Override
+					public void onFailure(@NonNull Call<PullRequest> call, @NonNull Throwable t) {
 
-			@Override
-			public void onFailure(@NonNull Call<PullRequest> call, @NonNull Throwable t) {
-
-				ctx.startActivity(issueIntent);
-				finish();
-				Log.e("onFailure-links-pr", t.toString());
-			}
-		});
+						ctx.startActivity(issueIntent);
+						finish();
+						Log.e("onFailure-links-pr", t.toString());
+					}
+				});
 	}
 
 	private void goToRepoSection(String repoOwner, String repoName, String type) {
 
 		Call<Repository> call = RetrofitClient.getApiInterface(ctx).repoGet(repoOwner, repoName);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Repository> call, @NonNull retrofit2.Response<Repository> response) {
-				Repository repoInfo = response.body();
+					@Override
+					public void onResponse(
+							@NonNull Call<Repository> call,
+							@NonNull retrofit2.Response<Repository> response) {
+						Repository repoInfo = response.body();
 
-				if(response.code() == 200) {
-					assert repoInfo != null;
+						if (response.code() == 200) {
+							assert repoInfo != null;
 
-					RepositoryContext repo = new RepositoryContext(repoInfo, ctx);
+							RepositoryContext repo = new RepositoryContext(repoInfo, ctx);
 
-					repoIntent.putExtra("goToSection", "yes");
-					repoIntent.putExtra("goToSectionType", type);
+							repoIntent.putExtra("goToSection", "yes");
+							repoIntent.putExtra("goToSectionType", type);
 
-					repo.saveToDB(ctx);
-					repoIntent.putExtra(RepositoryContext.INTENT_EXTRA, repo);
+							repo.saveToDB(ctx);
+							repoIntent.putExtra(RepositoryContext.INTENT_EXTRA, repo);
 
-					ctx.startActivity(repoIntent);
-					finish();
-				}
-				else {
-					ctx.startActivity(mainIntent);
-					finish();
-					Log.e("error-goToRepo", response.message());
-				}
+							ctx.startActivity(repoIntent);
+							finish();
+						} else {
+							ctx.startActivity(mainIntent);
+							finish();
+							Log.e("error-goToRepo", response.message());
+						}
+					}
 
-			}
+					@Override
+					public void onFailure(@NonNull Call<Repository> call, @NonNull Throwable t) {
 
-			@Override
-			public void onFailure(@NonNull Call<Repository> call, @NonNull Throwable t) {
-
-				ctx.startActivity(mainIntent);
-				finish();
-				Log.e("onFailure-goToRepo", t.toString());
-			}
-		});
+						ctx.startActivity(mainIntent);
+						finish();
+						Log.e("onFailure-goToRepo", t.toString());
+					}
+				});
 	}
 
 	private void getUserOrOrg(String userOrgName) {
 		Call<Organization> call = RetrofitClient.getApiInterface(ctx).orgGet(userOrgName);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Organization> call, @NonNull Response<Organization> response) {
-				if(response.code() == 404) { // org doesn't exist or it's a user user
-					Log.d("getUserOrOrg-404", String.valueOf(response.code()));
-					getUser(userOrgName);
-				}
-				else if(response.code() == 200) { // org
-					assert response.body() != null;
-					orgIntent.putExtra("orgName", response.body().getUsername());
-					orgIntent.putExtra("organizationId", response.body().getId());
-					orgIntent.putExtra("organizationAction", true);
-					ctx.startActivity(orgIntent);
-					finish();
-				}
-				else {
-					Log.e("getUserOrOrg-code", String.valueOf(response.code()));
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-			}
+					@Override
+					public void onResponse(
+							@NonNull Call<Organization> call,
+							@NonNull Response<Organization> response) {
+						if (response.code() == 404) { // org doesn't exist or it's a user user
+							Log.d("getUserOrOrg-404", String.valueOf(response.code()));
+							getUser(userOrgName);
+						} else if (response.code() == 200) { // org
+							assert response.body() != null;
+							orgIntent.putExtra("orgName", response.body().getUsername());
+							orgIntent.putExtra("organizationId", response.body().getId());
+							orgIntent.putExtra("organizationAction", true);
+							ctx.startActivity(orgIntent);
+							finish();
+						} else {
+							Log.e("getUserOrOrg-code", String.valueOf(response.code()));
+							ctx.startActivity(mainIntent);
+							finish();
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<Organization> call, @NonNull Throwable t) {
-				Log.e("onFailure-getUserOrOrg", t.toString());
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<Organization> call, @NonNull Throwable t) {
+						Log.e("onFailure-getUserOrOrg", t.toString());
+					}
+				});
 	}
 
 	private void getUser(String userName) {
 		Call<User> call = RetrofitClient.getApiInterface(ctx).userGet(userName);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<User> call, @NonNull Response<User> response) {
-				if(response.code() == 200) {
-					assert response.body() != null;
-					userIntent.putExtra("username", response.body().getLogin());
-					ctx.startActivity(userIntent);
-				}
-				else {
-					Log.e("getUser-code", String.valueOf(response.code()));
-					ctx.startActivity(mainIntent);
-				}
-				finish();
-			}
+					@Override
+					public void onResponse(
+							@NonNull Call<User> call, @NonNull Response<User> response) {
+						if (response.code() == 200) {
+							assert response.body() != null;
+							userIntent.putExtra("username", response.body().getLogin());
+							ctx.startActivity(userIntent);
+						} else {
+							Log.e("getUser-code", String.valueOf(response.code()));
+							ctx.startActivity(mainIntent);
+						}
+						finish();
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {
-				Log.e("onFailure-getUser", t.toString());
-				ctx.startActivity(mainIntent);
-				finish();
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {
+						Log.e("onFailure-getUser", t.toString());
+						ctx.startActivity(mainIntent);
+						finish();
+					}
+				});
 	}
 
 	private void getFile(String owner, String repo, String filePath, String branch) {
-		Call<ContentsResponse> call = RetrofitClient.getApiInterface(ctx).repoGetContents(owner, repo, filePath, branch);
+		Call<ContentsResponse> call =
+				RetrofitClient.getApiInterface(ctx).repoGetContents(owner, repo, filePath, branch);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<ContentsResponse> call, @NonNull Response<ContentsResponse> response) {
-				if(response.code() == 200) {
-					// check if file and open file/dir
-					ContentsResponse file = response.body();
-					assert file != null;
-					if(file.getType().equals("file")) {
-						repoIntent.putExtra("file", file);
-						repoIntent.putExtra("branch", branch);
-						goToRepoSection(owner, repo, "file");
+					@Override
+					public void onResponse(
+							@NonNull Call<ContentsResponse> call,
+							@NonNull Response<ContentsResponse> response) {
+						if (response.code() == 200) {
+							// check if file and open file/dir
+							ContentsResponse file = response.body();
+							assert file != null;
+							if (file.getType().equals("file")) {
+								repoIntent.putExtra("file", file);
+								repoIntent.putExtra("branch", branch);
+								goToRepoSection(owner, repo, "file");
+							}
+						} else {
+							Log.e("getFile-onFailure", String.valueOf(response.code()));
+							ctx.startActivity(mainIntent);
+							finish();
+						}
 					}
-				}
-				else {
-					Log.e("getFile-onFailure", String.valueOf(response.code()));
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<ContentsResponse> call, @NonNull Throwable t) {
-				Log.e("getFile-onFailure", t.toString());
-				// maybe it's a directory
-				getDir(owner, repo, filePath, branch);
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<ContentsResponse> call, @NonNull Throwable t) {
+						Log.e("getFile-onFailure", t.toString());
+						// maybe it's a directory
+						getDir(owner, repo, filePath, branch);
+					}
+				});
 	}
 
 	private void getDir(String owner, String repo, String filePath, String branch) {
@@ -532,7 +682,7 @@ public class DeepLinksActivity extends BaseActivity {
 	private void showNoActionButtons() {
 		viewBinding.progressBar.setVisibility(View.GONE);
 
-		switch(tinyDB.getInt("defaultScreenId")) {
+		switch (tinyDB.getInt("defaultScreenId")) {
 			case 1: // repos
 				mainIntent.putExtra("launchFragmentByLinkHandler", "repos");
 				ctx.startActivity(mainIntent);
@@ -557,45 +707,44 @@ public class DeepLinksActivity extends BaseActivity {
 				viewBinding.noActionFrame.setVisibility(View.VISIBLE);
 				viewBinding.addNewAccountFrame.setVisibility(View.GONE);
 
-				viewBinding.repository.setOnClickListener(repository -> {
+				viewBinding.repository.setOnClickListener(
+						repository -> {
+							tinyDB.putInt("defaultScreenId", 1);
+							mainIntent.putExtra("launchFragmentByLinkHandler", "repos");
+							ctx.startActivity(mainIntent);
+							finish();
+						});
 
-					tinyDB.putInt("defaultScreenId", 1);
-					mainIntent.putExtra("launchFragmentByLinkHandler", "repos");
-					ctx.startActivity(mainIntent);
-					finish();
-				});
+				viewBinding.organization.setOnClickListener(
+						organization -> {
+							tinyDB.putInt("defaultScreenId", 2);
+							mainIntent.putExtra("launchFragmentByLinkHandler", "org");
+							ctx.startActivity(mainIntent);
+							finish();
+						});
 
-				viewBinding.organization.setOnClickListener(organization -> {
+				viewBinding.notification.setOnClickListener(
+						notification -> {
+							tinyDB.putInt("defaultScreenId", 3);
+							mainIntent.putExtra("launchFragmentByLinkHandler", "notification");
+							ctx.startActivity(mainIntent);
+							finish();
+						});
 
-					tinyDB.putInt("defaultScreenId", 2);
-					mainIntent.putExtra("launchFragmentByLinkHandler", "org");
-					ctx.startActivity(mainIntent);
-					finish();
-				});
+				viewBinding.explore.setOnClickListener(
+						explore -> {
+							tinyDB.putInt("defaultScreenId", 4);
+							mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
+							ctx.startActivity(mainIntent);
+							finish();
+						});
 
-				viewBinding.notification.setOnClickListener(notification -> {
-
-					tinyDB.putInt("defaultScreenId", 3);
-					mainIntent.putExtra("launchFragmentByLinkHandler", "notification");
-					ctx.startActivity(mainIntent);
-					finish();
-				});
-
-				viewBinding.explore.setOnClickListener(explore -> {
-
-					tinyDB.putInt("defaultScreenId", 4);
-					mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
-					ctx.startActivity(mainIntent);
-					finish();
-				});
-
-				viewBinding.launchApp2.setOnClickListener(launchApp2 -> {
-
-					tinyDB.putInt("defaultScreenId", 0);
-					ctx.startActivity(mainIntent);
-					finish();
-				});
+				viewBinding.launchApp2.setOnClickListener(
+						launchApp2 -> {
+							tinyDB.putInt("defaultScreenId", 0);
+							ctx.startActivity(mainIntent);
+							finish();
+						});
 		}
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/activities/DiffActivity.java b/app/src/main/java/org/mian/gitnex/activities/DiffActivity.java
index c0d7d8c5..3302acf5 100644
--- a/app/src/main/java/org/mian/gitnex/activities/DiffActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/DiffActivity.java
@@ -10,7 +10,6 @@ import org.mian.gitnex.fragments.PullRequestChangesFragment;
 /**
  * @author opyale
  */
-
 public class DiffActivity extends BaseActivity {
 
 	public PullRequestChangesFragment fragment = PullRequestChangesFragment.newInstance();
@@ -24,21 +23,28 @@ public class DiffActivity extends BaseActivity {
 
 		setContentView(binding.getRoot());
 
-		getOnBackPressedDispatcher().addCallback(new OnBackPressedCallback(true) {
+		getOnBackPressedDispatcher()
+				.addCallback(
+						new OnBackPressedCallback(true) {
 
-			@Override
-			public void handleOnBackPressed() {
-				if(getSupportFragmentManager().findFragmentById(R.id.fragment_container) instanceof DiffFragment) {
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, fragment).commit();
-				}
-				else {
-					finish();
-				}
-			}
-		});
-
-		getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, fragment).commit();
+							@Override
+							public void handleOnBackPressed() {
+								if (getSupportFragmentManager()
+												.findFragmentById(R.id.fragment_container)
+										instanceof DiffFragment) {
+									getSupportFragmentManager()
+											.beginTransaction()
+											.replace(R.id.fragment_container, fragment)
+											.commit();
+								} else {
+									finish();
+								}
+							}
+						});
 
+		getSupportFragmentManager()
+				.beginTransaction()
+				.replace(R.id.fragment_container, fragment)
+				.commit();
 	}
-
 }
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 88c23200..19cde6bd 100644
--- a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
@@ -18,6 +18,14 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.EditIssueOption;
 import org.gitnex.tea4j.v2.models.Issue;
 import org.gitnex.tea4j.v2.models.Milestone;
@@ -31,21 +39,12 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.IssueContext;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class EditIssueActivity extends BaseActivity implements View.OnClickListener {
 
 	private final String msState = "open";
@@ -67,10 +66,12 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
 		super.onCreate(savedInstanceState);
 
-		ActivityEditIssueBinding activityEditIssueBinding = ActivityEditIssueBinding.inflate(getLayoutInflater());
+		ActivityEditIssueBinding activityEditIssueBinding =
+				ActivityEditIssueBinding.inflate(getLayoutInflater());
 		setContentView(activityEditIssueBinding.getRoot());
 
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager imm =
+				(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
 		resultLimit = Constants.getCurrentResultLimit(ctx);
 		issue = IssueContext.fromIntent(getIntent());
@@ -86,16 +87,17 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 		assert imm != null;
 		imm.showSoftInput(editIssueTitle, InputMethodManager.SHOW_IMPLICIT);
 
-		editIssueDescription.setOnTouchListener((touchView, motionEvent) -> {
+		editIssueDescription.setOnTouchListener(
+				(touchView, motionEvent) -> {
+					touchView.getParent().requestDisallowInterceptTouchEvent(true);
 
-			touchView.getParent().requestDisallowInterceptTouchEvent(true);
+					if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0
+							&& (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
 
-			if((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
-
-				touchView.getParent().requestDisallowInterceptTouchEvent(false);
-			}
-			return false;
-		});
+						touchView.getParent().requestDisallowInterceptTouchEvent(false);
+					}
+					return false;
+				});
 
 		editIssueMilestoneSpinner = findViewById(R.id.editIssueMilestoneSpinner);
 
@@ -105,19 +107,24 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 		editIssueDueDate.setOnClickListener(this);
 		editIssueButton.setOnClickListener(this);
 
-		if(issue.getIssueType().equalsIgnoreCase("Pull")) {
+		if (issue.getIssueType().equalsIgnoreCase("Pull")) {
 
-			toolbar_title.setText(getString(R.string.editPrNavHeader, String.valueOf(issue.getIssueIndex())));
-		}
-		else {
+			toolbar_title.setText(
+					getString(R.string.editPrNavHeader, String.valueOf(issue.getIssueIndex())));
+		} else {
 
-			toolbar_title.setText(getString(R.string.editIssueNavHeader, String.valueOf(issue.getIssueIndex())));
+			toolbar_title.setText(
+					getString(R.string.editIssueNavHeader, String.valueOf(issue.getIssueIndex())));
 		}
 
 		disableProcessButton();
-		getIssue(issue.getRepository().getOwner(), issue.getRepository().getName(), issue.getIssueIndex(), resultLimit);
+		getIssue(
+				issue.getRepository().getOwner(),
+				issue.getRepository().getName(),
+				issue.getIssueIndex(),
+				resultLimit);
 
-		if(!issue.getRepository().getPermissions().isPush()) {
+		if (!issue.getRepository().getPermissions().isPush()) {
 			findViewById(R.id.editIssueMilestoneSpinnerLayout).setVisibility(View.GONE);
 			findViewById(R.id.editIssueDueDateLayout).setVisibility(View.GONE);
 		}
@@ -135,23 +142,35 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 		String editIssueTitleForm = editIssueTitle.getText().toString();
 		String editIssueDescriptionForm = editIssueDescription.getText().toString();
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 		}
 
-		if(editIssueTitleForm.equals("")) {
+		if (editIssueTitleForm.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.issueTitleEmpty));
 			return;
 		}
 
 		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) {
+	private void editIssue(
+			String repoOwner,
+			String repoName,
+			int issueIndex,
+			String title,
+			String description,
+			int milestoneId) {
 
 		EditIssueOption issueData = new EditIssueOption();
 		issueData.setTitle(title);
@@ -159,189 +178,264 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 		issueData.setDueDate(currentDate);
 		issueData.setMilestone((long) milestoneId);
 
-		Call<Issue> call = RetrofitClient.getApiInterface(ctx).issueEditIssue(repoOwner, repoName, (long) issueIndex, issueData);
+		Call<Issue> call =
+				RetrofitClient.getApiInterface(ctx)
+						.issueEditIssue(repoOwner, repoName, (long) issueIndex, issueData);
 
-		call.enqueue(new Callback<Issue>() {
+		call.enqueue(
+				new Callback<Issue>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Issue> call, @NonNull retrofit2.Response<Issue> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Issue> call,
+							@NonNull retrofit2.Response<Issue> response) {
 
-				if(response.code() == 201) {
+						if (response.code() == 201) {
 
-					if(issue.getIssueType().equalsIgnoreCase("Pull")) {
+							if (issue.getIssueType().equalsIgnoreCase("Pull")) {
 
-						Toasty.success(ctx, getString(R.string.editPrSuccessMessage));
-					}
-					else {
+								Toasty.success(ctx, getString(R.string.editPrSuccessMessage));
+							} else {
 
-						Toasty.success(ctx, getString(R.string.editIssueSuccessMessage));
+								Toasty.success(ctx, getString(R.string.editIssueSuccessMessage));
+							}
+
+							Intent result = new Intent();
+							result.putExtra("issueEdited", true);
+							IssuesFragment.resumeIssues = issue.getIssue().getPullRequest() == null;
+							PullRequestsFragment.resumePullRequests =
+									issue.getIssue().getPullRequest() != null;
+							setResult(200, result);
+							finish();
+						} else if (response.code() == 401) {
+
+							enableProcessButton();
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else {
+
+							enableProcessButton();
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
 					}
 
-					Intent result = new Intent();
-					result.putExtra("issueEdited", true);
-					IssuesFragment.resumeIssues = issue.getIssue().getPullRequest() == null;
-					PullRequestsFragment.resumePullRequests = issue.getIssue().getPullRequest() != null;
-					setResult(200, result);
-					finish();
-				}
-				else if(response.code() == 401) {
-
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else {
-
-					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Issue> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<Issue> call, @NonNull Throwable t) {
 
+						Log.e("onFailure", t.toString());
+						enableProcessButton();
+					}
+				});
 	}
 
 	@Override
 	public void onClick(View v) {
 
-		if(v == editIssueDueDate) {
+		if (v == editIssueDueDate) {
 
 			final Calendar c = Calendar.getInstance();
 			int mYear = c.get(Calendar.YEAR);
 			final int mMonth = c.get(Calendar.MONTH);
 			final int mDay = c.get(Calendar.DAY_OF_MONTH);
 
-			DatePickerDialog datePickerDialog = new DatePickerDialog(this, (view, year, monthOfYear, dayOfMonth) -> {
-				editIssueDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth));
-				currentDate = new Date(year - 1900, monthOfYear, dayOfMonth);
-			}, mYear, mMonth, mDay);
+			DatePickerDialog datePickerDialog =
+					new DatePickerDialog(
+							this,
+							(view, year, monthOfYear, dayOfMonth) -> {
+								editIssueDueDate.setText(
+										getString(
+												R.string.setDueDate,
+												year,
+												(monthOfYear + 1),
+												dayOfMonth));
+								currentDate = new Date(year - 1900, monthOfYear, dayOfMonth);
+							},
+							mYear,
+							mMonth,
+							mDay);
 			datePickerDialog.show();
-		}
-		else if(v == editIssueButton) {
+		} else if (v == editIssueButton) {
 
 			processEditIssue();
 		}
-
 	}
 
-	private void getIssue(final String repoOwner, final String repoName, int issueIndex, int resultLimit) {
+	private void getIssue(
+			final String repoOwner, final String repoName, int issueIndex, int resultLimit) {
 
-		Call<Issue> call = RetrofitClient.getApiInterface(ctx).issueGetIssue(repoOwner, repoName, (long) issueIndex);
+		Call<Issue> call =
+				RetrofitClient.getApiInterface(ctx)
+						.issueGetIssue(repoOwner, repoName, (long) issueIndex);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Issue> call, @NonNull retrofit2.Response<Issue> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Issue> call,
+							@NonNull retrofit2.Response<Issue> response) {
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					assert response.body() != null;
-					editIssueTitle.setText(response.body().getTitle());
-					editIssueDescription.setText(response.body().getBody());
+							assert response.body() != null;
+							editIssueTitle.setText(response.body().getTitle());
+							editIssueDescription.setText(response.body().getBody());
 
-					Milestone currentMilestone = response.body().getMilestone();
+							Milestone currentMilestone = response.body().getMilestone();
 
-					// get milestones list
-					if(response.body().getId() > 0) {
+							// 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<>() {
+								call_.enqueue(
+										new Callback<>() {
 
-							@Override
-							public void onResponse(@NonNull Call<List<Milestone>> call, @NonNull retrofit2.Response<List<Milestone>> response_) {
+											@Override
+											public void onResponse(
+													@NonNull Call<List<Milestone>> call,
+													@NonNull retrofit2.Response<List<Milestone>>
+																	response_) {
 
-								if(response_.code() == 200) {
+												if (response_.code() == 200) {
 
-									List<Milestone> milestonesList_ = response_.body();
+													List<Milestone> milestonesList_ =
+															response_.body();
 
-									assert milestonesList_ != null;
+													assert milestonesList_ != null;
 
-									Milestone ms = new Milestone();
-									ms.setId(0L);
-									ms.setTitle(getString(R.string.issueCreatedNoMilestone));
-									milestonesList.put(ms.getTitle(), ms);
+													Milestone ms = new Milestone();
+													ms.setId(0L);
+													ms.setTitle(
+															getString(
+																	R.string
+																			.issueCreatedNoMilestone));
+													milestonesList.put(ms.getTitle(), ms);
 
-									if(milestonesList_.size() > 0) {
+													if (milestonesList_.size() > 0) {
 
-										for(Milestone milestone : milestonesList_) {
+														for (Milestone milestone :
+																milestonesList_) {
 
-											//Don't translate "open" is a enum
-											if(milestone.getState().equals("open")) {
-												milestonesList.put(milestone.getTitle(), milestone);
+															// Don't translate "open" is a enum
+															if (milestone
+																	.getState()
+																	.equals("open")) {
+																milestonesList.put(
+																		milestone.getTitle(),
+																		milestone);
+															}
+														}
+													}
+
+													ArrayAdapter<String> adapter =
+															new ArrayAdapter<>(
+																	EditIssueActivity.this,
+																	R.layout.list_spinner_items,
+																	new ArrayList<>(
+																			milestonesList
+																					.keySet()));
+
+													editIssueMilestoneSpinner.setAdapter(adapter);
+
+													editIssueMilestoneSpinner
+															.setOnItemClickListener(
+																	(parent,
+																			view,
+																			position,
+																			id) -> {
+																		if (position == 0) {
+																			milestoneId = 0;
+																		} else if (view
+																				instanceof
+																				TextView) {
+																			milestoneId =
+																					Math.toIntExact(
+																							Objects
+																									.requireNonNull(
+																											milestonesList
+																													.get(
+																															((TextView)
+																																			view)
+																																	.getText()
+																																	.toString()))
+																									.getId());
+																		}
+																	});
+
+													new Handler(Looper.getMainLooper())
+															.postDelayed(
+																	() -> {
+																		if (currentMilestone
+																				!= null) {
+																			milestoneId =
+																					Math.toIntExact(
+																							currentMilestone
+																									.getId());
+																			editIssueMilestoneSpinner
+																					.setText(
+																							currentMilestone
+																									.getTitle(),
+																							false);
+																		} else {
+																			milestoneId = 0;
+																			editIssueMilestoneSpinner
+																					.setText(
+																							getString(
+																									R
+																											.string
+																											.issueCreatedNoMilestone),
+																							false);
+																		}
+																	},
+																	500);
+
+													enableProcessButton();
+												}
 											}
-										}
-									}
 
-									ArrayAdapter<String> adapter = new ArrayAdapter<>(EditIssueActivity.this, R.layout.list_spinner_items, new ArrayList<>(milestonesList.keySet()));
+											@Override
+											public void onFailure(
+													@NonNull Call<List<Milestone>> call,
+													@NonNull Throwable t) {
 
-									editIssueMilestoneSpinner.setAdapter(adapter);
-
-									editIssueMilestoneSpinner.setOnItemClickListener((parent, view, position, id) -> {
-										if(position == 0) {
-											milestoneId = 0;
-										}
-										else if(view instanceof TextView) {
-											milestoneId = Math.toIntExact(Objects.requireNonNull(milestonesList.get(((TextView) view).getText().toString())).getId());
-										}
-									});
-
-									new Handler(Looper.getMainLooper()).postDelayed(() -> {
-										if(currentMilestone != null) {
-											milestoneId = Math.toIntExact(currentMilestone.getId());
-											editIssueMilestoneSpinner.setText(currentMilestone.getTitle(), false);
-										}
-										else {
-											milestoneId = 0;
-											editIssueMilestoneSpinner.setText(getString(R.string.issueCreatedNoMilestone), false);
-										}
-									}, 500);
-
-									enableProcessButton();
-								}
+												Log.e("onFailure", t.toString());
+											}
+										});
 							}
+							// get milestones list
 
-							@Override
-							public void onFailure(@NonNull Call<List<Milestone>> call, @NonNull Throwable t) {
+							if (response.body().getDueDate() != null) {
 
-								Log.e("onFailure", t.toString());
+								@SuppressLint("SimpleDateFormat")
+								DateFormat formatter = new SimpleDateFormat("yyyy-M-dd");
+								String dueDate = formatter.format(response.body().getDueDate());
+								editIssueDueDate.setText(dueDate);
 							}
-						});
+							// enableProcessButton();
 
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else {
+
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
 					}
-					// get milestones list
 
-					if(response.body().getDueDate() != null) {
+					@Override
+					public void onFailure(@NonNull Call<Issue> call, @NonNull Throwable t) {
 
-						@SuppressLint("SimpleDateFormat") DateFormat formatter = new SimpleDateFormat("yyyy-M-dd");
-						String dueDate = formatter.format(response.body().getDueDate());
-						editIssueDueDate.setText(dueDate);
+						Log.e("onFailure", t.toString());
 					}
-					//enableProcessButton();
-
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else {
-
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Issue> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-			}
-		});
-
+				});
 	}
 
 	private void disableProcessButton() {
@@ -359,5 +453,4 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 		super.onResume();
 		issue.getRepository().checkAccountSwitch(this);
 	}
-
 }
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 20bbecef..4d82d04e 100644
--- a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
@@ -18,6 +18,10 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.core.app.NotificationCompat;
 import com.vdurmont.emoji.EmojiParser;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Arrays;
+import okhttp3.ResponseBody;
 import org.apache.commons.io.FilenameUtils;
 import org.gitnex.tea4j.v2.models.ContentsResponse;
 import org.mian.gitnex.R;
@@ -33,98 +37,154 @@ import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.mian.gitnex.notifications.Notifications;
 import org.mian.gitnex.structs.BottomSheetListener;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Arrays;
-import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Response;
 
 /**
  * @author M M Arif
  */
-
 public class FileViewActivity extends BaseActivity implements BottomSheetListener {
 
 	private ActivityFileViewBinding binding;
 	private ContentsResponse file;
 	private RepositoryContext repository;
-	ActivityResultLauncher<Intent> activityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+	ActivityResultLauncher<Intent> activityResultLauncher =
+			registerForActivityResult(
+					new ActivityResultContracts.StartActivityForResult(),
+					result -> {
+						if (result.getResultCode() == Activity.RESULT_OK) {
 
-		if(result.getResultCode() == Activity.RESULT_OK) {
+							assert result.getData() != null;
 
-			assert result.getData() != null;
+							try {
 
-			try {
+								OutputStream outputStream =
+										getContentResolver()
+												.openOutputStream(result.getData().getData());
 
-				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);
 
-				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);
 
-				int notificationId = Notifications.uniqueNotificationId(ctx);
+								NotificationManager notificationManager =
+										(NotificationManager)
+												getSystemService(Context.NOTIFICATION_SERVICE);
+								notificationManager.notify(notificationId, builder.build());
 
-				NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-				notificationManager.notify(notificationId, builder.build());
+								Thread thread =
+										new Thread(
+												() -> {
+													try {
 
-				Thread thread = new Thread(() -> {
+														Call<ResponseBody> call =
+																RetrofitClient.getWebInterface(ctx)
+																		.getFileContents(
+																				repository
+																						.getOwner(),
+																				repository
+																						.getName(),
+																				repository
+																						.getBranchRef(),
+																				file.getPath());
 
-					try {
+														Response<ResponseBody> response =
+																call.execute();
 
-						Call<ResponseBody> call = RetrofitClient.getWebInterface(ctx).getFileContents(repository.getOwner(), repository.getName(), repository.getBranchRef(), file.getPath());
+														assert response.body() != null;
 
-						Response<ResponseBody> response = call.execute();
+														AppUtil.copyProgress(
+																response.body().byteStream(),
+																outputStream,
+																file.getSize(),
+																progress -> {
+																	builder.setProgress(
+																			100, progress, false);
+																	notificationManager.notify(
+																			notificationId,
+																			builder.build());
+																});
 
-						assert response.body() != null;
+														builder.setContentTitle(
+																		getString(
+																				R.string
+																						.fileViewerNotificationTitleFinished))
+																.setContentText(
+																		getString(
+																				R.string
+																						.fileViewerNotificationDescriptionFinished,
+																				file.getName()));
 
-						AppUtil.copyProgress(response.body().byteStream(), outputStream, file.getSize(), progress -> {
-							builder.setProgress(100, progress, false);
-							notificationManager.notify(notificationId, builder.build());
-						});
+													} catch (IOException ignored) {
 
-						builder.setContentTitle(getString(R.string.fileViewerNotificationTitleFinished)).setContentText(getString(R.string.fileViewerNotificationDescriptionFinished, file.getName()));
+														builder.setContentTitle(
+																		getString(
+																				R.string
+																						.fileViewerNotificationTitleFailed))
+																.setContentText(
+																		getString(
+																				R.string
+																						.fileViewerNotificationDescriptionFailed,
+																				file.getName()));
 
-					}
-					catch(IOException ignored) {
+													} finally {
 
-						builder.setContentTitle(getString(R.string.fileViewerNotificationTitleFailed)).setContentText(getString(R.string.fileViewerNotificationDescriptionFailed, file.getName()));
+														builder.setProgress(0, 0, false)
+																.setOngoing(false);
 
-					}
-					finally {
+														notificationManager.notify(
+																notificationId, builder.build());
+													}
+												});
 
-						builder.setProgress(0, 0, false).setOngoing(false);
+								thread.start();
 
-						notificationManager.notify(notificationId, builder.build());
-
-					}
-				});
-
-				thread.start();
-
-			}
-			catch(IOException ignored) {
-			}
-		}
-
-	});
+							} 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) {
@@ -144,135 +204,190 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
 		binding.toolbarTitle.setMovementMethod(new ScrollingMovementMethod());
 		binding.toolbarTitle.setText(file.getPath());
 
-		getSingleFileContents(repository.getOwner(), repository.getName(), file.getPath(), repository.getBranchRef());
+		getSingleFileContents(
+				repository.getOwner(),
+				repository.getName(),
+				file.getPath(),
+				repository.getBranchRef());
 	}
 
-	private void getSingleFileContents(final String owner, String repo, final String filename, String ref) {
+	private void getSingleFileContents(
+			final String owner, String repo, final String filename, String ref) {
 
-		Thread thread = new Thread(() -> {
+		Thread thread =
+				new Thread(
+						() -> {
+							Call<ResponseBody> call =
+									RetrofitClient.getWebInterface(ctx)
+											.getFileContents(owner, repo, ref, filename);
 
-			Call<ResponseBody> call = RetrofitClient.getWebInterface(ctx).getFileContents(owner, repo, ref, filename);
+							try {
 
-			try {
+								Response<ResponseBody> response = call.execute();
 
-				Response<ResponseBody> response = call.execute();
+								if (response.code() == 200) {
 
-				if(response.code() == 200) {
+									ResponseBody responseBody = response.body();
 
-					ResponseBody responseBody = response.body();
+									if (responseBody != null) {
 
-					if(responseBody != null) {
+										runOnUiThread(
+												() -> binding.progressBar.setVisibility(View.GONE));
+										String fileExtension = FilenameUtils.getExtension(filename);
 
-						runOnUiThread(() -> binding.progressBar.setVisibility(View.GONE));
-						String fileExtension = FilenameUtils.getExtension(filename);
+										switch (AppUtil.getFileType(fileExtension)) {
+											case IMAGE:
 
-						switch(AppUtil.getFileType(fileExtension)) {
+												// See
+												// https://developer.android.com/guide/topics/media/media-formats#core
+												if (Arrays.asList(
+																"bmp", "gif", "jpg", "jpeg", "png",
+																"webp", "heic", "heif")
+														.contains(fileExtension.toLowerCase())) {
 
-							case IMAGE:
+													byte[] pictureBytes = responseBody.bytes();
 
-								// See https://developer.android.com/guide/topics/media/media-formats#core
-								if(Arrays.asList("bmp", "gif", "jpg", "jpeg", "png", "webp", "heic", "heif").contains(fileExtension.toLowerCase())) {
+													Bitmap image =
+															Images.scaleImage(pictureBytes, 1920);
+													processable = image != null;
+													if (processable) {
+														runOnUiThread(
+																() -> {
+																	binding.contents.setVisibility(
+																			View.GONE);
+																	binding.markdownFrame
+																			.setVisibility(
+																					View.GONE);
 
-									byte[] pictureBytes = responseBody.bytes();
+																	binding.photoView.setVisibility(
+																			View.VISIBLE);
+																	binding.photoView
+																			.setImageBitmap(image);
+																});
+													}
+												}
+												break;
 
-									Bitmap image = Images.scaleImage(pictureBytes, 1920);
-									processable = image != null;
-									if(processable) {
-										runOnUiThread(() -> {
-											binding.contents.setVisibility(View.GONE);
-											binding.markdownFrame.setVisibility(View.GONE);
+											case UNKNOWN:
+											case TEXT:
+												if (file.getSize()
+														> Constants.maximumFileViewerSize) {
+													break;
+												}
 
-											binding.photoView.setVisibility(View.VISIBLE);
-											binding.photoView.setImageBitmap(image);
-										});
+												processable = true;
+												String text = responseBody.string();
+
+												runOnUiThread(
+														() -> {
+															binding.photoView.setVisibility(
+																	View.GONE);
+
+															binding.contents.setContent(
+																	text, fileExtension);
+
+															if (renderMd) {
+																Markdown.render(
+																		ctx,
+																		EmojiParser.parseToUnicode(
+																				text),
+																		binding.markdown,
+																		repository);
+
+																binding.contents.setVisibility(
+																		View.GONE);
+																binding.markdownFrame.setVisibility(
+																		View.VISIBLE);
+															} else {
+																binding.markdownFrame.setVisibility(
+																		View.GONE);
+																binding.contents.setVisibility(
+																		View.VISIBLE);
+															}
+														});
+												break;
+										}
+
+										if (!processable) { // While the file could still be
+											// non-binary,
+											// it's better we don't show it (to prevent any crashes
+											// and/or unwanted behavior) and let the user download
+											// it instead.
+											responseBody.close();
+
+											runOnUiThread(
+													() -> {
+														binding.photoView.setVisibility(View.GONE);
+														binding.contents.setVisibility(View.GONE);
+
+														binding.markdownFrame.setVisibility(
+																View.VISIBLE);
+														binding.markdown.setVisibility(View.GONE);
+														binding.markdownTv.setVisibility(
+																View.VISIBLE);
+														binding.markdownTv.setText(
+																getString(
+																		R.string
+																				.excludeFilesInFileViewer));
+														binding.markdownTv.setGravity(
+																Gravity.CENTER);
+														binding.markdownTv.setTypeface(
+																null, Typeface.BOLD);
+													});
+										}
+									} else {
+
+										runOnUiThread(
+												() -> {
+													binding.markdownTv.setText("");
+													binding.progressBar.setVisibility(View.GONE);
+												});
+									}
+								} else {
+
+									switch (response.code()) {
+										case 401:
+											runOnUiThread(
+													() ->
+															AlertDialogs
+																	.authorizationTokenRevokedDialog(
+																			ctx));
+											break;
+
+										case 403:
+											runOnUiThread(
+													() ->
+															Toasty.error(
+																	ctx,
+																	ctx.getString(
+																			R.string
+																					.authorizeError)));
+											break;
+
+										case 404:
+											runOnUiThread(
+													() ->
+															Toasty.warning(
+																	ctx,
+																	ctx.getString(
+																			R.string.apiNotFound)));
+											break;
+
+										default:
+											runOnUiThread(
+													() ->
+															Toasty.error(
+																	ctx,
+																	getString(
+																			R.string
+																					.genericError)));
 									}
 								}
-								break;
-
-							case UNKNOWN:
-							case TEXT:
-
-								if(file.getSize() > Constants.maximumFileViewerSize) {
-									break;
-								}
-
-								processable = true;
-								String text = responseBody.string();
-
-								runOnUiThread(() -> {
-									binding.photoView.setVisibility(View.GONE);
-
-									binding.contents.setContent(text, fileExtension);
-
-									if(renderMd) {
-										Markdown.render(ctx, EmojiParser.parseToUnicode(text), binding.markdown, repository);
-
-										binding.contents.setVisibility(View.GONE);
-										binding.markdownFrame.setVisibility(View.VISIBLE);
-									}
-									else {
-										binding.markdownFrame.setVisibility(View.GONE);
-										binding.contents.setVisibility(View.VISIBLE);
-									}
-								});
-								break;
-
-						}
-
-						if(!processable) { // While the file could still be non-binary,
-							// it's better we don't show it (to prevent any crashes and/or unwanted behavior) and let the user download it instead.
-							responseBody.close();
-
-							runOnUiThread(() -> {
-								binding.photoView.setVisibility(View.GONE);
-								binding.contents.setVisibility(View.GONE);
-
-								binding.markdownFrame.setVisibility(View.VISIBLE);
-								binding.markdown.setVisibility(View.GONE);
-								binding.markdownTv.setVisibility(View.VISIBLE);
-								binding.markdownTv.setText(getString(R.string.excludeFilesInFileViewer));
-								binding.markdownTv.setGravity(Gravity.CENTER);
-								binding.markdownTv.setTypeface(null, Typeface.BOLD);
-							});
-						}
-					}
-					else {
-
-						runOnUiThread(() -> {
-							binding.markdownTv.setText("");
-							binding.progressBar.setVisibility(View.GONE);
+							} catch (IOException ignored) {
+							}
 						});
-					}
-				}
-				else {
-
-					switch(response.code()) {
-
-						case 401:
-							runOnUiThread(() -> AlertDialogs.authorizationTokenRevokedDialog(ctx));
-							break;
-
-						case 403:
-							runOnUiThread(() -> Toasty.error(ctx, ctx.getString(R.string.authorizeError)));
-							break;
-
-						case 404:
-							runOnUiThread(() -> Toasty.warning(ctx, ctx.getString(R.string.apiNotFound)));
-							break;
-
-						default:
-							runOnUiThread(() -> Toasty.error(ctx, getString(R.string.genericError)));
-
-					}
-				}
-			}
-			catch(IOException ignored) {
-			}
-
-		});
 
 		thread.start();
-
 	}
 
 	@Override
@@ -282,7 +397,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
 		inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
 		inflater.inflate(R.menu.markdown_switcher, menu);
 
-		if(!FilenameUtils.getExtension(file.getName()).equalsIgnoreCase("md")) {
+		if (!FilenameUtils.getExtension(file.getName()).equalsIgnoreCase("md")) {
 
 			menu.getItem(0).setVisible(false);
 		}
@@ -295,13 +410,12 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
 
 		int id = item.getItemId();
 
-		if(id == android.R.id.home) {
+		if (id == android.R.id.home) {
 
 			finish();
 			return true;
 
-		}
-		else if(id == R.id.genericMenu) {
+		} else if (id == R.id.genericMenu) {
 
 			BottomSheetFileViewerFragment bottomSheet = new BottomSheetFileViewerFragment();
 			Bundle opts = repository.getBundle();
@@ -310,20 +424,22 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
 			bottomSheet.show(getSupportFragmentManager(), "fileViewerBottomSheet");
 			return true;
 
-		}
-		else if(id == R.id.markdown) {
+		} else if (id == R.id.markdown) {
 
-			if(!renderMd) {
-				if(binding.markdown.getAdapter() == null) {
-					Markdown.render(ctx, EmojiParser.parseToUnicode(binding.contents.getContent()), binding.markdown, repository);
+			if (!renderMd) {
+				if (binding.markdown.getAdapter() == null) {
+					Markdown.render(
+							ctx,
+							EmojiParser.parseToUnicode(binding.contents.getContent()),
+							binding.markdown,
+							repository);
 				}
 
 				binding.contents.setVisibility(View.GONE);
 				binding.markdownFrame.setVisibility(View.VISIBLE);
 
 				renderMd = true;
-			}
-			else {
+			} else {
 				binding.markdownFrame.setVisibility(View.GONE);
 				binding.contents.setVisibility(View.VISIBLE);
 
@@ -332,8 +448,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
 
 			return true;
 
-		}
-		else {
+		} else {
 			return super.onOptionsItemSelected(item);
 		}
 	}
@@ -341,11 +456,11 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
 	@Override
 	public void onButtonClicked(String text) {
 
-		if("downloadFile".equals(text)) {
+		if ("downloadFile".equals(text)) {
 			requestFileDownload();
 		}
 
-		if("deleteFile".equals(text)) {
+		if ("deleteFile".equals(text)) {
 			Intent intent = repository.getIntent(ctx, CreateFileActivity.class);
 			intent.putExtra("fileAction", CreateFileActivity.FILE_ACTION_DELETE);
 			intent.putExtra("filePath", file.getPath());
@@ -354,9 +469,9 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
 			editFileLauncher.launch(intent);
 		}
 
-		if("editFile".equals(text)) {
+		if ("editFile".equals(text)) {
 
-			if(binding.contents.getContent() != null && !binding.contents.getContent().isEmpty()) {
+			if (binding.contents.getContent() != null && !binding.contents.getContent().isEmpty()) {
 
 				Intent intent = repository.getIntent(ctx, CreateFileActivity.class);
 
@@ -367,21 +482,21 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
 
 				editFileLauncher.launch(intent);
 
-			}
-			else {
+			} else {
 				Toasty.error(ctx, getString(R.string.fileTypeCannotBeEdited));
 			}
 		}
 
-		if("copyUrl".equals(text)) {
-			AppUtil.copyToClipboard(this, file.getHtmlUrl(), ctx.getString(R.string.copyIssueUrlToastMsg));
+		if ("copyUrl".equals(text)) {
+			AppUtil.copyToClipboard(
+					this, file.getHtmlUrl(), ctx.getString(R.string.copyIssueUrlToastMsg));
 		}
 
-		if("share".equals(text)) {
+		if ("share".equals(text)) {
 			AppUtil.sharingIntent(this, file.getHtmlUrl());
 		}
 
-		if("open".equals(text)) {
+		if ("open".equals(text)) {
 			AppUtil.openUrlInBrowser(this, file.getHtmlUrl());
 		}
 	}
@@ -395,7 +510,6 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
 		intent.setType("*/*");
 
 		activityResultLauncher.launch(intent);
-
 	}
 
 	@Override
@@ -403,5 +517,4 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
 		super.onResume();
 		repository.checkAccountSwitch(this);
 	}
-
 }
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 6406b878..3c65beb7 100644
--- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
@@ -28,6 +28,14 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.vdurmont.emoji.EmojiParser;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.EditIssueOption;
 import org.gitnex.tea4j.v2.models.Issue;
 import org.gitnex.tea4j.v2.models.IssueLabelsOption;
@@ -65,14 +73,6 @@ import org.mian.gitnex.helpers.contexts.IssueContext;
 import org.mian.gitnex.structs.BottomSheetListener;
 import org.mian.gitnex.viewmodels.IssueCommentsViewModel;
 import org.mian.gitnex.views.ReactionList;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -80,8 +80,10 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
-public class IssueDetailActivity extends BaseActivity implements LabelsListAdapter.LabelsListAdapterListener, AssigneesListAdapter.AssigneesListAdapterListener, BottomSheetListener {
+public class IssueDetailActivity extends BaseActivity
+		implements LabelsListAdapter.LabelsListAdapterListener,
+				AssigneesListAdapter.AssigneesListAdapterListener,
+				BottomSheetListener {
 
 	public static boolean singleIssueUpdate = false;
 	public static boolean commentPosted = false;
@@ -103,26 +105,29 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 	private ActivityIssueDetailBinding viewBinding;
 	private MaterialAlertDialogBuilder materialAlertDialogBuilder;
 	private IssueCommentsViewModel issueCommentsModel;
-	private Runnable showMenu = () -> {
-	};
+	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(() -> {
-
-					viewBinding.frameAssignees.removeAllViews();
-					viewBinding.frameLabels.removeAllViews();
-					issue.setIssue(null);
-					getSingleIssue(repoOwner, repoName, issueIndex);
-
-				}, 500);
-			}
-		}
-	});
+	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);
+												},
+												500);
+							}
+						}
+					});
 	private int page = 1;
 
 	@Override
@@ -142,7 +147,8 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 		Objects.requireNonNull(getSupportActionBar()).setTitle(repoName);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-		materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
 		issueCommentsModel = new ViewModelProvider(this).get(IssueCommentsViewModel.class);
 
@@ -150,25 +156,34 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 		viewBinding.recyclerView.setNestedScrollingEnabled(false);
 		viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
 
-		viewBinding.addNewComment.setOnClickListener(v -> {
+		viewBinding.addNewComment.setOnClickListener(
+				v -> {
+					BottomSheetReplyFragment bottomSheetReplyFragment =
+							BottomSheetReplyFragment.newInstance(new Bundle(), issue);
+					bottomSheetReplyFragment.setOnInteractedListener(this::onResume);
+					bottomSheetReplyFragment.show(getSupportFragmentManager(), "replyBottomSheet");
+				});
 
-			BottomSheetReplyFragment bottomSheetReplyFragment = BottomSheetReplyFragment.newInstance(new Bundle(), issue);
-			bottomSheetReplyFragment.setOnInteractedListener(this::onResume);
-			bottomSheetReplyFragment.show(getSupportFragmentManager(), "replyBottomSheet");
-		});
-
-		labelsAdapter = new LabelsListAdapter(labelsList, IssueDetailActivity.this, currentLabelsIds);
-		assigneesAdapter = new AssigneesListAdapter(ctx, assigneesList, IssueDetailActivity.this, currentAssignees);
+		labelsAdapter =
+				new LabelsListAdapter(labelsList, IssueDetailActivity.this, currentLabelsIds);
+		assigneesAdapter =
+				new AssigneesListAdapter(
+						ctx, assigneesList, IssueDetailActivity.this, currentAssignees);
 		LabelsActions.getCurrentIssueLabels(ctx, repoOwner, repoName, issueIndex, currentLabelsIds);
-		AssigneesActions.getCurrentIssueAssignees(ctx, repoOwner, repoName, issueIndex, currentAssignees);
+		AssigneesActions.getCurrentIssueAssignees(
+				ctx, repoOwner, repoName, issueIndex, currentAssignees);
 
-		viewBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			page = 1;
-			viewBinding.pullToRefresh.setRefreshing(false);
-			issueCommentsModel.loadIssueComments(repoOwner, repoName, issueIndex, ctx, null);
-
-		}, 50));
+		viewBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											page = 1;
+											viewBinding.pullToRefresh.setRefreshing(false);
+											issueCommentsModel.loadIssueComments(
+													repoOwner, repoName, issueIndex, ctx, null);
+										},
+										50));
 
 		Typeface myTypeface = AppUtil.getTypeface(this);
 		viewBinding.toolbarTitle.setTypeface(myTypeface);
@@ -177,7 +192,8 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 		getSingleIssue(repoOwner, repoName, issueIndex);
 		fetchDataAsync(repoOwner, repoName, issueIndex);
 
-		if(getIntent().getStringExtra("openPrDiff") != null && getIntent().getStringExtra("openPrDiff").equals("true")) {
+		if (getIntent().getStringExtra("openPrDiff") != null
+				&& getIntent().getStringExtra("openPrDiff").equals("true")) {
 			startActivity(issue.getIntent(ctx, DiffActivity.class));
 		}
 	}
@@ -185,8 +201,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 	@Override
 	public void onButtonClicked(String text) {
 
-		switch(text) {
-
+		switch (text) {
 			case "onResume":
 				onResume();
 				break;
@@ -202,8 +217,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 	}
 
 	@Override
-	public void labelsInterface(List<String> data) {
-	}
+	public void labelsInterface(List<String> data) {}
 
 	@Override
 	public void labelsIdsInterface(List<Integer> data) {
@@ -221,156 +235,195 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 
 		assigneesAdapter.updateList(currentAssignees);
 		viewBinding.progressBar.setVisibility(View.VISIBLE);
-		CustomAssigneesSelectionDialogBinding assigneesBinding = CustomAssigneesSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
+		CustomAssigneesSelectionDialogBinding assigneesBinding =
+				CustomAssigneesSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
 		View view = assigneesBinding.getRoot();
 		materialAlertDialogBuilder.setView(view);
 
-		materialAlertDialogBuilder.setPositiveButton(R.string.saveButton, (dialog, whichButton) -> {
+		materialAlertDialogBuilder.setPositiveButton(
+				R.string.saveButton,
+				(dialog, whichButton) -> {
+					currentAssignees = new ArrayList<>(new LinkedHashSet<>(currentAssignees));
+					assigneesListData = new ArrayList<>(new LinkedHashSet<>(assigneesListData));
+					Collections.sort(assigneesListData);
+					Collections.sort(currentAssignees);
 
-			currentAssignees = new ArrayList<>(new LinkedHashSet<>(currentAssignees));
-			assigneesListData = new ArrayList<>(new LinkedHashSet<>(assigneesListData));
-			Collections.sort(assigneesListData);
-			Collections.sort(currentAssignees);
+					if (!assigneesListData.equals(currentAssignees)) {
 
-			if(!assigneesListData.equals(currentAssignees)) {
+						updateIssueAssignees();
+					}
+				});
 
-				updateIssueAssignees();
-			}
-		});
-
-		AssigneesActions.getRepositoryAssignees(ctx, repoOwner, repoName, assigneesList, materialAlertDialogBuilder, assigneesAdapter, assigneesBinding, viewBinding.progressBar);
+		AssigneesActions.getRepositoryAssignees(
+				ctx,
+				repoOwner,
+				repoName,
+				assigneesList,
+				materialAlertDialogBuilder,
+				assigneesAdapter,
+				assigneesBinding,
+				viewBinding.progressBar);
 	}
 
 	public void showLabels() {
 
 		labelsAdapter.updateList(currentLabelsIds);
 		viewBinding.progressBar.setVisibility(View.VISIBLE);
-		CustomLabelsSelectionDialogBinding labelsBinding = CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
+		CustomLabelsSelectionDialogBinding labelsBinding =
+				CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
 		View view = labelsBinding.getRoot();
 		materialAlertDialogBuilder.setView(view);
 
-		materialAlertDialogBuilder.setPositiveButton(R.string.saveButton, (dialog, whichButton) -> {
+		materialAlertDialogBuilder.setPositiveButton(
+				R.string.saveButton,
+				(dialog, whichButton) -> {
+					currentLabelsIds = new ArrayList<>(new LinkedHashSet<>(currentLabelsIds));
+					labelsIds = new ArrayList<>(new LinkedHashSet<>(labelsIds));
+					Collections.sort(labelsIds);
+					Collections.sort(currentLabelsIds);
 
-			currentLabelsIds = new ArrayList<>(new LinkedHashSet<>(currentLabelsIds));
-			labelsIds = new ArrayList<>(new LinkedHashSet<>(labelsIds));
-			Collections.sort(labelsIds);
-			Collections.sort(currentLabelsIds);
+					if (!labelsIds.equals(currentLabelsIds)) {
 
-			if(!labelsIds.equals(currentLabelsIds)) {
+						updateIssueLabels();
+					}
+				});
 
-				updateIssueLabels();
-			}
-		});
-
-		LabelsActions.getRepositoryLabels(ctx, repoOwner, repoName, labelsList, materialAlertDialogBuilder, labelsAdapter, labelsBinding, viewBinding.progressBar);
+		LabelsActions.getRepositoryLabels(
+				ctx,
+				repoOwner,
+				repoName,
+				labelsList,
+				materialAlertDialogBuilder,
+				labelsAdapter,
+				labelsBinding,
+				viewBinding.progressBar);
 	}
 
 	private void updateIssueAssignees() {
 
 		EditIssueOption updateAssigneeJson = new EditIssueOption().assignees(assigneesListData);
 
-		Call<Issue> call3 = RetrofitClient.getApiInterface(ctx).issueEditIssue(repoOwner, repoName, (long) issueIndex, updateAssigneeJson);
+		Call<Issue> call3 =
+				RetrofitClient.getApiInterface(ctx)
+						.issueEditIssue(repoOwner, repoName, (long) issueIndex, updateAssigneeJson);
 
-		call3.enqueue(new Callback<>() {
+		call3.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Issue> call, @NonNull retrofit2.Response<Issue> response2) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Issue> call,
+							@NonNull retrofit2.Response<Issue> response2) {
 
-				if(response2.code() == 201) {
+						if (response2.code() == 201) {
 
-					Toasty.success(ctx, ctx.getString(R.string.assigneesUpdated));
+							Toasty.success(ctx, ctx.getString(R.string.assigneesUpdated));
 
-					viewBinding.frameAssignees.removeAllViews();
-					viewBinding.frameLabels.removeAllViews();
-					issue.setIssue(response2.body());
-					getSingleIssue(repoOwner, repoName, issueIndex);
-					currentAssignees.clear();
-					new Handler(Looper.getMainLooper()).postDelayed(() -> AssigneesActions.getCurrentIssueAssignees(ctx, repoOwner, repoName, issueIndex, currentAssignees), 1000);
-				}
-				else if(response2.code() == 401) {
+							viewBinding.frameAssignees.removeAllViews();
+							viewBinding.frameLabels.removeAllViews();
+							issue.setIssue(response2.body());
+							getSingleIssue(repoOwner, repoName, issueIndex);
+							currentAssignees.clear();
+							new Handler(Looper.getMainLooper())
+									.postDelayed(
+											() ->
+													AssigneesActions.getCurrentIssueAssignees(
+															ctx,
+															repoOwner,
+															repoName,
+															issueIndex,
+															currentAssignees),
+											1000);
+						} else if (response2.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else if(response2.code() == 403) {
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else if (response2.code() == 403) {
 
-					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-				}
-				else if(response2.code() == 404) {
+							Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+						} else if (response2.code() == 404) {
 
-					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-				}
-				else {
+							Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+						} else {
 
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
+					}
 
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Issue> call, @NonNull Throwable t) {
-				Log.e("onFailure", t.toString());
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<Issue> call, @NonNull Throwable t) {
+						Log.e("onFailure", t.toString());
+					}
+				});
 	}
 
 	private void updateIssueLabels() {
 
 		ArrayList<Long> labelIds = new ArrayList<>();
-		for(Integer i : labelsIds) {
+		for (Integer i : labelsIds) {
 			labelIds.add((long) i);
 		}
 
 		IssueLabelsOption patchIssueLabels = new IssueLabelsOption();
 		patchIssueLabels.setLabels(labelIds);
 
-		Call<List<Label>> call = RetrofitClient.getApiInterface(ctx).issueReplaceLabels(repoOwner, repoName, (long) issueIndex, patchIssueLabels);
+		Call<List<Label>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.issueReplaceLabels(
+								repoOwner, repoName, (long) issueIndex, patchIssueLabels);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Label>> call, @NonNull retrofit2.Response<List<Label>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Label>> call,
+							@NonNull retrofit2.Response<List<Label>> response) {
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					Toasty.success(ctx, ctx.getString(R.string.labelsUpdated));
+							Toasty.success(ctx, ctx.getString(R.string.labelsUpdated));
 
-					viewBinding.frameAssignees.removeAllViews();
-					viewBinding.frameLabels.removeAllViews();
-					issue.setIssue(null);
-					getSingleIssue(repoOwner, repoName, issueIndex);
-					currentLabelsIds.clear();
-					new Handler(Looper.getMainLooper()).postDelayed(() -> LabelsActions.getCurrentIssueLabels(ctx, repoOwner, repoName, issueIndex, currentLabelsIds), 1000);
-					IssuesFragment.resumeIssues = true;
-				}
-				else if(response.code() == 401) {
+							viewBinding.frameAssignees.removeAllViews();
+							viewBinding.frameLabels.removeAllViews();
+							issue.setIssue(null);
+							getSingleIssue(repoOwner, repoName, issueIndex);
+							currentLabelsIds.clear();
+							new Handler(Looper.getMainLooper())
+									.postDelayed(
+											() ->
+													LabelsActions.getCurrentIssueLabels(
+															ctx,
+															repoOwner,
+															repoName,
+															issueIndex,
+															currentLabelsIds),
+											1000);
+							IssuesFragment.resumeIssues = true;
+						} else if (response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else if(response.code() == 403) {
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else if (response.code() == 403) {
 
-					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
+							Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
 
-					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-				}
-				else {
+							Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+						} else {
 
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
+					}
 
-			}
+					@Override
+					public void onFailure(@NonNull Call<List<Label>> call, @NonNull Throwable t) {
 
-			@Override
-			public void onFailure(@NonNull Call<List<Label>> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-			}
-		});
+						Log.e("onFailure", t.toString());
+					}
+				});
 	}
 
 	private void updateMenuState() {
-		if(loadingFinishedIssue && loadingFinishedPr && loadingFinishedRepo) {
+		if (loadingFinishedIssue && loadingFinishedPr && loadingFinishedRepo) {
 			showMenu.run();
 		}
 	}
@@ -379,16 +432,16 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 	public boolean onCreateOptionsMenu(@NonNull Menu menu) {
 
 		MenuInflater inflater = getMenuInflater();
-		showMenu = () -> {
-			inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
-			if(issue.getIssueType() != null) {
-				if(issue.getIssueType().equalsIgnoreCase("pull")) {
-					inflater.inflate(R.menu.pr_info_menu, menu);
-				}
-			}
-			showMenu = () -> {
-			}; // reset Runnable
-		};
+		showMenu =
+				() -> {
+					inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
+					if (issue.getIssueType() != null) {
+						if (issue.getIssueType().equalsIgnoreCase("pull")) {
+							inflater.inflate(R.menu.pr_info_menu, menu);
+						}
+					}
+					showMenu = () -> {}; // reset Runnable
+				};
 		updateMenuState();
 		return true;
 	}
@@ -398,43 +451,48 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 
 		int id = item.getItemId();
 
-		if(id == android.R.id.home) {
+		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);
 			}
 			finish();
 			return true;
-		}
-		else if(id == R.id.genericMenu) {
+		} else if (id == R.id.genericMenu) {
 
-			if(issue.hasIssue()) {
-				BottomSheetSingleIssueFragment bottomSheet = new BottomSheetSingleIssueFragment(issue, issueCreator);
+			if (issue.hasIssue()) {
+				BottomSheetSingleIssueFragment bottomSheet =
+						new BottomSheetSingleIssueFragment(issue, issueCreator);
 				bottomSheet.show(getSupportFragmentManager(), "singleIssueBottomSheet");
 			}
 			return true;
-		}
-		else if(id == R.id.prInfo) {
+		} else if (id == R.id.prInfo) {
 
-			if(issue.getPullRequest() != null) {
+			if (issue.getPullRequest() != null) {
 
-				MaterialAlertDialogBuilder materialAlertDialogBuilderPrInfo = new MaterialAlertDialogBuilder(ctx);
-				CustomPrInfoDialogBinding customPrInfoDialogBinding = CustomPrInfoDialogBinding.inflate(LayoutInflater.from(ctx));
+				MaterialAlertDialogBuilder materialAlertDialogBuilderPrInfo =
+						new MaterialAlertDialogBuilder(ctx);
+				CustomPrInfoDialogBinding customPrInfoDialogBinding =
+						CustomPrInfoDialogBinding.inflate(LayoutInflater.from(ctx));
 				View view = customPrInfoDialogBinding.getRoot();
 				materialAlertDialogBuilderPrInfo.setView(view);
 
-				customPrInfoDialogBinding.baseBranch.setText(issue.getPullRequest().getBase().getRef());
-				customPrInfoDialogBinding.headBranch.setText(issue.getPullRequest().getHead().getRef());
+				customPrInfoDialogBinding.baseBranch.setText(
+						issue.getPullRequest().getBase().getRef());
+				customPrInfoDialogBinding.headBranch.setText(
+						issue.getPullRequest().getHead().getRef());
 
-				materialAlertDialogBuilderPrInfo.setTitle(getResources().getString(R.string.prMergeInfo));
+				materialAlertDialogBuilderPrInfo.setTitle(
+						getResources().getString(R.string.prMergeInfo));
 				materialAlertDialogBuilderPrInfo.setNeutralButton(getString(R.string.close), null);
 				materialAlertDialogBuilderPrInfo.create().show();
 			}
 			return true;
-		}
-		else {
+		} else {
 
 			return super.onOptionsItemSelected(item);
 		}
@@ -446,152 +504,177 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 		super.onResume();
 		issue.getRepository().checkAccountSwitch(this);
 
-		if(commentPosted) {
+		if (commentPosted) {
 
-			viewBinding.scrollViewComments.post(() -> {
+			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;
-			});
+						commentPosted = false;
+					});
 		}
 
-		if(commentEdited) {
+		if (commentEdited) {
 
-			viewBinding.scrollViewComments.post(() -> {
-
-				issueCommentsModel.loadIssueComments(repoOwner, repoName, issueIndex, ctx, null);
-				commentEdited = false;
-			});
+			viewBinding.scrollViewComments.post(
+					() -> {
+						issueCommentsModel.loadIssueComments(
+								repoOwner, repoName, issueIndex, ctx, null);
+						commentEdited = false;
+					});
 		}
 
-		if(singleIssueUpdate) {
+		if (singleIssueUpdate) {
 
-			new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-				viewBinding.frameAssignees.removeAllViews();
-				viewBinding.frameLabels.removeAllViews();
-				issue.setIssue(null);
-				getSingleIssue(repoOwner, repoName, issueIndex);
-				singleIssueUpdate = false;
-
-			}, 500);
+			new Handler(Looper.getMainLooper())
+					.postDelayed(
+							() -> {
+								viewBinding.frameAssignees.removeAllViews();
+								viewBinding.frameLabels.removeAllViews();
+								issue.setIssue(null);
+								getSingleIssue(repoOwner, repoName, issueIndex);
+								singleIssueUpdate = false;
+							},
+							500);
 		}
 	}
 
 	private void fetchDataAsync(String owner, String repo, int index) {
 
-		issueCommentsModel.getIssueCommentList(owner, repo, index, ctx).observe(this, issueCommentsMain -> {
+		issueCommentsModel
+				.getIssueCommentList(owner, repo, index, ctx)
+				.observe(
+						this,
+						issueCommentsMain -> {
+							Bundle bundle = new Bundle();
+							bundle.putString("repoOwner", repoOwner);
+							bundle.putString("repoName", repoName);
+							bundle.putInt("issueNumber", issueIndex);
 
-			Bundle bundle = new Bundle();
-			bundle.putString("repoOwner", repoOwner);
-			bundle.putString("repoName", repoName);
-			bundle.putInt("issueNumber", issueIndex);
+							adapter =
+									new IssueCommentsAdapter(
+											ctx,
+											bundle,
+											issueCommentsMain,
+											getSupportFragmentManager(),
+											this::onResume,
+											issue);
+							adapter.setLoadMoreListener(
+									new IssueCommentsAdapter.OnLoadMoreListener() {
 
-			adapter = new IssueCommentsAdapter(ctx, bundle, issueCommentsMain, getSupportFragmentManager(), this::onResume, issue);
-			adapter.setLoadMoreListener(new IssueCommentsAdapter.OnLoadMoreListener() {
+										@Override
+										public void onLoadMore() {
 
-				@Override
-				public void onLoadMore() {
+											page += 1;
+											issueCommentsModel.loadMoreIssueComments(
+													owner, repo, index, ctx, page, adapter);
+											viewBinding.progressBar.setVisibility(View.VISIBLE);
+										}
 
-					page += 1;
-					issueCommentsModel.loadMoreIssueComments(owner, repo, index, ctx, page, adapter);
-					viewBinding.progressBar.setVisibility(View.VISIBLE);
-				}
+										@Override
+										public void onLoadFinished() {
 
-				@Override
-				public void onLoadFinished() {
+											viewBinding.progressBar.setVisibility(View.GONE);
+										}
+									});
 
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-			});
-
-			adapter.notifyDataChanged();
-			viewBinding.recyclerView.setAdapter(adapter);
-			viewBinding.progressBar.setVisibility(View.GONE);
-		});
+							adapter.notifyDataChanged();
+							viewBinding.recyclerView.setAdapter(adapter);
+							viewBinding.progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	private void getSingleIssue(String repoOwner, String repoName, int issueIndex) {
 
-		if(issue.hasIssue()) {
+		if (issue.hasIssue()) {
 			viewBinding.progressBar.setVisibility(View.GONE);
 			getSubscribed();
 			initWithIssue();
 			return;
 		}
 
-		Call<Issue> call = RetrofitClient.getApiInterface(ctx).issueGetIssue(repoOwner, repoName, (long) issueIndex);
+		Call<Issue> call =
+				RetrofitClient.getApiInterface(ctx)
+						.issueGetIssue(repoOwner, repoName, (long) issueIndex);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Issue> call, @NonNull Response<Issue> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Issue> call, @NonNull Response<Issue> response) {
 
-				viewBinding.progressBar.setVisibility(View.GONE);
+						viewBinding.progressBar.setVisibility(View.GONE);
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					Issue singleIssue = response.body();
-					assert singleIssue != null;
+							Issue singleIssue = response.body();
+							assert singleIssue != null;
 
-					issue.setIssue(singleIssue);
-					initWithIssue();
-				}
-				else if(response.code() == 401) {
+							issue.setIssue(singleIssue);
+							initWithIssue();
+						} else if (response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
 
-				}
-				else if(response.code() == 404) {
+						} else if (response.code() == 404) {
 
-					Toasty.warning(ctx, getResources().getString(R.string.noDataFound));
-					finish();
-				}
-			}
+							Toasty.warning(ctx, getResources().getString(R.string.noDataFound));
+							finish();
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<Issue> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<Issue> call, @NonNull Throwable t) {
 
-				viewBinding.progressBar.setVisibility(View.GONE);
-				Log.e("onFailure", t.toString());
-			}
-
-		});
+						viewBinding.progressBar.setVisibility(View.GONE);
+						Log.e("onFailure", t.toString());
+					}
+				});
 
 		getSubscribed();
-
 	}
 
 	private void getSubscribed() {
-		RetrofitClient.getApiInterface(ctx).issueCheckSubscription(repoOwner, repoName, (long) issueIndex).enqueue(new Callback<>() {
+		RetrofitClient.getApiInterface(ctx)
+				.issueCheckSubscription(repoOwner, repoName, (long) issueIndex)
+				.enqueue(
+						new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<WatchInfo> call, @NonNull Response<WatchInfo> response) {
+							@Override
+							public void onResponse(
+									@NonNull Call<WatchInfo> call,
+									@NonNull Response<WatchInfo> response) {
 
-				if(response.isSuccessful()) {
-					assert response.body() != null;
-					issue.setSubscribed(response.body().isSubscribed());
-				}
-				else {
-					issue.setSubscribed(false);
-				}
-			}
+								if (response.isSuccessful()) {
+									assert response.body() != null;
+									issue.setSubscribed(response.body().isSubscribed());
+								} else {
+									issue.setSubscribed(false);
+								}
+							}
 
-			@Override
-			public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
+							@Override
+							public void onFailure(
+									@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
 
-				issue.setSubscribed(false);
-			}
-		});
+								issue.setSubscribed(false);
+							}
+						});
 	}
 
 	private void initWithIssue() {
 
-		if(!issue.getRepository().hasRepository()) {
+		if (!issue.getRepository().hasRepository()) {
 			getRepoInfo();
-		}
-		else {
+		} else {
 			loadingFinishedRepo = true;
 		}
 		loadingFinishedIssue = true;
@@ -599,60 +682,95 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 
 		viewBinding.issuePrState.setVisibility(View.VISIBLE);
 
-		if(issue.getIssue().getPullRequest() != null) {
+		if (issue.getIssue().getPullRequest() != null) {
 			getPullRequest();
-			if(issue.getIssue().getPullRequest().isMerged()) { // merged
+			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, null)));
-			}
-			else if(!issue.getIssue().getPullRequest().isMerged() && issue.getIssue().getState().equals("closed")) { // closed
+				ImageViewCompat.setImageTintList(
+						viewBinding.issuePrState,
+						ColorStateList.valueOf(
+								ctx.getResources().getColor(R.color.iconPrMergedColor, null)));
+			} 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, null)));
-			}
-			else { // open
+				ImageViewCompat.setImageTintList(
+						viewBinding.issuePrState,
+						ColorStateList.valueOf(
+								ctx.getResources().getColor(R.color.iconIssuePrClosedColor, null)));
+			} else { // open
 
 				viewBinding.issuePrState.setImageResource(R.drawable.ic_pull_request);
-				if(tinyDB.getInt("themeId") == 3) {
-					ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.retroThemeColorPrimary, null)));
-				}
-				else if(tinyDB.getInt("themeId") == 4) {
-					if(TimeHelper.timeBetweenHours(tinyDB.getInt("darkThemeTimeHour", 18), tinyDB.getInt("lightThemeTimeHour", 6), tinyDB.getInt("darkThemeTimeMinute", 0), tinyDB.getInt("lightThemeTimeMinute", 0))) {
-						ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.darkGreen, null)));
+				if (tinyDB.getInt("themeId") == 3) {
+					ImageViewCompat.setImageTintList(
+							viewBinding.issuePrState,
+							ColorStateList.valueOf(
+									ctx.getResources()
+											.getColor(R.color.retroThemeColorPrimary, null)));
+				} else if (tinyDB.getInt("themeId") == 4) {
+					if (TimeHelper.timeBetweenHours(
+							tinyDB.getInt("darkThemeTimeHour", 18),
+							tinyDB.getInt("lightThemeTimeHour", 6),
+							tinyDB.getInt("darkThemeTimeMinute", 0),
+							tinyDB.getInt("lightThemeTimeMinute", 0))) {
+						ImageViewCompat.setImageTintList(
+								viewBinding.issuePrState,
+								ColorStateList.valueOf(
+										ctx.getResources().getColor(R.color.darkGreen, null)));
+					} else {
+						ImageViewCompat.setImageTintList(
+								viewBinding.issuePrState,
+								ColorStateList.valueOf(
+										ctx.getResources()
+												.getColor(R.color.retroThemeColorPrimary, null)));
 					}
-					else {
-						ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.retroThemeColorPrimary, null)));
-					}
-				}
-				else {
-					ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.darkGreen, null)));
+				} else {
+					ImageViewCompat.setImageTintList(
+							viewBinding.issuePrState,
+							ColorStateList.valueOf(
+									ctx.getResources().getColor(R.color.darkGreen, null)));
 				}
 			}
-		}
-		else if(issue.getIssue().getState().equals("closed")) { // issue closed
+		} else if (issue.getIssue().getState().equals("closed")) { // issue closed
 			loadingFinishedPr = true;
 			updateMenuState();
 			viewBinding.issuePrState.setImageResource(R.drawable.ic_issue);
-			ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.iconIssuePrClosedColor, null)));
-		}
-		else {
+			ImageViewCompat.setImageTintList(
+					viewBinding.issuePrState,
+					ColorStateList.valueOf(
+							ctx.getResources().getColor(R.color.iconIssuePrClosedColor, null)));
+		} else {
 			loadingFinishedPr = true;
 			updateMenuState();
 			viewBinding.issuePrState.setImageResource(R.drawable.ic_issue);
-			if(tinyDB.getInt("themeId") == 3) {
-				ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.retroThemeColorPrimary, null)));
-			}
-			else if(tinyDB.getInt("themeId") == 4) {
-				if(TimeHelper.timeBetweenHours(tinyDB.getInt("darkThemeTimeHour", 18), tinyDB.getInt("lightThemeTimeHour", 6), tinyDB.getInt("darkThemeTimeMinute", 0), tinyDB.getInt("lightThemeTimeMinute", 0))) {
-					ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.darkGreen, null)));
+			if (tinyDB.getInt("themeId") == 3) {
+				ImageViewCompat.setImageTintList(
+						viewBinding.issuePrState,
+						ColorStateList.valueOf(
+								ctx.getResources().getColor(R.color.retroThemeColorPrimary, null)));
+			} else if (tinyDB.getInt("themeId") == 4) {
+				if (TimeHelper.timeBetweenHours(
+						tinyDB.getInt("darkThemeTimeHour", 18),
+						tinyDB.getInt("lightThemeTimeHour", 6),
+						tinyDB.getInt("darkThemeTimeMinute", 0),
+						tinyDB.getInt("lightThemeTimeMinute", 0))) {
+					ImageViewCompat.setImageTintList(
+							viewBinding.issuePrState,
+							ColorStateList.valueOf(
+									ctx.getResources().getColor(R.color.darkGreen, null)));
+				} else {
+					ImageViewCompat.setImageTintList(
+							viewBinding.issuePrState,
+							ColorStateList.valueOf(
+									ctx.getResources()
+											.getColor(R.color.retroThemeColorPrimary, null)));
 				}
-				else {
-					ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.retroThemeColorPrimary, null)));
-				}
-			}
-			else {
-				ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.darkGreen, null)));
+			} else {
+				ImageViewCompat.setImageTintList(
+						viewBinding.issuePrState,
+						ColorStateList.valueOf(
+								ctx.getResources().getColor(R.color.darkGreen, null)));
 			}
 		}
 
@@ -661,83 +779,131 @@ 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();
 
-		if(!AppUtil.checkGhostUsers(issue.getIssue().getUser().getLogin())) {
+		if (!AppUtil.checkGhostUsers(issue.getIssue().getUser().getLogin())) {
 
-			viewBinding.assigneeAvatar.setOnClickListener(loginId -> {
-				Intent intent = new Intent(ctx, ProfileActivity.class);
-				intent.putExtra("username", issue.getIssue().getUser().getLogin());
-				ctx.startActivity(intent);
-			});
+			viewBinding.assigneeAvatar.setOnClickListener(
+					loginId -> {
+						Intent intent = new Intent(ctx, ProfileActivity.class);
+						intent.putExtra("username", issue.getIssue().getUser().getLogin());
+						ctx.startActivity(intent);
+					});
 
-			viewBinding.assigneeAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(ctx, issue.getIssue().getUser().getLogin(), ctx.getString(R.string.copyLoginIdToClipBoard, issue.getIssue().getUser().getLogin()));
-				return true;
-			});
+			viewBinding.assigneeAvatar.setOnLongClickListener(
+					loginId -> {
+						AppUtil.copyToClipboard(
+								ctx,
+								issue.getIssue().getUser().getLogin(),
+								ctx.getString(
+										R.string.copyLoginIdToClipBoard,
+										issue.getIssue().getUser().getLogin()));
+						return true;
+					});
 		}
 
 		viewBinding.author.setText(issue.getIssue().getUser().getLogin());
 
-		if(!cleanIssueDescription.equals("")) {
+		if (!cleanIssueDescription.equals("")) {
 			viewBinding.issueDescription.setVisibility(View.VISIBLE);
-			Markdown.render(ctx, EmojiParser.parseToUnicode(cleanIssueDescription), viewBinding.issueDescription, issue.getRepository());
-		}
-		else {
+			Markdown.render(
+					ctx,
+					EmojiParser.parseToUnicode(cleanIssueDescription),
+					viewBinding.issueDescription,
+					issue.getRepository());
+		} else {
 			viewBinding.issueDescription.setVisibility(View.GONE);
 		}
 
 		LinearLayout.LayoutParams paramsAssignees = new LinearLayout.LayoutParams(64, 64);
 		paramsAssignees.setMargins(15, 0, 0, 0);
 
-		if(issue.getIssue().getAssignees() != null) {
+		if (issue.getIssue().getAssignees() != null) {
 
 			viewBinding.assigneesScrollView.setVisibility(View.VISIBLE);
 
-			for(int i = 0; i < issue.getIssue().getAssignees().size(); i++) {
+			for (int i = 0; i < issue.getIssue().getAssignees().size(); i++) {
 
 				ImageView assigneesView = new ImageView(ctx);
 
-				PicassoService.getInstance(ctx).get().load(issue.getIssue().getAssignees().get(i).getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(36, 0)).resize(72, 72)
-					.centerCrop().into(assigneesView);
+				PicassoService.getInstance(ctx)
+						.get()
+						.load(issue.getIssue().getAssignees().get(i).getAvatarUrl())
+						.placeholder(R.drawable.loader_animated)
+						.transform(new RoundedTransformation(36, 0))
+						.resize(72, 72)
+						.centerCrop()
+						.into(assigneesView);
 
 				viewBinding.frameAssignees.addView(assigneesView);
 				assigneesView.setLayoutParams(paramsAssignees);
 
 				int finalI = i;
 
-				if(!AppUtil.checkGhostUsers(issue.getIssue().getAssignees().get(finalI).getLogin())) {
+				if (!AppUtil.checkGhostUsers(
+						issue.getIssue().getAssignees().get(finalI).getLogin())) {
 
-					assigneesView.setOnClickListener(loginId -> {
-						Intent intent = new Intent(ctx, ProfileActivity.class);
-						intent.putExtra("username", issue.getIssue().getAssignees().get(finalI).getLogin());
-						ctx.startActivity(intent);
-					});
+					assigneesView.setOnClickListener(
+							loginId -> {
+								Intent intent = new Intent(ctx, ProfileActivity.class);
+								intent.putExtra(
+										"username",
+										issue.getIssue().getAssignees().get(finalI).getLogin());
+								ctx.startActivity(intent);
+							});
 
-					assigneesView.setOnLongClickListener(loginId -> {
-						AppUtil.copyToClipboard(ctx, issue.getIssue().getAssignees().get(finalI).getLogin(), ctx.getString(R.string.copyLoginIdToClipBoard, issue.getIssue().getAssignees().get(finalI).getLogin()));
-						return true;
-					});
+					assigneesView.setOnLongClickListener(
+							loginId -> {
+								AppUtil.copyToClipboard(
+										ctx,
+										issue.getIssue().getAssignees().get(finalI).getLogin(),
+										ctx.getString(
+												R.string.copyLoginIdToClipBoard,
+												issue.getIssue()
+														.getAssignees()
+														.get(finalI)
+														.getLogin()));
+								return true;
+							});
 				}
 			}
-		}
-		else {
+		} else {
 
 			viewBinding.assigneesScrollView.setVisibility(View.GONE);
 		}
 
-		LinearLayout.LayoutParams paramsLabels = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+		LinearLayout.LayoutParams paramsLabels =
+				new LinearLayout.LayoutParams(
+						LinearLayout.LayoutParams.WRAP_CONTENT,
+						LinearLayout.LayoutParams.WRAP_CONTENT);
 		paramsLabels.setMargins(0, 0, 15, 0);
 
-		if(issue.getIssue().getLabels().size() > 0) {
+		if (issue.getIssue().getLabels().size() > 0) {
 
 			viewBinding.labelsScrollView.setVisibility(View.VISIBLE);
 
-			for(int i = 0; i < issue.getIssue().getLabels().size(); i++) {
+			for (int i = 0; i < issue.getIssue().getLabels().size(); i++) {
 
 				String labelColor = issue.getIssue().getLabels().get(i).getColor();
 				String labelName = issue.getIssue().getLabels().get(i).getName();
@@ -751,61 +917,83 @@ 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);
 			}
-		}
-		else {
+		} else {
 
 			viewBinding.labelsScrollView.setVisibility(View.GONE);
 		}
 
-		if(issue.getIssue().getDueDate() != null) {
+		if (issue.getIssue().getDueDate() != null) {
 
 			viewBinding.dueDateFrame.setVisibility(View.VISIBLE);
-			if(timeFormat.equals("normal") || timeFormat.equals("pretty")) {
+			if (timeFormat.equals("normal") || timeFormat.equals("pretty")) {
 
 				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));
-			}
-			else if(timeFormat.equals("normal1")) {
+				viewBinding.issueDueDate.setOnClickListener(
+						new ClickListener(
+								TimeHelper.customDateFormatForToastDateFormat(
+										issue.getIssue().getDueDate()),
+								ctx));
+			} else if (timeFormat.equals("normal1")) {
 
 				DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", locale);
 				String dueDate = formatter.format(issue.getIssue().getDueDate());
 				viewBinding.issueDueDate.setText(dueDate);
 			}
-		}
-		else {
+		} else {
 
 			viewBinding.dueDateFrame.setVisibility(View.GONE);
 		}
 
 		String edited;
 
-		if(!issue.getIssue().getUpdatedAt().equals(issue.getIssue().getUpdatedAt())) {
+		if (!issue.getIssue().getUpdatedAt().equals(issue.getIssue().getUpdatedAt())) {
 
 			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));
-		}
-		else {
+			viewBinding.issueModified.setOnClickListener(
+					new ClickListener(
+							TimeHelper.customDateFormatForToastDateFormat(
+									issue.getIssue().getUpdatedAt()),
+							ctx));
+		} else {
 
 			viewBinding.issueModified.setVisibility(View.INVISIBLE);
 		}
 
-		viewBinding.issueCreatedTime.setText(TimeHelper.formatTime(issue.getIssue().getCreatedAt(), locale, timeFormat, ctx));
+		viewBinding.issueCreatedTime.setText(
+				TimeHelper.formatTime(issue.getIssue().getCreatedAt(), locale, timeFormat, ctx));
 		viewBinding.issueCreatedTime.setVisibility(View.VISIBLE);
 
-		if(timeFormat.equals("pretty")) {
+		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();
@@ -818,68 +1006,78 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 		viewBinding.commentReactionBadges.removeAllViews();
 		viewBinding.commentReactionBadges.addView(reactionList);
 
-		reactionList.setOnReactionAddedListener(() -> {
+		reactionList.setOnReactionAddedListener(
+				() -> {
+					if (viewBinding.commentReactionBadges.getVisibility() != View.VISIBLE) {
+						viewBinding.commentReactionBadges.post(
+								() ->
+										viewBinding.commentReactionBadges.setVisibility(
+												View.VISIBLE));
+					}
+				});
 
-			if(viewBinding.commentReactionBadges.getVisibility() != View.VISIBLE) {
-				viewBinding.commentReactionBadges.post(() -> viewBinding.commentReactionBadges.setVisibility(View.VISIBLE));
-			}
-		});
-
-		if(issue.getIssue().getMilestone() != null) {
+		if (issue.getIssue().getMilestone() != null) {
 
 			viewBinding.milestoneFrame.setVisibility(View.VISIBLE);
 			viewBinding.issueMilestone.setText(issue.getIssue().getMilestone().getTitle());
-		}
-		else {
+		} else {
 
 			viewBinding.milestoneFrame.setVisibility(View.GONE);
 		}
 	}
 
 	private void getPullRequest() {
-		RetrofitClient.getApiInterface(this).repoGetPullRequest(repoOwner, repoName, (long) issueIndex).enqueue(new Callback<PullRequest>() {
+		RetrofitClient.getApiInterface(this)
+				.repoGetPullRequest(repoOwner, repoName, (long) issueIndex)
+				.enqueue(
+						new Callback<PullRequest>() {
 
-			@Override
-			public void onResponse(@NonNull Call<PullRequest> call, @NonNull Response<PullRequest> response) {
-				if(response.isSuccessful() && response.body() != null) {
-					issue.setPullRequest(response.body());
-					loadingFinishedPr = true;
-					updateMenuState();
-				}
-			}
+							@Override
+							public void onResponse(
+									@NonNull Call<PullRequest> call,
+									@NonNull Response<PullRequest> response) {
+								if (response.isSuccessful() && response.body() != null) {
+									issue.setPullRequest(response.body());
+									loadingFinishedPr = true;
+									updateMenuState();
+								}
+							}
 
-			@Override
-			public void onFailure(@NonNull Call<PullRequest> call, @NonNull Throwable t) {
-			}
-		});
+							@Override
+							public void onFailure(
+									@NonNull Call<PullRequest> call, @NonNull Throwable t) {}
+						});
 	}
 
 	private void getRepoInfo() {
-		Call<Repository> call = RetrofitClient.getApiInterface(ctx).repoGet(issue.getRepository().getOwner(), issue.getRepository().getName());
-		call.enqueue(new Callback<>() {
+		Call<Repository> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoGet(issue.getRepository().getOwner(), issue.getRepository().getName());
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Repository> call, @NonNull retrofit2.Response<Repository> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Repository> call,
+							@NonNull retrofit2.Response<Repository> response) {
 
-				Repository repoInfo = response.body();
+						Repository repoInfo = response.body();
 
-				if(response.code() == 200) {
-					assert repoInfo != null;
-					issue.getRepository().setRepository(repoInfo);
-					loadingFinishedRepo = true;
-					updateMenuState();
-				}
-				else {
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
+						if (response.code() == 200) {
+							assert repoInfo != null;
+							issue.getRepository().setRepository(repoInfo);
+							loadingFinishedRepo = true;
+							updateMenuState();
+						} else {
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<Repository> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<Repository> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, getString(R.string.genericError));
-			}
-		});
+						Toasty.error(ctx, getString(R.string.genericError));
+					}
+				});
 	}
-
 }
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 d37e48ca..df10a9f0 100644
--- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
@@ -10,6 +10,12 @@ import android.widget.EditText;
 import android.widget.RadioGroup;
 import androidx.annotation.NonNull;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import io.mikael.urlbuilder.UrlBuilder;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.UUID;
+import okhttp3.Credentials;
 import org.gitnex.tea4j.v2.models.AccessToken;
 import org.gitnex.tea4j.v2.models.CreateAccessTokenOption;
 import org.gitnex.tea4j.v2.models.GeneralAPISettings;
@@ -28,19 +34,12 @@ import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.UrlHelper;
 import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.structs.Protocol;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.UUID;
-import io.mikael.urlbuilder.UrlBuilder;
-import okhttp3.Credentials;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class LoginActivity extends BaseActivity {
 
 	private Button loginButton;
@@ -59,7 +58,8 @@ public class LoginActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityLoginBinding activityLoginBinding = ActivityLoginBinding.inflate(getLayoutInflater());
+		ActivityLoginBinding activityLoginBinding =
+				ActivityLoginBinding.inflate(getLayoutInflater());
 		setContentView(activityLoginBinding.getRoot());
 
 		NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.getInstance(ctx);
@@ -75,65 +75,89 @@ public class LoginActivity extends BaseActivity {
 
 		activityLoginBinding.appVersion.setText(AppUtil.getAppVersion(appCtx));
 
-		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(LoginActivity.this, R.layout.list_spinner_items, Protocol.values());
+		ArrayAdapter<Protocol> adapterProtocols =
+				new ArrayAdapter<>(
+						LoginActivity.this, R.layout.list_spinner_items, Protocol.values());
 
 		instanceUrlET.setText(getIntent().getStringExtra("instanceUrl"));
 
 		protocolSpinner.setAdapter(adapterProtocols);
 		protocolSpinner.setSelection(0);
-		protocolSpinner.setOnItemClickListener((parent, view, position, id) -> {
+		protocolSpinner.setOnItemClickListener(
+				(parent, view, position, id) -> {
+					selectedProtocol = String.valueOf(parent.getItemAtPosition(position));
 
-			selectedProtocol = String.valueOf(parent.getItemAtPosition(position));
+					if (selectedProtocol.equals(String.valueOf(Protocol.HTTP))) {
+						Toasty.warning(ctx, getResources().getString(R.string.protocolError));
+					}
+				});
 
-			if(selectedProtocol.equals(String.valueOf(Protocol.HTTP))) {
-				Toasty.warning(ctx, getResources().getString(R.string.protocolError));
-			}
-		});
-
-		if(R.id.loginToken == loginMethod.getCheckedRadioButtonId()) {
-			AppUtil.setMultiVisibility(View.GONE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
+		if (R.id.loginToken == loginMethod.getCheckedRadioButtonId()) {
+			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));
+		} else {
+			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));
-				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));
-				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));
+						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));
+						findViewById(R.id.loginTokenCodeLayout).setVisibility(View.GONE);
+					}
+				});
 
-		networkStatusObserver.registerNetworkStatusListener(hasNetworkConnection -> runOnUiThread(() -> {
-			if(hasNetworkConnection) {
-				enableProcessButton();
-			}
-			else {
-				disableProcessButton();
-				loginButton.setText(getResources().getString(R.string.btnLogin));
-				Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
-			}
-		}));
+		networkStatusObserver.registerNetworkStatusListener(
+				hasNetworkConnection ->
+						runOnUiThread(
+								() -> {
+									if (hasNetworkConnection) {
+										enableProcessButton();
+									} else {
+										disableProcessButton();
+										loginButton.setText(
+												getResources().getString(R.string.btnLogin));
+										Toasty.error(
+												ctx,
+												getResources()
+														.getString(R.string.checkNetConnection));
+									}
+								}));
 
 		loadDefaults();
 
-		loginButton.setOnClickListener(view -> {
-			disableProcessButton();
-			login();
-		});
+		loginButton.setOnClickListener(
+				view -> {
+					disableProcessButton();
+					login();
+				});
 	}
 
 	private void login() {
 
 		try {
 
-			if(selectedProtocol == null) {
+			if (selectedProtocol == null) {
 
 				Toasty.error(ctx, getResources().getString(R.string.protocolEmptyError));
 				enableProcessButton();
@@ -142,54 +166,73 @@ public class LoginActivity extends BaseActivity {
 
 			String loginUid = loginUidET.getText().toString().replaceAll("[\\uFEFF]", "").trim();
 			String loginPass = loginPassword.getText().toString().trim();
-			String loginToken = loginTokenCode.getText().toString().replaceAll("[\\uFEFF|#]", "").trim();
+			String loginToken =
+					loginTokenCode.getText().toString().replaceAll("[\\uFEFF|#]", "").trim();
 
-			LoginType loginType = (loginMethod.getCheckedRadioButtonId() == R.id.loginUsernamePassword) ? LoginType.BASIC : LoginType.TOKEN;
+			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());
 			tinyDB.putString("instanceUrlRaw", instanceUrlET.getText().toString());
 
-			if(instanceUrlET.getText().toString().equals("")) {
+			if (instanceUrlET.getText().toString().equals("")) {
 
 				Toasty.error(ctx, getResources().getString(R.string.emptyFieldURL));
 				enableProcessButton();
 				return;
 			}
 
-			if(loginType == LoginType.BASIC) {
+			if (loginType == LoginType.BASIC) {
 
-				if(otpCode.length() != 0 && otpCode.length() != 6) {
+				if (otpCode.length() != 0 && otpCode.length() != 6) {
 
 					Toasty.warning(ctx, getResources().getString(R.string.loginOTPTypeError));
 					enableProcessButton();
 					return;
 				}
 
-				if(loginUid.equals("")) {
+				if (loginUid.equals("")) {
 					Toasty.error(ctx, getResources().getString(R.string.emptyFieldUsername));
 					enableProcessButton();
 					return;
 				}
 
-				if(loginPass.equals("")) {
+				if (loginPass.equals("")) {
 					Toasty.error(ctx, getResources().getString(R.string.emptyFieldPassword));
 					enableProcessButton();
 					return;
 				}
 
-				int loginOTP = (otpCode.length() > 0) ? Integer.parseInt(otpCode.getText().toString().trim()) : 0;
+				int loginOTP =
+						(otpCode.length() > 0)
+								? Integer.parseInt(otpCode.getText().toString().trim())
+								: 0;
 
 				versionCheck(loginUid, loginPass, loginOTP, loginToken, loginType);
 
-			}
-			else {
+			} else {
 
-				if(loginToken.equals("")) {
+				if (loginToken.equals("")) {
 
 					Toasty.error(ctx, getResources().getString(R.string.loginTokenError));
 					enableProcessButton();
@@ -200,8 +243,7 @@ public class LoginActivity extends BaseActivity {
 				serverPageLimitSettings();
 			}
 
-		}
-		catch(Exception e) {
+		} catch (Exception e) {
 
 			Toasty.error(ctx, getResources().getString(R.string.malformedUrl));
 			enableProcessButton();
@@ -210,186 +252,251 @@ public class LoginActivity extends BaseActivity {
 
 	private void serverPageLimitSettings() {
 
-		Call<GeneralAPISettings> generalAPISettings = RetrofitClient.getApiInterface(ctx).getGeneralAPISettings();
-		generalAPISettings.enqueue(new Callback<>() {
+		Call<GeneralAPISettings> generalAPISettings =
+				RetrofitClient.getApiInterface(ctx).getGeneralAPISettings();
+		generalAPISettings.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull final Call<GeneralAPISettings> generalAPISettings, @NonNull retrofit2.Response<GeneralAPISettings> response) {
+					@Override
+					public void onResponse(
+							@NonNull final Call<GeneralAPISettings> generalAPISettings,
+							@NonNull retrofit2.Response<GeneralAPISettings> response) {
 
-				if(response.code() == 200 && response.body() != null) {
+						if (response.code() == 200 && response.body() != null) {
 
-					if(response.body().getMaxResponseItems() != null) {
-						maxResponseItems = Math.toIntExact(response.body().getMaxResponseItems());
+							if (response.body().getMaxResponseItems() != null) {
+								maxResponseItems =
+										Math.toIntExact(response.body().getMaxResponseItems());
+							}
+							if (response.body().getDefaultPagingNum() != null) {
+								defaultPagingNumber =
+										Math.toIntExact(response.body().getDefaultPagingNum());
+							}
+						}
 					}
-					if(response.body().getDefaultPagingNum() != null) {
-						defaultPagingNumber = Math.toIntExact(response.body().getDefaultPagingNum());
-					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<GeneralAPISettings> generalAPISettings, @NonNull Throwable t) {
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<GeneralAPISettings> generalAPISettings,
+							@NonNull Throwable t) {}
+				});
 	}
 
-	private void versionCheck(final String loginUid, final String loginPass, final int loginOTP, final String loginToken, final LoginType loginType) {
+	private void versionCheck(
+			final String loginUid,
+			final String loginPass,
+			final int loginOTP,
+			final String loginToken,
+			final LoginType loginType) {
 
 		Call<ServerVersion> callVersion;
 
-		if(!loginToken.equals("")) {
+		if (!loginToken.equals("")) {
 
-			callVersion = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), "token " + loginToken, null).getVersion();
-		}
-		else {
+			callVersion =
+					RetrofitClient.getApiInterface(
+									ctx, instanceUrl.toString(), "token " + loginToken, null)
+							.getVersion();
+		} else {
 
 			String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
 
-			if(loginOTP != 0) {
+			if (loginOTP != 0) {
 
-				callVersion = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null).getVersion(loginOTP);
-			}
-			else {
+				callVersion =
+						RetrofitClient.getApiInterface(
+										ctx, instanceUrl.toString(), credential, null)
+								.getVersion(loginOTP);
+			} else {
 
-				callVersion = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null).getVersion();
+				callVersion =
+						RetrofitClient.getApiInterface(
+										ctx, instanceUrl.toString(), credential, null)
+								.getVersion();
 			}
 		}
 
-		callVersion.enqueue(new Callback<>() {
+		callVersion.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull final Call<ServerVersion> callVersion, @NonNull retrofit2.Response<ServerVersion> responseVersion) {
+					@Override
+					public void onResponse(
+							@NonNull final Call<ServerVersion> callVersion,
+							@NonNull retrofit2.Response<ServerVersion> responseVersion) {
 
-				if(responseVersion.code() == 200) {
+						if (responseVersion.code() == 200) {
 
-					ServerVersion version = responseVersion.body();
-					assert version != null;
+							ServerVersion version = responseVersion.body();
+							assert version != null;
 
-					if(!Version.valid(version.getVersion())) {
+							if (!Version.valid(version.getVersion())) {
 
-						Toasty.error(ctx, getResources().getString(R.string.versionUnknown));
-						enableProcessButton();
-						return;
-					}
-
-					giteaVersion = new Version(version.getVersion());
-
-					if(giteaVersion.less(getString(R.string.versionLow))) {
-
-						MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(getString(R.string.versionAlertDialogHeader))
-							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setNeutralButton(getString(R.string.cancelButton), (dialog, which) -> {
-
-								dialog.dismiss();
+								Toasty.error(
+										ctx, getResources().getString(R.string.versionUnknown));
 								enableProcessButton();
-							}).setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
+								return;
+							}
+
+							giteaVersion = new Version(version.getVersion());
+
+							if (giteaVersion.less(getString(R.string.versionLow))) {
+
+								MaterialAlertDialogBuilder materialAlertDialogBuilder =
+										new MaterialAlertDialogBuilder(ctx)
+												.setTitle(
+														getString(
+																R.string.versionAlertDialogHeader))
+												.setMessage(
+														getResources()
+																.getString(
+																		R.string
+																				.versionUnsupportedOld,
+																		version.getVersion()))
+												.setNeutralButton(
+														getString(R.string.cancelButton),
+														(dialog, which) -> {
+															dialog.dismiss();
+															enableProcessButton();
+														})
+												.setPositiveButton(
+														getString(R.string.textContinue),
+														(dialog, which) -> {
+															dialog.dismiss();
+															login(
+																	loginType,
+																	loginUid,
+																	loginPass,
+																	loginOTP,
+																	loginToken);
+														});
+
+								materialAlertDialogBuilder.create().show();
+							} else if (giteaVersion.lessOrEqual(getString(R.string.versionHigh))) {
 
-								dialog.dismiss();
 								login(loginType, loginUid, loginPass, loginOTP, loginToken);
-							});
+							} else {
 
-						materialAlertDialogBuilder.create().show();
-					}
-					else if(giteaVersion.lessOrEqual(getString(R.string.versionHigh))) {
+								Toasty.warning(
+										ctx,
+										getResources().getString(R.string.versionUnsupportedNew));
+								login(loginType, loginUid, loginPass, loginOTP, loginToken);
+							}
 
-						login(loginType, loginUid, loginPass, loginOTP, loginToken);
-					}
-					else {
-
-						Toasty.warning(ctx, getResources().getString(R.string.versionUnsupportedNew));
-						login(loginType, loginUid, loginPass, loginOTP, loginToken);
+						} else if (responseVersion.code() == 403) {
 
+							login(loginType, loginUid, loginPass, loginOTP, loginToken);
+						}
 					}
 
-				}
-				else if(responseVersion.code() == 403) {
+					private void login(
+							LoginType loginType,
+							String loginUid,
+							String loginPass,
+							int loginOTP,
+							String loginToken) {
 
-					login(loginType, loginUid, loginPass, loginOTP, loginToken);
-				}
-			}
+						// ToDo: before store/create token: get UserInfo to check DB/AccountManager
+						// if there already exist a token
+						// the setup methods then can better handle all different cases
 
-			private void login(LoginType loginType, String loginUid, String loginPass, int loginOTP, String loginToken) {
+						if (loginType == LoginType.BASIC) {
 
-				// ToDo: before store/create token: get UserInfo to check DB/AccountManager if there already exist a token
-				// the setup methods then can better handle all different cases
+							setup(loginUid, loginPass, loginOTP);
+						} else if (loginType == LoginType.TOKEN) { // Token
 
-				if(loginType == LoginType.BASIC) {
+							setupUsingExistingToken(loginToken);
+						}
+					}
 
-					setup(loginUid, loginPass, loginOTP);
-				}
-				else if(loginType == LoginType.TOKEN) { // Token
+					@Override
+					public void onFailure(
+							@NonNull Call<ServerVersion> callVersion, @NonNull Throwable t) {
 
-					setupUsingExistingToken(loginToken);
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<ServerVersion> callVersion, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getResources().getString(R.string.genericServerResponseError));
-				enableProcessButton();
-			}
-		});
+						Toasty.error(
+								ctx, getResources().getString(R.string.genericServerResponseError));
+						enableProcessButton();
+					}
+				});
 	}
 
 	private void setupUsingExistingToken(final String loginToken) {
 
-		Call<User> call = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), "token " + loginToken, null).userGetCurrent();
+		Call<User> call =
+				RetrofitClient.getApiInterface(
+								ctx, instanceUrl.toString(), "token " + loginToken, null)
+						.userGetCurrent();
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<User> call, @NonNull retrofit2.Response<User> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<User> call, @NonNull retrofit2.Response<User> response) {
 
-				User userDetails = response.body();
+						User userDetails = response.body();
 
-				switch(response.code()) {
+						switch (response.code()) {
+							case 200:
+								assert userDetails != null;
 
-					case 200:
+								// insert new account to db if does not exist
+								String accountName = userDetails.getLogin() + "@" + instanceUrl;
+								UserAccountsApi userAccountsApi =
+										BaseApi.getInstance(ctx, UserAccountsApi.class);
+								assert userAccountsApi != null;
+								boolean userAccountExists =
+										userAccountsApi.userAccountExists(accountName);
+								UserAccount account;
+								if (!userAccountExists) {
+									long accountId =
+											userAccountsApi.createNewAccount(
+													accountName,
+													instanceUrl.toString(),
+													userDetails.getLogin(),
+													loginToken,
+													giteaVersion.toString(),
+													maxResponseItems,
+													defaultPagingNumber);
+									account = userAccountsApi.getAccountById((int) accountId);
+								} else {
+									userAccountsApi.updateTokenByAccountName(
+											accountName, loginToken);
+									userAccountsApi.login(
+											userAccountsApi
+													.getAccountByName(accountName)
+													.getAccountId());
+									account = userAccountsApi.getAccountByName(accountName);
+								}
 
-						assert userDetails != null;
+								AppUtil.switchToAccount(LoginActivity.this, account);
 
-						// insert new account to db if does not exist
-						String accountName = userDetails.getLogin() + "@" + instanceUrl;
-						UserAccountsApi userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
-						assert userAccountsApi != null;
-						boolean userAccountExists = userAccountsApi.userAccountExists(accountName);
-						UserAccount account;
-						if(!userAccountExists) {
-							long accountId = userAccountsApi.createNewAccount(accountName, instanceUrl.toString(), userDetails.getLogin(), loginToken, giteaVersion.toString(), maxResponseItems, defaultPagingNumber);
-							account = userAccountsApi.getAccountById((int) accountId);
-						}
-						else {
-							userAccountsApi.updateTokenByAccountName(accountName, loginToken);
-							userAccountsApi.login(userAccountsApi.getAccountByName(accountName).getAccountId());
-							account = userAccountsApi.getAccountByName(accountName);
+								enableProcessButton();
+								startActivity(new Intent(LoginActivity.this, MainActivity.class));
+								finish();
+								break;
+							case 401:
+								Toasty.error(
+										ctx,
+										getResources().getString(R.string.unauthorizedApiError));
+								enableProcessButton();
+								break;
+							default:
+								Toasty.error(
+										ctx,
+										getResources()
+												.getString(
+														R.string.genericApiError, response.code()));
+								enableProcessButton();
 						}
+					}
 
-						AppUtil.switchToAccount(LoginActivity.this, account);
+					@Override
+					public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {
 
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
 						enableProcessButton();
-						startActivity(new Intent(LoginActivity.this, MainActivity.class));
-						finish();
-						break;
-					case 401:
-
-						Toasty.error(ctx, getResources().getString(R.string.unauthorizedApiError));
-						enableProcessButton();
-						break;
-					default:
-
-						Toasty.error(ctx, getResources().getString(R.string.genericApiError, response.code()));
-						enableProcessButton();
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-				enableProcessButton();
-			}
-		});
-
+					}
+				});
 	}
 
 	private void setup(final String loginUid, final String loginPass, final int loginOTP) {
@@ -398,215 +505,322 @@ public class LoginActivity extends BaseActivity {
 		final String tokenName = "gitnex-app-" + device_id;
 
 		Call<List<AccessToken>> call;
-		if(loginOTP != 0) {
+		if (loginOTP != 0) {
 
-			call = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null).userGetTokens(loginOTP, loginUid, null, null);
-		}
-		else {
+			call =
+					RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null)
+							.userGetTokens(loginOTP, loginUid, null, null);
+		} else {
 
-			call = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null).userGetTokens(loginUid, null, null);
+			call =
+					RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null)
+							.userGetTokens(loginUid, null, null);
 		}
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<AccessToken>> call, @NonNull retrofit2.Response<List<AccessToken>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<AccessToken>> call,
+							@NonNull retrofit2.Response<List<AccessToken>> response) {
 
-				List<AccessToken> userTokens = response.body();
+						List<AccessToken> userTokens = response.body();
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					assert userTokens != null;
+							assert userTokens != null;
 
-					for(AccessToken t : userTokens) {
+							for (AccessToken t : userTokens) {
 
-						if(t.getName().equals(tokenName)) {
+								if (t.getName().equals(tokenName)) {
 
-							// this app had created an token on this instance before
-							// -> since it looks like GitNex forgot the secret we have to delete it first
+									// this app had created an token on this instance before
+									// -> since it looks like GitNex forgot the secret we have to
+									// delete it first
 
-							Call<Void> delToken;
-							if(loginOTP != 0) {
+									Call<Void> delToken;
+									if (loginOTP != 0) {
 
-								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(
+																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<>() {
+
+												@Override
+												public void onResponse(
+														@NonNull Call<Void> delToken,
+														@NonNull retrofit2.Response<Void> response) {
+
+													if (response.code() == 204) {
+
+														setupToken(
+																loginUid, loginPass, loginOTP,
+																tokenName);
+													} else {
+
+														Toasty.error(
+																ctx,
+																getResources()
+																		.getString(
+																				R.string
+																						.genericApiError,
+																				response.code()));
+														enableProcessButton();
+													}
+												}
+
+												@Override
+												public void onFailure(
+														@NonNull Call<Void> delToken,
+														@NonNull Throwable t) {
+
+													Toasty.error(
+															ctx,
+															getResources()
+																	.getString(
+																			R.string
+																					.malformedJson));
+													enableProcessButton();
+												}
+											});
+									return;
+								}
 							}
 
-							delToken.enqueue(new Callback<>() {
+							setupToken(loginUid, loginPass, loginOTP, tokenName);
+						} else {
 
-								@Override
-								public void onResponse(@NonNull Call<Void> delToken, @NonNull retrofit2.Response<Void> response) {
-
-									if(response.code() == 204) {
-
-										setupToken(loginUid, loginPass, loginOTP, tokenName);
-									}
-									else {
-
-										Toasty.error(ctx, getResources().getString(R.string.genericApiError, response.code()));
-										enableProcessButton();
-									}
-								}
-
-								@Override
-								public void onFailure(@NonNull Call<Void> delToken, @NonNull Throwable t) {
-
-									Toasty.error(ctx, getResources().getString(R.string.malformedJson));
-									enableProcessButton();
-								}
-							});
-							return;
+							Toasty.error(
+									ctx,
+									getResources()
+											.getString(R.string.genericApiError, response.code()));
+							enableProcessButton();
 						}
 					}
 
-					setupToken(loginUid, loginPass, loginOTP, tokenName);
-				}
-				else {
-
-					Toasty.error(ctx, getResources().getString(R.string.genericApiError, response.code()));
-					enableProcessButton();
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<AccessToken>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getResources().getString(R.string.malformedJson));
-				enableProcessButton();
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<AccessToken>> call, @NonNull Throwable t) {
 
+						Toasty.error(ctx, getResources().getString(R.string.malformedJson));
+						enableProcessButton();
+					}
+				});
 	}
 
-	private void setupToken(final String loginUid, final String loginPass, final int loginOTP, final String tokenName) {
+	private void setupToken(
+			final String loginUid,
+			final String loginPass,
+			final int loginOTP,
+			final String tokenName) {
 
 		final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
 
 		CreateAccessTokenOption createUserToken = new CreateAccessTokenOption().name(tokenName);
 		Call<AccessToken> callCreateToken;
 
-		if(loginOTP != 0) {
+		if (loginOTP != 0) {
 
-			callCreateToken = RetrofitClient.getApiInterface(ctx, instanceUrl.toString(), credential, null).userCreateToken(loginOTP, loginUid, createUserToken);
-		}
-		else {
+			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<>() {
+		callCreateToken.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<AccessToken> callCreateToken, @NonNull retrofit2.Response<AccessToken> responseCreate) {
+					@Override
+					public void onResponse(
+							@NonNull Call<AccessToken> callCreateToken,
+							@NonNull retrofit2.Response<AccessToken> responseCreate) {
 
-				if(responseCreate.code() == 201) {
+						if (responseCreate.code() == 201) {
 
-					AccessToken newToken = responseCreate.body();
-					assert newToken != null;
+							AccessToken newToken = responseCreate.body();
+							assert newToken != null;
 
-					if(!newToken.getSha1().equals("")) {
+							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<>() {
+								call.enqueue(
+										new Callback<>() {
 
-							@Override
-							public void onResponse(@NonNull Call<User> call, @NonNull retrofit2.Response<User> response) {
+											@Override
+											public void onResponse(
+													@NonNull Call<User> call,
+													@NonNull retrofit2.Response<User> response) {
 
-								User userDetails = response.body();
+												User userDetails = response.body();
 
-								switch(response.code()) {
+												switch (response.code()) {
+													case 200:
+														assert userDetails != null;
 
-									case 200:
+														// insert new account to db if does not
+														// exist
+														String accountName =
+																userDetails.getLogin()
+																		+ "@"
+																		+ instanceUrl;
+														UserAccountsApi userAccountsApi =
+																BaseApi.getInstance(
+																		ctx, UserAccountsApi.class);
+														assert userAccountsApi != null;
+														boolean userAccountExists =
+																userAccountsApi.userAccountExists(
+																		accountName);
 
-										assert userDetails != null;
+														UserAccount account;
+														if (!userAccountExists) {
+															long accountId =
+																	userAccountsApi
+																			.createNewAccount(
+																					accountName,
+																					instanceUrl
+																							.toString(),
+																					userDetails
+																							.getLogin(),
+																					newToken
+																							.getSha1(),
+																					giteaVersion
+																							.toString(),
+																					maxResponseItems,
+																					defaultPagingNumber);
+															account =
+																	userAccountsApi.getAccountById(
+																			(int) accountId);
+														} else {
+															userAccountsApi
+																	.updateTokenByAccountName(
+																			accountName,
+																			newToken.getSha1());
+															account =
+																	userAccountsApi
+																			.getAccountByName(
+																					accountName);
+														}
 
-										// insert new account to db if does not exist
-										String accountName = userDetails.getLogin() + "@" + instanceUrl;
-										UserAccountsApi userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
-										assert userAccountsApi != null;
-										boolean userAccountExists = userAccountsApi.userAccountExists(accountName);
+														AppUtil.switchToAccount(
+																LoginActivity.this, account);
 
-										UserAccount account;
-										if(!userAccountExists) {
-											long accountId = userAccountsApi.createNewAccount(accountName, instanceUrl.toString(), userDetails.getLogin(), newToken.getSha1(), giteaVersion.toString(), maxResponseItems,
-												defaultPagingNumber);
-											account = userAccountsApi.getAccountById((int) accountId);
-										}
-										else {
-											userAccountsApi.updateTokenByAccountName(accountName, newToken.getSha1());
-											account = userAccountsApi.getAccountByName(accountName);
-										}
+														startActivity(
+																new Intent(
+																		LoginActivity.this,
+																		MainActivity.class));
+														finish();
+														break;
+													case 401:
+														Toasty.error(
+																ctx,
+																getResources()
+																		.getString(
+																				R.string
+																						.unauthorizedApiError));
+														enableProcessButton();
+														break;
+													default:
+														Toasty.error(
+																ctx,
+																getResources()
+																		.getString(
+																				R.string
+																						.genericApiError,
+																				response.code()));
+														enableProcessButton();
+												}
+											}
 
-										AppUtil.switchToAccount(LoginActivity.this, account);
+											@Override
+											public void onFailure(
+													@NonNull Call<User> call,
+													@NonNull Throwable t) {
 
-										startActivity(new Intent(LoginActivity.this, MainActivity.class));
-										finish();
-										break;
-									case 401:
-
-										Toasty.error(ctx, getResources().getString(R.string.unauthorizedApiError));
-										enableProcessButton();
-										break;
-									default:
-
-										Toasty.error(ctx, getResources().getString(R.string.genericApiError, response.code()));
-										enableProcessButton();
-								}
+												Toasty.error(
+														ctx,
+														getResources()
+																.getString(R.string.genericError));
+												enableProcessButton();
+											}
+										});
 							}
+						} else if (responseCreate.code() == 500) {
 
-							@Override
-							public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {
-
-								Toasty.error(ctx, getResources().getString(R.string.genericError));
-								enableProcessButton();
-							}
-						});
+							Toasty.error(
+									ctx,
+									getResources()
+											.getString(
+													R.string.genericApiError,
+													responseCreate.code()));
+							enableProcessButton();
+						}
 					}
-				}
-				else if(responseCreate.code() == 500) {
 
-					Toasty.error(ctx, getResources().getString(R.string.genericApiError, responseCreate.code()));
-					enableProcessButton();
-				}
-			}
+					@Override
+					public void onFailure(
+							@NonNull Call<AccessToken> createUserToken, @NonNull Throwable t) {
 
-			@Override
-			public void onFailure(@NonNull Call<AccessToken> createUserToken, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	private void loadDefaults() {
 
-		if(tinyDB.getString("loginType").equals(LoginType.BASIC.name().toLowerCase())) {
+		if (tinyDB.getString("loginType").equals(LoginType.BASIC.name().toLowerCase())) {
 
 			loginMethod.check(R.id.loginUsernamePassword);
-		}
-		else {
+		} else {
 
 			loginMethod.check(R.id.loginToken);
 		}
 
-		if(!tinyDB.getString("instanceUrlRaw").equals("")) {
+		if (!tinyDB.getString("instanceUrlRaw").equals("")) {
 
 			instanceUrlET.setText(tinyDB.getString("instanceUrlRaw"));
 		}
 
-		if(getAccount() != null && getAccount().getAccount() != null) {
+		if (getAccount() != null && getAccount().getAccount() != null) {
 
 			loginUidET.setText(getAccount().getAccount().getUserName());
 		}
 
-		if(!tinyDB.getString("uniqueAppId").isEmpty()) {
+		if (!tinyDB.getString("uniqueAppId").isEmpty()) {
 			device_id = tinyDB.getString("uniqueAppId");
-		}
-		else {
+		} else {
 
 			device_id = UUID.randomUUID().toString();
 			tinyDB.putString("uniqueAppId", device_id);
@@ -625,6 +839,8 @@ public class LoginActivity extends BaseActivity {
 		loginButton.setEnabled(true);
 	}
 
-	private enum LoginType {BASIC, TOKEN}
-
+	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 e3780102..4b934554 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
@@ -22,6 +22,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.card.MaterialCardView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.navigation.NavigationView;
+import java.util.ArrayList;
+import java.util.List;
+import jp.wasabeef.picasso.transformations.BlurTransformation;
 import org.gitnex.tea4j.v2.models.GeneralAPISettings;
 import org.gitnex.tea4j.v2.models.NotificationCount;
 import org.gitnex.tea4j.v2.models.ServerVersion;
@@ -56,18 +59,15 @@ import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.structs.BottomSheetListener;
 import org.mian.gitnex.structs.FragmentRefreshListener;
-import java.util.ArrayList;
-import java.util.List;
-import jp.wasabeef.picasso.transformations.BlurTransformation;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 @SuppressWarnings("ConstantConditions")
-public class MainActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener, BottomSheetListener {
+public class MainActivity extends BaseActivity
+		implements NavigationView.OnNavigationItemSelectedListener, BottomSheetListener {
 
 	public static boolean refActivity = false;
 	public static boolean reloadRepos = false;
@@ -98,7 +98,11 @@ 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();
@@ -106,7 +110,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		}
 		// DO NOT MOVE
 
-		if(tinyDB.getInt("currentActiveAccountId", -1) <= 0) {
+		if (tinyDB.getInt("currentActiveAccountId", -1) <= 0) {
 			AppUtil.logout(ctx);
 			return;
 		}
@@ -123,37 +127,27 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		FragmentManager fm = getSupportFragmentManager();
 		Fragment fragmentById = fm.findFragmentById(R.id.fragment_container);
 
-		if(fragmentById instanceof SettingsFragment) {
+		if (fragmentById instanceof SettingsFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.navSettings));
-		}
-		else if(fragmentById instanceof MyRepositoriesFragment) {
+		} else if (fragmentById instanceof MyRepositoriesFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.navMyRepos));
-		}
-		else if(fragmentById instanceof StarredRepositoriesFragment) {
+		} else if (fragmentById instanceof StarredRepositoriesFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
-		}
-		else if(fragmentById instanceof OrganizationsFragment) {
+		} else if (fragmentById instanceof OrganizationsFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.navOrg));
-		}
-		else if(fragmentById instanceof ExploreFragment) {
+		} else if (fragmentById instanceof ExploreFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
-		}
-		else if(fragmentById instanceof NotificationsFragment) {
+		} else if (fragmentById instanceof NotificationsFragment) {
 			toolbarTitle.setText(R.string.pageTitleNotifications);
-		}
-		else if(fragmentById instanceof MyProfileFragment) {
+		} else if (fragmentById instanceof MyProfileFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.navProfile));
-		}
-		else if(fragmentById instanceof MostVisitedReposFragment) {
+		} else if (fragmentById instanceof MostVisitedReposFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.navMostVisited));
-		}
-		else if(fragmentById instanceof DraftsFragment) {
+		} else if (fragmentById instanceof DraftsFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
-		}
-		else if(fragmentById instanceof AdministrationFragment) {
+		} else if (fragmentById instanceof AdministrationFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleAdministration));
-		}
-		else if(fragmentById instanceof MyIssuesFragment) {
+		} else if (fragmentById instanceof MyIssuesFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.navMyIssues));
 		}
 
@@ -167,142 +161,184 @@ 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() {
+		drawer.addDrawerListener(
+				new DrawerLayout.DrawerListener() {
 
-			@Override
-			public void onDrawerOpened(@NonNull View drawerView) {
+					@Override
+					public void onDrawerOpened(@NonNull View drawerView) {
 
-				if(noConnection) {
+						if (noConnection) {
 
-					Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
-					noConnection = false;
-				}
+							Toasty.error(
+									ctx, getResources().getString(R.string.checkNetConnection));
+							noConnection = false;
+						}
 
-				TextView userEmail = hView.findViewById(R.id.userEmail);
-				TextView userFullName = hView.findViewById(R.id.userFullname);
-				ImageView userAvatar = hView.findViewById(R.id.userAvatar);
-				ImageView userAvatarBackground = hView.findViewById(R.id.userAvatarBackground);
-				MaterialCardView navRecyclerViewFrame = hView.findViewById(R.id.userAccountsFrame);
+						TextView userEmail = hView.findViewById(R.id.userEmail);
+						TextView userFullName = hView.findViewById(R.id.userFullname);
+						ImageView userAvatar = hView.findViewById(R.id.userAvatar);
+						ImageView userAvatarBackground =
+								hView.findViewById(R.id.userAvatarBackground);
+						MaterialCardView navRecyclerViewFrame =
+								hView.findViewById(R.id.userAccountsFrame);
 
-				List<UserAccount> userAccountsList = new ArrayList<>();
-				UserAccountsApi userAccountsApi;
-				userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
+						List<UserAccount> userAccountsList = new ArrayList<>();
+						UserAccountsApi userAccountsApi;
+						userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
 
-				RecyclerView navRecyclerViewUserAccounts = hView.findViewById(R.id.userAccounts);
-				UserAccountsNavAdapter adapterUserAccounts = new UserAccountsNavAdapter(ctx, userAccountsList, drawer);
+						RecyclerView navRecyclerViewUserAccounts =
+								hView.findViewById(R.id.userAccounts);
+						UserAccountsNavAdapter adapterUserAccounts =
+								new UserAccountsNavAdapter(ctx, userAccountsList, drawer);
 
-				userAccountsApi.getAllAccounts().observe((AppCompatActivity) ctx, userAccounts -> {
-					if(userAccounts.size() > 0) {
-						userAccountsList.clear();
-						userAccountsList.addAll(userAccounts);
-						navRecyclerViewUserAccounts.setAdapter(adapterUserAccounts);
-						navRecyclerViewFrame.setVisibility(View.VISIBLE);
-					}
-				});
+						userAccountsApi
+								.getAllAccounts()
+								.observe(
+										(AppCompatActivity) ctx,
+										userAccounts -> {
+											if (userAccounts.size() > 0) {
+												userAccountsList.clear();
+												userAccountsList.addAll(userAccounts);
+												navRecyclerViewUserAccounts.setAdapter(
+														adapterUserAccounts);
+												navRecyclerViewFrame.setVisibility(View.VISIBLE);
+											}
+										});
 
-				userEmail.setTypeface(myTypeface);
-				userFullName.setTypeface(myTypeface);
+						userEmail.setTypeface(myTypeface);
+						userFullName.setTypeface(myTypeface);
 
-				if(getAccount().getUserInfo() != null) {
-					String userEmailNav = getAccount().getUserInfo().getEmail();
-					String userFullNameNav = getAccount().getFullName();
-					String userAvatarNav = getAccount().getUserInfo().getAvatarUrl();
+						if (getAccount().getUserInfo() != null) {
+							String userEmailNav = getAccount().getUserInfo().getEmail();
+							String userFullNameNav = getAccount().getFullName();
+							String userAvatarNav = getAccount().getUserInfo().getAvatarUrl();
 
-					if(!userEmailNav.equals("")) {
-						userEmail.setText(userEmailNav);
-					}
-
-					if(!userFullNameNav.equals("")) {
-						userFullName.setText(Html.fromHtml(userFullNameNav));
-					}
-
-					if(!userAvatarNav.equals("")) {
-
-						int avatarRadius = AppUtil.getPixelsFromDensity(ctx, 60);
-
-						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() {
-
-							@Override
-							public void onSuccess() {
-
-								int textColor = new ColorInverter().getImageViewContrastColor(userAvatarBackground);
-
-								userFullName.setTextColor(textColor);
-								userEmail.setTextColor(textColor);
+							if (!userEmailNav.equals("")) {
+								userEmail.setText(userEmailNav);
 							}
 
-							@Override
-							public void onError(Exception e) {
-
+							if (!userFullNameNav.equals("")) {
+								userFullName.setText(Html.fromHtml(userFullNameNav));
 							}
-						});
+
+							if (!userAvatarNav.equals("")) {
+
+								int avatarRadius = AppUtil.getPixelsFromDensity(ctx, 60);
+
+								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() {
+
+													@Override
+													public void onSuccess() {
+
+														int textColor =
+																new ColorInverter()
+																		.getImageViewContrastColor(
+																				userAvatarBackground);
+
+														userFullName.setTextColor(textColor);
+														userEmail.setTextColor(textColor);
+													}
+
+													@Override
+													public void onError(Exception e) {}
+												});
+							}
+						}
+
+						userAvatar.setOnClickListener(
+								v -> {
+									toolbarTitle.setText(
+											getResources().getString(R.string.navProfile));
+									getSupportFragmentManager()
+											.beginTransaction()
+											.replace(
+													R.id.fragment_container,
+													new MyProfileFragment())
+											.commit();
+									navigationView.setCheckedItem(R.id.nav_profile);
+									drawer.closeDrawers();
+								});
+
+						getNotificationsCount();
 					}
-				}
 
-				userAvatar.setOnClickListener(v -> {
+					@Override
+					public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
 
-					toolbarTitle.setText(getResources().getString(R.string.navProfile));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
-					navigationView.setCheckedItem(R.id.nav_profile);
-					drawer.closeDrawers();
+						if (getAccount().getUserInfo() != null) {
+							navigationView
+									.getMenu()
+									.findItem(R.id.nav_administration)
+									.setVisible(getAccount().getUserInfo().isIsAdmin());
+						} else {
+							// hide first
+							navigationView
+									.getMenu()
+									.findItem(R.id.nav_administration)
+									.setVisible(false);
+						}
 
+						if (getAccount().requiresVersion("1.14.0")) {
+							navigationView.getMenu().findItem(R.id.nav_my_issues).setVisible(true);
+						}
+					}
+
+					@Override
+					public void onDrawerClosed(@NonNull View drawerView) {}
+
+					@Override
+					public void onDrawerStateChanged(int newState) {}
 				});
 
-				getNotificationsCount();
-			}
-
-			@Override
-			public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
-
-				if(getAccount().getUserInfo() != null) {
-					navigationView.getMenu().findItem(R.id.nav_administration).setVisible(getAccount().getUserInfo().isIsAdmin());
-				}
-				else {
-					// hide first
-					navigationView.getMenu().findItem(R.id.nav_administration).setVisible(false);
-				}
-
-				if(getAccount().requiresVersion("1.14.0")) {
-					navigationView.getMenu().findItem(R.id.nav_my_issues).setVisible(true);
-				}
-			}
-
-			@Override
-			public void onDrawerClosed(@NonNull View drawerView) {
-			}
-
-			@Override
-			public void onDrawerStateChanged(int newState) {
-			}
-
-		});
-
 		toggle.syncState();
 		toolbar.setNavigationIcon(R.drawable.ic_menu);
 
 		String launchFragment = mainIntent.getStringExtra("launchFragment");
 
-		if(launchFragment != null) {
+		if (launchFragment != null) {
 
 			mainIntent.removeExtra("launchFragment");
 
-			switch(launchFragment) {
-
+			switch (launchFragment) {
 				case "drafts":
 					toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new DraftsFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new DraftsFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_comments_draft);
 					return;
 
 				case "notifications":
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleNotifications));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new NotificationsFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_notifications);
 					return;
 			}
@@ -310,139 +346,185 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 		String launchFragmentByHandler = mainIntent.getStringExtra("launchFragmentByLinkHandler");
 
-		if(launchFragmentByHandler != null) {
+		if (launchFragmentByHandler != null) {
 
 			mainIntent.removeExtra("launchFragmentByLinkHandler");
 
-			switch(launchFragmentByHandler) {
-
+			switch (launchFragmentByHandler) {
 				case "repos":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new RepositoriesFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_repositories);
 					return;
 
 				case "org":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new OrganizationsFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_organizations);
 					return;
 
 				case "notification":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new NotificationsFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_notifications);
 					setActionBarTitle(getResources().getString(R.string.pageTitleNotifications));
 					return;
 
 				case "explore":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new ExploreFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_explore);
 					return;
 
 				case "profile":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new MyProfileFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_profile);
 					return;
 
 				case "admin":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AdministrationFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new AdministrationFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_administration);
 					return;
-
 			}
 		}
 
-		if(savedInstanceState == null) {
+		if (savedInstanceState == null) {
 
-			if(!getAccount().requiresVersion("1.12.3")) {
-				if(tinyDB.getInt("homeScreenId", 0) == 7) {
+			if (!getAccount().requiresVersion("1.12.3")) {
+				if (tinyDB.getInt("homeScreenId", 0) == 7) {
 					tinyDB.putInt("homeScreenId", 0);
 				}
 			}
 
-			switch(tinyDB.getInt("homeScreenId", 0)) {
-
+			switch (tinyDB.getInt("homeScreenId", 0)) {
 				case 1:
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new StarredRepositoriesFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new StarredRepositoriesFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_starred_repos);
 					break;
 
 				case 2:
 					toolbarTitle.setText(getResources().getString(R.string.navOrg));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new OrganizationsFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_organizations);
 					break;
 
 				case 3:
 					toolbarTitle.setText(getResources().getString(R.string.navRepos));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new RepositoriesFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_repositories);
 					break;
 
 				case 4:
 					toolbarTitle.setText(getResources().getString(R.string.navProfile));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new MyProfileFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_profile);
 					break;
 
 				case 5:
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new ExploreFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_explore);
 					break;
 
 				case 6:
 					toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new DraftsFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new DraftsFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_comments_draft);
 					break;
 
 				case 7:
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleNotifications));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new NotificationsFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_notifications);
 					break;
 
 				case 8:
 					toolbarTitle.setText(getResources().getString(R.string.navMyIssues));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyIssuesFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new MyIssuesFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_my_issues);
 					break;
 				case 9:
 					toolbarTitle.setText(getResources().getString(R.string.navMostVisited));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MostVisitedReposFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new MostVisitedReposFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_most_visited);
 					break;
 
 				default:
 					toolbarTitle.setText(getResources().getString(R.string.navMyRepos));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, new MyRepositoriesFragment())
+							.commit();
 					navigationView.setCheckedItem(R.id.nav_home);
 					break;
 			}
 		}
 
-		handler.postDelayed(() -> {
+		handler.postDelayed(
+				() -> {
+					boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+					if (!connToInternet) {
 
-			boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-			if(!connToInternet) {
+						if (!noConnection) {
+							Toasty.error(
+									ctx, getResources().getString(R.string.checkNetConnection));
+						}
+						noConnection = true;
+					} else {
 
-				if(!noConnection) {
-					Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
-				}
-				noConnection = true;
-			}
-			else {
-
-				loadUserInfo();
-				giteaVersion();
-				serverPageLimitSettings();
-				noConnection = false;
-			}
-		}, 1500);
+						loadUserInfo();
+						giteaVersion();
+						serverPageLimitSettings();
+						noConnection = false;
+					}
+				},
+				1500);
 
 		// Changelog popup
 		int versionCode = AppUtil.getAppBuildNo(appCtx);
-		if(versionCode > tinyDB.getInt("versionCode")) {
+		if (versionCode > tinyDB.getInt("versionCode")) {
 
 			tinyDB.putInt("versionCode", versionCode);
 
@@ -455,7 +537,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 	public void onResume() {
 		super.onResume();
 
-		if(refActivity) {
+		if (refActivity) {
 			this.recreate();
 			this.overridePendingTransition(0, 0);
 			refActivity = false;
@@ -471,63 +553,64 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 	public void onButtonClicked(String text) {
 		int currentActiveAccountId = tinyDB.getInt("currentActiveAccountId");
 
-		switch(text) {
-
+		switch (text) {
 			case "deleteDrafts":
-				if(currentActiveAccountId > 0) {
+				if (currentActiveAccountId > 0) {
 
 					FragmentManager fm = getSupportFragmentManager();
-					DraftsFragment frag = (DraftsFragment) fm.findFragmentById(R.id.fragment_container);
+					DraftsFragment frag =
+							(DraftsFragment) fm.findFragmentById(R.id.fragment_container);
 
-					if(frag != null) {
+					if (frag != null) {
 
-						new MaterialAlertDialogBuilder(ctx).setTitle(R.string.deleteAllDrafts).setCancelable(false).setMessage(R.string.deleteAllDraftsDialogMessage)
-							.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
-
-								frag.deleteAllDrafts(currentActiveAccountId);
-								dialog.dismiss();
-
-							}).setNeutralButton(R.string.cancelButton, null).show();
-					}
-					else {
+						new MaterialAlertDialogBuilder(ctx)
+								.setTitle(R.string.deleteAllDrafts)
+								.setCancelable(false)
+								.setMessage(R.string.deleteAllDraftsDialogMessage)
+								.setPositiveButton(
+										R.string.menuDeleteText,
+										(dialog, which) -> {
+											frag.deleteAllDrafts(currentActiveAccountId);
+											dialog.dismiss();
+										})
+								.setNeutralButton(R.string.cancelButton, null)
+								.show();
+					} else {
 
 						Toasty.error(ctx, getResources().getString(R.string.genericError));
 					}
 
-				}
-				else {
+				} else {
 
 					Toasty.error(ctx, getResources().getString(R.string.genericError));
 				}
 				break;
 
 			case "openMyIssues":
-				if(getFragmentRefreshListener() != null) {
+				if (getFragmentRefreshListener() != null) {
 					getFragmentRefreshListener().onRefresh("open");
 				}
 				break;
 			case "closedMyIssues":
-				if(getFragmentRefreshListener() != null) {
+				if (getFragmentRefreshListener() != null) {
 					getFragmentRefreshListener().onRefresh("closed");
 				}
 				break;
 			case "assignedToMe":
-				if(getFragmentRefreshListener() != null) {
+				if (getFragmentRefreshListener() != null) {
 					getFragmentRefreshListener().onRefresh("assignedToMe");
 				}
 				break;
 		}
-
 	}
 
 	@Override
 	public void onBackPressed() {
 
-		if(drawer.isDrawerOpen(GravityCompat.START)) {
+		if (drawer.isDrawerOpen(GravityCompat.START)) {
 
 			drawer.closeDrawer(GravityCompat.START);
-		}
-		else {
+		} else {
 
 			super.onBackPressed();
 		}
@@ -538,69 +621,93 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 		int id = menuItem.getItemId();
 
-		if(id == R.id.nav_home) {
+		if (id == R.id.nav_home) {
 
 			toolbarTitle.setText(getResources().getString(R.string.navMyRepos));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
-		}
-		else if(id == R.id.nav_organizations) {
+			getSupportFragmentManager()
+					.beginTransaction()
+					.replace(R.id.fragment_container, new MyRepositoriesFragment())
+					.commit();
+		} else if (id == R.id.nav_organizations) {
 
 			toolbarTitle.setText(getResources().getString(R.string.navOrg));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
-		}
-		else if(id == R.id.nav_profile) {
+			getSupportFragmentManager()
+					.beginTransaction()
+					.replace(R.id.fragment_container, new OrganizationsFragment())
+					.commit();
+		} else if (id == R.id.nav_profile) {
 			toolbarTitle.setText(getResources().getString(R.string.navProfile));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
-		}
-		else if(id == R.id.nav_repositories) {
+			getSupportFragmentManager()
+					.beginTransaction()
+					.replace(R.id.fragment_container, new MyProfileFragment())
+					.commit();
+		} else if (id == R.id.nav_repositories) {
 
 			toolbarTitle.setText(getResources().getString(R.string.navRepos));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
-		}
-		else if(id == R.id.nav_settings) {
+			getSupportFragmentManager()
+					.beginTransaction()
+					.replace(R.id.fragment_container, new RepositoriesFragment())
+					.commit();
+		} else if (id == R.id.nav_settings) {
 
 			toolbarTitle.setText(getResources().getString(R.string.navSettings));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new SettingsFragment()).commit();
-		}
-		else if(id == R.id.nav_logout) {
+			getSupportFragmentManager()
+					.beginTransaction()
+					.replace(R.id.fragment_container, new SettingsFragment())
+					.commit();
+		} else if (id == R.id.nav_logout) {
 
 			AppUtil.logout(ctx);
 			overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
-		}
-		else if(id == R.id.nav_starred_repos) {
+		} else if (id == R.id.nav_starred_repos) {
 
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new StarredRepositoriesFragment()).commit();
-		}
-		else if(id == R.id.nav_explore) {
+			getSupportFragmentManager()
+					.beginTransaction()
+					.replace(R.id.fragment_container, new StarredRepositoriesFragment())
+					.commit();
+		} else if (id == R.id.nav_explore) {
 
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
-		}
-		else if(id == R.id.nav_notifications) {
+			getSupportFragmentManager()
+					.beginTransaction()
+					.replace(R.id.fragment_container, new ExploreFragment())
+					.commit();
+		} else if (id == R.id.nav_notifications) {
 
 			toolbarTitle.setText(R.string.pageTitleNotifications);
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
-		}
-		else if(id == R.id.nav_comments_draft) {
+			getSupportFragmentManager()
+					.beginTransaction()
+					.replace(R.id.fragment_container, new NotificationsFragment())
+					.commit();
+		} else if (id == R.id.nav_comments_draft) {
 
 			toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new DraftsFragment()).commit();
-		}
-		else if(id == R.id.nav_administration) {
+			getSupportFragmentManager()
+					.beginTransaction()
+					.replace(R.id.fragment_container, new DraftsFragment())
+					.commit();
+		} else if (id == R.id.nav_administration) {
 
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleAdministration));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AdministrationFragment()).commit();
-		}
-		else if(id == R.id.nav_my_issues) {
+			getSupportFragmentManager()
+					.beginTransaction()
+					.replace(R.id.fragment_container, new AdministrationFragment())
+					.commit();
+		} else if (id == R.id.nav_my_issues) {
 
 			toolbarTitle.setText(getResources().getString(R.string.navMyIssues));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyIssuesFragment()).commit();
-		}
-		else if(id == R.id.nav_most_visited) {
+			getSupportFragmentManager()
+					.beginTransaction()
+					.replace(R.id.fragment_container, new MyIssuesFragment())
+					.commit();
+		} else if (id == R.id.nav_most_visited) {
 
 			toolbarTitle.setText(getResources().getString(R.string.navMostVisited));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MostVisitedReposFragment()).commit();
+			getSupportFragmentManager()
+					.beginTransaction()
+					.replace(R.id.fragment_container, new MostVisitedReposFragment())
+					.commit();
 		}
 
 		drawer.closeDrawer(GravityCompat.START);
@@ -612,15 +719,15 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 		int id = item.getItemId();
 
-		if(id == R.id.genericMenu) {
+		if (id == R.id.genericMenu) {
 
 			BottomSheetDraftsFragment bottomSheet = new BottomSheetDraftsFragment();
 			bottomSheet.show(getSupportFragmentManager(), "draftsBottomSheet");
 			return true;
-		}
-		else if(id == R.id.filter) {
+		} else if (id == R.id.filter) {
 
-			BottomSheetMyIssuesFilterFragment filterBottomSheet = new BottomSheetMyIssuesFilterFragment();
+			BottomSheetMyIssuesFilterFragment filterBottomSheet =
+					new BottomSheetMyIssuesFilterFragment();
 			filterBottomSheet.show(getSupportFragmentManager(), "myIssuesFilterMenuBottomSheet");
 			return true;
 		}
@@ -630,126 +737,165 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 	private void serverPageLimitSettings() {
 
-		Call<GeneralAPISettings> generalAPISettings = RetrofitClient.getApiInterface(ctx).getGeneralAPISettings();
-		generalAPISettings.enqueue(new Callback<>() {
+		Call<GeneralAPISettings> generalAPISettings =
+				RetrofitClient.getApiInterface(ctx).getGeneralAPISettings();
+		generalAPISettings.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull final Call<GeneralAPISettings> generalAPISettings, @NonNull retrofit2.Response<GeneralAPISettings> response) {
+					@Override
+					public void onResponse(
+							@NonNull final Call<GeneralAPISettings> generalAPISettings,
+							@NonNull retrofit2.Response<GeneralAPISettings> response) {
 
-				if(response.code() == 200 && response.body() != null) {
+						if (response.code() == 200 && response.body() != null) {
 
-					int maxResponseItems = 50;
-					int defaultPagingNumber = 25;
+							int maxResponseItems = 50;
+							int defaultPagingNumber = 25;
 
-					if(response.body().getMaxResponseItems() != null) {
-						maxResponseItems = Math.toIntExact(response.body().getMaxResponseItems());
-					}
-					if(response.body().getDefaultPagingNum() != null) {
-						defaultPagingNumber = Math.toIntExact(response.body().getDefaultPagingNum());
+							if (response.body().getMaxResponseItems() != null) {
+								maxResponseItems =
+										Math.toIntExact(response.body().getMaxResponseItems());
+							}
+							if (response.body().getDefaultPagingNum() != null) {
+								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"));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<GeneralAPISettings> generalAPISettings, @NonNull Throwable t) {
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<GeneralAPISettings> generalAPISettings,
+							@NonNull Throwable t) {}
+				});
 	}
 
 	private void giteaVersion() {
 
 		Call<ServerVersion> callVersion = RetrofitClient.getApiInterface(ctx).getVersion();
-		callVersion.enqueue(new Callback<>() {
+		callVersion.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull final Call<ServerVersion> callVersion, @NonNull retrofit2.Response<ServerVersion> responseVersion) {
+					@Override
+					public void onResponse(
+							@NonNull final Call<ServerVersion> callVersion,
+							@NonNull retrofit2.Response<ServerVersion> responseVersion) {
 
-				if(responseVersion.code() == 200 && responseVersion.body() != null) {
-					String version = responseVersion.body().getVersion();
+						if (responseVersion.code() == 200 && responseVersion.body() != null) {
+							String version = responseVersion.body().getVersion();
 
-					BaseApi.getInstance(ctx, UserAccountsApi.class).updateServerVersion(version, tinyDB.getInt("currentActiveAccountId"));
-					getAccount().setAccount(BaseApi.getInstance(ctx, UserAccountsApi.class).getAccountById(tinyDB.getInt("currentActiveAccountId")));
-				}
-			}
+							BaseApi.getInstance(ctx, UserAccountsApi.class)
+									.updateServerVersion(
+											version, tinyDB.getInt("currentActiveAccountId"));
+							getAccount()
+									.setAccount(
+											BaseApi.getInstance(ctx, UserAccountsApi.class)
+													.getAccountById(
+															tinyDB.getInt(
+																	"currentActiveAccountId")));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<ServerVersion> callVersion, @NonNull Throwable t) {
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<ServerVersion> callVersion, @NonNull Throwable t) {}
+				});
 	}
 
 	private void loadUserInfo() {
 		Call<User> call = RetrofitClient.getApiInterface(ctx).userGetCurrent();
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<User> call, @NonNull retrofit2.Response<User> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<User> call, @NonNull retrofit2.Response<User> response) {
 
-				User userDetails = response.body();
+						User userDetails = response.body();
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.code() == 200) {
+							if (response.code() == 200) {
 
-						assert userDetails != null;
+								assert userDetails != null;
 
-						getAccount().setUserInfo(userDetails);
-						navigationView.getMenu().findItem(R.id.nav_administration).setVisible(userDetails.isIsAdmin());
-						if(!getAccount().getAccount().getUserName().equals(userDetails.getLogin())) {
-							// user changed it's name -> update database
-							int accountId = getAccount().getAccount().getAccountId();
-							BaseApi.getInstance(MainActivity.this, UserAccountsApi.class).updateUsername(accountId, userDetails.getLogin());
-							getAccount().setAccount(BaseApi.getInstance(MainActivity.this, UserAccountsApi.class).getAccountById(accountId));
-						}
-						if(profileInitListener != null) {
-							profileInitListener.onButtonClicked(null);
+								getAccount().setUserInfo(userDetails);
+								navigationView
+										.getMenu()
+										.findItem(R.id.nav_administration)
+										.setVisible(userDetails.isIsAdmin());
+								if (!getAccount()
+										.getAccount()
+										.getUserName()
+										.equals(userDetails.getLogin())) {
+									// user changed it's name -> update database
+									int accountId = getAccount().getAccount().getAccountId();
+									BaseApi.getInstance(MainActivity.this, UserAccountsApi.class)
+											.updateUsername(accountId, userDetails.getLogin());
+									getAccount()
+											.setAccount(
+													BaseApi.getInstance(
+																	MainActivity.this,
+																	UserAccountsApi.class)
+															.getAccountById(accountId));
+								}
+								if (profileInitListener != null) {
+									profileInitListener.onButtonClicked(null);
+								}
+							}
+						} else if (response.code() == 401) {
+
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else {
+
+							String toastError =
+									getResources()
+											.getString(R.string.genericApiError, response.code());
+							Toasty.error(ctx, toastError);
 						}
 					}
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else {
-
-					String toastError = getResources().getString(R.string.genericApiError, response.code());
-					Toasty.error(ctx, toastError);
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {
-			}
-		});
 
+					@Override
+					public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {}
+				});
 	}
 
 	private void getNotificationsCount() {
 
 		Call<NotificationCount> call = RetrofitClient.getApiInterface(ctx).notifyNewAvailable();
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<NotificationCount> call, @NonNull retrofit2.Response<NotificationCount> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<NotificationCount> call,
+							@NonNull retrofit2.Response<NotificationCount> response) {
 
-				NotificationCount notificationCount = response.body();
+						NotificationCount notificationCount = response.body();
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					assert notificationCount != null;
-					notificationCounter = navNotifications.getActionView().findViewById(R.id.counterBadgeNotification);
-					notificationCounter.setText(String.valueOf(notificationCount.getNew()));
-				}
-			}
+							assert notificationCount != null;
+							notificationCounter =
+									navNotifications
+											.getActionView()
+											.findViewById(R.id.counterBadgeNotification);
+							notificationCounter.setText(String.valueOf(notificationCount.getNew()));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<NotificationCount> call, @NonNull Throwable t) {
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<NotificationCount> call, @NonNull Throwable t) {}
+				});
 	}
 
 	public void setProfileInitListener(BottomSheetListener profileInitListener) {
@@ -762,8 +908,8 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		return fragmentRefreshListenerMyIssues;
 	}
 
-	public void setFragmentRefreshListenerMyIssues(FragmentRefreshListener fragmentRefreshListener) {
+	public void setFragmentRefreshListenerMyIssues(
+			FragmentRefreshListener fragmentRefreshListener) {
 		this.fragmentRefreshListenerMyIssues = fragmentRefreshListener;
 	}
-
 }
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 6f8d20a2..b13e970d 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
@@ -8,6 +8,8 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
+import java.util.ArrayList;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.MergePullRequestOption;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.PullRequestActions;
@@ -19,15 +21,12 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.MergePullRequestSpinner;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.IssueContext;
-import java.util.ArrayList;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class MergePullRequestActivity extends BaseActivity {
 
 	private View.OnClickListener onClickListener;
@@ -49,7 +48,8 @@ public class MergePullRequestActivity extends BaseActivity {
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager imm =
+				(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
 		viewBinding.mergeTitle.requestFocus();
 		assert imm != null;
@@ -57,50 +57,51 @@ public class MergePullRequestActivity extends BaseActivity {
 
 		setMergeAdapter();
 
-		if(!issue.getPullRequest().getTitle().isEmpty()) {
+		if (!issue.getPullRequest().getTitle().isEmpty()) {
 
 			viewBinding.toolbarTitle.setText(issue.getPullRequest().getTitle());
-			viewBinding.mergeTitle.setText(issue.getPullRequest().getTitle() + " (#" + issue.getIssueIndex() + ")");
+			viewBinding.mergeTitle.setText(
+					issue.getPullRequest().getTitle() + " (#" + issue.getIssueIndex() + ")");
 		}
 
 		initCloseListener();
 		viewBinding.close.setOnClickListener(onClickListener);
 
-		// if gitea version is greater/equal(1.12.0) than user installed version (installed.higherOrEqual(compareVer))
-		if(getAccount().requiresVersion("1.12.0")) {
+		// if gitea version is greater/equal(1.12.0) than user installed version
+		// (installed.higherOrEqual(compareVer))
+		if (getAccount().requiresVersion("1.12.0")) {
 
 			viewBinding.deleteBranch.setVisibility(View.VISIBLE);
 		}
 
-		if(!issue.getPullRequest().isMergeable()) {
+		if (!issue.getPullRequest().isMergeable()) {
 
 			disableProcessButton();
 			viewBinding.mergeInfoDisabledMessage.setVisibility(View.VISIBLE);
-		}
-		else {
+		} else {
 
 			viewBinding.mergeInfoDisabledMessage.setVisibility(View.GONE);
 		}
 
-		if(issue.prIsFork()) {
+		if (issue.prIsFork()) {
 
 			viewBinding.deleteBranchForkInfo.setVisibility(View.VISIBLE);
-		}
-		else {
+		} else {
 
 			viewBinding.deleteBranchForkInfo.setVisibility(View.GONE);
 		}
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			disableProcessButton();
-		}
-		else {
+		} else {
 
 			viewBinding.mergeButton.setOnClickListener(mergePullRequest);
 		}
 
-		if(!(issue.getPullRequest().getHead().getRepo() != null ? issue.getPullRequest().getHead().getRepo().getPermissions().isPush() : false)) {
+		if (!(issue.getPullRequest().getHead().getRepo() != null
+				? issue.getPullRequest().getHead().getRepo().getPermissions().isPush()
+				: false)) {
 			viewBinding.deleteBranch.setVisibility(View.GONE);
 			viewBinding.deleteBranchForkInfo.setVisibility(View.GONE);
 		}
@@ -110,22 +111,33 @@ public class MergePullRequestActivity extends BaseActivity {
 
 		ArrayList<MergePullRequestSpinner> mergeList = new ArrayList<>();
 
-		mergeList.add(new MergePullRequestSpinner("merge", getResources().getString(R.string.mergeOptionMerge)));
-		mergeList.add(new MergePullRequestSpinner("rebase", getResources().getString(R.string.mergeOptionRebase)));
-		mergeList.add(new MergePullRequestSpinner("rebase-merge", getResources().getString(R.string.mergeOptionRebaseCommit)));
+		mergeList.add(
+				new MergePullRequestSpinner(
+						"merge", getResources().getString(R.string.mergeOptionMerge)));
+		mergeList.add(
+				new MergePullRequestSpinner(
+						"rebase", getResources().getString(R.string.mergeOptionRebase)));
+		mergeList.add(
+				new MergePullRequestSpinner(
+						"rebase-merge",
+						getResources().getString(R.string.mergeOptionRebaseCommit)));
 		// squash merge works only on gitea > v1.11.4 due to a bug
-		if(getAccount().requiresVersion("1.12.0")) {
+		if (getAccount().requiresVersion("1.12.0")) {
 
-			mergeList.add(new MergePullRequestSpinner("squash", getResources().getString(R.string.mergeOptionSquash)));
+			mergeList.add(
+					new MergePullRequestSpinner(
+							"squash", getResources().getString(R.string.mergeOptionSquash)));
 		}
 
-		ArrayAdapter<MergePullRequestSpinner> adapter = new ArrayAdapter<>(MergePullRequestActivity.this, R.layout.list_spinner_items, mergeList);
+		ArrayAdapter<MergePullRequestSpinner> adapter =
+				new ArrayAdapter<>(
+						MergePullRequestActivity.this, R.layout.list_spinner_items, mergeList);
 		viewBinding.mergeSpinner.setAdapter(adapter);
 
-		viewBinding.mergeSpinner.setOnItemClickListener((parent, view, position, id) -> {
-
-			Do = mergeList.get(position).getId();
-		});
+		viewBinding.mergeSpinner.setOnItemClickListener(
+				(parent, view, position, id) -> {
+					Do = mergeList.get(position).getId();
+				});
 	}
 
 	private void initCloseListener() {
@@ -135,36 +147,37 @@ public class MergePullRequestActivity extends BaseActivity {
 
 	private void processMergePullRequest() {
 
-		String mergePRDesc = Objects.requireNonNull(viewBinding.mergeDescription.getText()).toString();
+		String mergePRDesc =
+				Objects.requireNonNull(viewBinding.mergeDescription.getText()).toString();
 		String mergePRTitle = Objects.requireNonNull(viewBinding.mergeTitle.getText()).toString();
 		boolean deleteBranch = viewBinding.deleteBranch.isChecked();
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 		}
 
-		if(Do == null) {
+		if (Do == null) {
 
 			Toasty.error(ctx, getResources().getString(R.string.selectMergeStrategy));
-		}
-		else {
+		} else {
 
 			disableProcessButton();
 			mergeFunction(Do, mergePRDesc, mergePRTitle, deleteBranch);
 		}
 	}
 
-	private void mergeFunction(String Do, String mergePRDT, String mergeTitle, boolean deleteBranch) {
+	private void mergeFunction(
+			String Do, String mergePRDT, String mergeTitle, boolean deleteBranch) {
 
 		MergePullRequestOption mergePR = new MergePullRequestOption();
 		mergePR.setDeleteBranchAfterMerge(deleteBranch);
 		mergePR.setMergeTitleField(mergeTitle);
 		mergePR.setMergeMessageField(mergePRDT);
-		switch(Do) {
+		switch (Do) {
 			case "merge":
 				mergePR.setDo(MergePullRequestOption.DoEnum.MERGE);
 				break;
@@ -179,67 +192,82 @@ 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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					if(deleteBranch) {
+							if (deleteBranch) {
 
-						if(issue.prIsFork()) {
-							String repoFullName = issue.getPullRequest().getHead().getRepo().getFullName();
-							String[] parts = repoFullName.split("/");
-							final String repoOwner = parts[0];
-							final String repoName = parts[1];
+								if (issue.prIsFork()) {
+									String repoFullName =
+											issue.getPullRequest()
+													.getHead()
+													.getRepo()
+													.getFullName();
+									String[] parts = repoFullName.split("/");
+									final String repoOwner = parts[0];
+									final String repoName = parts[1];
 
-							PullRequestActions.deleteHeadBranch(ctx, repoOwner, repoName, issue.getPullRequest().getHead().getRef(), false);
+									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);
+								}
+							}
+
+							Toasty.success(ctx, getString(R.string.mergePRSuccessMsg));
+							Intent result = new Intent();
+							PullRequestsFragment.resumePullRequests = true;
+							IssueDetailActivity.singleIssueUpdate = true;
+							RepoDetailActivity.updateRepo = true;
+							setResult(200, result);
+							finish();
+						} else if (response.code() == 401) {
+
+							enableProcessButton();
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else if (response.code() == 404) {
+
+							enableProcessButton();
+							Toasty.warning(ctx, getString(R.string.mergePR404ErrorMsg));
+						} else if (response.code() == 405) {
+
+							enableProcessButton();
+							Toasty.warning(ctx, getString(R.string.mergeNotAllowed));
+						} else {
+
+							enableProcessButton();
+							Toasty.error(ctx, getString(R.string.genericError));
 						}
-						else {
-							PullRequestActions.deleteHeadBranch(ctx, issue.getRepository().getOwner(), issue.getRepository().getName(), issue.getPullRequest().getHead().getRef(), false);
-						}
-
 					}
 
-					Toasty.success(ctx, getString(R.string.mergePRSuccessMsg));
-					Intent result = new Intent();
-					PullRequestsFragment.resumePullRequests = true;
-					IssueDetailActivity.singleIssueUpdate = true;
-					RepoDetailActivity.updateRepo = true;
-					setResult(200, result);
-					finish();
-				}
-				else if(response.code() == 401) {
-
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else if(response.code() == 404) {
-
-					enableProcessButton();
-					Toasty.warning(ctx, getString(R.string.mergePR404ErrorMsg));
-				}
-				else if(response.code() == 405) {
-
-					enableProcessButton();
-					Toasty.warning(ctx, getString(R.string.mergeNotAllowed));
-				}
-				else {
-
-					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-				enableProcessButton();
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+						enableProcessButton();
+					}
+				});
 	}
 
 	private void disableProcessButton() {
@@ -257,5 +285,4 @@ public class MergePullRequestActivity extends BaseActivity {
 		super.onResume();
 		issue.getRepository().checkAccountSwitch(this);
 	}
-
 }
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 b48a6cdb..9815ae9e 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MyProfileEmailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MyProfileEmailActivity.java
@@ -10,6 +10,9 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.CreateEmailOption;
 import org.gitnex.tea4j.v2.models.Email;
 import org.mian.gitnex.R;
@@ -19,16 +22,12 @@ import org.mian.gitnex.fragments.MyProfileEmailsFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class MyProfileEmailActivity extends BaseActivity {
 
 	private View.OnClickListener onClickListener;
@@ -41,12 +40,14 @@ public class MyProfileEmailActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityProfileEmailBinding activityProfileEmailBinding = ActivityProfileEmailBinding.inflate(getLayoutInflater());
+		ActivityProfileEmailBinding activityProfileEmailBinding =
+				ActivityProfileEmailBinding.inflate(getLayoutInflater());
 		setContentView(activityProfileEmailBinding.getRoot());
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager imm =
+				(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
 		ImageView closeActivity = activityProfileEmailBinding.close;
 		userEmail = activityProfileEmailBinding.userEmail;
@@ -59,15 +60,13 @@ public class MyProfileEmailActivity extends BaseActivity {
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			disableProcessButton();
-		}
-		else {
+		} else {
 
 			addEmailButton.setOnClickListener(addEmailListener);
 		}
-
 	}
 
 	private void processAddNewEmail() {
@@ -76,18 +75,17 @@ public class MyProfileEmailActivity extends BaseActivity {
 
 		String newUserEmail = userEmail.getText().toString().trim();
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 		}
 
-		if(newUserEmail.equals("")) {
+		if (newUserEmail.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.emailErrorEmpty));
 			return;
-		}
-		else if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {
+		} else if (!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {
 
 			Toasty.warning(ctx, getString(R.string.emailErrorInvalid));
 			return;
@@ -106,53 +104,50 @@ public class MyProfileEmailActivity extends BaseActivity {
 
 		Call<List<Email>> call = RetrofitClient.getApiInterface(ctx).userAddEmail(addEmailFunc);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Email>> call, @NonNull retrofit2.Response<List<Email>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Email>> call,
+							@NonNull retrofit2.Response<List<Email>> response) {
 
-				if(response.code() == 201) {
+						if (response.code() == 201) {
 
-					Toasty.success(ctx, getString(R.string.emailAddedText));
-					MyProfileEmailsFragment.refreshEmails = true;
-					enableProcessButton();
-					finish();
-				}
-				else if(response.code() == 401) {
+							Toasty.success(ctx, getString(R.string.emailAddedText));
+							MyProfileEmailsFragment.refreshEmails = true;
+							enableProcessButton();
+							finish();
+						} else if (response.code() == 401) {
 
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else if(response.code() == 403) {
+							enableProcessButton();
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else if (response.code() == 403) {
 
-					enableProcessButton();
-					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
+							enableProcessButton();
+							Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
 
-					enableProcessButton();
-					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-				}
-				else if(response.code() == 422) {
+							enableProcessButton();
+							Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+						} else if (response.code() == 422) {
 
-					enableProcessButton();
-					Toasty.warning(ctx, ctx.getString(R.string.emailErrorInUse));
-				}
-				else {
+							enableProcessButton();
+							Toasty.warning(ctx, ctx.getString(R.string.emailErrorInUse));
+						} else {
 
-					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
+							enableProcessButton();
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Email>> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<Email>> call, @NonNull Throwable t) {
 
+						Log.e("onFailure", t.toString());
+						enableProcessButton();
+					}
+				});
 	}
 
 	private void initCloseListener() {
@@ -169,5 +164,4 @@ public class MyProfileEmailActivity extends BaseActivity {
 
 		addEmailButton.setEnabled(true);
 	}
-
 }
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 72aa4965..54f58507 100644
--- a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java
@@ -16,6 +16,8 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import com.google.android.material.tabs.TabLayout;
+import io.mikael.urlbuilder.UrlBuilder;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.OrganizationPermissions;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -27,8 +29,6 @@ import org.mian.gitnex.fragments.OrganizationRepositoriesFragment;
 import org.mian.gitnex.fragments.OrganizationTeamsFragment;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.structs.BottomSheetListener;
-import java.util.Objects;
-import io.mikael.urlbuilder.UrlBuilder;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -36,7 +36,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class OrganizationDetailActivity extends BaseActivity implements BottomSheetListener {
 
 	public OrganizationPermissions permissions;
@@ -60,51 +59,61 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
 		checkIsMember();
 
-		if(getAccount().requiresVersion("1.16.0")) {
-			RetrofitClient.getApiInterface(this).orgGetUserPermissions(getAccount().getAccount().getUserName(), orgName).enqueue(new Callback<>() {
+		if (getAccount().requiresVersion("1.16.0")) {
+			RetrofitClient.getApiInterface(this)
+					.orgGetUserPermissions(getAccount().getAccount().getUserName(), orgName)
+					.enqueue(
+							new Callback<>() {
 
-				@Override
-				public void onResponse(@NonNull Call<OrganizationPermissions> call, @NonNull Response<OrganizationPermissions> response) {
+								@Override
+								public void onResponse(
+										@NonNull Call<OrganizationPermissions> call,
+										@NonNull Response<OrganizationPermissions> response) {
 
-					if(response.isSuccessful()) {
-						permissions = response.body();
-					}
-					else {
-						permissions = null;
-					}
-				}
+									if (response.isSuccessful()) {
+										permissions = response.body();
+									} else {
+										permissions = null;
+									}
+								}
 
-				@Override
-				public void onFailure(@NonNull Call<OrganizationPermissions> call, @NonNull Throwable t) {
+								@Override
+								public void onFailure(
+										@NonNull Call<OrganizationPermissions> call,
+										@NonNull Throwable t) {
 
-					permissions = null;
-				}
-			});
-		}
-		else {
+									permissions = null;
+								}
+							});
+		} else {
 			permissions = null;
 		}
 	}
 
 	public void checkIsMember() {
-		RetrofitClient.getApiInterface(this).orgIsMember(orgName, getAccount().getAccount().getUserName()).enqueue(new Callback<>() {
+		RetrofitClient.getApiInterface(this)
+				.orgIsMember(orgName, getAccount().getAccount().getUserName())
+				.enqueue(
+						new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull Response<Void> response) {
-				isMember = response.code() != 404;
-				init();
-			}
+							@Override
+							public void onResponse(
+									@NonNull Call<Void> call, @NonNull Response<Void> response) {
+								isMember = response.code() != 404;
+								init();
+							}
 
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-				isMember = false;
-				init();
-			}
-		});
+							@Override
+							public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+								isMember = false;
+								init();
+							}
+						});
 	}
 
 	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);
@@ -113,7 +122,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 		TabLayout tabLayout = findViewById(R.id.tabs);
 		tabLayout.setVisibility(View.VISIBLE);
 
-		if(!isMember) {
+		if (!isMember) {
 			tabLayout.removeTabAt(3);
 		}
 
@@ -126,16 +135,16 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 		ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
 		int tabsCount = vg.getChildCount();
 
-		for(int j = 0; j < tabsCount; j++) {
+		for (int j = 0; j < tabsCount; j++) {
 
 			ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
 			int tabChildCount = vgTab.getChildCount();
 
-			for(int i = 0; i < tabChildCount; i++) {
+			for (int i = 0; i < tabChildCount; i++) {
 
 				View tabViewChild = vgTab.getChildAt(i);
 
-				if(tabViewChild instanceof TextView) {
+				if (tabViewChild instanceof TextView) {
 
 					((TextView) tabViewChild).setTypeface(myTypeface);
 				}
@@ -143,7 +152,8 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 		}
 
 		mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
-		tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
+		tabLayout.addOnTabSelectedListener(
+				new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
 	}
 
 	@Override
@@ -159,18 +169,17 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
 		int id = item.getItemId();
 
-		if(id == android.R.id.home) {
+		if (id == android.R.id.home) {
 
 			finish();
 			return true;
-		}
-		else if(id == R.id.repoMenu) {
+		} else if (id == R.id.repoMenu) {
 
-			BottomSheetOrganizationFragment bottomSheet = new BottomSheetOrganizationFragment(permissions);
+			BottomSheetOrganizationFragment bottomSheet =
+					new BottomSheetOrganizationFragment(permissions);
 			bottomSheet.show(getSupportFragmentManager(), "orgBottomSheet");
 			return true;
-		}
-		else {
+		} else {
 
 			return super.onOptionsItemSelected(item);
 		}
@@ -179,10 +188,13 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 	@Override
 	public void onButtonClicked(String text) {
 
-		String url = UrlBuilder.fromString(getAccount().getAccount().getInstanceUrl()).withPath("/").toString();
+		String url =
+				UrlBuilder.fromString(getAccount().getAccount().getInstanceUrl())
+						.withPath("/")
+						.toString();
 		url = url + getIntent().getStringExtra("orgName");
 
-		switch(text) {
+		switch (text) {
 			case "repository":
 				Intent intentRepo = new Intent(this, CreateRepoActivity.class);
 				intentRepo.putExtra("organizationAction", true);
@@ -191,14 +203,14 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 				startActivity(intentRepo);
 				break;
 			case "label":
-
 				Intent intent = new Intent(ctx, CreateLabelActivity.class);
 				intent.putExtra("orgName", getIntent().getStringExtra("orgName"));
 				intent.putExtra("type", "org");
 				ctx.startActivity(intent);
 				break;
 			case "team":
-				Intent intentTeam = new Intent(OrganizationDetailActivity.this, CreateTeamByOrgActivity.class);
+				Intent intentTeam =
+						new Intent(OrganizationDetailActivity.this, CreateTeamByOrgActivity.class);
 				intentTeam.putExtras(getIntent().getExtras());
 				startActivity(intentTeam);
 				break;
@@ -220,35 +232,27 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
 		}
 
-		@NonNull
-		@Override
+		@NonNull @Override
 		public Fragment getItem(int position) {
 
 			String orgName = getIntent().getStringExtra("orgName");
 
 			Fragment fragment = null;
-			switch(position) {
-
+			switch (position) {
 				case 0: // info
-
 					return OrganizationInfoFragment.newInstance(orgName);
 				case 1: // repos
-
 					return OrganizationRepositoriesFragment.newInstance(orgName);
 				case 2: // labels
-
 					return OrganizationLabelsFragment.newInstance(orgName);
 				case 3: // teams / members
-
-					if(isMember) {
+					if (isMember) {
 						return OrganizationTeamsFragment.newInstance(orgName, permissions);
-					}
-					else {
+					} else {
 						return OrganizationMembersFragment.newInstance(orgName);
 					}
 				case 4: // members
-
-					if(isMember) {
+					if (isMember) {
 						return OrganizationMembersFragment.newInstance(orgName);
 					}
 			}
@@ -257,14 +261,11 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
 		@Override
 		public int getCount() {
-			if(isMember) {
+			if (isMember) {
 				return 5;
-			}
-			else {
+			} else {
 				return 4;
 			}
 		}
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamInfoActivity.java b/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamInfoActivity.java
index 5f538b1c..0b519b04 100644
--- a/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamInfoActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamInfoActivity.java
@@ -25,7 +25,6 @@ import org.mian.gitnex.structs.BottomSheetListener;
 /**
  * @author M M Arif
  */
-
 public class OrganizationTeamInfoActivity extends BaseActivity implements BottomSheetListener {
 
 	private Team team;
@@ -36,67 +35,78 @@ public class OrganizationTeamInfoActivity extends BaseActivity implements Bottom
 
 		super.onCreate(savedInstanceState);
 
-		org.mian.gitnex.databinding.ActivityOrgTeamInfoBinding binding = ActivityOrgTeamInfoBinding.inflate(getLayoutInflater());
+		org.mian.gitnex.databinding.ActivityOrgTeamInfoBinding binding =
+				ActivityOrgTeamInfoBinding.inflate(getLayoutInflater());
 
 		setContentView(binding.getRoot());
 		setSupportActionBar(binding.toolbar);
 
 		team = (Team) getIntent().getSerializableExtra("team");
 
-		if(team.getName() != null && !team.getName().isEmpty()) {
+		if (team.getName() != null && !team.getName().isEmpty()) {
 			binding.toolbarTitle.setText(team.getName());
-		}
-		else {
+		} else {
 			binding.toolbarTitle.setText(R.string.orgTeamMembers);
 		}
 
 		binding.close.setOnClickListener(view -> finish());
 		binding.pager.setOffscreenPageLimit(1);
-		binding.pager.setAdapter(new FragmentStateAdapter(getSupportFragmentManager(), getLifecycle()) {
+		binding.pager.setAdapter(
+				new FragmentStateAdapter(getSupportFragmentManager(), getLifecycle()) {
 
-			@NonNull
-			@Override
-			public Fragment createFragment(int position) {
-				switch(position) {
-					case 0:
-						return OrganizationTeamInfoReposFragment.newInstance(team);
-					case 1:
-						return OrganizationTeamInfoMembersFragment.newInstance(team);
-					case 2:
-						return OrganizationTeamInfoPermissionsFragment.newInstance(team);
-				}
-				return null;
-			}
+					@NonNull @Override
+					public Fragment createFragment(int position) {
+						switch (position) {
+							case 0:
+								return OrganizationTeamInfoReposFragment.newInstance(team);
+							case 1:
+								return OrganizationTeamInfoMembersFragment.newInstance(team);
+							case 2:
+								return OrganizationTeamInfoPermissionsFragment.newInstance(team);
+						}
+						return null;
+					}
 
-			@Override
-			public int getItemCount() {
-				return 3;
-			}
-		});
+					@Override
+					public int getItemCount() {
+						return 3;
+					}
+				});
 
-		new TabLayoutMediator(binding.tabs, binding.pager, (tab, position) -> {
-			TextView textView = (TextView) LayoutInflater.from(ctx).inflate(R.layout.layout_tab_text, findViewById(android.R.id.content), false);
+		new TabLayoutMediator(
+						binding.tabs,
+						binding.pager,
+						(tab, position) -> {
+							TextView textView =
+									(TextView)
+											LayoutInflater.from(ctx)
+													.inflate(
+															R.layout.layout_tab_text,
+															findViewById(android.R.id.content),
+															false);
 
-			switch(position) {
-				case 0:
-					textView.setText(R.string.navRepos);
-					break;
-				case 1:
-					textView.setText(R.string.orgTabMembers);
-					break;
-				case 2:
-					textView.setText(R.string.teamPermissions);
-					break;
-			}
+							switch (position) {
+								case 0:
+									textView.setText(R.string.navRepos);
+									break;
+								case 1:
+									textView.setText(R.string.orgTabMembers);
+									break;
+								case 2:
+									textView.setText(R.string.teamPermissions);
+									break;
+							}
 
-			tab.setCustomView(textView);
-		}).attach();
+							tab.setCustomView(textView);
+						})
+				.attach();
 	}
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-		OrganizationPermissions permissions = (OrganizationPermissions) getIntent().getSerializableExtra("permissions");
-		if(permissions == null || permissions.isIsOwner()) {
+		OrganizationPermissions permissions =
+				(OrganizationPermissions) getIntent().getSerializableExtra("permissions");
+		if (permissions == null || permissions.isIsOwner()) {
 			MenuInflater inflater = getMenuInflater();
 			inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
 		}
@@ -107,37 +117,36 @@ public class OrganizationTeamInfoActivity extends BaseActivity implements Bottom
 	public boolean onOptionsItemSelected(MenuItem item) {
 		int id = item.getItemId();
 
-		if(id == android.R.id.home) {
+		if (id == android.R.id.home) {
 			finish();
 			return true;
-		}
-		else if(id == R.id.genericMenu) {
-			BottomSheetOrganizationTeamsFragment bottomSheet = new BottomSheetOrganizationTeamsFragment();
+		} else if (id == R.id.genericMenu) {
+			BottomSheetOrganizationTeamsFragment bottomSheet =
+					new BottomSheetOrganizationTeamsFragment();
 			Bundle args = new Bundle();
 			args.putBoolean("showRepo", !team.isIncludesAllRepositories());
 			bottomSheet.setArguments(args);
 			bottomSheet.show(getSupportFragmentManager(), "orgTeamsBottomSheet");
 			return true;
-		}
-		else {
+		} else {
 			return super.onOptionsItemSelected(item);
 		}
 	}
 
 	@Override
 	public void onButtonClicked(String text) {
-		if("newMember".equals(text)) {
-			Intent intent = new Intent(OrganizationTeamInfoActivity.this, AddNewTeamMemberActivity.class);
+		if ("newMember".equals(text)) {
+			Intent intent =
+					new Intent(OrganizationTeamInfoActivity.this, AddNewTeamMemberActivity.class);
 			intent.putExtra("teamId", team.getId());
 			startActivity(intent);
-		}
-		else if("newRepo".equals(text)) {
-			Intent intent = new Intent(OrganizationTeamInfoActivity.this, AddNewTeamRepoActivity.class);
+		} else if ("newRepo".equals(text)) {
+			Intent intent =
+					new Intent(OrganizationTeamInfoActivity.this, AddNewTeamRepoActivity.class);
 			intent.putExtra("teamId", team.getId());
 			intent.putExtra("teamName", team.getName());
 			intent.putExtra("orgName", getIntent().getStringExtra("orgName"));
 			startActivity(intent);
 		}
 	}
-
 }
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 50f88ede..d0eaa364 100644
--- a/app/src/main/java/org/mian/gitnex/activities/ProfileActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/ProfileActivity.java
@@ -16,6 +16,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
+import java.util.Objects;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.fragments.BottomSheetUserProfileFragment;
@@ -28,7 +29,6 @@ import org.mian.gitnex.fragments.profile.StarredRepositoriesFragment;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.structs.BottomSheetListener;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -36,7 +36,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class ProfileActivity extends BaseActivity implements BottomSheetListener {
 
 	private String username;
@@ -52,10 +51,10 @@ public class ProfileActivity extends BaseActivity implements BottomSheetListener
 		Toolbar toolbar = findViewById(R.id.toolbar);
 		TextView toolbarTitle = findViewById(R.id.toolbarTitle);
 
-		if(profileIntent.getStringExtra("username") != null && !Objects.equals(profileIntent.getStringExtra("username"), "")) {
+		if (profileIntent.getStringExtra("username") != null
+				&& !Objects.equals(profileIntent.getStringExtra("username"), "")) {
 			username = profileIntent.getStringExtra("username");
-		}
-		else {
+		} else {
 			Toasty.warning(ctx, ctx.getResources().getString(R.string.userInvalidUserName));
 			finish();
 		}
@@ -74,26 +73,34 @@ 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)};
-		new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> tab.setText(tabTitles[position])).attach();
+		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);
 		int tabsCount = vg.getChildCount();
 
-		for(int j = 0; j < tabsCount; j++) {
+		for (int j = 0; j < tabsCount; j++) {
 
 			ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
 			int tabChildCount = vgTab.getChildCount();
 
-			for(int i = 0; i < tabChildCount; i++) {
+			for (int i = 0; i < tabChildCount; i++) {
 				View tabViewChild = vgTab.getChildAt(i);
-				if(tabViewChild instanceof TextView) {
+				if (tabViewChild instanceof TextView) {
 					((TextView) tabViewChild).setTypeface(myTypeface);
 				}
 			}
 
-			if(!username.equals(getAccount().getAccount().getUserName())) {
+			if (!username.equals(getAccount().getAccount().getUserName())) {
 				checkFollowStatus();
 			}
 		}
@@ -101,76 +108,84 @@ public class ProfileActivity extends BaseActivity implements BottomSheetListener
 
 	@Override
 	public void onButtonClicked(String text) {
-		if(text.equals("follow")) {
+		if (text.equals("follow")) {
 			followUnfollow();
 		}
 	}
 
 	private void checkFollowStatus() {
-		RetrofitClient.getApiInterface(this).userCurrentCheckFollowing(username).enqueue(new Callback<Void>() {
+		RetrofitClient.getApiInterface(this)
+				.userCurrentCheckFollowing(username)
+				.enqueue(
+						new Callback<Void>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull Response<Void> response) {
-				if(response.code() == 204) {
-					following = true;
-				}
-				else if(response.code() == 404) {
-					following = false;
-				}
-				else {
-					following = false;
-				}
-			}
+							@Override
+							public void onResponse(
+									@NonNull Call<Void> call, @NonNull Response<Void> response) {
+								if (response.code() == 204) {
+									following = true;
+								} else if (response.code() == 404) {
+									following = false;
+								} else {
+									following = false;
+								}
+							}
 
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-				following = false;
-			}
-		});
+							@Override
+							public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+								following = false;
+							}
+						});
 	}
 
 	private void followUnfollow() {
 		Call<Void> call;
-		if(following) {
+		if (following) {
 			call = RetrofitClient.getApiInterface(this).userCurrentDeleteFollow(username);
-		}
-		else {
+		} else {
 			call = RetrofitClient.getApiInterface(this).userCurrentPutFollow(username);
 		}
 
-		call.enqueue(new Callback<Void>() {
+		call.enqueue(
+				new Callback<Void>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull Response<Void> response) {
-				if(response.isSuccessful()) {
-					following = !following;
-					if(following) {
-						Toasty.success(ProfileActivity.this, String.format(getString(R.string.nowFollowUser), username));
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull Response<Void> response) {
+						if (response.isSuccessful()) {
+							following = !following;
+							if (following) {
+								Toasty.success(
+										ProfileActivity.this,
+										String.format(getString(R.string.nowFollowUser), username));
+							} else {
+								Toasty.success(
+										ProfileActivity.this,
+										String.format(
+												getString(R.string.unfollowedUser), username));
+							}
+						} else {
+							if (following) {
+								Toasty.error(
+										ProfileActivity.this,
+										getString(R.string.unfollowingFailed));
+							} else {
+								Toasty.error(
+										ProfileActivity.this, getString(R.string.followingFailed));
+							}
+						}
 					}
-					else {
-						Toasty.success(ProfileActivity.this, String.format(getString(R.string.unfollowedUser), username));
-					}
-				}
-				else {
-					if(following) {
-						Toasty.error(ProfileActivity.this, getString(R.string.unfollowingFailed));
-					}
-					else {
-						Toasty.error(ProfileActivity.this, getString(R.string.followingFailed));
-					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-				if(following) {
-					Toasty.error(ProfileActivity.this, getString(R.string.unfollowingFailed));
-				}
-				else {
-					Toasty.error(ProfileActivity.this, getString(R.string.followingFailed));
-				}
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+						if (following) {
+							Toasty.error(
+									ProfileActivity.this, getString(R.string.unfollowingFailed));
+						} else {
+							Toasty.error(ProfileActivity.this, getString(R.string.followingFailed));
+						}
+					}
+				});
 	}
 
 	@Override
@@ -178,22 +193,21 @@ public class ProfileActivity extends BaseActivity implements BottomSheetListener
 
 		int id = item.getItemId();
 
-		if(id == android.R.id.home) {
+		if (id == android.R.id.home) {
 			finish();
 			return true;
-		}
-		else if(id == R.id.genericMenu) {
-			new BottomSheetUserProfileFragment(following).show(getSupportFragmentManager(), "userProfileBottomSheet");
+		} else if (id == R.id.genericMenu) {
+			new BottomSheetUserProfileFragment(following)
+					.show(getSupportFragmentManager(), "userProfileBottomSheet");
 			return true;
-		}
-		else {
+		} else {
 			return super.onOptionsItemSelected(item);
 		}
 	}
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-		if(!username.equals(getAccount().getAccount().getUserName())) {
+		if (!username.equals(getAccount().getAccount().getUserName())) {
 			getMenuInflater().inflate(R.menu.generic_nav_dotted_menu, menu);
 		}
 		return super.onCreateOptionsMenu(menu);
@@ -205,10 +219,9 @@ public class ProfileActivity extends BaseActivity implements BottomSheetListener
 			super(fa);
 		}
 
-		@NonNull
-		@Override
+		@NonNull @Override
 		public Fragment createFragment(int position) {
-			switch(position) {
+			switch (position) {
 				case 0: // detail
 					return DetailFragment.newInstance(username);
 				case 1: // repos
@@ -229,7 +242,5 @@ public class ProfileActivity extends BaseActivity implements BottomSheetListener
 		public int getItemCount() {
 			return 6;
 		}
-
 	}
-
 }
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 ccc38432..599bd79a 100644
--- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
@@ -26,6 +26,9 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.progressindicator.LinearProgressIndicator;
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.Branch;
 import org.gitnex.tea4j.v2.models.Milestone;
 import org.gitnex.tea4j.v2.models.Organization;
@@ -52,9 +55,6 @@ import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.mian.gitnex.structs.BottomSheetListener;
 import org.mian.gitnex.structs.FragmentRefreshListener;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -62,18 +62,20 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 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();
-			}
-		}
-	});
+	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;
@@ -83,44 +85,55 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 	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 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 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;
 	private Dialog progressDialog;
 	private MaterialAlertDialogBuilder materialAlertDialogBuilder;
 	private Intent intentWiki;
-	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> 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());
+							}
+						}
+					});
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -133,7 +146,8 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 
 		Toolbar toolbar = findViewById(R.id.toolbar);
 
-		materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
 		intentWiki = new Intent(ctx, WikiActivity.class);
 
@@ -157,7 +171,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 	public void onResume() {
 		super.onResume();
 		repository.checkAccountSwitch(this);
-		if(updateRepo) {
+		if (updateRepo) {
 			updateRepo = false;
 			repository.removeRepository();
 			getRepoInfo(repository.getOwner(), repository.getName());
@@ -177,107 +191,113 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 
 		int id = item.getItemId();
 
-		if(id == android.R.id.home) {
+		if (id == android.R.id.home) {
 
-			if(!getIntent().getBooleanExtra("openedFromUserOrg", false)) {
-				RetrofitClient.getApiInterface(ctx).orgGet(repository.getOwner()).enqueue(new Callback<>() {
+			if (!getIntent().getBooleanExtra("openedFromUserOrg", false)) {
+				RetrofitClient.getApiInterface(ctx)
+						.orgGet(repository.getOwner())
+						.enqueue(
+								new Callback<>() {
 
-					@Override
-					public void onResponse(@NonNull Call<Organization> call, @NonNull Response<Organization> response) {
-						Intent intent = new Intent(ctx, response.isSuccessful() ? OrganizationDetailActivity.class : ProfileActivity.class);
-						intent.putExtra(response.isSuccessful() ? "orgName" : "username", repository.getOwner());
-						intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-						startActivity(intent);
-						finish();
-					}
+									@Override
+									public void onResponse(
+											@NonNull Call<Organization> call,
+											@NonNull Response<Organization> response) {
+										Intent intent =
+												new Intent(
+														ctx,
+														response.isSuccessful()
+																? OrganizationDetailActivity.class
+																: ProfileActivity.class);
+										intent.putExtra(
+												response.isSuccessful() ? "orgName" : "username",
+												repository.getOwner());
+										intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+										startActivity(intent);
+										finish();
+									}
 
-					@Override
-					public void onFailure(@NonNull Call<Organization> call, @NonNull Throwable t) {
-						finish();
-					}
-				});
-			}
-			else {
+									@Override
+									public void onFailure(
+											@NonNull Call<Organization> call,
+											@NonNull Throwable t) {
+										finish();
+									}
+								});
+			} else {
 				finish();
 			}
 			return true;
-		}
-		else if(id == R.id.repoMenu) {
+		} else if (id == R.id.repoMenu) {
 
-			if(repository.hasRepository()) {
+			if (repository.hasRepository()) {
 				BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment(repository);
 				bottomSheet.show(getSupportFragmentManager(), "repoBottomSheet");
 			}
 			return true;
-		}
-		else if(id == R.id.filter) {
+		} else if (id == R.id.filter) {
 
-			BottomSheetIssuesFilterFragment filterBottomSheet = new BottomSheetIssuesFilterFragment();
+			BottomSheetIssuesFilterFragment filterBottomSheet =
+					new BottomSheetIssuesFilterFragment();
 			filterBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuBottomSheet");
 			return true;
-		}
-		else if(id == R.id.filterPr) {
+		} else if (id == R.id.filterPr) {
 
-			BottomSheetPullRequestFilterFragment filterPrBottomSheet = new BottomSheetPullRequestFilterFragment();
+			BottomSheetPullRequestFilterFragment filterPrBottomSheet =
+					new BottomSheetPullRequestFilterFragment();
 			filterPrBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuPrBottomSheet");
 			return true;
-		}
-		else if(id == R.id.filterMilestone) {
+		} else if (id == R.id.filterMilestone) {
 
-			BottomSheetMilestonesFilterFragment filterMilestoneBottomSheet = new BottomSheetMilestonesFilterFragment();
-			filterMilestoneBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuMilestoneBottomSheet");
+			BottomSheetMilestonesFilterFragment filterMilestoneBottomSheet =
+					new BottomSheetMilestonesFilterFragment();
+			filterMilestoneBottomSheet.show(
+					getSupportFragmentManager(), "repoFilterMenuMilestoneBottomSheet");
 			return true;
-		}
-		else if(id == R.id.switchBranches) {
+		} else if (id == R.id.switchBranches) {
 
 			chooseBranch();
 			return true;
-		}
-		else if(id == R.id.branchCommits) {
+		} else if (id == R.id.branchCommits) {
 
 			Intent intent = repository.getIntent(ctx, CommitsActivity.class);
 
 			ctx.startActivity(intent);
 			return true;
-		}
-		else if(id == R.id.filterReleases && getAccount().requiresVersion("1.15.0")) {
-			BottomSheetReleasesTagsFragment bottomSheetReleasesTagsFragment = new BottomSheetReleasesTagsFragment();
-			bottomSheetReleasesTagsFragment.show(getSupportFragmentManager(), "repoFilterReleasesMenuBottomSheet");
+		} else if (id == R.id.filterReleases && getAccount().requiresVersion("1.15.0")) {
+			BottomSheetReleasesTagsFragment bottomSheetReleasesTagsFragment =
+					new BottomSheetReleasesTagsFragment();
+			bottomSheetReleasesTagsFragment.show(
+					getSupportFragmentManager(), "repoFilterReleasesMenuBottomSheet");
 			return true;
 		}
 
 		return super.onOptionsItemSelected(item);
-
 	}
 
 	@Override
 	public void onButtonClicked(String text) {
 
-		switch(text) {
-
+		switch (text) {
 			case "label":
-
 				startActivity(repository.getIntent(ctx, CreateLabelActivity.class));
 				break;
 			case "newIssue":
-
 				startActivity(repository.getIntent(ctx, CreateIssueActivity.class));
 				break;
 			case "newMilestone":
-
-				createMilestoneLauncher.launch(repository.getIntent(ctx, CreateMilestoneActivity.class));
+				createMilestoneLauncher.launch(
+						repository.getIntent(ctx, CreateMilestoneActivity.class));
 				break;
 			case "addCollaborator":
-
 				startActivity(repository.getIntent(ctx, AddCollaboratorToRepositoryActivity.class));
 				break;
 			case "chooseBranch":
-
 				chooseBranch();
 				break;
 			case "createRelease":
-
-				createReleaseLauncher.launch(repository.getIntent(ctx, CreateReleaseActivity.class));
+				createReleaseLauncher.launch(
+						repository.getIntent(ctx, CreateReleaseActivity.class));
 				break;
 			case "openWebRepo":
 				AppUtil.openUrlInBrowser(this, repository.getRepository().getHtmlUrl());
@@ -286,10 +306,12 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 				AppUtil.sharingIntent(this, repository.getRepository().getHtmlUrl());
 				break;
 			case "copyRepoUrl":
-				AppUtil.copyToClipboard(this, repository.getRepository().getHtmlUrl(), ctx.getString(R.string.copyIssueUrlToastMsg));
+				AppUtil.copyToClipboard(
+						this,
+						repository.getRepository().getHtmlUrl(),
+						ctx.getString(R.string.copyIssueUrlToastMsg));
 				break;
 			case "newFile":
-
 				editFileLauncher.launch(repository.getIntent(ctx, CreateFileActivity.class));
 				break;
 			case "filterByMilestone":
@@ -297,60 +319,59 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 				break;
 			case "openIssues":
 				repository.setIssueState(RepositoryContext.State.OPEN);
-				if(getFragmentRefreshListener() != null) {
+				if (getFragmentRefreshListener() != null) {
 
 					getFragmentRefreshListener().onRefresh("open");
 				}
 				break;
 			case "closedIssues":
 				repository.setIssueState(RepositoryContext.State.CLOSED);
-				if(getFragmentRefreshListener() != null) {
+				if (getFragmentRefreshListener() != null) {
 
 					getFragmentRefreshListener().onRefresh("closed");
 				}
 				break;
 			case "openPr":
 				repository.setPrState(RepositoryContext.State.OPEN);
-				if(getFragmentRefreshListenerPr() != null) {
+				if (getFragmentRefreshListenerPr() != null) {
 					getFragmentRefreshListenerPr().onRefresh("open");
 				}
 				break;
 			case "closedPr":
 				repository.setPrState(RepositoryContext.State.CLOSED);
-				if(getFragmentRefreshListenerPr() != null) {
+				if (getFragmentRefreshListenerPr() != null) {
 
 					getFragmentRefreshListenerPr().onRefresh("closed");
 				}
 				break;
 			case "openMilestone":
 				repository.setMilestoneState(RepositoryContext.State.OPEN);
-				if(getFragmentRefreshListenerMilestone() != null) {
+				if (getFragmentRefreshListenerMilestone() != null) {
 
 					getFragmentRefreshListenerMilestone().onRefresh("open");
 				}
 				break;
 			case "closedMilestone":
 				repository.setMilestoneState(RepositoryContext.State.CLOSED);
-				if(getFragmentRefreshListenerMilestone() != null) {
+				if (getFragmentRefreshListenerMilestone() != null) {
 
 					getFragmentRefreshListenerMilestone().onRefresh("closed");
 				}
 				break;
 			case "repoSettings":
-
-				settingsLauncher.launch(repository.getIntent(ctx, RepositorySettingsActivity.class));
+				settingsLauncher.launch(
+						repository.getIntent(ctx, RepositorySettingsActivity.class));
 				break;
 			case "newPullRequest":
-
 				startActivity(repository.getIntent(ctx, CreatePullRequestActivity.class));
 				break;
 			case "tags":
-				if(getFragmentRefreshListenerReleases() != null) {
+				if (getFragmentRefreshListenerReleases() != null) {
 					getFragmentRefreshListenerReleases().onRefresh("tags");
 				}
 				break;
 			case "releases":
-				if(getFragmentRefreshListenerReleases() != null) {
+				if (getFragmentRefreshListenerReleases() != null) {
 					getFragmentRefreshListenerReleases().onRefresh("releases");
 				}
 				break;
@@ -367,10 +388,10 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 				repository.setStarred(true);
 				break;
 			case "createWiki":
-
 				Intent intent = new Intent(ctx, WikiActivity.class);
 				intent.putExtra("action", "add");
-				intent.putExtra(RepositoryContext.INTENT_EXTRA, ((RepoDetailActivity) ctx).repository);
+				intent.putExtra(
+						RepositoryContext.INTENT_EXTRA, ((RepoDetailActivity) ctx).repository);
 				ctx.startActivity(intent);
 				break;
 		}
@@ -382,59 +403,76 @@ 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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Milestone>> call, @NonNull Response<List<Milestone>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Milestone>> call,
+							@NonNull Response<List<Milestone>> response) {
 
-				progressDialog.hide();
-				if(response.code() == 200) {
+						progressDialog.hide();
+						if (response.code() == 200) {
 
-					List<String> milestonesList = new ArrayList<>();
-					int selectedMilestone = 0;
-					assert response.body() != null;
+							List<String> milestonesList = new ArrayList<>();
+							int selectedMilestone = 0;
+							assert response.body() != null;
 
-					milestonesList.add("All");
-					for(int i = 0; i < response.body().size(); i++) {
-						Milestone milestones = response.body().get(i);
-						milestonesList.add(milestones.getTitle());
-					}
-
-					for(int j = 0; j < milestonesList.size(); j++) {
-						if(repository.getIssueMilestoneFilterName() != null) {
-							if(repository.getIssueMilestoneFilterName().equals(milestonesList.get(j))) {
-								selectedMilestone = j;
+							milestonesList.add("All");
+							for (int i = 0; i < response.body().size(); i++) {
+								Milestone milestones = response.body().get(i);
+								milestonesList.add(milestones.getTitle());
 							}
+
+							for (int j = 0; j < milestonesList.size(); j++) {
+								if (repository.getIssueMilestoneFilterName() != null) {
+									if (repository
+											.getIssueMilestoneFilterName()
+											.equals(milestonesList.get(j))) {
+										selectedMilestone = j;
+									}
+								}
+							}
+
+							materialAlertDialogBuilder
+									.setTitle(R.string.selectMilestone)
+									.setSingleChoiceItems(
+											milestonesList.toArray(new String[0]),
+											selectedMilestone,
+											(dialogInterface, i) -> {
+												repository.setIssueMilestoneFilterName(
+														milestonesList.get(i));
+
+												if (getFragmentRefreshListenerFilterIssuesByMilestone()
+														!= null) {
+													getFragmentRefreshListenerFilterIssuesByMilestone()
+															.onRefresh(milestonesList.get(i));
+												}
+												dialogInterface.dismiss();
+											})
+									.setNeutralButton(R.string.cancelButton, null);
+							materialAlertDialogBuilder.create().show();
 						}
 					}
 
-					materialAlertDialogBuilder.setTitle(R.string.selectMilestone).setSingleChoiceItems(milestonesList.toArray(new String[0]), selectedMilestone, (dialogInterface, i) -> {
-
-						repository.setIssueMilestoneFilterName(milestonesList.get(i));
-
-						if(getFragmentRefreshListenerFilterIssuesByMilestone() != null) {
-							getFragmentRefreshListenerFilterIssuesByMilestone().onRefresh(milestonesList.get(i));
-						}
-						dialogInterface.dismiss();
-					}).setNeutralButton(R.string.cancelButton, null);
-					materialAlertDialogBuilder.create().show();
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Milestone>> call, @NonNull Throwable t) {
-				progressDialog.hide();
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Milestone>> call, @NonNull Throwable t) {
+						progressDialog.hide();
+					}
+				});
 	}
 
 	@Override
 	public void onDestroy() {
 		super.onDestroy();
 
-		if(progressDialog != null) {
+		if (progressDialog != null) {
 			progressDialog.dismiss();
 		}
 	}
@@ -446,126 +484,150 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 		progressDialog.setContentView(R.layout.custom_progress_loader);
 		progressDialog.show();
 
-		Call<List<Branch>> call = RetrofitClient.getApiInterface(ctx).repoListBranches(repository.getOwner(), repository.getName(), null, null);
+		Call<List<Branch>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoListBranches(repository.getOwner(), repository.getName(), null, null);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Branch>> call, @NonNull Response<List<Branch>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Branch>> call,
+							@NonNull Response<List<Branch>> response) {
 
-				progressDialog.hide();
-				if(response.code() == 200) {
+						progressDialog.hide();
+						if (response.code() == 200) {
 
-					List<String> branchesList = new ArrayList<>();
-					int selectedBranch = 0;
-					assert response.body() != null;
+							List<String> branchesList = new ArrayList<>();
+							int selectedBranch = 0;
+							assert response.body() != null;
 
-					for(int i = 0; i < response.body().size(); i++) {
+							for (int i = 0; i < response.body().size(); i++) {
 
-						Branch branches = response.body().get(i);
-						branchesList.add(branches.getName());
+								Branch branches = response.body().get(i);
+								branchesList.add(branches.getName());
 
-						if(repository.getBranchRef().equals(branches.getName())) {
-							selectedBranch = i;
+								if (repository.getBranchRef().equals(branches.getName())) {
+									selectedBranch = i;
+								}
+							}
+
+							materialAlertDialogBuilder
+									.setTitle(R.string.pageTitleChooseBranch)
+									.setSingleChoiceItems(
+											branchesList.toArray(new String[0]),
+											selectedBranch,
+											(dialogInterface, i) -> {
+												repository.setBranchRef(branchesList.get(i));
+
+												if (getFragmentRefreshListenerFiles() != null) {
+													getFragmentRefreshListenerFiles()
+															.onRefresh(branchesList.get(i));
+												}
+												dialogInterface.dismiss();
+											})
+									.setNeutralButton(R.string.cancelButton, null);
+							materialAlertDialogBuilder.create().show();
 						}
 					}
 
-					materialAlertDialogBuilder.setTitle(R.string.pageTitleChooseBranch).setSingleChoiceItems(branchesList.toArray(new String[0]), selectedBranch, (dialogInterface, i) -> {
-
-						repository.setBranchRef(branchesList.get(i));
-
-						if(getFragmentRefreshListenerFiles() != null) {
-							getFragmentRefreshListenerFiles().onRefresh(branchesList.get(i));
-						}
-						dialogInterface.dismiss();
-					}).setNeutralButton(R.string.cancelButton, null);
-					materialAlertDialogBuilder.create().show();
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Branch>> call, @NonNull Throwable t) {
-				progressDialog.hide();
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<Branch>> call, @NonNull Throwable t) {
+						progressDialog.hide();
+					}
+				});
 	}
 
 	private void getRepoInfo(final String owner, String repo) {
 
 		LinearProgressIndicator loading = findViewById(R.id.loadingIndicator);
-		if(repository.hasRepository()) {
+		if (repository.hasRepository()) {
 			loading.setVisibility(View.GONE);
 			initWithRepo();
 			return;
 		}
 
 		Call<Repository> call = RetrofitClient.getApiInterface(ctx).repoGet(owner, repo);
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Repository> call, @NonNull retrofit2.Response<Repository> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Repository> call,
+							@NonNull retrofit2.Response<Repository> response) {
 
-				Repository repoInfo = response.body();
-				loading.setVisibility(View.GONE);
+						Repository repoInfo = response.body();
+						loading.setVisibility(View.GONE);
 
-				if(response.code() == 200) {
-					assert repoInfo != null;
-					repository.setRepository(repoInfo);
-					initWithRepo();
-				}
-				else {
-					Toasty.error(ctx, getString(R.string.genericError));
-					finish();
-				}
-			}
+						if (response.code() == 200) {
+							assert repoInfo != null;
+							repository.setRepository(repoInfo);
+							initWithRepo();
+						} else {
+							Toasty.error(ctx, getString(R.string.genericError));
+							finish();
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<Repository> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<Repository> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, getString(R.string.genericError));
-				finish();
-			}
-		});
+						Toasty.error(ctx, getString(R.string.genericError));
+						finish();
+					}
+				});
 	}
 
 	private void initWithRepo() {
 		repository.setBranchRef(repository.getRepository().getDefaultBranch());
 
 		ImageView repoTypeToolbar = findViewById(R.id.repoTypeToolbar);
-		if(repository.getRepository().isPrivate()) {
+		if (repository.getRepository().isPrivate()) {
 			repoTypeToolbar.setVisibility(View.VISIBLE);
-		}
-		else {
+		} else {
 			repoTypeToolbar.setVisibility(View.GONE);
 		}
 
 		TabLayout tabLayout = findViewById(R.id.tabs);
 
-		if(viewPager == null) {
+		if (viewPager == null) {
 
 			viewPager = findViewById(R.id.repositoryContainer);
 			viewPager.setOffscreenPageLimit(1);
 
 			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)};
-			new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> tab.setText(tabTitles[position])).attach();
+			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);
 			int tabsCount = viewGroup.getChildCount();
 
-			for(int j = 0; j < tabsCount; j++) {
+			for (int j = 0; j < tabsCount; j++) {
 
 				ViewGroup vgTab = (ViewGroup) viewGroup.getChildAt(j);
 				int tabChildCount = vgTab.getChildCount();
 
-				for(int i = 0; i < tabChildCount; i++) {
+				for (int i = 0; i < tabChildCount; i++) {
 
 					View tabViewChild = vgTab.getChildAt(i);
 
-					if(tabViewChild instanceof TextView) {
+					if (tabViewChild instanceof TextView) {
 
 						((TextView) tabViewChild).setTypeface(myTypeface);
 					}
@@ -573,72 +635,80 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 			}
 		}
 
-		if(tinyDB.getBoolean("enableCounterBadges", true)) {
-			@SuppressLint("InflateParams") View tabHeader2 = LayoutInflater.from(ctx).inflate(R.layout.badge_issue, null);
-			if(textViewBadgeIssue == null) {
+		if (tinyDB.getBoolean("enableCounterBadges", true)) {
+			@SuppressLint("InflateParams")
+			View tabHeader2 = LayoutInflater.from(ctx).inflate(R.layout.badge_issue, null);
+			if (textViewBadgeIssue == null) {
 				textViewBadgeIssue = tabHeader2.findViewById(R.id.counterBadgeIssue);
 			}
 
-			@SuppressLint("InflateParams") View tabHeader4 = LayoutInflater.from(ctx).inflate(R.layout.badge_pull, null);
-			if(textViewBadgePull == null) {
+			@SuppressLint("InflateParams")
+			View tabHeader4 = LayoutInflater.from(ctx).inflate(R.layout.badge_pull, null);
+			if (textViewBadgePull == null) {
 				textViewBadgePull = tabHeader4.findViewById(R.id.counterBadgePull);
 			}
 
-			@SuppressLint("InflateParams") View tabHeader6 = LayoutInflater.from(ctx).inflate(R.layout.badge_release, null);
-			if(textViewBadgeRelease == null) {
+			@SuppressLint("InflateParams")
+			View tabHeader6 = LayoutInflater.from(ctx).inflate(R.layout.badge_release, null);
+			if (textViewBadgeRelease == null) {
 				textViewBadgeRelease = tabHeader6.findViewById(R.id.counterBadgeRelease);
 			}
 
 			ColorStateList textColor = tabLayout.getTabTextColors();
 
-			if(repository.getRepository().getOpenIssuesCount() != null) {
+			if (repository.getRepository().getOpenIssuesCount() != null) {
 				textViewBadgeIssue.setVisibility(View.VISIBLE);
-				textViewBadgeIssue.setText(String.valueOf(repository.getRepository().getOpenIssuesCount()));
+				textViewBadgeIssue.setText(
+						String.valueOf(repository.getRepository().getOpenIssuesCount()));
 
 				TabLayout.Tab tabOpenIssues = tabLayout.getTabAt(2);
 				assert tabOpenIssues != null;
 
-				if(tabOpenIssues.getCustomView() == null) {
+				if (tabOpenIssues.getCustomView() == null) {
 					tabOpenIssues.setCustomView(tabHeader2);
 				}
-				TextView openIssueTabView = Objects.requireNonNull(tabOpenIssues.getCustomView()).findViewById(R.id.counterBadgeIssueText);
+				TextView openIssueTabView =
+						Objects.requireNonNull(tabOpenIssues.getCustomView())
+								.findViewById(R.id.counterBadgeIssueText);
 				openIssueTabView.setTextColor(textColor);
-			}
-			else {
+			} else {
 				textViewBadgeIssue.setVisibility(View.GONE);
 			}
 
-			if(repository.getRepository().getOpenPrCounter() != null) {
+			if (repository.getRepository().getOpenPrCounter() != null) {
 				textViewBadgePull.setVisibility(View.VISIBLE);
-				textViewBadgePull.setText(String.valueOf(repository.getRepository().getOpenPrCounter()));
+				textViewBadgePull.setText(
+						String.valueOf(repository.getRepository().getOpenPrCounter()));
 
 				TabLayout.Tab tabOpenPulls = tabLayout.getTabAt(3);
 				assert tabOpenPulls != null;
 
-				if(tabOpenPulls.getCustomView() == null) {
+				if (tabOpenPulls.getCustomView() == null) {
 					tabOpenPulls.setCustomView(tabHeader4);
 				}
-				TextView openPullTabView = Objects.requireNonNull(tabOpenPulls.getCustomView()).findViewById(R.id.counterBadgePullText);
+				TextView openPullTabView =
+						Objects.requireNonNull(tabOpenPulls.getCustomView())
+								.findViewById(R.id.counterBadgePullText);
 				openPullTabView.setTextColor(textColor);
-			}
-			else {
+			} else {
 				textViewBadgePull.setVisibility(View.GONE);
 			}
 
-			if(repository.getRepository().getReleaseCounter() != null) {
+			if (repository.getRepository().getReleaseCounter() != null) {
 				textViewBadgeRelease.setVisibility(View.VISIBLE);
-				textViewBadgeRelease.setText(String.valueOf(repository.getRepository().getReleaseCounter()));
-
+				textViewBadgeRelease.setText(
+						String.valueOf(repository.getRepository().getReleaseCounter()));
 
 				TabLayout.Tab tabOpenRelease = tabLayout.getTabAt(4);
 				assert tabOpenRelease != null;
-				if(tabOpenRelease.getCustomView() == null) {
+				if (tabOpenRelease.getCustomView() == null) {
 					tabOpenRelease.setCustomView(tabHeader6);
 				}
-				TextView openReleaseTabView = Objects.requireNonNull(tabOpenRelease.getCustomView()).findViewById(R.id.counterBadgeReleaseText);
+				TextView openReleaseTabView =
+						Objects.requireNonNull(tabOpenRelease.getCustomView())
+								.findViewById(R.id.counterBadgeReleaseText);
 				openReleaseTabView.setTextColor(textColor);
-			}
-			else {
+			} else {
 				textViewBadgeRelease.setVisibility(View.GONE);
 			}
 		}
@@ -647,11 +717,11 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 		String goToSection = mainIntent.getStringExtra("goToSection");
 		String goToSectionType = mainIntent.getStringExtra("goToSectionType");
 
-		if(goToSection != null) {
+		if (goToSection != null) {
 			mainIntent.removeExtra("goToSection");
 			mainIntent.removeExtra("goToSectionType");
 
-			switch(goToSectionType) {
+			switch (goToSectionType) {
 				case "branchesList":
 					viewPager.setCurrentItem(1);
 					chooseBranch();
@@ -660,7 +730,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 					viewPager.setCurrentItem(1);
 					String selectedBranch = mainIntent.getStringExtra("selectedBranch");
 					repository.setBranchRef(selectedBranch);
-					if(getFragmentRefreshListenerFiles() != null) {
+					if (getFragmentRefreshListenerFiles() != null) {
 						getFragmentRefreshListenerFiles().onRefresh(selectedBranch);
 					}
 					break;
@@ -668,7 +738,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 					viewPager.setCurrentItem(1);
 					String branch1 = mainIntent.getStringExtra("branch");
 					repository.setBranchRef(branch1);
-					if(getFragmentRefreshListenerFiles() != null) {
+					if (getFragmentRefreshListenerFiles() != null) {
 						getFragmentRefreshListenerFiles().onRefresh(branch1);
 					}
 					Intent intent = repository.getIntent(ctx, FileViewActivity.class);
@@ -679,7 +749,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 					viewPager.setCurrentItem(1);
 					String branch2 = mainIntent.getStringExtra("branch");
 					repository.setBranchRef(branch2);
-					if(getFragmentRefreshListenerFiles() != null) {
+					if (getFragmentRefreshListenerFiles() != null) {
 						getFragmentRefreshListenerFiles().onRefresh(branch2);
 					}
 					break;
@@ -687,7 +757,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 					viewPager.setCurrentItem(1);
 					String branch = mainIntent.getStringExtra("branchName");
 					repository.setBranchRef(branch);
-					if(getFragmentRefreshListenerFiles() != null) {
+					if (getFragmentRefreshListenerFiles() != null) {
 						getFragmentRefreshListenerFiles().onRefresh(branch);
 					}
 					Intent intent1 = repository.getIntent(ctx, CommitsActivity.class);
@@ -712,7 +782,8 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 					break;
 				case "newRelease":
 					viewPager.setCurrentItem(4);
-					createReleaseLauncher.launch(repository.getIntent(ctx, CreateReleaseActivity.class));
+					createReleaseLauncher.launch(
+							repository.getIntent(ctx, CreateReleaseActivity.class));
 					break;
 				case "wiki":
 					viewPager.setCurrentItem(5);
@@ -720,7 +791,8 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 				case "wikiNew":
 					viewPager.setCurrentItem(5);
 					intentWiki.putExtra("action", "add");
-					intentWiki.putExtra(RepositoryContext.INTENT_EXTRA, ((RepoDetailActivity) ctx).repository);
+					intentWiki.putExtra(
+							RepositoryContext.INTENT_EXTRA, ((RepoDetailActivity) ctx).repository);
 					ctx.startActivity(intentWiki);
 					break;
 				case "milestones":
@@ -728,13 +800,15 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 					break;
 				case "milestonesNew":
 					viewPager.setCurrentItem(6);
-					createMilestoneLauncher.launch(repository.getIntent(ctx, CreateMilestoneActivity.class));
+					createMilestoneLauncher.launch(
+							repository.getIntent(ctx, CreateMilestoneActivity.class));
 					break;
 				case "labels":
 					viewPager.setCurrentItem(7);
 					break;
 				case "settings":
-					settingsLauncher.launch(repository.getIntent(ctx, RepositorySettingsActivity.class));
+					settingsLauncher.launch(
+							repository.getIntent(ctx, RepositorySettingsActivity.class));
 					break;
 			}
 		}
@@ -743,41 +817,44 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 	private void checkRepositoryStarStatus(final String owner, String repo) {
 
 		Call<Void> call = RetrofitClient.getApiInterface(ctx).userCurrentCheckStarring(owner, repo);
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				repository.setStarred(response.code() == 204);
-			}
+						repository.setStarred(response.code() == 204);
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {}
+				});
 	}
 
 	private void checkRepositoryWatchStatus(final String owner, String repo) {
 
-		Call<WatchInfo> call = RetrofitClient.getApiInterface(ctx).userCurrentCheckSubscription(owner, repo);
-		call.enqueue(new Callback<>() {
+		Call<WatchInfo> call =
+				RetrofitClient.getApiInterface(ctx).userCurrentCheckSubscription(owner, repo);
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<WatchInfo> call,
+							@NonNull retrofit2.Response<WatchInfo> response) {
 
-				if(response.code() == 200) {
-					assert response.body() != null;
-					repository.setWatched(response.body().isSubscribed());
-				}
-				else {
-					repository.setWatched(false);
-				}
-			}
+						if (response.code() == 200) {
+							assert response.body() != null;
+							repository.setWatched(response.body().isSubscribed());
+						} else {
+							repository.setWatched(false);
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {}
+				});
 	}
 
 	// Issues milestone filter interface
@@ -785,7 +862,8 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 		return fragmentRefreshListenerFilterIssuesByMilestone;
 	}
 
-	public void setFragmentRefreshListenerFilterIssuesByMilestone(FragmentRefreshListener fragmentRefreshListener) {
+	public void setFragmentRefreshListenerFilterIssuesByMilestone(
+			FragmentRefreshListener fragmentRefreshListener) {
 		this.fragmentRefreshListenerFilterIssuesByMilestone = fragmentRefreshListener;
 	}
 
@@ -812,7 +890,8 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 		return fragmentRefreshListenerMilestone;
 	}
 
-	public void setFragmentRefreshListenerMilestone(FragmentRefreshListener fragmentRefreshListenerMilestone) {
+	public void setFragmentRefreshListenerMilestone(
+			FragmentRefreshListener fragmentRefreshListenerMilestone) {
 		this.fragmentRefreshListenerMilestone = fragmentRefreshListenerMilestone;
 	}
 
@@ -821,16 +900,18 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 		return fragmentRefreshListenerFiles;
 	}
 
-	public void setFragmentRefreshListenerFiles(FragmentRefreshListener fragmentRefreshListenerFiles) {
+	public void setFragmentRefreshListenerFiles(
+			FragmentRefreshListener fragmentRefreshListenerFiles) {
 		this.fragmentRefreshListenerFiles = fragmentRefreshListenerFiles;
 	}
 
-	//Releases interface
+	// Releases interface
 	public FragmentRefreshListener getFragmentRefreshListenerReleases() {
 		return fragmentRefreshListenerReleases;
 	}
 
-	public void setFragmentRefreshListenerReleases(FragmentRefreshListener fragmentRefreshListener) {
+	public void setFragmentRefreshListenerReleases(
+			FragmentRefreshListener fragmentRefreshListener) {
 		this.fragmentRefreshListenerReleases = fragmentRefreshListener;
 	}
 
@@ -840,13 +921,12 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 			super(fa);
 		}
 
-		@NonNull
-		@Override
+		@NonNull @Override
 		public Fragment createFragment(int position) {
 
 			Fragment fragment = null;
 
-			switch(position) {
+			switch (position) {
 				case 0: // Repository details
 					return RepoInfoFragment.newInstance(repository);
 				case 1: // Files
@@ -877,6 +957,5 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
 		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 4bcdcdd8..cdd13510 100644
--- a/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java
@@ -14,6 +14,8 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Repository;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.RepoForksAdapter;
@@ -21,8 +23,6 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.ActivityRepoForksBinding;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -30,7 +30,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class RepoForksActivity extends BaseActivity {
 
 	private ActivityRepoForksBinding activityRepoForksBinding;
@@ -59,30 +58,38 @@ public class RepoForksActivity extends BaseActivity {
 		final String repoOwner = repository.getOwner();
 		final String repoName = repository.getName();
 
-		activityRepoForksBinding.toolbarTitle.setText(ctx.getResources().getString(R.string.infoTabRepoForksCount));
+		activityRepoForksBinding.toolbarTitle.setText(
+				ctx.getResources().getString(R.string.infoTabRepoForksCount));
 
 		activityRepoForksBinding.close.setOnClickListener(v -> finish());
 		resultLimit = Constants.getCurrentResultLimit(ctx);
 		forksList = new ArrayList<>();
 
-		activityRepoForksBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			pageSize = 1;
-			activityRepoForksBinding.pullToRefresh.setRefreshing(false);
-			loadInitial(repoOwner, repoName, pageSize, resultLimit);
-			adapter.notifyDataChanged();
-
-		}, 200));
+		activityRepoForksBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											pageSize = 1;
+											activityRepoForksBinding.pullToRefresh.setRefreshing(
+													false);
+											loadInitial(repoOwner, repoName, pageSize, resultLimit);
+											adapter.notifyDataChanged();
+										},
+										200));
 
 		adapter = new RepoForksAdapter(ctx, forksList);
-		adapter.setLoadMoreListener(() -> activityRepoForksBinding.recyclerView.post(() -> {
+		adapter.setLoadMoreListener(
+				() ->
+						activityRepoForksBinding.recyclerView.post(
+								() -> {
+									if (forksList.size() == resultLimit
+											|| pageSize == resultLimit) {
 
-			if(forksList.size() == resultLimit || pageSize == resultLimit) {
-
-				int page = (forksList.size() + resultLimit) / resultLimit;
-				loadMore(repoOwner, repoName, page, resultLimit);
-			}
-		}));
+										int page = (forksList.size() + resultLimit) / resultLimit;
+										loadMore(repoOwner, repoName, page, resultLimit);
+									}
+								}));
 
 		activityRepoForksBinding.recyclerView.setHasFixedSize(true);
 		activityRepoForksBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
@@ -93,85 +100,91 @@ public class RepoForksActivity extends BaseActivity {
 
 	private void loadInitial(String repoOwner, String repoName, int pageSize, int resultLimit) {
 
-		Call<List<Repository>> call = RetrofitClient.getApiInterface(ctx).listForks(repoOwner, repoName, pageSize, resultLimit);
+		Call<List<Repository>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.listForks(repoOwner, repoName, pageSize, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Repository>> call, @NonNull Response<List<Repository>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Repository>> call,
+							@NonNull Response<List<Repository>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					assert response.body() != null;
+							assert response.body() != null;
 
-					if(response.body().size() > 0) {
-						forksList.clear();
-						forksList.addAll(response.body());
-						adapter.notifyDataChanged();
-						activityRepoForksBinding.noData.setVisibility(View.GONE);
-					}
-					else {
-						forksList.clear();
-						adapter.notifyDataChanged();
-						activityRepoForksBinding.noData.setVisibility(View.VISIBLE);
+							if (response.body().size() > 0) {
+								forksList.clear();
+								forksList.addAll(response.body());
+								adapter.notifyDataChanged();
+								activityRepoForksBinding.noData.setVisibility(View.GONE);
+							} else {
+								forksList.clear();
+								adapter.notifyDataChanged();
+								activityRepoForksBinding.noData.setVisibility(View.VISIBLE);
+							}
+
+							activityRepoForksBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Log.e(TAG, String.valueOf(response.code()));
+						}
 					}
 
-					activityRepoForksBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
-				Log.e(TAG, t.toString());
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
+						Log.e(TAG, t.toString());
+					}
+				});
 	}
 
 	private void loadMore(String repoOwner, String repoName, int page, int resultLimit) {
 
 		activityRepoForksBinding.progressLoadMore.setVisibility(View.VISIBLE);
 
-		Call<List<Repository>> call = RetrofitClient.getApiInterface(ctx).listForks(repoOwner, repoName, page, resultLimit);
+		Call<List<Repository>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.listForks(repoOwner, repoName, page, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Repository>> call, @NonNull Response<List<Repository>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Repository>> call,
+							@NonNull Response<List<Repository>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					//remove loading view
-					forksList.remove(forksList.size() - 1);
+							// remove loading view
+							forksList.remove(forksList.size() - 1);
 
-					List<Repository> result = response.body();
-					assert result != null;
+							List<Repository> result = response.body();
+							assert result != null;
 
-					if(result.size() > 0) {
-						pageSize = result.size();
-						forksList.addAll(result);
-					}
-					else {
-						adapter.setMoreDataAvailable(false);
+							if (result.size() > 0) {
+								pageSize = result.size();
+								forksList.addAll(result);
+							} else {
+								adapter.setMoreDataAvailable(false);
+							}
+
+							adapter.notifyDataChanged();
+							activityRepoForksBinding.progressLoadMore.setVisibility(View.GONE);
+						} else {
+							Log.e(TAG, String.valueOf(response.code()));
+						}
 					}
 
-					adapter.notifyDataChanged();
-					activityRepoForksBinding.progressLoadMore.setVisibility(View.GONE);
-				}
-				else {
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
-				Log.e(TAG, t.toString());
-			}
-
-		});
-
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
+						Log.e(TAG, t.toString());
+					}
+				});
 	}
 
 	@Override
@@ -184,19 +197,20 @@ public class RepoForksActivity extends BaseActivity {
 		SearchView searchView = (SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				filter(newText);
-				return true;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						filter(newText);
+						return true;
+					}
+				});
 
 		return super.onCreateOptionsMenu(menu);
 	}
@@ -204,8 +218,10 @@ public class RepoForksActivity extends BaseActivity {
 	private void filter(String text) {
 		List<Repository> userRepositories = new ArrayList<>();
 
-		for(Repository d : forksList) {
-			if(d.getOwner().getLogin().contains(text) || d.getName().toLowerCase().contains(text) || d.getDescription().toLowerCase().contains(text)) {
+		for (Repository d : forksList) {
+			if (d.getOwner().getLogin().contains(text)
+					|| d.getName().toLowerCase().contains(text)
+					|| d.getDescription().toLowerCase().contains(text)) {
 
 				userRepositories.add(d);
 			}
@@ -219,5 +235,4 @@ public class RepoForksActivity extends BaseActivity {
 		super.onResume();
 		repository.checkAccountSwitch(this);
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
index 8140804e..0b36c9c6 100644
--- a/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
@@ -16,7 +16,6 @@ import org.mian.gitnex.viewmodels.RepoStargazersViewModel;
 /**
  * @author M M Arif
  */
-
 public class RepoStargazersActivity extends BaseActivity {
 
 	private TextView noDataStargazers;
@@ -32,7 +31,8 @@ public class RepoStargazersActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityRepoStargazersBinding activityRepoStargazersBinding = ActivityRepoStargazersBinding.inflate(getLayoutInflater());
+		ActivityRepoStargazersBinding activityRepoStargazersBinding =
+				ActivityRepoStargazersBinding.inflate(getLayoutInflater());
 		setContentView(activityRepoStargazersBinding.getRoot());
 
 		ImageView closeActivity = activityRepoStargazersBinding.close;
@@ -55,27 +55,29 @@ public class RepoStargazersActivity extends BaseActivity {
 
 	private void fetchDataAsync(String repoOwner, String repoName) {
 
-		RepoStargazersViewModel repoStargazersModel = new ViewModelProvider(this).get(RepoStargazersViewModel.class);
+		RepoStargazersViewModel repoStargazersModel =
+				new ViewModelProvider(this).get(RepoStargazersViewModel.class);
 
-		repoStargazersModel.getRepoStargazers(repoOwner, repoName, ctx).observe(this, stargazersListMain -> {
+		repoStargazersModel
+				.getRepoStargazers(repoOwner, repoName, ctx)
+				.observe(
+						this,
+						stargazersListMain -> {
+							adapter = new UserGridAdapter(ctx, stargazersListMain);
 
-			adapter = new UserGridAdapter(ctx, stargazersListMain);
+							if (adapter.getCount() > 0) {
 
-			if(adapter.getCount() > 0) {
+								mGridView.setAdapter(adapter);
+								noDataStargazers.setVisibility(View.GONE);
+							} else {
 
-				mGridView.setAdapter(adapter);
-				noDataStargazers.setVisibility(View.GONE);
-			}
-			else {
-
-				adapter.notifyDataSetChanged();
-				mGridView.setAdapter(adapter);
-				noDataStargazers.setVisibility(View.VISIBLE);
-			}
-
-			mProgressBar.setVisibility(View.GONE);
-		});
+								adapter.notifyDataSetChanged();
+								mGridView.setAdapter(adapter);
+								noDataStargazers.setVisibility(View.VISIBLE);
+							}
 
+							mProgressBar.setVisibility(View.GONE);
+						});
 	}
 
 	private void initCloseListener() {
@@ -88,5 +90,4 @@ public class RepoStargazersActivity extends BaseActivity {
 		super.onResume();
 		repository.checkAccountSwitch(this);
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java
index 03dcd7ae..a684b8bc 100644
--- a/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java
@@ -16,7 +16,6 @@ import org.mian.gitnex.viewmodels.RepoWatchersViewModel;
 /**
  * @author M M Arif
  */
-
 public class RepoWatchersActivity extends BaseActivity {
 
 	private TextView noDataWatchers;
@@ -32,7 +31,8 @@ public class RepoWatchersActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityRepoWatchersBinding activityRepoWatchersBinding = ActivityRepoWatchersBinding.inflate(getLayoutInflater());
+		ActivityRepoWatchersBinding activityRepoWatchersBinding =
+				ActivityRepoWatchersBinding.inflate(getLayoutInflater());
 		setContentView(activityRepoWatchersBinding.getRoot());
 
 		ImageView closeActivity = activityRepoWatchersBinding.close;
@@ -55,27 +55,29 @@ public class RepoWatchersActivity extends BaseActivity {
 
 	private void fetchDataAsync(String repoOwner, String repoName) {
 
-		RepoWatchersViewModel repoWatchersModel = new ViewModelProvider(this).get(RepoWatchersViewModel.class);
+		RepoWatchersViewModel repoWatchersModel =
+				new ViewModelProvider(this).get(RepoWatchersViewModel.class);
 
-		repoWatchersModel.getRepoWatchers(repoOwner, repoName, ctx).observe(this, watchersListMain -> {
+		repoWatchersModel
+				.getRepoWatchers(repoOwner, repoName, ctx)
+				.observe(
+						this,
+						watchersListMain -> {
+							adapter = new UserGridAdapter(ctx, watchersListMain);
 
-			adapter = new UserGridAdapter(ctx, watchersListMain);
+							if (adapter.getCount() > 0) {
 
-			if(adapter.getCount() > 0) {
+								mGridView.setAdapter(adapter);
+								noDataWatchers.setVisibility(View.GONE);
+							} else {
 
-				mGridView.setAdapter(adapter);
-				noDataWatchers.setVisibility(View.GONE);
-			}
-			else {
-
-				adapter.notifyDataSetChanged();
-				mGridView.setAdapter(adapter);
-				noDataWatchers.setVisibility(View.VISIBLE);
-			}
-
-			mProgressBar.setVisibility(View.GONE);
-		});
+								adapter.notifyDataSetChanged();
+								mGridView.setAdapter(adapter);
+								noDataWatchers.setVisibility(View.VISIBLE);
+							}
 
+							mProgressBar.setVisibility(View.GONE);
+						});
 	}
 
 	private void initCloseListener() {
@@ -88,5 +90,4 @@ public class RepoWatchersActivity extends BaseActivity {
 		super.onResume();
 		repository.checkAccountSwitch(this);
 	}
-
 }
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 c27883b3..8a871d12 100644
--- a/app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java
@@ -8,6 +8,7 @@ import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.EditRepoOption;
 import org.gitnex.tea4j.v2.models.InternalTracker;
 import org.gitnex.tea4j.v2.models.Repository;
@@ -22,14 +23,12 @@ import org.mian.gitnex.databinding.CustomRepositoryEditPropertiesDialogBinding;
 import org.mian.gitnex.databinding.CustomRepositoryTransferDialogBinding;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class RepositorySettingsActivity extends BaseActivity {
 
 	private ActivityRepositorySettingsBinding viewBinding;
@@ -59,40 +58,44 @@ public class RepositorySettingsActivity extends BaseActivity {
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
 		viewBinding.editProperties.setOnClickListener(editProperties -> showRepositoryProperties());
 
-		viewBinding.deleteRepositoryFrame.setOnClickListener(deleteRepository -> showDeleteRepository());
+		viewBinding.deleteRepositoryFrame.setOnClickListener(
+				deleteRepository -> showDeleteRepository());
 
-		viewBinding.transferOwnerFrame.setOnClickListener(transferRepositoryOwnership -> showTransferRepository());
+		viewBinding.transferOwnerFrame.setOnClickListener(
+				transferRepositoryOwnership -> showTransferRepository());
 	}
 
 	private void showTransferRepository() {
 
-		transferRepoBinding = CustomRepositoryTransferDialogBinding.inflate(LayoutInflater.from(ctx));
+		transferRepoBinding =
+				CustomRepositoryTransferDialogBinding.inflate(LayoutInflater.from(ctx));
 
 		View view = transferRepoBinding.getRoot();
 		materialAlertDialogBuilder.setView(view);
 
-		transferRepoBinding.transfer.setOnClickListener(deleteRepo -> {
+		transferRepoBinding.transfer.setOnClickListener(
+				deleteRepo -> {
+					String newOwner =
+							String.valueOf(transferRepoBinding.ownerNameForTransfer.getText());
+					String repoName =
+							String.valueOf(transferRepoBinding.repoNameForTransfer.getText());
 
-			String newOwner = String.valueOf(transferRepoBinding.ownerNameForTransfer.getText());
-			String repoName = String.valueOf(transferRepoBinding.repoNameForTransfer.getText());
+					if (!repository.getName().equals(repoName)) {
 
-			if(!repository.getName().equals(repoName)) {
+						Toasty.error(ctx, getString(R.string.repoSettingsDeleteError));
+					} else if (newOwner.matches("")) {
 
-				Toasty.error(ctx, getString(R.string.repoSettingsDeleteError));
-			}
-			else if(newOwner.matches("")) {
+						Toasty.error(ctx, getString(R.string.repoTransferOwnerError));
+					} else {
 
-				Toasty.error(ctx, getString(R.string.repoTransferOwnerError));
-			}
-			else {
-
-				transferRepository(newOwner);
-			}
-		});
+						transferRepository(newOwner);
+					}
+				});
 
 		dialogRepo = materialAlertDialogBuilder.show();
 	}
@@ -102,49 +105,54 @@ 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<>() {
+		transferCall.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Repository> call, @NonNull retrofit2.Response<Repository> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Repository> call,
+							@NonNull retrofit2.Response<Repository> response) {
 
-				transferRepoBinding.transfer.setVisibility(View.GONE);
-				transferRepoBinding.processingRequest.setVisibility(View.VISIBLE);
+						transferRepoBinding.transfer.setVisibility(View.GONE);
+						transferRepoBinding.processingRequest.setVisibility(View.VISIBLE);
 
-				if(response.code() == 202 || response.code() == 201) {
+						if (response.code() == 202 || response.code() == 201) {
 
-					dialogRepo.dismiss();
-					Toasty.success(ctx, getString(R.string.repoTransferSuccess));
+							dialogRepo.dismiss();
+							Toasty.success(ctx, getString(R.string.repoTransferSuccess));
 
-					Objects.requireNonNull(BaseApi.getInstance(ctx, RepositoriesApi.class)).deleteRepository(repository.getRepositoryId());
-					Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class);
-					RepositorySettingsActivity.this.startActivity(intent);
-					finish();
-				}
-				else if(response.code() == 404) {
+							Objects.requireNonNull(BaseApi.getInstance(ctx, RepositoriesApi.class))
+									.deleteRepository(repository.getRepositoryId());
+							Intent intent =
+									new Intent(RepositorySettingsActivity.this, MainActivity.class);
+							RepositorySettingsActivity.this.startActivity(intent);
+							finish();
+						} else if (response.code() == 404) {
 
-					transferRepoBinding.transfer.setVisibility(View.VISIBLE);
-					transferRepoBinding.processingRequest.setVisibility(View.GONE);
-					Toasty.error(ctx, getString(R.string.repoTransferError));
-				}
-				else {
+							transferRepoBinding.transfer.setVisibility(View.VISIBLE);
+							transferRepoBinding.processingRequest.setVisibility(View.GONE);
+							Toasty.error(ctx, getString(R.string.repoTransferError));
+						} else {
 
-					transferRepoBinding.transfer.setVisibility(View.VISIBLE);
-					transferRepoBinding.processingRequest.setVisibility(View.GONE);
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
+							transferRepoBinding.transfer.setVisibility(View.VISIBLE);
+							transferRepoBinding.processingRequest.setVisibility(View.GONE);
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
+					}
 
-			}
+					@Override
+					public void onFailure(@NonNull Call<Repository> call, @NonNull Throwable t) {
 
-			@Override
-			public void onFailure(@NonNull Call<Repository> call, @NonNull Throwable t) {
-
-				transferRepoBinding.transfer.setVisibility(View.VISIBLE);
-				transferRepoBinding.processingRequest.setVisibility(View.GONE);
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
+						transferRepoBinding.transfer.setVisibility(View.VISIBLE);
+						transferRepoBinding.processingRequest.setVisibility(View.GONE);
+						Toasty.error(ctx, getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	private void showDeleteRepository() {
@@ -154,60 +162,67 @@ public class RepositorySettingsActivity extends BaseActivity {
 		View view = deleteRepoBinding.getRoot();
 		materialAlertDialogBuilder.setView(view);
 
-		deleteRepoBinding.delete.setOnClickListener(deleteRepo -> {
+		deleteRepoBinding.delete.setOnClickListener(
+				deleteRepo -> {
+					if (!repository
+							.getName()
+							.equals(
+									String.valueOf(
+											deleteRepoBinding.repoNameForDeletion.getText()))) {
 
-			if(!repository.getName().equals(String.valueOf(deleteRepoBinding.repoNameForDeletion.getText()))) {
+						Toasty.error(ctx, getString(R.string.repoSettingsDeleteError));
+					} else {
 
-				Toasty.error(ctx, getString(R.string.repoSettingsDeleteError));
-			}
-			else {
-
-				deleteRepository();
-			}
-		});
+						deleteRepository();
+					}
+				});
 
 		dialogRepo = materialAlertDialogBuilder.show();
 	}
 
 	private void deleteRepository() {
 
-		Call<Void> deleteCall = RetrofitClient.getApiInterface(ctx).repoDelete(repository.getOwner(), repository.getName());
+		Call<Void> deleteCall =
+				RetrofitClient.getApiInterface(ctx)
+						.repoDelete(repository.getOwner(), repository.getName());
 
-		deleteCall.enqueue(new Callback<>() {
+		deleteCall.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				deleteRepoBinding.delete.setVisibility(View.GONE);
-				deleteRepoBinding.processingRequest.setVisibility(View.VISIBLE);
+						deleteRepoBinding.delete.setVisibility(View.GONE);
+						deleteRepoBinding.processingRequest.setVisibility(View.VISIBLE);
 
-				if(response.code() == 204) {
+						if (response.code() == 204) {
 
-					dialogRepo.dismiss();
-					Toasty.success(ctx, getString(R.string.repoDeletionSuccess));
+							dialogRepo.dismiss();
+							Toasty.success(ctx, getString(R.string.repoDeletionSuccess));
 
-					Objects.requireNonNull(BaseApi.getInstance(ctx, RepositoriesApi.class)).deleteRepository(repository.getRepositoryId());
-					Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class);
-					RepositorySettingsActivity.this.startActivity(intent);
-					finish();
-				}
-				else {
+							Objects.requireNonNull(BaseApi.getInstance(ctx, RepositoriesApi.class))
+									.deleteRepository(repository.getRepositoryId());
+							Intent intent =
+									new Intent(RepositorySettingsActivity.this, MainActivity.class);
+							RepositorySettingsActivity.this.startActivity(intent);
+							finish();
+						} else {
 
-					deleteRepoBinding.delete.setVisibility(View.VISIBLE);
-					deleteRepoBinding.processingRequest.setVisibility(View.GONE);
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
+							deleteRepoBinding.delete.setVisibility(View.VISIBLE);
+							deleteRepoBinding.processingRequest.setVisibility(View.GONE);
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
+					}
 
-			}
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				deleteRepoBinding.delete.setVisibility(View.VISIBLE);
-				deleteRepoBinding.processingRequest.setVisibility(View.GONE);
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
+						deleteRepoBinding.delete.setVisibility(View.VISIBLE);
+						deleteRepoBinding.processingRequest.setVisibility(View.GONE);
+						Toasty.error(ctx, getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	private void showRepositoryProperties() {
@@ -231,21 +246,20 @@ public class RepositorySettingsActivity extends BaseActivity {
 
 		propBinding.repoEnableIssues.setChecked(repoInfo.isHasIssues());
 
-		propBinding.repoEnableIssues.setOnCheckedChangeListener((buttonView, isChecked) -> {
+		propBinding.repoEnableIssues.setOnCheckedChangeListener(
+				(buttonView, isChecked) -> {
+					if (isChecked) {
+						propBinding.repoEnableTimer.setVisibility(View.VISIBLE);
+					} else {
+						propBinding.repoEnableTimer.setVisibility(View.GONE);
+					}
+				});
 
-			if(isChecked) {
-				propBinding.repoEnableTimer.setVisibility(View.VISIBLE);
-			}
-			else {
-				propBinding.repoEnableTimer.setVisibility(View.GONE);
-			}
-		});
+		if (repoInfo.getInternalTracker() != null) {
 
-		if(repoInfo.getInternalTracker() != null) {
-
-			propBinding.repoEnableTimer.setChecked(repoInfo.getInternalTracker().isEnableTimeTracker());
-		}
-		else {
+			propBinding.repoEnableTimer.setChecked(
+					repoInfo.getInternalTracker().isEnableTimeTracker());
+		} else {
 
 			propBinding.repoEnableTimer.setVisibility(View.GONE);
 		}
@@ -258,16 +272,39 @@ public class RepositorySettingsActivity extends BaseActivity {
 		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()));
+				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()));
 
 		dialogRepo = materialAlertDialogBuilder.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);
@@ -284,47 +321,56 @@ public class RepositorySettingsActivity extends BaseActivity {
 		repoProps.setAllowSquashMerge(repoEnableSquash);
 		repoProps.setAllowRebaseExplicit(repoEnableForceMerge);
 
-		Call<Repository> propsCall = RetrofitClient.getApiInterface(ctx).repoEdit(repository.getOwner(), repository.getName(), repoProps);
+		Call<Repository> propsCall =
+				RetrofitClient.getApiInterface(ctx)
+						.repoEdit(repository.getOwner(), repository.getName(), repoProps);
 
-		propsCall.enqueue(new Callback<>() {
+		propsCall.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Repository> call, @NonNull retrofit2.Response<Repository> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Repository> call,
+							@NonNull retrofit2.Response<Repository> response) {
 
-				propBinding.save.setVisibility(View.GONE);
-				propBinding.processingRequest.setVisibility(View.VISIBLE);
+						propBinding.save.setVisibility(View.GONE);
+						propBinding.processingRequest.setVisibility(View.VISIBLE);
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					dialogRepo.dismiss();
-					Toasty.success(ctx, getString(R.string.repoPropertiesSaveSuccess));
-					assert response.body() != null;
-					repository.setRepository(response.body());
+							dialogRepo.dismiss();
+							Toasty.success(ctx, getString(R.string.repoPropertiesSaveSuccess));
+							assert response.body() != null;
+							repository.setRepository(response.body());
 
-					if(!repository.getName().equals(repoName)) {
-						Objects.requireNonNull(BaseApi.getInstance(ctx, RepositoriesApi.class)).updateRepositoryOwnerAndName(repository.getOwner(), repoName, repository.getRepositoryId());
-						Intent result = new Intent();
-						result.putExtra("nameChanged", true);
-						setResult(200, result);
-						finish();
+							if (!repository.getName().equals(repoName)) {
+								Objects.requireNonNull(
+												BaseApi.getInstance(ctx, RepositoriesApi.class))
+										.updateRepositoryOwnerAndName(
+												repository.getOwner(),
+												repoName,
+												repository.getRepositoryId());
+								Intent result = new Intent();
+								result.putExtra("nameChanged", true);
+								setResult(200, result);
+								finish();
+							}
+						} else {
+
+							propBinding.save.setVisibility(View.VISIBLE);
+							propBinding.processingRequest.setVisibility(View.GONE);
+							Toasty.error(ctx, getString(R.string.genericError));
+						}
 					}
-				}
-				else {
 
-					propBinding.save.setVisibility(View.VISIBLE);
-					propBinding.processingRequest.setVisibility(View.GONE);
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
+					@Override
+					public void onFailure(@NonNull Call<Repository> call, @NonNull Throwable t) {
 
-			@Override
-			public void onFailure(@NonNull Call<Repository> call, @NonNull Throwable t) {
-
-				propBinding.save.setVisibility(View.VISIBLE);
-				propBinding.processingRequest.setVisibility(View.GONE);
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
+						propBinding.save.setVisibility(View.VISIBLE);
+						propBinding.processingRequest.setVisibility(View.GONE);
+						Toasty.error(ctx, getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	private void initCloseListener() {
@@ -336,5 +382,4 @@ public class RepositorySettingsActivity extends BaseActivity {
 		super.onResume();
 		repository.checkAccountSwitch(this);
 	}
-
 }
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 68b7ec41..7580fb47 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
@@ -22,7 +22,6 @@ import org.mian.gitnex.helpers.Toasty;
 /**
  * @author M M Arif
  */
-
 public class SettingsAppearanceActivity extends BaseActivity {
 
 	private static String[] timeList;
@@ -38,7 +37,8 @@ public class SettingsAppearanceActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivitySettingsAppearanceBinding activitySettingsAppearanceBinding = ActivitySettingsAppearanceBinding.inflate(getLayoutInflater());
+		ActivitySettingsAppearanceBinding activitySettingsAppearanceBinding =
+				ActivitySettingsAppearanceBinding.inflate(getLayoutInflater());
 		setContentView(activitySettingsAppearanceBinding.getRoot());
 
 		ImageView closeActivity = activitySettingsAppearanceBinding.close;
@@ -46,7 +46,8 @@ public class SettingsAppearanceActivity extends BaseActivity {
 		LinearLayout timeFrame = activitySettingsAppearanceBinding.timeFrame;
 		LinearLayout customFontFrame = activitySettingsAppearanceBinding.customFontFrame;
 		LinearLayout themeFrame = activitySettingsAppearanceBinding.themeSelectionFrame;
-		LinearLayout lightTimeFrame = activitySettingsAppearanceBinding.lightThemeTimeSelectionFrame;
+		LinearLayout lightTimeFrame =
+				activitySettingsAppearanceBinding.lightThemeTimeSelectionFrame;
 		LinearLayout darkTimeFrame = activitySettingsAppearanceBinding.darkThemeTimeSelectionFrame;
 
 		SwitchMaterial counterBadgesSwitch = activitySettingsAppearanceBinding.switchCounterBadge;
@@ -60,19 +61,19 @@ public class SettingsAppearanceActivity extends BaseActivity {
 
 		String lightMinute = String.valueOf(tinyDB.getInt("lightThemeTimeMinute"));
 		String lightHour = String.valueOf(tinyDB.getInt("lightThemeTimeHour"));
-		if(lightMinute.length() == 1) {
+		if (lightMinute.length() == 1) {
 			lightMinute = "0" + lightMinute;
 		}
-		if(lightHour.length() == 1) {
+		if (lightHour.length() == 1) {
 			lightHour = "0" + lightHour;
 		}
 
 		String darkMinute = String.valueOf(tinyDB.getInt("darkThemeTimeMinute"));
 		String darkHour = String.valueOf(tinyDB.getInt("darkThemeTimeHour"));
-		if(darkMinute.length() == 1) {
+		if (darkMinute.length() == 1) {
 			darkMinute = "0" + darkMinute;
 		}
-		if(darkHour.length() == 1) {
+		if (darkHour.length() == 1) {
 			darkHour = "0" + darkHour;
 		}
 
@@ -80,17 +81,21 @@ 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.customFontSelected.setText(
+				customFontList[customFontSelectedChoice]);
 		activitySettingsAppearanceBinding.themeSelected.setText(themeList[themeSelectedChoice]);
 
-		if(themeList[themeSelectedChoice].startsWith("Auto")) {
+		if (themeList[themeSelectedChoice].startsWith("Auto")) {
 			darkTimeFrame.setVisibility(View.VISIBLE);
 			lightTimeFrame.setVisibility(View.VISIBLE);
-		}
-		else {
+		} else {
 			darkTimeFrame.setVisibility(View.GONE);
 			lightTimeFrame.setVisibility(View.GONE);
 		}
@@ -98,114 +103,146 @@ public class SettingsAppearanceActivity extends BaseActivity {
 		counterBadgesSwitch.setChecked(tinyDB.getBoolean("enableCounterBadges", true));
 
 		// counter badge switcher
-		counterBadgesSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			tinyDB.putBoolean("enableCounterBadges", isChecked);
-			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-		});
-		activitySettingsAppearanceBinding.counterBadgeFrame.setOnClickListener(v -> counterBadgesSwitch.setChecked(!counterBadgesSwitch.isChecked()));
+		counterBadgesSwitch.setOnCheckedChangeListener(
+				(buttonView, isChecked) -> {
+					tinyDB.putBoolean("enableCounterBadges", isChecked);
+					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+				});
+		activitySettingsAppearanceBinding.counterBadgeFrame.setOnClickListener(
+				v -> counterBadgesSwitch.setChecked(!counterBadgesSwitch.isChecked()));
 
 		// show labels in lists(issues, pr) - default is color dots
-		activitySettingsAppearanceBinding.switchLabelsInListBadge.setChecked(tinyDB.getBoolean("showLabelsInList", false));
+		activitySettingsAppearanceBinding.switchLabelsInListBadge.setChecked(
+				tinyDB.getBoolean("showLabelsInList", false));
 
-		activitySettingsAppearanceBinding.switchLabelsInListBadge.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			tinyDB.putBoolean("showLabelsInList", isChecked);
-			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-		});
+		activitySettingsAppearanceBinding.switchLabelsInListBadge.setOnCheckedChangeListener(
+				(buttonView, isChecked) -> {
+					tinyDB.putBoolean("showLabelsInList", isChecked);
+					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 -> {
+		themeFrame.setOnClickListener(
+				view -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.themeSelectorDialogTitle)
+									.setSingleChoiceItems(
+											themeList,
+											themeSelectedChoice,
+											(dialogInterfaceTheme, i) -> {
+												themeSelectedChoice = i;
+												activitySettingsAppearanceBinding.themeSelected
+														.setText(themeList[i]);
+												tinyDB.putInt("themeId", i);
 
-			MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(R.string.themeSelectorDialogTitle)
-				.setSingleChoiceItems(themeList, themeSelectedChoice, (dialogInterfaceTheme, i) -> {
+												SettingsFragment.refreshParent = true;
+												this.recreate();
+												this.overridePendingTransition(0, 0);
+												dialogInterfaceTheme.dismiss();
+												Toasty.success(
+														appCtx,
+														getResources()
+																.getString(R.string.settingsSave));
+											});
 
-					themeSelectedChoice = i;
-					activitySettingsAppearanceBinding.themeSelected.setText(themeList[i]);
-					tinyDB.putInt("themeId", i);
-
-					SettingsFragment.refreshParent = true;
-					this.recreate();
-					this.overridePendingTransition(0, 0);
-					dialogInterfaceTheme.dismiss();
-					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+					materialAlertDialogBuilder.create().show();
 				});
 
-			materialAlertDialogBuilder.create().show();
-		});
+		lightTimeFrame.setOnClickListener(
+				view -> {
+					LightTimePicker timePicker = new LightTimePicker();
+					timePicker.show(getSupportFragmentManager(), "timePicker");
+				});
 
-		lightTimeFrame.setOnClickListener(view -> {
-			LightTimePicker timePicker = new LightTimePicker();
-			timePicker.show(getSupportFragmentManager(), "timePicker");
-		});
-
-		darkTimeFrame.setOnClickListener(view -> {
-			DarkTimePicker timePicker = new DarkTimePicker();
-			timePicker.show(getSupportFragmentManager(), "timePicker");
-		});
+		darkTimeFrame.setOnClickListener(
+				view -> {
+					DarkTimePicker timePicker = new DarkTimePicker();
+					timePicker.show(getSupportFragmentManager(), "timePicker");
+				});
 
 		// custom font dialog
-		customFontFrame.setOnClickListener(view -> {
+		customFontFrame.setOnClickListener(
+				view -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.settingsCustomFontSelectorDialogTitle)
+									.setCancelable(customFontSelectedChoice != -1)
+									.setSingleChoiceItems(
+											customFontList,
+											customFontSelectedChoice,
+											(dialogInterfaceCustomFont, i) -> {
+												customFontSelectedChoice = i;
+												activitySettingsAppearanceBinding.customFontSelected
+														.setText(customFontList[i]);
+												tinyDB.putInt("customFontId", i);
+												AppUtil.typeface = null; // reset typeface
+												FontsOverride.setDefaultFont(this);
 
-			MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(R.string.settingsCustomFontSelectorDialogTitle).setCancelable(customFontSelectedChoice != -1)
-				.setSingleChoiceItems(customFontList, customFontSelectedChoice, (dialogInterfaceCustomFont, i) -> {
+												SettingsFragment.refreshParent = true;
+												this.recreate();
+												this.overridePendingTransition(0, 0);
+												dialogInterfaceCustomFont.dismiss();
+												Toasty.success(
+														appCtx,
+														appCtx.getResources()
+																.getString(R.string.settingsSave));
+											});
 
-					customFontSelectedChoice = i;
-					activitySettingsAppearanceBinding.customFontSelected.setText(customFontList[i]);
-					tinyDB.putInt("customFontId", i);
-					AppUtil.typeface = null; // reset typeface
-					FontsOverride.setDefaultFont(this);
-
-					SettingsFragment.refreshParent = true;
-					this.recreate();
-					this.overridePendingTransition(0, 0);
-					dialogInterfaceCustomFont.dismiss();
-					Toasty.success(appCtx, appCtx.getResources().getString(R.string.settingsSave));
+					materialAlertDialogBuilder.create().show();
 				});
 
-			materialAlertDialogBuilder.create().show();
-		});
-
 		// time and date dialog
-		timeFrame.setOnClickListener(view -> {
+		timeFrame.setOnClickListener(
+				view -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.settingsTimeSelectorDialogTitle)
+									.setCancelable(timeSelectedChoice != -1)
+									.setSingleChoiceItems(
+											timeList,
+											timeSelectedChoice,
+											(dialogInterfaceTime, i) -> {
+												timeSelectedChoice = i;
+												activitySettingsAppearanceBinding.tvDateTimeSelected
+														.setText(timeList[i]);
+												tinyDB.putInt("timeId", i);
 
-			MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(R.string.settingsTimeSelectorDialogTitle).setCancelable(timeSelectedChoice != -1)
-				.setSingleChoiceItems(timeList, timeSelectedChoice, (dialogInterfaceTime, i) -> {
+												switch (i) {
+													case 0:
+														tinyDB.putString("dateFormat", "pretty");
+														break;
+													case 1:
+														tinyDB.putString("dateFormat", "normal");
+														break;
+												}
 
-					timeSelectedChoice = i;
-					activitySettingsAppearanceBinding.tvDateTimeSelected.setText(timeList[i]);
-					tinyDB.putInt("timeId", i);
+												dialogInterfaceTime.dismiss();
+												Toasty.success(
+														appCtx,
+														getResources()
+																.getString(R.string.settingsSave));
+											});
 
-					switch(i) {
-						case 0:
-							tinyDB.putString("dateFormat", "pretty");
-							break;
-						case 1:
-							tinyDB.putString("dateFormat", "normal");
-							break;
-					}
-
-					dialogInterfaceTime.dismiss();
-					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+					materialAlertDialogBuilder.create().show();
 				});
-
-			materialAlertDialogBuilder.create().show();
-		});
-
 	}
 
 	private void initCloseListener() {
 		onClickListener = view -> finish();
 	}
 
-	public static class LightTimePicker extends DialogFragment implements TimePickerDialog.OnTimeSetListener {
+	public static class LightTimePicker extends DialogFragment
+			implements TimePickerDialog.OnTimeSetListener {
 
 		TinyDB db = TinyDB.getInstance(getContext());
 
-		@NonNull
-		@Override
+		@NonNull @Override
 		public Dialog onCreateDialog(Bundle savedInstanceState) {
 			int hour = db.getInt("lightThemeTimeHour");
 			int minute = db.getInt("lightThemeTimeMinute");
@@ -220,18 +257,19 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			SettingsFragment.refreshParent = true;
 			requireActivity().overridePendingTransition(0, 0);
 			this.dismiss();
-			Toasty.success(requireActivity().getApplicationContext(), requireContext().getResources().getString(R.string.settingsSave));
+			Toasty.success(
+					requireActivity().getApplicationContext(),
+					requireContext().getResources().getString(R.string.settingsSave));
 			requireActivity().recreate();
 		}
-
 	}
 
-	public static class DarkTimePicker extends DialogFragment implements TimePickerDialog.OnTimeSetListener {
+	public static class DarkTimePicker extends DialogFragment
+			implements TimePickerDialog.OnTimeSetListener {
 
 		TinyDB db = TinyDB.getInstance(getContext());
 
-		@NonNull
-		@Override
+		@NonNull @Override
 		public Dialog onCreateDialog(Bundle savedInstanceState) {
 			int hour = db.getInt("darkThemeTimeHour");
 			int minute = db.getInt("darkThemeTimeMinute");
@@ -246,10 +284,10 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			SettingsFragment.refreshParent = true;
 			requireActivity().overridePendingTransition(0, 0);
 			this.dismiss();
-			Toasty.success(requireActivity().getApplicationContext(), requireContext().getResources().getString(R.string.settingsSave));
+			Toasty.success(
+					requireActivity().getApplicationContext(),
+					requireContext().getResources().getString(R.string.settingsSave));
 			requireActivity().recreate();
 		}
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsDraftsActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsDraftsActivity.java
index afe31704..5e2a4eac 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsDraftsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsDraftsActivity.java
@@ -10,7 +10,6 @@ import org.mian.gitnex.helpers.Toasty;
 /**
  * @author M M Arif
  */
-
 public class SettingsDraftsActivity extends BaseActivity {
 
 	private View.OnClickListener onClickListener;
@@ -20,7 +19,8 @@ public class SettingsDraftsActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivitySettingsDraftsBinding activitySettingsDraftsBinding = ActivitySettingsDraftsBinding.inflate(getLayoutInflater());
+		ActivitySettingsDraftsBinding activitySettingsDraftsBinding =
+				ActivitySettingsDraftsBinding.inflate(getLayoutInflater());
 		setContentView(activitySettingsDraftsBinding.getRoot());
 
 		ImageView closeActivity = activitySettingsDraftsBinding.close;
@@ -28,21 +28,22 @@ public class SettingsDraftsActivity extends BaseActivity {
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		activitySettingsDraftsBinding.commentsDeletionSwitch.setChecked(tinyDB.getBoolean("draftsCommentsDeletionEnabled", true));
+		activitySettingsDraftsBinding.commentsDeletionSwitch.setChecked(
+				tinyDB.getBoolean("draftsCommentsDeletionEnabled", true));
 
 		// delete comments on submit switcher
-		activitySettingsDraftsBinding.commentsDeletionSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			tinyDB.putBoolean("draftsCommentsDeletionEnabled", isChecked);
-			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-		});
+		activitySettingsDraftsBinding.commentsDeletionSwitch.setOnCheckedChangeListener(
+				(buttonView, isChecked) -> {
+					tinyDB.putBoolean("draftsCommentsDeletionEnabled", isChecked);
+					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+				});
 		activitySettingsDraftsBinding.enableDraftsCommentsDeletion.setOnClickListener(
-			v -> activitySettingsDraftsBinding.commentsDeletionSwitch.setChecked(!activitySettingsDraftsBinding.commentsDeletionSwitch.isChecked()));
-
+				v ->
+						activitySettingsDraftsBinding.commentsDeletionSwitch.setChecked(
+								!activitySettingsDraftsBinding.commentsDeletionSwitch.isChecked()));
 	}
 
 	private void initCloseListener() {
 		onClickListener = view -> finish();
 	}
-
 }
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 9c844bae..b86f11d4 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
@@ -3,17 +3,16 @@ package org.mian.gitnex.activities;
 import android.os.Bundle;
 import android.view.View;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsGeneralBinding;
-import org.mian.gitnex.helpers.Toasty;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import org.mian.gitnex.R;
+import org.mian.gitnex.databinding.ActivitySettingsGeneralBinding;
+import org.mian.gitnex.helpers.Toasty;
 
 /**
  * @author M M Arif
  */
-
 public class SettingsGeneralActivity extends BaseActivity {
 
 	private static int homeScreenSelectedChoice = 0;
@@ -37,121 +36,139 @@ public class SettingsGeneralActivity extends BaseActivity {
 		// home screen
 		String[] appHomeDefaultScreen = getResources().getStringArray(R.array.appDefaultHomeScreen);
 
-		String[] appHomeDefaultScreenNew = getResources().getStringArray(R.array.appDefaultHomeScreenNew);
+		String[] appHomeDefaultScreenNew =
+				getResources().getStringArray(R.array.appDefaultHomeScreenNew);
 
-		if(getAccount().requiresVersion("1.12.3")) {
+		if (getAccount().requiresVersion("1.12.3")) {
 
 			appHomeDefaultScreen = appHomeDefaultScreenNew;
 		}
 
 		homeScreenList = new ArrayList<>(Arrays.asList(appHomeDefaultScreen));
 
-		if(!getAccount().requiresVersion("1.14.0")) {
+		if (!getAccount().requiresVersion("1.14.0")) {
 			homeScreenList.remove(8);
 		}
 
 		String[] homeScreenArray = new String[homeScreenList.size()];
 		homeScreenList.toArray(homeScreenArray);
 
-		if(homeScreenSelectedChoice == 0) {
+		if (homeScreenSelectedChoice == 0) {
 
 			homeScreenSelectedChoice = tinyDB.getInt("homeScreenId", 0);
 			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.navMyRepos));
 		}
 
-		if(homeScreenSelectedChoice == 1) {
+		if (homeScreenSelectedChoice == 1) {
 
-			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.pageTitleStarredRepos));
-		}
-		else if(homeScreenSelectedChoice == 2) {
+			viewBinding.homeScreenSelected.setText(
+					getResources().getString(R.string.pageTitleStarredRepos));
+		} else if (homeScreenSelectedChoice == 2) {
 
 			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.navOrg));
-		}
-		else if(homeScreenSelectedChoice == 3) {
+		} else if (homeScreenSelectedChoice == 3) {
 
 			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.navRepos));
-		}
-		else if(homeScreenSelectedChoice == 4) {
+		} else if (homeScreenSelectedChoice == 4) {
 
 			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.navProfile));
-		}
-		else if(homeScreenSelectedChoice == 5) {
+		} else if (homeScreenSelectedChoice == 5) {
 
-			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.pageTitleExplore));
-		}
-		else if(homeScreenSelectedChoice == 6) {
+			viewBinding.homeScreenSelected.setText(
+					getResources().getString(R.string.pageTitleExplore));
+		} else if (homeScreenSelectedChoice == 6) {
 
 			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.titleDrafts));
-		}
-		else if(homeScreenSelectedChoice == 7) {
+		} else if (homeScreenSelectedChoice == 7) {
 
-			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.pageTitleNotifications));
-		}
-		else if(homeScreenSelectedChoice == 8) {
+			viewBinding.homeScreenSelected.setText(
+					getResources().getString(R.string.pageTitleNotifications));
+		} else if (homeScreenSelectedChoice == 8) {
 
 			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.navMyIssues));
-		}
-		else if(homeScreenSelectedChoice == 9) {
+		} else if (homeScreenSelectedChoice == 9) {
 
-			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.navMostVisited));
+			viewBinding.homeScreenSelected.setText(
+					getResources().getString(R.string.navMostVisited));
 		}
 
-		viewBinding.homeScreenFrame.setOnClickListener(setDefaultHomeScreen -> {
+		viewBinding.homeScreenFrame.setOnClickListener(
+				setDefaultHomeScreen -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.settingsHomeScreenSelectorDialogTitle)
+									.setCancelable(homeScreenSelectedChoice != -1)
+									.setSingleChoiceItems(
+											homeScreenArray,
+											homeScreenSelectedChoice,
+											(dialogInterfaceHomeScreen, i) -> {
+												homeScreenSelectedChoice = i;
+												viewBinding.homeScreenSelected.setText(
+														homeScreenArray[i]);
+												tinyDB.putInt("homeScreenId", i);
 
-			MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(R.string.settingsHomeScreenSelectorDialogTitle).setCancelable(homeScreenSelectedChoice != -1)
-				.setSingleChoiceItems(homeScreenArray, homeScreenSelectedChoice, (dialogInterfaceHomeScreen, i) -> {
+												dialogInterfaceHomeScreen.dismiss();
+												Toasty.success(
+														appCtx,
+														getResources()
+																.getString(R.string.settingsSave));
+											});
 
-					homeScreenSelectedChoice = i;
-					viewBinding.homeScreenSelected.setText(homeScreenArray[i]);
-					tinyDB.putInt("homeScreenId", i);
-
-					dialogInterfaceHomeScreen.dismiss();
-					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+					materialAlertDialogBuilder.create().show();
 				});
-
-			materialAlertDialogBuilder.create().show();
-		});
 		// home screen
 
 		// link handler
-		String[] linkHandlerDefaultScreenList = getResources().getStringArray(R.array.linkHandlerDefaultScreen);
+		String[] linkHandlerDefaultScreenList =
+				getResources().getStringArray(R.array.linkHandlerDefaultScreen);
 		linkHandlerDefaultScreen = new ArrayList<>(Arrays.asList(linkHandlerDefaultScreenList));
 
 		String[] linksArray = new String[linkHandlerDefaultScreen.size()];
 		linkHandlerDefaultScreen.toArray(linksArray);
 
 		defaultLinkHandlerScreenSelectedChoice = tinyDB.getInt("defaultScreenId");
-		viewBinding.generalDeepLinkSelected.setText(linksArray[defaultLinkHandlerScreenSelectedChoice]);
+		viewBinding.generalDeepLinkSelected.setText(
+				linksArray[defaultLinkHandlerScreenSelectedChoice]);
 
-		viewBinding.setDefaultLinkHandler.setOnClickListener(setDefaultLinkHandler -> {
+		viewBinding.setDefaultLinkHandler.setOnClickListener(
+				setDefaultLinkHandler -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.linkSelectorDialogTitle)
+									.setCancelable(defaultLinkHandlerScreenSelectedChoice != -1)
+									.setSingleChoiceItems(
+											linksArray,
+											defaultLinkHandlerScreenSelectedChoice,
+											(dialogInterfaceHomeScreen, i) -> {
+												defaultLinkHandlerScreenSelectedChoice = i;
+												viewBinding.generalDeepLinkSelected.setText(
+														linksArray[i]);
+												tinyDB.putInt("defaultScreenId", i);
 
-			MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(R.string.linkSelectorDialogTitle).setCancelable(defaultLinkHandlerScreenSelectedChoice != -1)
-				.setSingleChoiceItems(linksArray, defaultLinkHandlerScreenSelectedChoice, (dialogInterfaceHomeScreen, i) -> {
+												dialogInterfaceHomeScreen.dismiss();
+												Toasty.success(
+														appCtx,
+														getResources()
+																.getString(R.string.settingsSave));
+											});
 
-					defaultLinkHandlerScreenSelectedChoice = i;
-					viewBinding.generalDeepLinkSelected.setText(linksArray[i]);
-					tinyDB.putInt("defaultScreenId", i);
-
-					dialogInterfaceHomeScreen.dismiss();
-					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+					materialAlertDialogBuilder.create().show();
 				});
-
-			materialAlertDialogBuilder.create().show();
-		});
 		// link handler
 
 		// custom tabs
 		viewBinding.switchTabs.setChecked(tinyDB.getBoolean("useCustomTabs"));
-		viewBinding.switchTabs.setOnCheckedChangeListener((buttonView, isChecked) -> {
-			tinyDB.putBoolean("useCustomTabs", isChecked);
-			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-		});
-		viewBinding.customTabsFrame.setOnClickListener(v -> viewBinding.switchTabs.setChecked(!viewBinding.switchTabs.isChecked()));
+		viewBinding.switchTabs.setOnCheckedChangeListener(
+				(buttonView, isChecked) -> {
+					tinyDB.putBoolean("useCustomTabs", isChecked);
+					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+				});
+		viewBinding.customTabsFrame.setOnClickListener(
+				v -> viewBinding.switchTabs.setChecked(!viewBinding.switchTabs.isChecked()));
 		// custom tabs
 	}
 
 	private void initCloseListener() {
 		onClickListener = view -> finish();
 	}
-
 }
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 a92c6527..d85a0f26 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java
@@ -17,7 +17,6 @@ import org.mian.gitnex.notifications.Notifications;
  * @author M M Arif
  * @author opyale
  */
-
 public class SettingsNotificationsActivity extends BaseActivity {
 
 	private ActivitySettingsNotificationsBinding viewBinding;
@@ -34,106 +33,150 @@ public class SettingsNotificationsActivity extends BaseActivity {
 
 		viewBinding.close.setOnClickListener(onClickListener);
 
-		viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay)));
-		viewBinding.chooseColorState.setCardBackgroundColor(tinyDB.getInt("notificationsLightColor", Color.GREEN));
+		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));
-		viewBinding.enableLightsMode.setChecked(tinyDB.getBoolean("notificationsEnableLights", true));
-		viewBinding.enableVibrationMode.setChecked(tinyDB.getBoolean("notificationsEnableVibration", true));
+		viewBinding.enableNotificationsMode.setChecked(
+				tinyDB.getBoolean("notificationsEnabled", true));
+		viewBinding.enableLightsMode.setChecked(
+				tinyDB.getBoolean("notificationsEnableLights", true));
+		viewBinding.enableVibrationMode.setChecked(
+				tinyDB.getBoolean("notificationsEnableVibration", true));
 
-		if(!viewBinding.enableNotificationsMode.isChecked()) {
-			AppUtil.setMultiVisibility(View.GONE, viewBinding.chooseColorFrame, viewBinding.enableLightsFrame, viewBinding.enableVibrationFrame, viewBinding.pollingDelayFrame);
+		if (!viewBinding.enableNotificationsMode.isChecked()) {
+			AppUtil.setMultiVisibility(
+					View.GONE,
+					viewBinding.chooseColorFrame,
+					viewBinding.enableLightsFrame,
+					viewBinding.enableVibrationFrame,
+					viewBinding.pollingDelayFrame);
 		}
 
-		if(!viewBinding.enableLightsMode.isChecked()) {
+		if (!viewBinding.enableLightsMode.isChecked()) {
 			viewBinding.chooseColorFrame.setVisibility(View.GONE);
 		}
 
-		viewBinding.enableNotificationsMode.setOnCheckedChangeListener((buttonView, isChecked) -> {
+		viewBinding.enableNotificationsMode.setOnCheckedChangeListener(
+				(buttonView, isChecked) -> {
+					tinyDB.putBoolean("notificationsEnabled", isChecked);
 
-			tinyDB.putBoolean("notificationsEnabled", isChecked);
+					if (isChecked) {
+						Notifications.startWorker(ctx);
+						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);
+					}
 
-			if(isChecked) {
-				Notifications.startWorker(ctx);
-				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);
-			}
-
-			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-
-		});
-		viewBinding.enableNotificationsFrame.setOnClickListener(v -> viewBinding.enableNotificationsMode.setChecked(!viewBinding.enableNotificationsMode.isChecked()));
-
-		// polling delay
-		viewBinding.pollingDelayFrame.setOnClickListener(v -> {
-
-			NumberPicker numberPicker = new NumberPicker(ctx);
-			numberPicker.setMinValue(Constants.minimumPollingDelay);
-			numberPicker.setMaxValue(Constants.maximumPollingDelay);
-			numberPicker.setValue(tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay));
-			numberPicker.setWrapSelectorWheel(true);
-
-			MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(R.string.pollingDelayDialogHeaderText).setMessage(getString(R.string.pollingDelayDialogDescriptionText))
-				.setCancelable(true).setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss()).setPositiveButton(getString(R.string.okButton), (dialog, which) -> {
-
-					tinyDB.putInt("pollingDelayMinutes", numberPicker.getValue());
-
-					Notifications.stopWorker(ctx);
-					Notifications.startWorker(ctx);
-
-					viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), numberPicker.getValue()));
 					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
 				});
+		viewBinding.enableNotificationsFrame.setOnClickListener(
+				v ->
+						viewBinding.enableNotificationsMode.setChecked(
+								!viewBinding.enableNotificationsMode.isChecked()));
 
-			materialAlertDialogBuilder.setView(numberPicker);
-			materialAlertDialogBuilder.create().show();
-		});
+		// polling delay
+		viewBinding.pollingDelayFrame.setOnClickListener(
+				v -> {
+					NumberPicker numberPicker = new NumberPicker(ctx);
+					numberPicker.setMinValue(Constants.minimumPollingDelay);
+					numberPicker.setMaxValue(Constants.maximumPollingDelay);
+					numberPicker.setValue(
+							tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay));
+					numberPicker.setWrapSelectorWheel(true);
+
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.pollingDelayDialogHeaderText)
+									.setMessage(
+											getString(R.string.pollingDelayDialogDescriptionText))
+									.setCancelable(true)
+									.setNeutralButton(
+											R.string.cancelButton,
+											(dialog, which) -> dialog.dismiss())
+									.setPositiveButton(
+											getString(R.string.okButton),
+											(dialog, which) -> {
+												tinyDB.putInt(
+														"pollingDelayMinutes",
+														numberPicker.getValue());
+
+												Notifications.stopWorker(ctx);
+												Notifications.startWorker(ctx);
+
+												viewBinding.pollingDelaySelected.setText(
+														String.format(
+																getString(
+																		R.string
+																				.pollingDelaySelectedText),
+																numberPicker.getValue()));
+												Toasty.success(
+														appCtx,
+														getResources()
+																.getString(R.string.settingsSave));
+											});
+
+					materialAlertDialogBuilder.setView(numberPicker);
+					materialAlertDialogBuilder.create().show();
+				});
 
 		// lights switcher
-		viewBinding.enableLightsMode.setOnCheckedChangeListener((buttonView, isChecked) -> {
+		viewBinding.enableLightsMode.setOnCheckedChangeListener(
+				(buttonView, isChecked) -> {
+					if (!isChecked) {
+						viewBinding.chooseColorFrame.setVisibility(View.GONE);
+					} else {
+						viewBinding.chooseColorFrame.setVisibility(View.VISIBLE);
+					}
 
-			if(!isChecked) {
-				viewBinding.chooseColorFrame.setVisibility(View.GONE);
-			}
-			else {
-				viewBinding.chooseColorFrame.setVisibility(View.VISIBLE);
-			}
-
-			tinyDB.putBoolean("notificationsEnableLights", isChecked);
-			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-
-		});
-		viewBinding.enableLightsFrame.setOnClickListener(v -> viewBinding.enableLightsMode.setChecked(!viewBinding.enableLightsMode.isChecked()));
+					tinyDB.putBoolean("notificationsEnableLights", isChecked);
+					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+				});
+		viewBinding.enableLightsFrame.setOnClickListener(
+				v ->
+						viewBinding.enableLightsMode.setChecked(
+								!viewBinding.enableLightsMode.isChecked()));
 
 		// lights color chooser
-		viewBinding.chooseColorFrame.setOnClickListener(v -> {
+		viewBinding.chooseColorFrame.setOnClickListener(
+				v -> {
+					ColorPicker colorPicker = new ColorPicker(SettingsNotificationsActivity.this);
+					colorPicker.setColor(tinyDB.getInt("notificationsLightColor", Color.GREEN));
+					colorPicker.setCallback(
+							color -> {
+								tinyDB.putInt("notificationsLightColor", color);
+								viewBinding.chooseColorState.setCardBackgroundColor(color);
+								colorPicker.dismiss();
+								Toasty.success(
+										appCtx, getResources().getString(R.string.settingsSave));
+							});
 
-			ColorPicker colorPicker = new ColorPicker(SettingsNotificationsActivity.this);
-			colorPicker.setColor(tinyDB.getInt("notificationsLightColor", Color.GREEN));
-			colorPicker.setCallback(color -> {
-
-				tinyDB.putInt("notificationsLightColor", color);
-				viewBinding.chooseColorState.setCardBackgroundColor(color);
-				colorPicker.dismiss();
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			});
-
-			colorPicker.show();
-
-		});
+					colorPicker.show();
+				});
 
 		// vibration switcher
-		viewBinding.enableVibrationMode.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			tinyDB.putBoolean("notificationsEnableVibration", isChecked);
-			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-
-		});
-		viewBinding.enableVibrationFrame.setOnClickListener(v -> viewBinding.enableVibrationMode.setChecked(!viewBinding.enableVibrationMode.isChecked()));
-
+		viewBinding.enableVibrationMode.setOnCheckedChangeListener(
+				(buttonView, isChecked) -> {
+					tinyDB.putBoolean("notificationsEnableVibration", isChecked);
+					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+				});
+		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 782f9b66..421021aa 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java
@@ -10,7 +10,6 @@ import org.mian.gitnex.helpers.Toasty;
 /**
  * @author M M Arif
  */
-
 public class SettingsReportsActivity extends BaseActivity {
 
 	private View.OnClickListener onClickListener;
@@ -20,7 +19,8 @@ public class SettingsReportsActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivitySettingsReportsBinding activitySettingsReportsBinding = ActivitySettingsReportsBinding.inflate(getLayoutInflater());
+		ActivitySettingsReportsBinding activitySettingsReportsBinding =
+				ActivitySettingsReportsBinding.inflate(getLayoutInflater());
 		setContentView(activitySettingsReportsBinding.getRoot());
 
 		ImageView closeActivity = activitySettingsReportsBinding.close;
@@ -28,19 +28,22 @@ public class SettingsReportsActivity extends BaseActivity {
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		activitySettingsReportsBinding.crashReportsSwitch.setChecked(tinyDB.getBoolean("crashReportingEnabled", true));
+		activitySettingsReportsBinding.crashReportsSwitch.setChecked(
+				tinyDB.getBoolean("crashReportingEnabled", true));
 
 		// crash reports switcher
-		activitySettingsReportsBinding.crashReportsSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			tinyDB.putBoolean("crashReportingEnabled", isChecked);
-			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-		});
-		activitySettingsReportsBinding.enableSendReports.setOnClickListener(v -> activitySettingsReportsBinding.crashReportsSwitch.setChecked(!activitySettingsReportsBinding.crashReportsSwitch.isChecked()));
+		activitySettingsReportsBinding.crashReportsSwitch.setOnCheckedChangeListener(
+				(buttonView, isChecked) -> {
+					tinyDB.putBoolean("crashReportingEnabled", isChecked);
+					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+				});
+		activitySettingsReportsBinding.enableSendReports.setOnClickListener(
+				v ->
+						activitySettingsReportsBinding.crashReportsSwitch.setChecked(
+								!activitySettingsReportsBinding.crashReportsSwitch.isChecked()));
 	}
 
 	private void initCloseListener() {
 		onClickListener = view -> finish();
 	}
-
 }
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 3508d016..8c23121f 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
@@ -1,5 +1,8 @@
 package org.mian.gitnex.activities;
 
+import static androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG;
+import static androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL;
+
 import android.app.KeyguardManager;
 import android.content.Context;
 import android.os.Bundle;
@@ -11,21 +14,18 @@ import android.widget.TextView;
 import androidx.biometric.BiometricManager;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.switchmaterial.SwitchMaterial;
+import java.io.File;
+import java.io.IOException;
 import org.apache.commons.io.FileUtils;
 import org.mian.gitnex.R;
 import org.mian.gitnex.databinding.ActivitySettingsSecurityBinding;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
-import java.io.File;
-import java.io.IOException;
-import static androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG;
-import static androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL;
 
 /**
  * @author M M Arif
  */
-
 public class SettingsSecurityActivity extends BaseActivity {
 
 	private static String[] cacheSizeDataList;
@@ -39,7 +39,8 @@ public class SettingsSecurityActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		ActivitySettingsSecurityBinding activitySettingsSecurityBinding = ActivitySettingsSecurityBinding.inflate(getLayoutInflater());
+		ActivitySettingsSecurityBinding activitySettingsSecurityBinding =
+				ActivitySettingsSecurityBinding.inflate(getLayoutInflater());
 		setContentView(activitySettingsSecurityBinding.getRoot());
 
 		ImageView closeActivity = activitySettingsSecurityBinding.close;
@@ -47,13 +48,19 @@ public class SettingsSecurityActivity extends BaseActivity {
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		TextView cacheSizeDataSelected = activitySettingsSecurityBinding.cacheSizeDataSelected; // setter for data cache size
-		TextView cacheSizeImagesSelected = activitySettingsSecurityBinding.cacheSizeImagesSelected; // setter for images cache size
-		TextView clearCacheSelected = activitySettingsSecurityBinding.clearCacheSelected; // setter for clear cache
+		TextView cacheSizeDataSelected =
+				activitySettingsSecurityBinding.cacheSizeDataSelected; // setter for data cache size
+		TextView cacheSizeImagesSelected =
+				activitySettingsSecurityBinding
+						.cacheSizeImagesSelected; // setter for images cache size
+		TextView clearCacheSelected =
+				activitySettingsSecurityBinding.clearCacheSelected; // setter for clear cache
 
 		LinearLayout certsFrame = activitySettingsSecurityBinding.certsFrame;
-		LinearLayout cacheSizeDataFrame = activitySettingsSecurityBinding.cacheSizeDataSelectionFrame;
-		LinearLayout cacheSizeImagesFrame = activitySettingsSecurityBinding.cacheSizeImagesSelectionFrame;
+		LinearLayout cacheSizeDataFrame =
+				activitySettingsSecurityBinding.cacheSizeDataSelectionFrame;
+		LinearLayout cacheSizeImagesFrame =
+				activitySettingsSecurityBinding.cacheSizeImagesSelectionFrame;
 		LinearLayout clearCacheFrame = activitySettingsSecurityBinding.clearCacheSelectionFrame;
 
 		SwitchMaterial switchBiometric = activitySettingsSecurityBinding.switchBiometric;
@@ -61,15 +68,20 @@ public class SettingsSecurityActivity extends BaseActivity {
 		cacheSizeDataList = getResources().getStringArray(R.array.cacheSizeList);
 		cacheSizeImagesList = getResources().getStringArray(R.array.cacheSizeList);
 
-		cacheSizeDataSelected.setText(tinyDB.getString("cacheSizeStr", getString(R.string.cacheSizeDataSelectionSelectedText)));
-		cacheSizeImagesSelected.setText(tinyDB.getString("cacheSizeImagesStr", getString(R.string.cacheSizeImagesSelectionSelectedText)));
+		cacheSizeDataSelected.setText(
+				tinyDB.getString(
+						"cacheSizeStr", getString(R.string.cacheSizeDataSelectionSelectedText)));
+		cacheSizeImagesSelected.setText(
+				tinyDB.getString(
+						"cacheSizeImagesStr",
+						getString(R.string.cacheSizeImagesSelectionSelectedText)));
 
-		if(cacheSizeDataSelectedChoice == 0) {
+		if (cacheSizeDataSelectedChoice == 0) {
 
 			cacheSizeDataSelectedChoice = tinyDB.getInt("cacheSizeId");
 		}
 
-		if(cacheSizeImagesSelectedChoice == 0) {
+		if (cacheSizeImagesSelectedChoice == 0) {
 
 			cacheSizeImagesSelectedChoice = tinyDB.getInt("cacheSizeImagesId");
 		}
@@ -77,140 +89,188 @@ public class SettingsSecurityActivity extends BaseActivity {
 		switchBiometric.setChecked(tinyDB.getBoolean("biometricStatus", false));
 
 		// biometric switcher
-		switchBiometric.setOnCheckedChangeListener((buttonView, isChecked) -> {
+		switchBiometric.setOnCheckedChangeListener(
+				(buttonView, isChecked) -> {
+					if (isChecked) {
 
-			if(isChecked) {
+						BiometricManager biometricManager = BiometricManager.from(ctx);
+						KeyguardManager keyguardManager =
+								(KeyguardManager) ctx.getSystemService(Context.KEYGUARD_SERVICE);
 
-				BiometricManager biometricManager = BiometricManager.from(ctx);
-				KeyguardManager keyguardManager = (KeyguardManager) ctx.getSystemService(Context.KEYGUARD_SERVICE);
+						if (!keyguardManager.isDeviceSecure()) {
 
-				if(!keyguardManager.isDeviceSecure()) {
-
-					switch(biometricManager.canAuthenticate(BIOMETRIC_STRONG | DEVICE_CREDENTIAL)) {
-
-						case BiometricManager.BIOMETRIC_SUCCESS:
+							switch (biometricManager.canAuthenticate(
+									BIOMETRIC_STRONG | DEVICE_CREDENTIAL)) {
+								case BiometricManager.BIOMETRIC_SUCCESS:
+									tinyDB.putBoolean("biometricStatus", true);
+									Toasty.success(
+											appCtx,
+											getResources().getString(R.string.settingsSave));
+									break;
+								case BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE:
+								case BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED:
+								case BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED:
+								case BiometricManager.BIOMETRIC_STATUS_UNKNOWN:
+									tinyDB.putBoolean("biometricStatus", false);
+									switchBiometric.setChecked(false);
+									Toasty.error(
+											appCtx,
+											getResources()
+													.getString(R.string.biometricNotSupported));
+									break;
+								case BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE:
+									tinyDB.putBoolean("biometricStatus", false);
+									switchBiometric.setChecked(false);
+									Toasty.error(
+											appCtx,
+											getResources()
+													.getString(R.string.biometricNotAvailable));
+									break;
+								case BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED:
+									tinyDB.putBoolean("biometricStatus", false);
+									switchBiometric.setChecked(false);
+									Toasty.info(
+											appCtx,
+											getResources().getString(R.string.enrollBiometric));
+									break;
+							}
+						} else {
 
 							tinyDB.putBoolean("biometricStatus", true);
 							Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-							break;
-						case BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE:
-						case BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED:
-						case BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED:
-						case BiometricManager.BIOMETRIC_STATUS_UNKNOWN:
+						}
+					} else {
 
-							tinyDB.putBoolean("biometricStatus", false);
-							switchBiometric.setChecked(false);
-							Toasty.error(appCtx, getResources().getString(R.string.biometricNotSupported));
-							break;
-						case BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE:
-
-							tinyDB.putBoolean("biometricStatus", false);
-							switchBiometric.setChecked(false);
-							Toasty.error(appCtx, getResources().getString(R.string.biometricNotAvailable));
-							break;
-						case BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED:
-
-							tinyDB.putBoolean("biometricStatus", false);
-							switchBiometric.setChecked(false);
-							Toasty.info(appCtx, getResources().getString(R.string.enrollBiometric));
-							break;
+						tinyDB.putBoolean("biometricStatus", false);
+						Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
 					}
-				}
-				else {
+				});
 
-					tinyDB.putBoolean("biometricStatus", true);
-					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-				}
-			}
-			else {
-
-				tinyDB.putBoolean("biometricStatus", false);
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-
-		});
-
-		activitySettingsSecurityBinding.biometricFrame.setOnClickListener(v -> switchBiometric.setChecked(!switchBiometric.isChecked()));
+		activitySettingsSecurityBinding.biometricFrame.setOnClickListener(
+				v -> switchBiometric.setChecked(!switchBiometric.isChecked()));
 
 		// clear cache setter
 		File cacheDir = appCtx.getCacheDir();
-		clearCacheSelected.setText(FileUtils.byteCountToDisplaySize((int) FileUtils.sizeOfDirectory(cacheDir)));
+		clearCacheSelected.setText(
+				FileUtils.byteCountToDisplaySize((int) FileUtils.sizeOfDirectory(cacheDir)));
 
 		// clear cache
-		clearCacheFrame.setOnClickListener(v1 -> {
+		clearCacheFrame.setOnClickListener(
+				v1 -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.clearCacheDialogHeader)
+									.setMessage(
+											getResources()
+													.getString(R.string.clearCacheDialogMessage))
+									.setNeutralButton(
+											R.string.cancelButton,
+											(dialog, which) -> dialog.dismiss())
+									.setPositiveButton(
+											R.string.menuDeleteText,
+											(dialog, which) -> {
+												try {
 
-			MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(R.string.clearCacheDialogHeader).setMessage(getResources().getString(R.string.clearCacheDialogMessage))
-				.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss()).setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
+													FileUtils.deleteDirectory(cacheDir);
+													FileUtils.forceMkdir(cacheDir);
+													this.recreate();
+													this.overridePendingTransition(0, 0);
+												} catch (IOException e) {
 
-					try {
+													Log.e("SettingsSecurity", e.toString());
+												}
+											});
 
-						FileUtils.deleteDirectory(cacheDir);
-						FileUtils.forceMkdir(cacheDir);
-						this.recreate();
-						this.overridePendingTransition(0, 0);
-					}
-					catch(IOException e) {
-
-						Log.e("SettingsSecurity", e.toString());
-					}
+					materialAlertDialogBuilder.create().show();
 				});
 
-			materialAlertDialogBuilder.create().show();
-		});
-
 		// cache size images selection dialog
-		cacheSizeImagesFrame.setOnClickListener(view -> {
+		cacheSizeImagesFrame.setOnClickListener(
+				view -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.cacheSizeImagesDialogHeader)
+									.setCancelable(cacheSizeImagesSelectedChoice != -1)
+									.setSingleChoiceItems(
+											cacheSizeImagesList,
+											cacheSizeImagesSelectedChoice,
+											(dialogInterfaceTheme, i) -> {
+												cacheSizeImagesSelectedChoice = i;
+												cacheSizeImagesSelected.setText(
+														cacheSizeImagesList[i]);
+												tinyDB.putString(
+														"cacheSizeImagesStr",
+														cacheSizeImagesList[i]);
+												tinyDB.putInt("cacheSizeImagesId", i);
 
-			MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(R.string.cacheSizeImagesDialogHeader).setCancelable(cacheSizeImagesSelectedChoice != -1)
-				.setSingleChoiceItems(cacheSizeImagesList, cacheSizeImagesSelectedChoice, (dialogInterfaceTheme, i) -> {
+												dialogInterfaceTheme.dismiss();
+												Toasty.success(
+														appCtx,
+														getResources()
+																.getString(R.string.settingsSave));
+											});
 
-					cacheSizeImagesSelectedChoice = i;
-					cacheSizeImagesSelected.setText(cacheSizeImagesList[i]);
-					tinyDB.putString("cacheSizeImagesStr", cacheSizeImagesList[i]);
-					tinyDB.putInt("cacheSizeImagesId", i);
-
-					dialogInterfaceTheme.dismiss();
-					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+					materialAlertDialogBuilder.create().show();
 				});
 
-			materialAlertDialogBuilder.create().show();
-		});
-
 		// cache size data selection dialog
-		cacheSizeDataFrame.setOnClickListener(view -> {
+		cacheSizeDataFrame.setOnClickListener(
+				view -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.cacheSizeDataDialogHeader)
+									.setCancelable(cacheSizeDataSelectedChoice != -1)
+									.setSingleChoiceItems(
+											cacheSizeDataList,
+											cacheSizeDataSelectedChoice,
+											(dialogInterfaceTheme, i) -> {
+												cacheSizeDataSelectedChoice = i;
+												cacheSizeDataSelected.setText(cacheSizeDataList[i]);
+												tinyDB.putString(
+														"cacheSizeStr", cacheSizeDataList[i]);
+												tinyDB.putInt("cacheSizeId", i);
 
-			MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(R.string.cacheSizeDataDialogHeader).setCancelable(cacheSizeDataSelectedChoice != -1)
-				.setSingleChoiceItems(cacheSizeDataList, cacheSizeDataSelectedChoice, (dialogInterfaceTheme, i) -> {
+												dialogInterfaceTheme.dismiss();
+												Toasty.success(
+														appCtx,
+														getResources()
+																.getString(R.string.settingsSave));
+											});
 
-					cacheSizeDataSelectedChoice = i;
-					cacheSizeDataSelected.setText(cacheSizeDataList[i]);
-					tinyDB.putString("cacheSizeStr", cacheSizeDataList[i]);
-					tinyDB.putInt("cacheSizeId", i);
-
-					dialogInterfaceTheme.dismiss();
-					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+					materialAlertDialogBuilder.create().show();
 				});
 
-			materialAlertDialogBuilder.create().show();
-		});
-
 		// certs deletion
-		certsFrame.setOnClickListener(v1 -> {
+		certsFrame.setOnClickListener(
+				v1 -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.settingsCertsPopupTitle)
+									.setMessage(
+											getResources()
+													.getString(R.string.settingsCertsPopupMessage))
+									.setNeutralButton(
+											R.string.cancelButton,
+											(dialog, which) -> dialog.dismiss())
+									.setPositiveButton(
+											R.string.menuDeleteText,
+											(dialog, which) -> {
+												appCtx.getSharedPreferences(
+																MemorizingTrustManager
+																		.KEYSTORE_NAME,
+																Context.MODE_PRIVATE)
+														.edit()
+														.remove(MemorizingTrustManager.KEYSTORE_KEY)
+														.apply();
+												AppUtil.logout(this);
+											});
 
-			MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(R.string.settingsCertsPopupTitle).setMessage(getResources().getString(R.string.settingsCertsPopupMessage))
-				.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss()).setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
-
-					appCtx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE).edit().remove(MemorizingTrustManager.KEYSTORE_KEY).apply();
-					AppUtil.logout(this);
+					materialAlertDialogBuilder.create().show();
 				});
-
-			materialAlertDialogBuilder.create().show();
-		});
 	}
 
 	private void initCloseListener() {
 
 		onClickListener = view -> finish();
 	}
-
 }
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 4b9e9bff..3b7d2d5c 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
@@ -6,18 +6,17 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.LinkedHashMap;
+import java.util.Locale;
 import org.mian.gitnex.R;
 import org.mian.gitnex.databinding.ActivitySettingsTranslationBinding;
 import org.mian.gitnex.fragments.SettingsFragment;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.LinkedHashMap;
-import java.util.Locale;
 
 /**
  * @author M M Arif
  */
-
 public class SettingsTranslationActivity extends BaseActivity {
 
 	private static int langSelectedChoice = 0;
@@ -26,7 +25,9 @@ public class SettingsTranslationActivity extends BaseActivity {
 	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));
+		return String.format(
+				"%s (%s)",
+				translated.getDisplayName(translated), translated.getDisplayName(english));
 	}
 
 	@Override
@@ -36,11 +37,12 @@ public class SettingsTranslationActivity extends BaseActivity {
 
 		LinkedHashMap<String, String> langs = new LinkedHashMap<>();
 		langs.put("", getString(R.string.settingsLanguageSystem));
-		for(String langCode : getResources().getStringArray(R.array.languages)) {
+		for (String langCode : getResources().getStringArray(R.array.languages)) {
 			langs.put(langCode, getLanguageDisplayName(langCode));
 		}
 
-		ActivitySettingsTranslationBinding activitySettingsTranslationBinding = ActivitySettingsTranslationBinding.inflate(getLayoutInflater());
+		ActivitySettingsTranslationBinding activitySettingsTranslationBinding =
+				ActivitySettingsTranslationBinding.inflate(getLayoutInflater());
 		setContentView(activitySettingsTranslationBinding.getRoot());
 
 		ImageView closeActivity = activitySettingsTranslationBinding.close;
@@ -48,42 +50,54 @@ public class SettingsTranslationActivity extends BaseActivity {
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		final TextView tvLanguageSelected = activitySettingsTranslationBinding.tvLanguageSelected; // setter for en, fr
+		final TextView tvLanguageSelected =
+				activitySettingsTranslationBinding.tvLanguageSelected; // setter for en, fr
 		TextView helpTranslate = activitySettingsTranslationBinding.helpTranslate;
 
 		LinearLayout langFrame = activitySettingsTranslationBinding.langFrame;
 
-		helpTranslate.setOnClickListener(v12 -> {
-			AppUtil.openUrlInBrowser(this, getResources().getString(R.string.crowdInLink));
-		});
-
-		langSelectedChoice = tinyDB.getInt("langId");
-		tvLanguageSelected.setText(langs.get(langs.keySet().toArray(new String[0])[langSelectedChoice]));
-
-		// language dialog
-		langFrame.setOnClickListener(view -> {
-
-			MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(R.string.settingsLanguageSelectorDialogTitle).setCancelable(langSelectedChoice != -1)
-				.setNeutralButton(getString(R.string.cancelButton), null).setSingleChoiceItems(langs.values().toArray(new String[0]), langSelectedChoice, (dialogInterface, i) -> {
-
-					String selectedLanguage = langs.keySet().toArray(new String[0])[i];
-					tinyDB.putInt("langId", i);
-					tinyDB.putString("locale", selectedLanguage);
-
-					SettingsFragment.refreshParent = true;
-					this.overridePendingTransition(0, 0);
-					dialogInterface.dismiss();
-					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-					this.recreate();
+		helpTranslate.setOnClickListener(
+				v12 -> {
+					AppUtil.openUrlInBrowser(this, getResources().getString(R.string.crowdInLink));
 				});
 
-			materialAlertDialogBuilder.create().show();
-		});
+		langSelectedChoice = tinyDB.getInt("langId");
+		tvLanguageSelected.setText(
+				langs.get(langs.keySet().toArray(new String[0])[langSelectedChoice]));
+
+		// language dialog
+		langFrame.setOnClickListener(
+				view -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.settingsLanguageSelectorDialogTitle)
+									.setCancelable(langSelectedChoice != -1)
+									.setNeutralButton(getString(R.string.cancelButton), null)
+									.setSingleChoiceItems(
+											langs.values().toArray(new String[0]),
+											langSelectedChoice,
+											(dialogInterface, i) -> {
+												String selectedLanguage =
+														langs.keySet().toArray(new String[0])[i];
+												tinyDB.putInt("langId", i);
+												tinyDB.putString("locale", selectedLanguage);
+
+												SettingsFragment.refreshParent = true;
+												this.overridePendingTransition(0, 0);
+												dialogInterface.dismiss();
+												Toasty.success(
+														appCtx,
+														getResources()
+																.getString(R.string.settingsSave));
+												this.recreate();
+											});
+
+					materialAlertDialogBuilder.create().show();
+				});
 	}
 
 	private void initCloseListener() {
 
 		onClickListener = view -> finish();
 	}
-
 }
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 a40f6df4..f7109966 100644
--- a/app/src/main/java/org/mian/gitnex/activities/WikiActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/WikiActivity.java
@@ -10,6 +10,7 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.vdurmont.emoji.EmojiParser;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.CreateWikiPageOptions;
 import org.gitnex.tea4j.v2.models.WikiPage;
 import org.mian.gitnex.R;
@@ -23,7 +24,6 @@ import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.mian.gitnex.structs.BottomSheetListener;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -31,7 +31,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class WikiActivity extends BaseActivity implements BottomSheetListener {
 
 	private ActivityWikiBinding binding;
@@ -51,10 +50,9 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
 		setContentView(binding.getRoot());
 		setSupportActionBar(binding.toolbar);
 
-		if(getIntent().getStringExtra("action") != null) {
+		if (getIntent().getStringExtra("action") != null) {
 			action = getIntent().getStringExtra("action");
-		}
-		else {
+		} else {
 			action = "";
 		}
 		pageName = getIntent().getStringExtra("pageName");
@@ -63,18 +61,16 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
 		binding.toolbarTitle.setMovementMethod(new ScrollingMovementMethod());
 		binding.toolbarTitle.setText(pageName);
 
-		if(action.equalsIgnoreCase("edit")) {
+		if (action.equalsIgnoreCase("edit")) {
 			getWikiPageContents();
 			binding.renderWiki.setVisibility(View.GONE);
 			binding.wikiTitle.setText(pageName);
-		}
-		else if(action.equalsIgnoreCase("add")) {
+		} else if (action.equalsIgnoreCase("add")) {
 			binding.renderWiki.setVisibility(View.GONE);
 			binding.progressBar.setVisibility(View.GONE);
 			binding.toolbarTitle.setText(R.string.createWikiPage);
 			binding.createWiki.setVisibility(View.VISIBLE);
-		}
-		else {
+		} else {
 			getWikiPageContents();
 			binding.renderWiki.setVisibility(View.VISIBLE);
 			binding.createWiki.setVisibility(View.GONE);
@@ -83,18 +79,21 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
 
 	private void processWiki() {
 
-		String wikiTitle = binding.wikiTitle.getText() != null ? binding.wikiTitle.getText().toString() : "";
-		String wikiContent = binding.wikiContent.getText() != null ? binding.wikiContent.getText().toString() : "";
+		String wikiTitle =
+				binding.wikiTitle.getText() != null ? binding.wikiTitle.getText().toString() : "";
+		String wikiContent =
+				binding.wikiContent.getText() != null
+						? binding.wikiContent.getText().toString()
+						: "";
 
-		if(wikiTitle.isEmpty() || wikiContent.isEmpty()) {
+		if (wikiTitle.isEmpty() || wikiContent.isEmpty()) {
 			Toasty.error(ctx, getString(R.string.wikiPageNameAndContentError));
 			return;
 		}
 
-		if(action.equalsIgnoreCase("edit")) {
+		if (action.equalsIgnoreCase("edit")) {
 			patchWiki(wikiTitle, wikiContent);
-		}
-		else if(action.equalsIgnoreCase("add")) {
+		} else if (action.equalsIgnoreCase("add")) {
 			addWiki(wikiTitle, wikiContent);
 		}
 	}
@@ -105,46 +104,68 @@ 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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<WikiPage> call, @NonNull retrofit2.Response<WikiPage> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<WikiPage> call,
+							@NonNull retrofit2.Response<WikiPage> response) {
 
-				if(response.isSuccessful()) {
-					if(response.code() == 201) {
+						if (response.isSuccessful()) {
+							if (response.code() == 201) {
 
-						Toasty.success(ctx, getString(R.string.wikiCreated));
-						WikiFragment.resumeWiki = true;
-						finish();
-					}
-					else {
+								Toasty.success(ctx, getString(R.string.wikiCreated));
+								WikiFragment.resumeWiki = true;
+								finish();
+							} else {
 
-						switch(response.code()) {
-
-							case 401:
-								runOnUiThread(() -> AlertDialogs.authorizationTokenRevokedDialog(ctx));
-								break;
-							case 403:
-								runOnUiThread(() -> Toasty.error(ctx, ctx.getString(R.string.authorizeError)));
-								break;
-							case 404:
-								runOnUiThread(() -> Toasty.warning(ctx, ctx.getString(R.string.apiNotFound)));
-								break;
-							default:
-								runOnUiThread(() -> Toasty.error(ctx, getString(R.string.genericError)));
+								switch (response.code()) {
+									case 401:
+										runOnUiThread(
+												() ->
+														AlertDialogs
+																.authorizationTokenRevokedDialog(
+																		ctx));
+										break;
+									case 403:
+										runOnUiThread(
+												() ->
+														Toasty.error(
+																ctx,
+																ctx.getString(
+																		R.string.authorizeError)));
+										break;
+									case 404:
+										runOnUiThread(
+												() ->
+														Toasty.warning(
+																ctx,
+																ctx.getString(
+																		R.string.apiNotFound)));
+										break;
+									default:
+										runOnUiThread(
+												() ->
+														Toasty.error(
+																ctx,
+																getString(R.string.genericError)));
+								}
+							}
 						}
 					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<WikiPage> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<WikiPage> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	private void patchWiki(String wikiTitle, String wikiContent) {
@@ -153,142 +174,222 @@ 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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<WikiPage> call, @NonNull retrofit2.Response<WikiPage> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<WikiPage> call,
+							@NonNull retrofit2.Response<WikiPage> response) {
 
-				if(response.isSuccessful()) {
-					if(response.code() == 200) {
+						if (response.isSuccessful()) {
+							if (response.code() == 200) {
 
-						Toasty.success(ctx, getString(R.string.wikiUpdated));
-						WikiFragment.resumeWiki = true;
-						finish();
-					}
-					else {
+								Toasty.success(ctx, getString(R.string.wikiUpdated));
+								WikiFragment.resumeWiki = true;
+								finish();
+							} else {
 
-						switch(response.code()) {
-
-							case 401:
-								runOnUiThread(() -> AlertDialogs.authorizationTokenRevokedDialog(ctx));
-								break;
-							case 403:
-								runOnUiThread(() -> Toasty.error(ctx, ctx.getString(R.string.authorizeError)));
-								break;
-							case 404:
-								runOnUiThread(() -> Toasty.warning(ctx, ctx.getString(R.string.apiNotFound)));
-								break;
-							default:
-								runOnUiThread(() -> Toasty.error(ctx, getString(R.string.genericError)));
+								switch (response.code()) {
+									case 401:
+										runOnUiThread(
+												() ->
+														AlertDialogs
+																.authorizationTokenRevokedDialog(
+																		ctx));
+										break;
+									case 403:
+										runOnUiThread(
+												() ->
+														Toasty.error(
+																ctx,
+																ctx.getString(
+																		R.string.authorizeError)));
+										break;
+									case 404:
+										runOnUiThread(
+												() ->
+														Toasty.warning(
+																ctx,
+																ctx.getString(
+																		R.string.apiNotFound)));
+										break;
+									default:
+										runOnUiThread(
+												() ->
+														Toasty.error(
+																ctx,
+																getString(R.string.genericError)));
+								}
+							}
 						}
 					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<WikiPage> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<WikiPage> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	private void getWikiPageContents() {
 
-		Call<WikiPage> call = RetrofitClient.getApiInterface(ctx).repoGetWikiPage(repository.getOwner(), repository.getName(), pageName);
+		Call<WikiPage> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoGetWikiPage(repository.getOwner(), repository.getName(), pageName);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<WikiPage> call, @NonNull retrofit2.Response<WikiPage> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<WikiPage> call,
+							@NonNull retrofit2.Response<WikiPage> response) {
 
-				if(response.isSuccessful()) {
-					if(response.code() == 200) {
+						if (response.isSuccessful()) {
+							if (response.code() == 200) {
 
-						WikiPage wikiPage = response.body();
+								WikiPage wikiPage = response.body();
 
-						runOnUiThread(() -> {
+								runOnUiThread(
+										() -> {
+											assert wikiPage != null;
+											String pageContents =
+													AppUtil.decodeBase64(
+															wikiPage.getContentBase64());
+											binding.contents.setContent(pageContents, "md");
 
-							assert wikiPage != null;
-							String pageContents = AppUtil.decodeBase64(wikiPage.getContentBase64());
-							binding.contents.setContent(pageContents, "md");
+											if (renderMd) {
+												Markdown.render(
+														ctx,
+														EmojiParser.parseToUnicode(pageContents),
+														binding.markdown,
+														repository);
 
-							if(renderMd) {
-								Markdown.render(ctx, EmojiParser.parseToUnicode(pageContents), binding.markdown, repository);
+												binding.markdownFrame.setVisibility(View.VISIBLE);
+												binding.contents.setVisibility(View.GONE);
+											} else {
+												binding.markdownFrame.setVisibility(View.GONE);
+												binding.contents.setVisibility(View.VISIBLE);
+											}
 
-								binding.markdownFrame.setVisibility(View.VISIBLE);
-								binding.contents.setVisibility(View.GONE);
-							}
-							else {
-								binding.markdownFrame.setVisibility(View.GONE);
-								binding.contents.setVisibility(View.VISIBLE);
+											if (action.equalsIgnoreCase("edit")) {
+												binding.wikiContent.setText(pageContents);
+											}
+										});
+							} else {
+
+								switch (response.code()) {
+									case 401:
+										runOnUiThread(
+												() ->
+														AlertDialogs
+																.authorizationTokenRevokedDialog(
+																		ctx));
+										break;
+									case 403:
+										runOnUiThread(
+												() ->
+														Toasty.error(
+																ctx,
+																ctx.getString(
+																		R.string.authorizeError)));
+										break;
+									case 404:
+										runOnUiThread(
+												() ->
+														Toasty.warning(
+																ctx,
+																ctx.getString(
+																		R.string.apiNotFound)));
+										break;
+									default:
+										runOnUiThread(
+												() ->
+														Toasty.error(
+																ctx,
+																getString(R.string.genericError)));
+								}
 							}
 
-							if(action.equalsIgnoreCase("edit")) {
-								binding.wikiContent.setText(pageContents);
-							}
-						});
-					}
-					else {
-
-						switch(response.code()) {
-
-							case 401:
-								runOnUiThread(() -> AlertDialogs.authorizationTokenRevokedDialog(ctx));
-								break;
-							case 403:
-								runOnUiThread(() -> Toasty.error(ctx, ctx.getString(R.string.authorizeError)));
-								break;
-							case 404:
-								runOnUiThread(() -> Toasty.warning(ctx, ctx.getString(R.string.apiNotFound)));
-								break;
-							default:
-								runOnUiThread(() -> Toasty.error(ctx, getString(R.string.genericError)));
+							binding.progressBar.setVisibility(View.GONE);
 						}
 					}
 
-					binding.progressBar.setVisibility(View.GONE);
-				}
-			}
+					@Override
+					public void onFailure(@NonNull Call<WikiPage> call, @NonNull Throwable t) {
 
-			@Override
-			public void onFailure(@NonNull Call<WikiPage> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	private void deleteWiki(final String owner, final String repo, final String pageName) {
 
-		MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(String.format(ctx.getString(R.string.deleteGenericTitle), pageName))
-			.setMessage(ctx.getString(R.string.deleteWikiPageMessage, pageName)).setNeutralButton(R.string.cancelButton, null)
-			.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> RetrofitClient.getApiInterface(ctx).repoDeleteWikiPage(owner, repo, pageName).enqueue(new Callback<>() {
+		MaterialAlertDialogBuilder materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(ctx)
+						.setTitle(
+								String.format(ctx.getString(R.string.deleteGenericTitle), pageName))
+						.setMessage(ctx.getString(R.string.deleteWikiPageMessage, pageName))
+						.setNeutralButton(R.string.cancelButton, null)
+						.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();
+																} else if (response.code() == 403) {
+																	Toasty.error(
+																			ctx,
+																			ctx.getString(
+																					R.string
+																							.authorizeError));
+																} else {
+																	Toasty.error(
+																			ctx,
+																			ctx.getString(
+																					R.string
+																							.genericError));
+																}
+															}
 
-				@Override
-				public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+															@Override
+															public void onFailure(
+																	@NonNull Call<Void> call,
+																	@NonNull Throwable t) {
 
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}));
+																Toasty.error(
+																		ctx,
+																		ctx.getString(
+																				R.string
+																						.genericError));
+															}
+														}));
 
 		materialAlertDialogBuilder.create().show();
 	}
@@ -298,11 +399,10 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
 
 		MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.markdown_switcher, menu);
-		if(action.equalsIgnoreCase("edit") || action.equalsIgnoreCase("add")) {
+		if (action.equalsIgnoreCase("edit") || action.equalsIgnoreCase("add")) {
 			inflater.inflate(R.menu.save, menu);
-		}
-		else {
-			if(repository.getPermissions().isPush()) {
+		} else {
+			if (repository.getPermissions().isPush()) {
 				inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
 			}
 		}
@@ -312,8 +412,7 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
 
 	@Override
 	public void onButtonClicked(String text) {
-		switch(text) {
-
+		switch (text) {
 			case "editWiki":
 				Intent intent = new Intent(ctx, WikiActivity.class);
 				intent.putExtra("pageName", pageName);
@@ -333,52 +432,58 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
 
 		int id = item.getItemId();
 
-		if(id == android.R.id.home) {
+		if (id == android.R.id.home) {
 
 			finish();
 			return true;
-		}
-		else if(id == R.id.genericMenu) {
+		} else if (id == R.id.genericMenu) {
 
 			BottomSheetWikiFragment bottomSheet = new BottomSheetWikiFragment();
 			bottomSheet.show(getSupportFragmentManager(), "wikiBottomSheet");
 			return true;
-		}
-		else if(id == R.id.save) {
+		} else if (id == R.id.save) {
 
 			processWiki();
 			return true;
-		}
-		else if(id == R.id.markdown) {
+		} else if (id == R.id.markdown) {
 
-			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);
+			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);
 
 					binding.markdownPreview.setVisibility(View.VISIBLE);
 					binding.contentLayout.setVisibility(View.GONE);
 					renderMd = false;
-				}
-				else {
+				} else {
 					binding.markdownPreview.setVisibility(View.GONE);
 					binding.contentLayout.setVisibility(View.VISIBLE);
 					renderMd = true;
 				}
-			}
-			else {
+			} else {
 
-				if(!renderMd) {
+				if (!renderMd) {
 
-					if(binding.markdown.getAdapter() == null) {
-						Markdown.render(ctx, EmojiParser.parseToUnicode(binding.contents.getContent()), binding.markdown, repository);
+					if (binding.markdown.getAdapter() == null) {
+						Markdown.render(
+								ctx,
+								EmojiParser.parseToUnicode(binding.contents.getContent()),
+								binding.markdown,
+								repository);
 					}
 
 					binding.contents.setVisibility(View.GONE);
 					binding.markdownFrame.setVisibility(View.VISIBLE);
 
 					renderMd = true;
-				}
-				else {
+				} else {
 					binding.markdownFrame.setVisibility(View.GONE);
 					binding.contents.setVisibility(View.VISIBLE);
 
@@ -387,10 +492,8 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
 			}
 
 			return true;
-		}
-		else {
+		} else {
 			return super.onOptionsItemSelected(item);
 		}
 	}
-
 }
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 adee3f94..aee87bcd 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java
@@ -10,6 +10,8 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.List;
+import java.util.Locale;
 import org.apache.commons.lang3.StringUtils;
 import org.gitnex.tea4j.v2.models.Cron;
 import org.mian.gitnex.R;
@@ -18,16 +20,14 @@ import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
-import java.util.Locale;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
-public class AdminCronTasksAdapter extends RecyclerView.Adapter<AdminCronTasksAdapter.CronTasksViewHolder> {
+public class AdminCronTasksAdapter
+		extends RecyclerView.Adapter<AdminCronTasksAdapter.CronTasksViewHolder> {
 
 	private final List<Cron> tasksList;
 
@@ -50,58 +50,71 @@ public class AdminCronTasksAdapter extends RecyclerView.Adapter<AdminCronTasksAd
 			LinearLayout cronTasksInfo = itemView.findViewById(R.id.cronTasksInfo);
 			LinearLayout cronTasksRun = itemView.findViewById(R.id.cronTasksRun);
 
-			cronTasksInfo.setOnClickListener(taskInfo -> {
+			cronTasksInfo.setOnClickListener(
+					taskInfo -> {
+						String nextRun = "";
+						String lastRun = "";
 
-				String nextRun = "";
-				String lastRun = "";
+						if (cronTasks.getNext() != null) {
+							nextRun =
+									TimeHelper.formatTime(
+											cronTasks.getNext(), locale, timeFormat, ctx);
+						}
+						if (cronTasks.getPrev() != null) {
+							lastRun =
+									TimeHelper.formatTime(
+											cronTasks.getPrev(), locale, timeFormat, ctx);
+						}
 
-				if(cronTasks.getNext() != null) {
-					nextRun = TimeHelper.formatTime(cronTasks.getNext(), locale, timeFormat, ctx);
-				}
-				if(cronTasks.getPrev() != null) {
-					lastRun = TimeHelper.formatTime(cronTasks.getPrev(), locale, timeFormat, ctx);
-				}
+						View view =
+								LayoutInflater.from(ctx)
+										.inflate(R.layout.layout_cron_task_info, null);
 
-				View view = LayoutInflater.from(ctx).inflate(R.layout.layout_cron_task_info, null);
+						TextView taskScheduleContent = view.findViewById(R.id.taskScheduleContent);
+						TextView nextRunContent = view.findViewById(R.id.nextRunContent);
+						TextView lastRunContent = view.findViewById(R.id.lastRunContent);
+						TextView execTimeContent = view.findViewById(R.id.execTimeContent);
 
-				TextView taskScheduleContent = view.findViewById(R.id.taskScheduleContent);
-				TextView nextRunContent = view.findViewById(R.id.nextRunContent);
-				TextView lastRunContent = view.findViewById(R.id.lastRunContent);
-				TextView execTimeContent = view.findViewById(R.id.execTimeContent);
+						taskScheduleContent.setText(cronTasks.getSchedule());
+						nextRunContent.setText(nextRun);
+						lastRunContent.setText(lastRun);
+						execTimeContent.setText(String.valueOf(cronTasks.getExecTimes()));
 
-				taskScheduleContent.setText(cronTasks.getSchedule());
-				nextRunContent.setText(nextRun);
-				lastRunContent.setText(lastRun);
-				execTimeContent.setText(String.valueOf(cronTasks.getExecTimes()));
+						MaterialAlertDialogBuilder materialAlertDialogBuilder =
+								new MaterialAlertDialogBuilder(ctx)
+										.setTitle(
+												StringUtils.capitalize(
+														cronTasks.getName().replace("_", " ")))
+										.setView(view)
+										.setNeutralButton(ctx.getString(R.string.close), null);
 
-				MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(StringUtils.capitalize(cronTasks.getName().replace("_", " "))).setView(view)
-					.setNeutralButton(ctx.getString(R.string.close), null);
+						materialAlertDialogBuilder.create().show();
+					});
 
-				materialAlertDialogBuilder.create().show();
-			});
-
-			cronTasksRun.setOnClickListener(taskInfo -> {
-
-				runCronTask(ctx, cronTasks.getName());
-			});
+			cronTasksRun.setOnClickListener(
+					taskInfo -> {
+						runCronTask(ctx, cronTasks.getName());
+					});
 		}
-
 	}
 
 	public AdminCronTasksAdapter(List<Cron> tasksListMain) {
 		this.tasksList = tasksListMain;
 	}
 
-	@NonNull
-	@Override
-	public AdminCronTasksAdapter.CronTasksViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+	@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);
+		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) {
+	public void onBindViewHolder(
+			@NonNull AdminCronTasksAdapter.CronTasksViewHolder holder, int position) {
 
 		Cron currentItem = tasksList.get(position);
 
@@ -113,46 +126,47 @@ public class AdminCronTasksAdapter extends RecyclerView.Adapter<AdminCronTasksAd
 
 		Call<Void> call = RetrofitClient.getApiInterface(ctx).adminCronRun(taskName);
 
-		call.enqueue(new Callback<Void>() {
+		call.enqueue(
+				new Callback<Void>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				switch(response.code()) {
+						switch (response.code()) {
+							case 204:
+								Toasty.success(
+										ctx,
+										ctx.getString(R.string.adminCronTaskSuccessMsg, taskName));
+								break;
 
-					case 204:
-						Toasty.success(ctx, ctx.getString(R.string.adminCronTaskSuccessMsg, taskName));
-						break;
+							case 401:
+								AlertDialogs.authorizationTokenRevokedDialog(ctx);
+								break;
 
-					case 401:
-						AlertDialogs.authorizationTokenRevokedDialog(ctx);
-						break;
+							case 403:
+								Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+								break;
 
-					case 403:
-						Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-						break;
+							case 404:
+								Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+								break;
 
-					case 404:
-						Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-						break;
+							default:
+								Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-					default:
-						Toasty.error(ctx, ctx.getString(R.string.genericError));
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						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 61e3cbef..731a0b86 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
@@ -15,58 +15,60 @@ import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
-public class AdminGetUsersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable {
+public class AdminGetUsersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+		implements Filterable {
 
 	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<>();
+	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();
+					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);
+						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;
 				}
-			}
 
-			FilterResults results = new FilterResults();
-			results.values = filteredList;
+				@Override
+				protected void publishResults(CharSequence constraint, FilterResults results) {
 
-			return results;
-		}
-
-		@Override
-		protected void publishResults(CharSequence constraint, FilterResults results) {
-
-			usersList.clear();
-			usersList.addAll((List) results.values);
-			notifyDataChanged();
-		}
-	};
+					usersList.clear();
+					usersList.addAll((List) results.values);
+					notifyDataChanged();
+				}
+			};
 
 	public AdminGetUsersAdapter(List<User> usersListMain, Context ctx) {
 		this.context = ctx;
@@ -74,16 +76,19 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<RecyclerView.View
 		usersListFull = new ArrayList<>(usersList);
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		LayoutInflater inflater = LayoutInflater.from(context);
-		return new AdminGetUsersAdapter.ReposHolder(inflater.inflate(R.layout.list_admin_users, parent, false));
+		return new AdminGetUsersAdapter.ReposHolder(
+				inflater.inflate(R.layout.list_admin_users, parent, false));
 	}
 
 	@Override
 	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.onLoadMore();
 		}
@@ -103,7 +108,7 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<RecyclerView.View
 
 	public void setMoreDataAvailable(boolean moreDataAvailable) {
 		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
+		if (!isMoreDataAvailable) {
 			loadMoreListener.onLoadFinished();
 		}
 	}
@@ -134,7 +139,6 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<RecyclerView.View
 		void onLoadMore();
 
 		void onLoadFinished();
-
 	}
 
 	class ReposHolder extends RecyclerView.ViewHolder {
@@ -155,16 +159,21 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<RecyclerView.View
 			userEmail = itemView.findViewById(R.id.userEmail);
 			userRole = itemView.findViewById(R.id.userRole);
 
-			itemView.setOnClickListener(loginId -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", userLoginId);
-				context.startActivity(intent);
-			});
+			itemView.setOnClickListener(
+					loginId -> {
+						Intent intent = new Intent(context, ProfileActivity.class);
+						intent.putExtra("username", userLoginId);
+						context.startActivity(intent);
+					});
 
-			userAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-				return true;
-			});
+			userAvatar.setOnLongClickListener(
+					loginId -> {
+						AppUtil.copyToClipboard(
+								context,
+								userLoginId,
+								context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
+						return true;
+					});
 		}
 
 		void bindData(User users) {
@@ -173,39 +182,60 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<RecyclerView.View
 
 			userLoginId = users.getLogin();
 
-			if(!users.getFullName().equals("")) {
+			if (!users.getFullName().equals("")) {
 
 				userFullName.setText(Html.fromHtml(users.getFullName()));
-				userName.setText(context.getResources().getString(R.string.usernameWithAt, users.getLogin()));
-			}
-			else {
+				userName.setText(
+						context.getResources()
+								.getString(R.string.usernameWithAt, users.getLogin()));
+			} else {
 
-				userFullName.setText(context.getResources().getString(R.string.usernameWithAt, users.getLogin()));
+				userFullName.setText(
+						context.getResources()
+								.getString(R.string.usernameWithAt, users.getLogin()));
 				userName.setVisibility(View.GONE);
 			}
 
-			if(!users.getEmail().equals("")) {
+			if (!users.getEmail().equals("")) {
 				userEmail.setText(users.getEmail());
-			}
-			else {
+			} else {
 				userEmail.setVisibility(View.GONE);
 			}
 
-			if(users.isIsAdmin()) {
+			if (users.isIsAdmin()) {
 
 				userRole.setVisibility(View.VISIBLE);
-				TextDrawable drawable = TextDrawable.builder().beginConfig().textColor(ResourcesCompat.getColor(context.getResources(), R.color.colorWhite, null)).fontSize(60).width(200).height(80).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(60)
+								.width(200)
+								.height(80)
+								.endConfig()
+								.buildRoundRect(
+										context.getResources()
+												.getString(R.string.userRoleAdmin)
+												.toLowerCase(),
+										ResourcesCompat.getColor(
+												context.getResources(), R.color.releasePre, null),
+										8);
 				userRole.setImageDrawable(drawable);
-			}
-			else {
+			} else {
 
 				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);
 		}
-
 	}
-
 }
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 9dcbc3f8..bb397696 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/AdminUnadoptedReposAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/AdminUnadoptedReposAdapter.java
@@ -9,12 +9,12 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.List;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.ActivityAdminCronTasksBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -22,8 +22,8 @@ import retrofit2.Callback;
  * @author M M Arif
  * @author qwerty287
  */
-
-public class AdminUnadoptedReposAdapter extends RecyclerView.Adapter<AdminUnadoptedReposAdapter.UnadoptedViewHolder> {
+public class AdminUnadoptedReposAdapter
+		extends RecyclerView.Adapter<AdminUnadoptedReposAdapter.UnadoptedViewHolder> {
 
 	private final Runnable updateList;
 	private final Runnable loadMoreListener;
@@ -31,24 +31,29 @@ public class AdminUnadoptedReposAdapter extends RecyclerView.Adapter<AdminUnadop
 	private List<String> repos;
 	private boolean isLoading = false, hasMore = true;
 
-	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;
 		this.activityAdminCronTasksBinding = activityAdminCronTasksBinding;
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public UnadoptedViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_admin_unadopted_repos, parent, false);
+		View v =
+				LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.list_admin_unadopted_repos, parent, false);
 		return new UnadoptedViewHolder(v);
 	}
 
 	@Override
 	public void onBindViewHolder(@NonNull UnadoptedViewHolder holder, int position) {
-		if(position >= getItemCount() - 1 && hasMore && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1 && hasMore && !isLoading && loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.run();
 		}
@@ -69,91 +74,96 @@ public class AdminUnadoptedReposAdapter extends RecyclerView.Adapter<AdminUnadop
 
 		String[] repoSplit = name.split("/");
 
-		Call<Void> call = RetrofitClient.getApiInterface(ctx).adminDeleteUnadoptedRepository(repoSplit[0], repoSplit[1]);
+		Call<Void> call =
+				RetrofitClient.getApiInterface(ctx)
+						.adminDeleteUnadoptedRepository(repoSplit[0], repoSplit[1]);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				switch(response.code()) {
+						switch (response.code()) {
+							case 204:
+								updateList.run();
+								Toasty.success(ctx, ctx.getString(R.string.repoDeletionSuccess));
+								break;
 
-					case 204:
-						updateList.run();
-						Toasty.success(ctx, ctx.getString(R.string.repoDeletionSuccess));
-						break;
+							case 401:
+								AlertDialogs.authorizationTokenRevokedDialog(ctx);
+								break;
 
-					case 401:
-						AlertDialogs.authorizationTokenRevokedDialog(ctx);
-						break;
+							case 403:
+								Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+								break;
 
-					case 403:
-						Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-						break;
+							case 404:
+								Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+								break;
 
-					case 404:
-						Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-						break;
+							default:
+								Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-					default:
-						Toasty.error(ctx, ctx.getString(R.string.genericError));
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	private void adopt(final Context ctx, final String name, int position) {
 
 		String[] repoSplit = name.split("/");
 
-		Call<Void> call = RetrofitClient.getApiInterface(ctx).adminAdoptRepository(repoSplit[0], repoSplit[1]);
+		Call<Void> call =
+				RetrofitClient.getApiInterface(ctx)
+						.adminAdoptRepository(repoSplit[0], repoSplit[1]);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				switch(response.code()) {
+						switch (response.code()) {
+							case 204:
+								updateAdapter(position);
+								if (getItemCount() == 0) {
+									activityAdminCronTasksBinding.noData.setVisibility(
+											View.VISIBLE);
+								}
+								Toasty.success(ctx, ctx.getString(R.string.repoAdopted, name));
+								break;
 
-					case 204:
-						updateAdapter(position);
-						if(getItemCount() == 0) {
-							activityAdminCronTasksBinding.noData.setVisibility(View.VISIBLE);
+							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));
 						}
-						Toasty.success(ctx, ctx.getString(R.string.repoAdopted, name));
-						break;
+					}
 
-					case 401:
-						AlertDialogs.authorizationTokenRevokedDialog(ctx);
-						break;
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-					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));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	@Override
@@ -184,17 +194,32 @@ public class AdminUnadoptedReposAdapter extends RecyclerView.Adapter<AdminUnadop
 
 			name = itemView.findViewById(R.id.repo_name);
 
-			itemView.setOnClickListener(taskInfo -> {
-				String[] repoSplit = repoName.split("/");
+			itemView.setOnClickListener(
+					taskInfo -> {
+						String[] repoSplit = repoName.split("/");
 
-				MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(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())));
+						MaterialAlertDialogBuilder materialAlertDialogBuilder =
+								new MaterialAlertDialogBuilder(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())));
 
-				materialAlertDialogBuilder.create().show();
-			});
+						materialAlertDialogBuilder.create().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 cf789359..d58e90d9 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java
@@ -11,20 +11,20 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
-public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdapter.AssigneesViewHolder> {
+public class AssigneesListAdapter
+		extends RecyclerView.Adapter<AssigneesListAdapter.AssigneesViewHolder> {
 
 	private final Context context;
 	private final List<User> assigneesList;
@@ -32,7 +32,11 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 	private List<String> assigneesStrings = new ArrayList<>();
 	private List<String> currentAssignees;
 
-	public AssigneesListAdapter(Context ctx, List<User> dataMain, AssigneesListAdapterListener assigneesListener, List<String> currentAssignees) {
+	public AssigneesListAdapter(
+			Context ctx,
+			List<User> dataMain,
+			AssigneesListAdapterListener assigneesListener,
+			List<String> currentAssignees) {
 
 		this.context = ctx;
 		this.assigneesList = dataMain;
@@ -40,34 +44,42 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 		this.currentAssignees = currentAssignees;
 	}
 
-	@NonNull
-	@Override
-	public AssigneesListAdapter.AssigneesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+	@NonNull @Override
+	public AssigneesListAdapter.AssigneesViewHolder onCreateViewHolder(
+			@NonNull ViewGroup parent, int viewType) {
 
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.custom_assignees_list, parent, false);
+		View v =
+				LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.custom_assignees_list, parent, false);
 		return new AssigneesListAdapter.AssigneesViewHolder(v);
 	}
 
 	@Override
-	public void onBindViewHolder(@NonNull AssigneesListAdapter.AssigneesViewHolder holder, int position) {
+	public void onBindViewHolder(
+			@NonNull AssigneesListAdapter.AssigneesViewHolder holder, int position) {
 
 		User currentItem = assigneesList.get(position);
 		int imgRadius = AppUtil.getPixelsFromDensity(context, 90);
 
-		if(currentItem.getFullName().equals("")) {
+		if (currentItem.getFullName().equals("")) {
 
 			holder.assigneesName.setText(currentItem.getLogin());
-		}
-		else {
+		} else {
 
 			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++) {
+		for (int i = 0; i < assigneesList.size(); i++) {
 
-			if(assigneesStrings.contains(currentItem.getLogin())) {
+			if (assigneesStrings.contains(currentItem.getLogin())) {
 
 				holder.assigneesSelection.setChecked(true);
 			}
@@ -75,9 +87,9 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 
 		currentAssignees = new ArrayList<>(new LinkedHashSet<>(currentAssignees));
 
-		for(int i = 0; i < currentAssignees.size(); i++) {
+		for (int i = 0; i < currentAssignees.size(); i++) {
 
-			if(currentAssignees.contains(currentItem.getLogin())) {
+			if (currentAssignees.contains(currentItem.getLogin())) {
 
 				holder.assigneesSelection.setChecked(true);
 				assigneesStrings.add(currentAssignees.get(i));
@@ -86,19 +98,18 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 
 		assigneesListener.assigneesInterface(assigneesStrings);
 
-		holder.assigneesSelection.setOnCheckedChangeListener((buttonView, isChecked) -> {
+		holder.assigneesSelection.setOnCheckedChangeListener(
+				(buttonView, isChecked) -> {
+					if (isChecked) {
 
-			if(isChecked) {
+						assigneesStrings.add(currentItem.getLogin());
+					} else {
 
-				assigneesStrings.add(currentItem.getLogin());
-			}
-			else {
+						assigneesStrings.remove(currentItem.getLogin());
+					}
 
-				assigneesStrings.remove(currentItem.getLogin());
-			}
-
-			assigneesListener.assigneesInterface(assigneesStrings);
-		});
+					assigneesListener.assigneesInterface(assigneesStrings);
+				});
 
 		assigneesStrings = new ArrayList<>(new LinkedHashSet<>(assigneesStrings));
 	}
@@ -119,7 +130,6 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 	public interface AssigneesListAdapterListener {
 
 		void assigneesInterface(List<String> data);
-
 	}
 
 	static class AssigneesViewHolder extends RecyclerView.ViewHolder {
@@ -137,7 +147,5 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 			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 69f36968..a0f1d91a 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/CollaboratorSearchAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CollaboratorSearchAdapter.java
@@ -15,6 +15,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.CollaboratorActions;
@@ -26,7 +27,6 @@ import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -34,23 +34,26 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
-public class CollaboratorSearchAdapter extends RecyclerView.Adapter<CollaboratorSearchAdapter.CollaboratorSearchViewHolder> {
+public class CollaboratorSearchAdapter
+		extends RecyclerView.Adapter<CollaboratorSearchAdapter.CollaboratorSearchViewHolder> {
 
 	private final List<User> usersSearchList;
 	private final Context context;
 	private final RepositoryContext repository;
 
-	public CollaboratorSearchAdapter(List<User> dataList, Context ctx, RepositoryContext repository) {
+	public CollaboratorSearchAdapter(
+			List<User> dataList, Context ctx, RepositoryContext repository) {
 		this.context = ctx;
 		this.usersSearchList = dataList;
 		this.repository = repository;
 	}
 
-	@NonNull
-	@Override
-	public CollaboratorSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_collaborators_search, parent, false);
+	@NonNull @Override
+	public CollaboratorSearchViewHolder onCreateViewHolder(
+			@NonNull ViewGroup parent, int viewType) {
+		View v =
+				LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.list_collaborators_search, parent, false);
 		return new CollaboratorSearchAdapter.CollaboratorSearchViewHolder(v);
 	}
 
@@ -61,60 +64,74 @@ public class CollaboratorSearchAdapter extends RecyclerView.Adapter<Collaborator
 		int imgRadius = AppUtil.getPixelsFromDensity(context, 60);
 		holder.userInfo = currentItem;
 
-		if(!currentItem.getFullName().equals("")) {
+		if (!currentItem.getFullName().equals("")) {
 
 			holder.userFullName.setText(Html.fromHtml(currentItem.getFullName()));
-		}
-		else {
+		} else {
 
-			holder.userFullName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
+			holder.userFullName.setText(
+					context.getResources()
+							.getString(R.string.usernameWithAt, currentItem.getLogin()));
 		}
 
-		holder.userName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
+		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);
+		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);
 		}
 
-		if(getItemCount() > 0) {
+		if (getItemCount() > 0) {
 
-			final String loginUid = ((BaseActivity) context).getAccount().getAccount().getUserName();
+			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>() {
+			call.enqueue(
+					new Callback<Void>() {
 
-				@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.code() == 204) {
-						if(!currentItem.getLogin().equals(loginUid) && !currentItem.getLogin().equals(repository.getOwner())) {
-							holder.addCollaboratorButtonRemove.setVisibility(View.VISIBLE);
+							if (response.code() == 204) {
+								if (!currentItem.getLogin().equals(loginUid)
+										&& !currentItem.getLogin().equals(repository.getOwner())) {
+									holder.addCollaboratorButtonRemove.setVisibility(View.VISIBLE);
+								} else {
+									holder.addCollaboratorButtonRemove.setVisibility(View.GONE);
+								}
+							} else if (response.code() == 404) {
+								if (!currentItem.getLogin().equals(loginUid)
+										&& !currentItem.getLogin().equals(repository.getOwner())) {
+									holder.addCollaboratorButtonAdd.setVisibility(View.VISIBLE);
+								} else {
+									holder.addCollaboratorButtonAdd.setVisibility(View.GONE);
+								}
+							} else {
+								holder.addCollaboratorButtonRemove.setVisibility(View.GONE);
+								holder.addCollaboratorButtonAdd.setVisibility(View.GONE);
+							}
 						}
-						else {
-							holder.addCollaboratorButtonRemove.setVisibility(View.GONE);
-						}
-					}
-					else if(response.code() == 404) {
-						if(!currentItem.getLogin().equals(loginUid) && !currentItem.getLogin().equals(repository.getOwner())) {
-							holder.addCollaboratorButtonAdd.setVisibility(View.VISIBLE);
-						}
-						else {
-							holder.addCollaboratorButtonAdd.setVisibility(View.GONE);
-						}
-					}
-					else {
-						holder.addCollaboratorButtonRemove.setVisibility(View.GONE);
-						holder.addCollaboratorButtonAdd.setVisibility(View.GONE);
-					}
-				}
 
-				@Override
-				public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-					Log.i("onFailure", t.toString());
-				}
-			});
+						@Override
+						public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+							Log.i("onFailure", t.toString());
+						}
+					});
 		}
 	}
 
@@ -131,7 +148,7 @@ public class CollaboratorSearchAdapter extends RecyclerView.Adapter<Collaborator
 		private final ImageView addCollaboratorButtonAdd;
 		private final ImageView addCollaboratorButtonRemove;
 		private final String[] permissionList = {"Read", "Write", "Admin"};
-		final private int permissionSelectedChoice = 0;
+		private final int permissionSelectedChoice = 0;
 		private User userInfo;
 
 		private CollaboratorSearchViewHolder(View itemView) {
@@ -143,39 +160,67 @@ public class CollaboratorSearchAdapter extends RecyclerView.Adapter<Collaborator
 			addCollaboratorButtonAdd = itemView.findViewById(R.id.addCollaboratorButtonAdd);
 			addCollaboratorButtonRemove = itemView.findViewById(R.id.addCollaboratorButtonRemove);
 
-			addCollaboratorButtonAdd.setOnClickListener(v -> {
+			addCollaboratorButtonAdd.setOnClickListener(
+					v -> {
+						MaterialAlertDialogBuilder materialAlertDialogBuilder =
+								new MaterialAlertDialogBuilder(context)
+										.setTitle(R.string.newTeamPermission)
+										.setSingleChoiceItems(
+												permissionList, permissionSelectedChoice, null)
+										.setNeutralButton(R.string.cancelButton, null)
+										.setPositiveButton(
+												R.string.addButton,
+												(dialog, which) -> {
+													ListView lw =
+															((AlertDialog) dialog).getListView();
+													Object checkedItem =
+															lw.getAdapter()
+																	.getItem(
+																			lw
+																					.getCheckedItemPosition());
 
-				MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context).setTitle(R.string.newTeamPermission).setSingleChoiceItems(permissionList, permissionSelectedChoice, null)
-					.setNeutralButton(R.string.cancelButton, null).setPositiveButton(R.string.addButton, (dialog, which) -> {
+													CollaboratorActions.addCollaborator(
+															context,
+															String.valueOf(checkedItem)
+																	.toLowerCase(),
+															userInfo.getLogin(),
+															repository);
+												});
 
-						ListView lw = ((AlertDialog) dialog).getListView();
-						Object checkedItem = lw.getAdapter().getItem(lw.getCheckedItemPosition());
-
-						CollaboratorActions.addCollaborator(context, String.valueOf(checkedItem).toLowerCase(), userInfo.getLogin(), repository);
+						materialAlertDialogBuilder.create().show();
 					});
 
-				materialAlertDialogBuilder.create().show();
-			});
+			addCollaboratorButtonRemove.setOnClickListener(
+					v ->
+							AlertDialogs.collaboratorRemoveDialog(
+									context, userInfo.getLogin(), repository));
 
-			addCollaboratorButtonRemove.setOnClickListener(v -> AlertDialogs.collaboratorRemoveDialog(context, userInfo.getLogin(), repository));
+			new Handler()
+					.postDelayed(
+							() -> {
+								if (!AppUtil.checkGhostUsers(userInfo.getLogin())) {
 
-			new Handler().postDelayed(() -> {
-				if(!AppUtil.checkGhostUsers(userInfo.getLogin())) {
+									userAvatar.setOnClickListener(
+											loginId -> {
+												Intent intent =
+														new Intent(context, ProfileActivity.class);
+												intent.putExtra("username", userInfo.getLogin());
+												context.startActivity(intent);
+											});
 
-					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;
-					});
-				}
-			}, 500);
+									userAvatar.setOnLongClickListener(
+											loginId -> {
+												AppUtil.copyToClipboard(
+														context,
+														userInfo.getLogin(),
+														context.getString(
+																R.string.copyLoginIdToClipBoard,
+																userInfo.getLogin()));
+												return true;
+											});
+								}
+							},
+							500);
 		}
-
 	}
-
 }
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 b8e1c4db..d39349b8 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
@@ -10,18 +10,17 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
 public class CollaboratorsAdapter extends BaseAdapter {
 
 	private final List<User> collaboratorsList;
@@ -54,13 +53,12 @@ public class CollaboratorsAdapter extends BaseAdapter {
 
 		ViewHolder viewHolder;
 
-		if(finalView == null) {
+		if (finalView == null) {
 
 			finalView = LayoutInflater.from(context).inflate(R.layout.list_collaborators, null);
 			viewHolder = new ViewHolder(finalView);
 			finalView.setTag(viewHolder);
-		}
-		else {
+		} else {
 
 			viewHolder = (ViewHolder) finalView.getTag();
 		}
@@ -74,22 +72,28 @@ public class CollaboratorsAdapter extends BaseAdapter {
 		int imgRadius = AppUtil.getPixelsFromDensity(context, 90);
 
 		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();
 
-		if(!currentItem.getFullName().equals("")) {
+		if (!currentItem.getFullName().equals("")) {
 
 			viewHolder.collaboratorName.setText(Html.fromHtml(currentItem.getFullName()));
-			viewHolder.userName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
-		}
-		else {
+			viewHolder.userName.setText(
+					context.getResources()
+							.getString(R.string.usernameWithAt, currentItem.getLogin()));
+		} else {
 
 			viewHolder.collaboratorName.setText(currentItem.getLogin());
 			viewHolder.userName.setVisibility(View.GONE);
 		}
-
 	}
 
 	private class ViewHolder {
@@ -105,18 +109,21 @@ public class CollaboratorsAdapter extends BaseAdapter {
 			collaboratorName = v.findViewById(R.id.collaboratorName);
 			userName = v.findViewById(R.id.userName);
 
-			v.setOnClickListener(loginId -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", userLoginId);
-				context.startActivity(intent);
-			});
+			v.setOnClickListener(
+					loginId -> {
+						Intent intent = new Intent(context, ProfileActivity.class);
+						intent.putExtra("username", userLoginId);
+						context.startActivity(intent);
+					});
 
-			v.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-				return true;
-			});
+			v.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 638381ad..cca7cf25 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
@@ -13,6 +13,8 @@ import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.card.MaterialCardView;
 import com.vdurmont.emoji.EmojiParser;
+import java.util.List;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.Commit;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CommitDetailActivity;
@@ -23,13 +25,10 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.contexts.IssueContext;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * @author M M Arif
  */
-
 public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
@@ -44,8 +43,7 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 		this.commitsList = commitsListMain;
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		LayoutInflater inflater = LayoutInflater.from(context);
 		return new CommitsHolder(inflater.inflate(R.layout.list_commits, parent, false));
@@ -54,7 +52,10 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 	@Override
 	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.run();
 		}
@@ -120,69 +121,118 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 
 		void bindData(Commit commitsModel) {
 
-			String[] commitMessageParts = commitsModel.getCommit().getMessage().split("(\r\n|\n)", 2);
+			String[] commitMessageParts =
+					commitsModel.getCommit().getMessage().split("(\r\n|\n)", 2);
 
 			commitSubject.setText(EmojiParser.parseToUnicode(commitMessageParts[0].trim()));
 
-
-			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));
-			}
-			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));
+			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));
+			} 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));
 			}
 
-			if(commitsModel.getAuthor() != null && commitsModel.getAuthor().getAvatarUrl() != null && !commitsModel.getAuthor().getAvatarUrl().isEmpty()) {
+			if (commitsModel.getAuthor() != null
+					&& commitsModel.getAuthor().getAvatarUrl() != null
+					&& !commitsModel.getAuthor().getAvatarUrl().isEmpty()) {
 
 				commitAuthorAvatarFrame.setVisibility(View.VISIBLE);
 
 				int imgRadius = AppUtil.getPixelsFromDensity(context, 60);
 
-				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 {
+			} else {
 				commitAuthorAvatar.setImageDrawable(null);
 				commitAuthorAvatarFrame.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()) {
 
 				commitCommitterAvatarFrame.setVisibility(View.VISIBLE);
 
 				int imgRadius = AppUtil.getPixelsFromDensity(context, 60);
 
-				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 {
+			} else {
 				commitCommitterAvatar.setImageDrawable(null);
 				commitCommitterAvatarFrame.setVisibility(View.GONE);
 			}
 
-			commitSha.setText(commitsModel.getSha().substring(0, Math.min(commitsModel.getSha().length(), 10)));
-			rootView.setOnClickListener(v -> {
-				Intent intent;
-				if(context instanceof CommitsActivity) {
-					intent = ((CommitsActivity) context).repository.getIntent(context, CommitDetailActivity.class);
-				}
-				else {
-					intent = IssueContext.fromIntent(((DiffActivity) context).getIntent()).getRepository().getIntent(context, CommitDetailActivity.class);
-				}
-				intent.putExtra("sha", commitsModel.getSha());
-				context.startActivity(intent);
-			});
-
+			commitSha.setText(
+					commitsModel
+							.getSha()
+							.substring(0, Math.min(commitsModel.getSha().length(), 10)));
+			rootView.setOnClickListener(
+					v -> {
+						Intent intent;
+						if (context instanceof CommitsActivity) {
+							intent =
+									((CommitsActivity) context)
+											.repository.getIntent(
+													context, CommitDetailActivity.class);
+						} else {
+							intent =
+									IssueContext.fromIntent(((DiffActivity) context).getIntent())
+											.getRepository()
+											.getIntent(context, CommitDetailActivity.class);
+						}
+						intent.putExtra("sha", commitsModel.getSha());
+						context.startActivity(intent);
+					});
 		}
-
 	}
-
 }
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 b9c42860..e38b6c0d 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/DiffAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/DiffAdapter.java
@@ -9,18 +9,17 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 import androidx.fragment.app.FragmentManager;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.mian.gitnex.R;
 import org.mian.gitnex.fragments.BottomSheetReplyFragment;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.contexts.IssueContext;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author opyale
  */
-
 public class DiffAdapter extends BaseAdapter {
 
 	private static int COLOR_ADDED;
@@ -36,7 +35,12 @@ public class DiffAdapter extends BaseAdapter {
 	private final Typeface typeface;
 	private final String type;
 
-	public DiffAdapter(Context context, FragmentManager fragmentManager, List<String> lines, IssueContext issue, String type) {
+	public DiffAdapter(
+			Context context,
+			FragmentManager fragmentManager,
+			List<String> lines,
+			IssueContext issue,
+			String type) {
 
 		this.context = context;
 		this.fragmentManager = fragmentManager;
@@ -52,7 +56,6 @@ public class DiffAdapter extends BaseAdapter {
 		COLOR_NORMAL = AppUtil.getColorFromAttribute(context, R.attr.primaryBackgroundColor);
 		COLOR_SELECTED = AppUtil.getColorFromAttribute(context, R.attr.diffSelectedColor);
 		COLOR_FONT = AppUtil.getColorFromAttribute(context, R.attr.inputTextColor);
-
 	}
 
 	@Override
@@ -73,80 +76,82 @@ public class DiffAdapter extends BaseAdapter {
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
 
-		if(convertView == null) {
+		if (convertView == null) {
 
 			TextView textView = new TextView(context);
 
-			textView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+			textView.setLayoutParams(
+					new ViewGroup.LayoutParams(
+							ViewGroup.LayoutParams.MATCH_PARENT,
+							ViewGroup.LayoutParams.WRAP_CONTENT));
 			textView.setTextColor(COLOR_FONT);
 			textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
 			textView.setPadding(32, 0, 32, 0);
 			textView.setTypeface(typeface);
 
 			convertView = textView;
-
 		}
 
-		if(type.equalsIgnoreCase("pull")) {
-			convertView.setOnClickListener(v -> {
+		if (type.equalsIgnoreCase("pull")) {
+			convertView.setOnClickListener(
+					v -> {
+						if (selectedLines.contains(position)) {
 
-				if(selectedLines.contains(position)) {
+							selectedLines.remove((Object) position);
+							v.setBackgroundColor(getLineColor(lines.get(position)));
+						} else {
 
-					selectedLines.remove((Object) position);
-					v.setBackgroundColor(getLineColor(lines.get(position)));
-				}
-				else {
+							selectedLines.add(position);
+							v.setBackgroundColor(COLOR_SELECTED);
+						}
+					});
 
-					selectedLines.add(position);
-					v.setBackgroundColor(COLOR_SELECTED);
-				}
-			});
+			convertView.setOnLongClickListener(
+					v -> {
+						if (selectedLines.contains(position)) {
 
-			convertView.setOnLongClickListener(v -> {
+							StringBuilder stringBuilder = new StringBuilder();
+							stringBuilder.append("```\n");
 
-				if(selectedLines.contains(position)) {
+							for (Integer selectedLine :
+									selectedLines.stream().sorted().collect(Collectors.toList())) {
+								stringBuilder.append(lines.get(selectedLine));
+								stringBuilder.append("\n");
+							}
 
-					StringBuilder stringBuilder = new StringBuilder();
-					stringBuilder.append("```\n");
+							stringBuilder.append("```\n\n");
+							selectedLines.clear();
 
-					for(Integer selectedLine : selectedLines.stream().sorted().collect(Collectors.toList())) {
-						stringBuilder.append(lines.get(selectedLine));
-						stringBuilder.append("\n");
-					}
+							Bundle bundle = new Bundle();
+							bundle.putString("commentBody", stringBuilder.toString());
+							bundle.putBoolean("cursorToEnd", true);
 
-					stringBuilder.append("```\n\n");
-					selectedLines.clear();
+							BottomSheetReplyFragment.newInstance(bundle, issue)
+									.show(fragmentManager, "replyBottomSheet");
+						}
 
-					Bundle bundle = new Bundle();
-					bundle.putString("commentBody", stringBuilder.toString());
-					bundle.putBoolean("cursorToEnd", true);
-
-					BottomSheetReplyFragment.newInstance(bundle, issue).show(fragmentManager, "replyBottomSheet");
-				}
-
-				return true;
-
-			});
+						return true;
+					});
 		}
 
 		String line = lines.get(position);
 
-		int backgroundColor = selectedLines.contains(position) ? COLOR_SELECTED : getLineColor(line);
+		int backgroundColor =
+				selectedLines.contains(position) ? COLOR_SELECTED : getLineColor(line);
 
 		convertView.setBackgroundColor(backgroundColor);
 		((TextView) convertView).setText(line);
 
 		return convertView;
-
 	}
 
 	private int getLineColor(String line) {
 
-		if(line.length() == 0) {
+		if (line.length() == 0) {
 			return COLOR_NORMAL;
 		}
 
-		switch(line.charAt(0)) {
+		switch (line.charAt(0)) {
 			case '+':
 				return COLOR_ADDED;
 			case '-':
@@ -156,5 +161,4 @@ public class DiffAdapter extends BaseAdapter {
 				return COLOR_NORMAL;
 		}
 	}
-
 }
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 13f9b8b0..42203395 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/DiffFilesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/DiffFilesAdapter.java
@@ -9,20 +9,19 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CommitDetailActivity;
 import org.mian.gitnex.activities.DiffActivity;
 import org.mian.gitnex.fragments.DiffFragment;
 import org.mian.gitnex.helpers.FileDiffView;
 import org.mian.gitnex.helpers.contexts.IssueContext;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * @author M M Arif
  */
-
 public class DiffFilesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private static final Pattern statisticsPattern = Pattern.compile("(\\d+).*?,.*?(\\d+)");
@@ -32,7 +31,11 @@ public class DiffFilesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 	private final String fragmentType;
 	private List<FileDiffView> fileDiffViews;
 
-	public DiffFilesAdapter(Context context, List<FileDiffView> fileDiffViews, IssueContext issue, String fragmentType) {
+	public DiffFilesAdapter(
+			Context context,
+			List<FileDiffView> fileDiffViews,
+			IssueContext issue,
+			String fragmentType) {
 
 		this.context = context;
 		this.fileDiffViews = fileDiffViews;
@@ -40,11 +43,11 @@ public class DiffFilesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 		this.fragmentType = fragmentType;
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		LayoutInflater inflater = LayoutInflater.from(context);
-		return new DiffFilesAdapter.FilesHolder(inflater.inflate(R.layout.list_diff_files, parent, false));
+		return new DiffFilesAdapter.FilesHolder(
+				inflater.inflate(R.layout.list_diff_files, parent, false));
 	}
 
 	@Override
@@ -87,15 +90,26 @@ public class DiffFilesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 			fileStatistics = itemView.findViewById(R.id.fileStatistics);
 			main_frame = itemView.findViewById(R.id.main_frame);
 
-			main_frame.setOnClickListener(v -> {
-				if(fragmentType.equalsIgnoreCase("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();
-				}
-
-			});
+			main_frame.setOnClickListener(
+					v -> {
+						if (fragmentType.equalsIgnoreCase("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();
+						}
+					});
 		}
 
 		void bindData(FileDiffView fileDiffView) {
@@ -105,14 +119,13 @@ public class DiffFilesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 
 			Matcher matcher = statisticsPattern.matcher(fileDiffView.getFileInfo());
 
-			if(matcher.find() && matcher.groupCount() == 2) {
-				fileStatistics.setText(context.getString(R.string.diffStatistics, matcher.group(1), matcher.group(2)));
-			}
-			else {
+			if (matcher.find() && matcher.groupCount() == 2) {
+				fileStatistics.setText(
+						context.getString(
+								R.string.diffStatistics, matcher.group(1), matcher.group(2)));
+			} else {
 				fileStatistics.setText(fileDiffView.getFileInfo());
 			}
 		}
-
 	}
-
 }
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 933b2c33..ebb8534d 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java
@@ -15,6 +15,7 @@ import androidx.core.content.res.ResourcesCompat;
 import androidx.core.text.HtmlCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
+import java.util.List;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.database.api.BaseApi;
@@ -25,19 +26,20 @@ import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.IssueContext;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
 public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsViewHolder> {
 
 	private final FragmentManager fragmentManager;
 	private final Context context;
 	private List<DraftWithRepository> draftsList;
 
-	public DraftsAdapter(Context ctx, FragmentManager fragmentManager, List<DraftWithRepository> draftsListMain) {
+	public DraftsAdapter(
+			Context ctx,
+			FragmentManager fragmentManager,
+			List<DraftWithRepository> draftsListMain) {
 		this.context = ctx;
 		this.fragmentManager = fragmentManager;
 		this.draftsList = draftsListMain;
@@ -48,13 +50,16 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 		draftsList.remove(position);
 		notifyItemRemoved(position);
 		notifyItemRangeChanged(position, draftsList.size());
-		Toasty.success(context, context.getResources().getString(R.string.draftsSingleDeleteSuccess));
+		Toasty.success(
+				context, context.getResources().getString(R.string.draftsSingleDeleteSuccess));
 	}
 
-	@NonNull
-	@Override
-	public DraftsAdapter.DraftsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_drafts, parent, false);
+	@NonNull @Override
+	public DraftsAdapter.DraftsViewHolder onCreateViewHolder(
+			@NonNull ViewGroup parent, int viewType) {
+		View v =
+				LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.list_drafts, parent, false);
 		return new DraftsViewHolder(v);
 	}
 
@@ -64,18 +69,30 @@ 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;
 
 		Markdown.render(context, currentItem.getDraftText(), holder.draftText);
 
-		if(!currentItem.getCommentId().equalsIgnoreCase("new")) {
+		if (!currentItem.getCommentId().equalsIgnoreCase("new")) {
 			holder.editCommentStatus.setVisibility(View.VISIBLE);
-		}
-		else {
+		} else {
 			holder.editCommentStatus.setVisibility(View.GONE);
 		}
 	}
@@ -112,44 +129,63 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 			ImageView deleteDraft = itemView.findViewById(R.id.deleteDraft);
 			editCommentStatus = itemView.findViewById(R.id.editCommentStatus);
 
-			deleteDraft.setOnClickListener(itemDelete -> {
+			deleteDraft.setOnClickListener(
+					itemDelete -> {
+						int getDraftId = draftWithRepository.getDraftId();
+						deleteDraft(getBindingAdapterPosition());
 
-				int getDraftId = draftWithRepository.getDraftId();
-				deleteDraft(getBindingAdapterPosition());
+						DraftsApi draftsApi = BaseApi.getInstance(context, DraftsApi.class);
+						assert draftsApi != null;
+						draftsApi.deleteSingleDraft(getDraftId);
+					});
 
-				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();
 
-			itemView.setOnClickListener(itemEdit -> {
+						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()));
 
-				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();
+						if (!draftWithRepository.getCommentId().isEmpty()) {
+							bundle.putString("commentAction", "edit");
+						}
 
-				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");
-			});
+						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 40ad2cb4..1441ceb6 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreIssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreIssuesAdapter.java
@@ -20,6 +20,10 @@ import androidx.core.content.res.ResourcesCompat;
 import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Locale;
 import org.gitnex.tea4j.v2.models.Issue;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
@@ -35,15 +39,10 @@ import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.IssueContext;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.Locale;
 
 /**
  * @author M M Arif
  */
-
 public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
@@ -58,16 +57,19 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
 		this.tinyDb = TinyDB.getInstance(context);
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		LayoutInflater inflater = LayoutInflater.from(context);
-		return new ExploreIssuesAdapter.IssuesHolder(inflater.inflate(R.layout.list_issues, parent, false));
+		return new ExploreIssuesAdapter.IssuesHolder(
+				inflater.inflate(R.layout.list_issues, parent, false));
 	}
 
 	@Override
 	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.onLoadMore();
 		}
@@ -87,7 +89,7 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
 
 	public void setMoreDataAvailable(boolean moreDataAvailable) {
 		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
+		if (!isMoreDataAvailable) {
 			loadMoreListener.onLoadFinished();
 		}
 	}
@@ -113,7 +115,6 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
 		void onLoadMore();
 
 		void onLoadFinished();
-
 	}
 
 	class IssuesHolder extends RecyclerView.ViewHolder {
@@ -142,41 +143,56 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
 			frameLabelsDots = itemView.findViewById(R.id.frameLabelsDots);
 			commentIcon = itemView.findViewById(R.id.comment_icon);
 
-			new Handler().postDelayed(() -> {
+			new Handler()
+					.postDelayed(
+							() -> {
+								String[] parts = issue.getRepository().getFullName().split("/");
+								final String repoOwner = parts[0];
+								final String repoName = parts[1];
 
-				String[] parts = issue.getRepository().getFullName().split("/");
-				final String repoOwner = parts[0];
-				final String repoName = parts[1];
+								RepositoryContext repo =
+										new RepositoryContext(repoOwner, repoName, context);
 
-				RepositoryContext repo = new RepositoryContext(repoOwner, repoName, context);
+								Intent intentIssueDetail =
+										new IssueContext(issue, repo)
+												.getIntent(context, IssueDetailActivity.class);
+								intentIssueDetail.putExtra("openedFromLink", "true");
 
-				Intent intentIssueDetail = new IssueContext(issue, repo).getIntent(context, IssueDetailActivity.class);
-				intentIssueDetail.putExtra("openedFromLink", "true");
+								itemView.setOnClickListener(
+										v -> {
+											repo.saveToDB(context);
+											context.startActivity(intentIssueDetail);
+										});
+								frameLabels.setOnClickListener(
+										v -> {
+											repo.saveToDB(context);
+											context.startActivity(intentIssueDetail);
+										});
+								frameLabelsDots.setOnClickListener(
+										v -> {
+											repo.saveToDB(context);
+											context.startActivity(intentIssueDetail);
+										});
+							},
+							200);
 
-				itemView.setOnClickListener(v -> {
-					repo.saveToDB(context);
-					context.startActivity(intentIssueDetail);
-				});
-				frameLabels.setOnClickListener(v -> {
-					repo.saveToDB(context);
-					context.startActivity(intentIssueDetail);
-				});
-				frameLabelsDots.setOnClickListener(v -> {
-					repo.saveToDB(context);
-					context.startActivity(intentIssueDetail);
-				});
-			}, 200);
+			issueAssigneeAvatar.setOnClickListener(
+					v -> {
+						Intent intent = new Intent(context, ProfileActivity.class);
+						intent.putExtra("username", issue.getUser().getLogin());
+						context.startActivity(intent);
+					});
 
-			issueAssigneeAvatar.setOnClickListener(v -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", issue.getUser().getLogin());
-				context.startActivity(intent);
-			});
-
-			issueAssigneeAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, issue.getUser().getLogin(), context.getString(R.string.copyLoginIdToClipBoard, issue.getUser().getLogin()));
-				return true;
-			});
+			issueAssigneeAvatar.setOnLongClickListener(
+					loginId -> {
+						AppUtil.copyToClipboard(
+								context,
+								issue.getUser().getLogin(),
+								context.getString(
+										R.string.copyLoginIdToClipBoard,
+										issue.getUser().getLogin()));
+						return true;
+					});
 		}
 
 		void bindData(Issue issue) {
@@ -187,27 +203,46 @@ 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));
+			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) {
+			if (issue.getLabels() != null) {
 
-				if(!tinyDb.getBoolean("showLabelsInList", false)) { // default
+				if (!tinyDb.getBoolean("showLabelsInList", false)) { // default
 
 					labelsScrollViewWithText.setVisibility(View.GONE);
 					labelsScrollViewDots.setVisibility(View.VISIBLE);
 					frameLabelsDots.removeAllViews();
 
-					for(int i = 0; i < issue.getLabels().size(); i++) {
+					for (int i = 0; i < issue.getLabels().size(); i++) {
 
 						String labelColor = issue.getLabels().get(i).getColor();
 						int color = Color.parseColor("#" + labelColor);
@@ -217,19 +252,25 @@ 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);
 					}
-				}
-				else {
+				} else {
 
 					labelsScrollViewDots.setVisibility(View.GONE);
 					labelsScrollViewWithText.setVisibility(View.VISIBLE);
 					frameLabels.removeAllViews();
 
-					for(int i = 0; i < issue.getLabels().size(); i++) {
+					for (int i = 0; i < issue.getLabels().size(); i++) {
 
 						String labelColor = issue.getLabels().get(i).getColor();
 						String labelName = issue.getLabels().get(i).getName();
@@ -243,49 +284,81 @@ 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()
-							.buildRoundRect(labelName, color, AppUtil.getPixelsFromDensity(context, 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(context, 8)))
+										.height(height)
+										.endConfig()
+										.buildRoundRect(
+												labelName,
+												color,
+												AppUtil.getPixelsFromDensity(context, 18));
 
 						labelsView.setImageDrawable(drawable);
 						frameLabels.addView(labelsView);
 					}
 				}
-			}
-			else {
+			} else {
 				labelsScrollViewDots.setVisibility(View.GONE);
 				labelsScrollViewWithText.setVisibility(View.GONE);
 			}
 
-			if(issue.getComments() > 15) {
-				commentIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_flame));
-				commentIcon.setColorFilter(context.getResources().getColor(R.color.releasePre, null));
+			if (issue.getComments() > 15) {
+				commentIcon.setImageDrawable(
+						ContextCompat.getDrawable(context, R.drawable.ic_flame));
+				commentIcon.setColorFilter(
+						context.getResources().getColor(R.color.releasePre, null));
 			}
 
-			switch(timeFormat) {
-				case "pretty": {
-					PrettyTime prettyTime = new PrettyTime(locale);
-					String createdTime = prettyTime.format(issue.getCreatedAt());
-					issueCreatedTime.setText(createdTime);
-					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);
-					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);
-					String createdTime = formatter.format(issue.getCreatedAt());
-					issueCreatedTime.setText(createdTime);
-					break;
-				}
+			switch (timeFormat) {
+				case "pretty":
+					{
+						PrettyTime prettyTime = new PrettyTime(locale);
+						String createdTime = prettyTime.format(issue.getCreatedAt());
+						issueCreatedTime.setText(createdTime);
+						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);
+						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);
+						String createdTime = formatter.format(issue.getCreatedAt());
+						issueCreatedTime.setText(createdTime);
+						break;
+					}
 			}
-
 		}
-
 	}
-
 }
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 7ac6ef7b..d1fc739f 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
@@ -14,6 +14,10 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Locale;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
@@ -24,15 +28,10 @@ import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.Locale;
 
 /**
  * @author M M Arif
  */
-
 public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
@@ -41,22 +40,26 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 	private Runnable loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
-	public ExploreRepositoriesAdapter(List<org.gitnex.tea4j.v2.models.Repository> dataList, Context ctx) {
+	public ExploreRepositoriesAdapter(
+			List<org.gitnex.tea4j.v2.models.Repository> dataList, Context ctx) {
 		this.context = ctx;
 		this.reposList = dataList;
 		this.tinyDb = TinyDB.getInstance(context);
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		LayoutInflater inflater = LayoutInflater.from(context);
-		return new ExploreRepositoriesAdapter.RepositoriesHolder(inflater.inflate(R.layout.list_repositories, parent, false));
+		return new ExploreRepositoriesAdapter.RepositoriesHolder(
+				inflater.inflate(R.layout.list_repositories, parent, false));
 	}
 
 	@Override
 	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.run();
 		}
@@ -115,14 +118,15 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 			repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
 			spacerView = itemView.findViewById(R.id.spacerView);
 
-			itemView.setOnClickListener(v -> {
-				Context context = v.getContext();
-				RepositoryContext repo = new RepositoryContext(userRepositories, context);
-				repo.saveToDB(context);
-				Intent intent = repo.getIntent(context, RepoDetailActivity.class);
+			itemView.setOnClickListener(
+					v -> {
+						Context context = v.getContext();
+						RepositoryContext repo = new RepositoryContext(userRepositories, context);
+						repo.saveToDB(context);
+						Intent intent = repo.getIntent(context, RepoDetailActivity.class);
 
-				context.startActivity(intent);
-			});
+						context.startActivity(intent);
+					});
 		}
 
 		@SuppressLint("SetTextI18n")
@@ -141,65 +145,96 @@ 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, 14);
+			TextDrawable drawable =
+					TextDrawable.builder()
+							.beginConfig()
+							.useFont(Typeface.DEFAULT)
+							.fontSize(18)
+							.toUpperCase()
+							.width(28)
+							.height(28)
+							.endConfig()
+							.buildRoundRect(firstCharacter, color, 14);
 
-			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);
-				}
-				else {
+			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);
+				} else {
 					image.setImageDrawable(drawable);
 				}
-			}
-			else {
+			} else {
 				image.setImageDrawable(drawable);
 			}
 
-			if(userRepositories.getUpdatedAt() != null) {
+			if (userRepositories.getUpdatedAt() != null) {
 
-				switch(timeFormat) {
-					case "pretty": {
-						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));
-						break;
-					}
-					case "normal": {
-						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);
-						String createdTime = formatter.format(userRepositories.getUpdatedAt());
-						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						break;
-					}
+				switch (timeFormat) {
+					case "pretty":
+						{
+							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));
+							break;
+						}
+					case "normal":
+						{
+							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);
+							String createdTime = formatter.format(userRepositories.getUpdatedAt());
+							repoLastUpdated.setText(
+									context.getString(R.string.lastUpdatedAt, createdTime));
+							break;
+						}
 				}
-			}
-			else {
+			} else {
 				repoLastUpdated.setVisibility(View.GONE);
 			}
 
-			if(!userRepositories.getDescription().equals("")) {
+			if (!userRepositories.getDescription().equals("")) {
 				repoDescription.setVisibility(View.VISIBLE);
 				repoDescription.setText(userRepositories.getDescription());
 				spacerView.setVisibility(View.GONE);
-			}
-			else {
+			} else {
 				repoDescription.setVisibility(View.GONE);
 				spacerView.setVisibility(View.VISIBLE);
 			}
 
-			if(isRepoAdmin == null) {
+			if (isRepoAdmin == null) {
 				isRepoAdmin = new CheckBox(context);
 			}
 			isRepoAdmin.setChecked(userRepositories.getPermissions().isAdmin());
 		}
-
 	}
-
 }
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 12531975..f756c702 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
@@ -12,17 +12,17 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.recyclerview.widget.RecyclerView;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.commons.io.FileUtils;
 import org.gitnex.tea4j.v2.models.ContentsResponse;
 import org.mian.gitnex.R;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
-public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHolder> implements Filterable {
+public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHolder>
+		implements Filterable {
 
 	private final List<ContentsResponse> originalFiles = new ArrayList<>();
 	private final List<ContentsResponse> alteredFiles = new ArrayList<>();
@@ -30,44 +30,42 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 	private final Context context;
 
 	private final FilesAdapterListener filesListener;
-	private final Filter filesFilter = new Filter() {
+	private final Filter filesFilter =
+			new Filter() {
 
-		@Override
-		protected FilterResults performFiltering(CharSequence constraint) {
+				@Override
+				protected FilterResults performFiltering(CharSequence constraint) {
 
-			List<ContentsResponse> filteredList = new ArrayList<>();
+					List<ContentsResponse> filteredList = new ArrayList<>();
 
-			if(constraint == null || constraint.length() == 0) {
-				filteredList.addAll(originalFiles);
-			}
-			else {
-				String filterPattern = constraint.toString().toLowerCase().trim();
+					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);
+						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;
 				}
-			}
 
-			FilterResults results = new FilterResults();
-			results.values = filteredList;
+				@Override
+				protected void publishResults(CharSequence constraint, FilterResults results) {
 
-			return results;
+					alteredFiles.clear();
+					alteredFiles.addAll((List) results.values);
 
-		}
-
-		@Override
-		protected void publishResults(CharSequence constraint, FilterResults results) {
-
-			alteredFiles.clear();
-			alteredFiles.addAll((List) results.values);
-
-			notifyDataSetChanged();
-
-		}
-
-	};
+					notifyDataSetChanged();
+				}
+			};
 
 	public FilesAdapter(Context ctx, FilesAdapterListener filesListener) {
 
@@ -87,10 +85,12 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 		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);
+	@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);
 	}
 
@@ -102,32 +102,36 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 		holder.file = currentItem;
 		holder.fileName.setText(currentItem.getName());
 
-		switch(currentItem.getType()) {
-
+		switch (currentItem.getType()) {
 			case "file":
-				holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_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())));
+				holder.fileInfo.setText(
+						FileUtils.byteCountToDisplaySize(Math.toIntExact(currentItem.getSize())));
 				break;
 
 			case "dir":
-				holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_directory));
+				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.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.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));
-
+				holder.fileTypeIs.setImageDrawable(
+						AppCompatResources.getDrawable(context, R.drawable.ic_question));
 		}
 	}
 
@@ -144,7 +148,6 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 	public interface FilesAdapterListener {
 
 		void onClickFile(ContentsResponse file);
-
 	}
 
 	class FilesViewHolder extends RecyclerView.ViewHolder {
@@ -165,73 +168,71 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 
 			fileFrame.setOnClickListener(v -> filesListener.onClickFile(file));
 
-			//ImageView filesDropdownMenu = itemView.findViewById(R.id.filesDropdownMenu);
+			// ImageView filesDropdownMenu = itemView.findViewById(R.id.filesDropdownMenu);
 
-            /*filesDropdownMenu.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+			/*filesDropdownMenu.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
 
-                    final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+					final Context context = v.getContext();
+					Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
-                    popupMenu.inflate(R.menu.files_dotted_list_menu);
+					PopupMenu popupMenu = new PopupMenu(context_, v);
+					popupMenu.inflate(R.menu.files_dotted_list_menu);
 
-                    Object menuHelper;
-                    Class[] argTypes;
-                    try {
+					Object menuHelper;
+					Class[] argTypes;
+					try {
 
-                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
-                        fMenuHelper.setAccessible(true);
-                        menuHelper = fMenuHelper.get(popupMenu);
-                        argTypes = new Class[] { boolean.class };
-                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
-                                argTypes).invoke(menuHelper, true);
+						Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
+						fMenuHelper.setAccessible(true);
+						menuHelper = fMenuHelper.get(popupMenu);
+						argTypes = new Class[] { boolean.class };
+						menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
+								argTypes).invoke(menuHelper, true);
 
-                    } catch (Exception e) {
+					} catch (Exception e) {
 
-                        popupMenu.show();
-                        return;
+						popupMenu.show();
+						return;
 
-                    }
+					}
 
-                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-                        @Override
-                        public boolean onMenuItemClick(MenuItem item) {
-                            switch (item.getItemId()) {
-                                case R.id.deleteFile:
+					popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+						@Override
+						public boolean onMenuItemClick(MenuItem item) {
+							switch (item.getItemId()) {
+								case R.id.deleteFile:
 
-                                    Intent intent = new Intent(context, DeleteFileActivity.class);
-                                    intent.putExtra("repoFullNameForDeleteFile", fullName.getText());
-                                    context.startActivity(intent);
-                                    break;
+									Intent intent = new Intent(context, DeleteFileActivity.class);
+									intent.putExtra("repoFullNameForDeleteFile", fullName.getText());
+									context.startActivity(intent);
+									break;
 
-                                case R.id.editFile:
+								case R.id.editFile:
 
-                                    Intent intentW = new Intent(context, EditFileActivity.class);
-                                    intentW.putExtra("repoFullNameForEditFile", fullName.getText());
-                                    context.startActivity(intentW);
-                                    break;
+									Intent intentW = new Intent(context, EditFileActivity.class);
+									intentW.putExtra("repoFullNameForEditFile", fullName.getText());
+									context.startActivity(intentW);
+									break;
 
-                                case R.id.openInBrowser:
+								case R.id.openInBrowser:
 
-                                    Intent intentOpenInBrowser = new Intent(context, OpenFileInBrowserActivity.class);
-                                    intentOpenInBrowser.putExtra("fileFullNameBrowser", fullName.getText());
-                                    context.startActivity(intentOpenInBrowser);
-                                    break;
+									Intent intentOpenInBrowser = new Intent(context, OpenFileInBrowserActivity.class);
+									intentOpenInBrowser.putExtra("fileFullNameBrowser", fullName.getText());
+									context.startActivity(intentOpenInBrowser);
+									break;
 
-                            }
-                            return false;
-                        }
-                    });
+							}
+							return false;
+						}
+					});
 
-                    popupMenu.show();
+					popupMenu.show();
 
-                }
-            });*/
+				}
+			});*/
 
 		}
-
 	}
-
 }
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 7421a671..1ac2bd82 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
@@ -31,6 +31,9 @@ import com.amulyakhare.textdrawable.TextDrawable;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.card.MaterialCardView;
 import com.vdurmont.emoji.EmojiParser;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
 import org.apache.commons.lang3.StringUtils;
 import org.gitnex.tea4j.v2.models.TimelineComment;
 import org.json.JSONArray;
@@ -57,16 +60,12 @@ import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.IssueContext;
 import org.mian.gitnex.views.ReactionList;
 import org.mian.gitnex.views.ReactionSpinner;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
@@ -81,7 +80,13 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
 	private boolean isLoading = false, isMoreDataAvailable = true, timelineLastView = false;
 	private Intent intent;
 
-	public IssueCommentsAdapter(Context ctx, Bundle bundle, List<TimelineComment> issuesCommentsMain, FragmentManager fragmentManager, Runnable onInteractedListener, IssueContext issue) {
+	public IssueCommentsAdapter(
+			Context ctx,
+			Bundle bundle,
+			List<TimelineComment> issuesCommentsMain,
+			FragmentManager fragmentManager,
+			Runnable onInteractedListener,
+			IssueContext issue) {
 
 		this.context = ctx;
 		this.bundle = bundle;
@@ -102,63 +107,77 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
 
 	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<Void> call =
+				RetrofitClient.getApiInterface(ctx)
+						.issueDeleteComment(
+								issue.getRepository().getOwner(),
+								issue.getRepository().getName(),
+								(long) commentId);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				switch(response.code()) {
+						switch (response.code()) {
+							case 204:
+								updateAdapter(position);
+								Toasty.success(
+										ctx,
+										ctx.getResources()
+												.getString(R.string.deleteCommentSuccess));
+								IssuesFragment.resumeIssues = true;
+								break;
 
-					case 204:
-						updateAdapter(position);
-						Toasty.success(ctx, ctx.getResources().getString(R.string.deleteCommentSuccess));
-						IssuesFragment.resumeIssues = true;
-						break;
+							case 401:
+								AlertDialogs.authorizationTokenRevokedDialog(ctx);
+								break;
 
-					case 401:
-						AlertDialogs.authorizationTokenRevokedDialog(ctx);
-						break;
+							case 403:
+								Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+								break;
 
-					case 403:
-						Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-						break;
+							case 404:
+								Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+								break;
 
-					case 404:
-						Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-						break;
+							default:
+								Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-					default:
-						Toasty.error(ctx, ctx.getString(R.string.genericError));
+					@Override
+					public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(
+								ctx,
+								ctx.getResources().getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		LayoutInflater inflater = LayoutInflater.from(context);
-		return new IssueCommentViewHolder(inflater.inflate(R.layout.list_issue_comments, parent, false));
+		return new IssueCommentViewHolder(
+				inflater.inflate(R.layout.list_issue_comments, parent, false));
 	}
 
 	@Override
 	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.onLoadMore();
 			timelineLastView = true;
 		}
 
-		((IssueCommentsAdapter.IssueCommentViewHolder) holder).bindData(issuesComments.get(position));
+		((IssueCommentsAdapter.IssueCommentViewHolder) holder)
+				.bindData(issuesComments.get(position));
 	}
 
 	public void notifyDataChanged() {
@@ -169,7 +188,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
 
 	public void setMoreDataAvailable(boolean moreDataAvailable) {
 		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
+		if (!isMoreDataAvailable) {
 			loadMoreListener.onLoadFinished();
 		}
 	}
@@ -196,6 +215,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
 	public interface OnLoadMoreListener {
 
 		void onLoadMore();
+
 		void onLoadFinished();
 	}
 
@@ -234,150 +254,202 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
 			timelineDividerView = view.findViewById(R.id.timeline_divider_view);
 			timelineLine2 = view.findViewById(R.id.timeline_line_2);
 
-			menu.setOnClickListener(v -> {
+			menu.setOnClickListener(
+					v -> {
+						final String loginUid =
+								((BaseActivity) context).getAccount().getAccount().getUserName();
 
-				final String loginUid = ((BaseActivity) context).getAccount().getAccount().getUserName();
+						@SuppressLint("InflateParams")
+						View vw =
+								LayoutInflater.from(context)
+										.inflate(R.layout.bottom_sheet_issue_comments, null);
 
-				@SuppressLint("InflateParams") View vw = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_issue_comments, null);
+						TextView commentMenuEdit = vw.findViewById(R.id.commentMenuEdit);
+						TextView commentShare = vw.findViewById(R.id.issueCommentShare);
+						TextView commentMenuQuote = vw.findViewById(R.id.commentMenuQuote);
+						TextView commentMenuCopy = vw.findViewById(R.id.commentMenuCopy);
+						TextView commentMenuDelete = vw.findViewById(R.id.commentMenuDelete);
+						TextView issueCommentCopyUrl = vw.findViewById(R.id.issueCommentCopyUrl);
+						TextView open = vw.findViewById(R.id.open);
+						LinearLayout linearLayout = vw.findViewById(R.id.commentReactionButtons);
 
-				TextView commentMenuEdit = vw.findViewById(R.id.commentMenuEdit);
-				TextView commentShare = vw.findViewById(R.id.issueCommentShare);
-				TextView commentMenuQuote = vw.findViewById(R.id.commentMenuQuote);
-				TextView commentMenuCopy = vw.findViewById(R.id.commentMenuCopy);
-				TextView commentMenuDelete = vw.findViewById(R.id.commentMenuDelete);
-				TextView issueCommentCopyUrl = vw.findViewById(R.id.issueCommentCopyUrl);
-				TextView open = vw.findViewById(R.id.open);
-				LinearLayout linearLayout = vw.findViewById(R.id.commentReactionButtons);
+						if (issue.getRepository().getRepository().isArchived()) {
+							commentMenuEdit.setVisibility(View.GONE);
+							commentMenuDelete.setVisibility(View.GONE);
+							commentMenuQuote.setVisibility(View.GONE);
+							linearLayout.setVisibility(View.GONE);
+						}
 
-				if(issue.getRepository().getRepository().isArchived()) {
-					commentMenuEdit.setVisibility(View.GONE);
-					commentMenuDelete.setVisibility(View.GONE);
-					commentMenuQuote.setVisibility(View.GONE);
-					linearLayout.setVisibility(View.GONE);
-				}
+						if (!loginUid.contentEquals(issueComment.getUser().getLogin())
+								&& !issue.getRepository().getPermissions().isPush()) {
+							commentMenuEdit.setVisibility(View.GONE);
+							commentMenuDelete.setVisibility(View.GONE);
+						}
 
-				if(!loginUid.contentEquals(issueComment.getUser().getLogin()) && !issue.getRepository().getPermissions().isPush()) {
-					commentMenuEdit.setVisibility(View.GONE);
-					commentMenuDelete.setVisibility(View.GONE);
-				}
+						if (issueComment.getBody().isEmpty()) {
+							commentMenuCopy.setVisibility(View.GONE);
+						}
 
-				if(issueComment.getBody().isEmpty()) {
-					commentMenuCopy.setVisibility(View.GONE);
-				}
+						BottomSheetDialog dialog = new BottomSheetDialog(context);
+						dialog.setContentView(vw);
+						dialog.show();
 
-				BottomSheetDialog dialog = new BottomSheetDialog(context);
-				dialog.setContentView(vw);
-				dialog.show();
+						TextView loadReactions = new TextView(context);
+						loadReactions.setText(context.getString(R.string.genericWaitFor));
+						loadReactions.setGravity(Gravity.CENTER);
+						loadReactions.setLayoutParams(
+								new ViewGroup.LayoutParams(
+										ViewGroup.LayoutParams.MATCH_PARENT, 160));
+						linearLayout.addView(loadReactions);
 
-				TextView loadReactions = new TextView(context);
-				loadReactions.setText(context.getString(R.string.genericWaitFor));
-				loadReactions.setGravity(Gravity.CENTER);
-				loadReactions.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 160));
-				linearLayout.addView(loadReactions);
+						Bundle bundle1 = new Bundle();
+						bundle1.putAll(bundle);
+						bundle1.putInt("commentId", Math.toIntExact(issueComment.getId()));
 
-				Bundle bundle1 = new Bundle();
-				bundle1.putAll(bundle);
-				bundle1.putInt("commentId", Math.toIntExact(issueComment.getId()));
+						ReactionSpinner reactionSpinner = new ReactionSpinner(context, bundle1);
+						reactionSpinner.setOnInteractedListener(
+								() -> {
+									onInteractedListener.run();
+									dialog.dismiss();
+								});
 
-				ReactionSpinner reactionSpinner = new ReactionSpinner(context, bundle1);
-				reactionSpinner.setOnInteractedListener(() -> {
-					onInteractedListener.run();
-					dialog.dismiss();
-				});
+						reactionSpinner.setOnLoadingFinishedListener(
+								() -> {
+									linearLayout.removeView(loadReactions);
+									reactionSpinner.setLayoutParams(
+											new ViewGroup.LayoutParams(
+													ViewGroup.LayoutParams.MATCH_PARENT, 160));
+									linearLayout.addView(reactionSpinner);
+								});
 
-				reactionSpinner.setOnLoadingFinishedListener(() -> {
-					linearLayout.removeView(loadReactions);
-					reactionSpinner.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 160));
-					linearLayout.addView(reactionSpinner);
-				});
+						commentMenuEdit.setOnClickListener(
+								v1 -> {
+									Bundle bundle = new Bundle();
+									bundle.putInt(
+											"commentId", Math.toIntExact(issueComment.getId()));
+									bundle.putString("commentAction", "edit");
+									bundle.putString("commentBody", issueComment.getBody());
 
-				commentMenuEdit.setOnClickListener(v1 -> {
-					Bundle bundle = new Bundle();
-					bundle.putInt("commentId", Math.toIntExact(issueComment.getId()));
-					bundle.putString("commentAction", "edit");
-					bundle.putString("commentBody", issueComment.getBody());
+									BottomSheetReplyFragment bottomSheetReplyFragment =
+											BottomSheetReplyFragment.newInstance(bundle, issue);
+									bottomSheetReplyFragment.setOnInteractedListener(
+											onInteractedListener);
+									bottomSheetReplyFragment.show(
+											fragmentManager, "replyBottomSheet");
 
-					BottomSheetReplyFragment bottomSheetReplyFragment = BottomSheetReplyFragment.newInstance(bundle, issue);
-					bottomSheetReplyFragment.setOnInteractedListener(onInteractedListener);
-					bottomSheetReplyFragment.show(fragmentManager, "replyBottomSheet");
+									dialog.dismiss();
+								});
 
-					dialog.dismiss();
-				});
+						commentShare.setOnClickListener(
+								v1 -> {
+									AppUtil.sharingIntent(context, issueComment.getHtmlUrl());
+									dialog.dismiss();
+								});
 
-				commentShare.setOnClickListener(v1 -> {
+						issueCommentCopyUrl.setOnClickListener(
+								v1 -> {
+									AppUtil.copyToClipboard(
+											context,
+											issueComment.getHtmlUrl(),
+											context.getString(R.string.copyIssueUrlToastMsg));
+									dialog.dismiss();
+								});
 
-					AppUtil.sharingIntent(context, issueComment.getHtmlUrl());
-					dialog.dismiss();
-				});
+						open.setOnClickListener(
+								v1 -> {
+									AppUtil.openUrlInBrowser(context, issueComment.getHtmlUrl());
+									dialog.dismiss();
+								});
 
-				issueCommentCopyUrl.setOnClickListener(v1 -> {
+						commentMenuQuote.setOnClickListener(
+								v1 -> {
+									StringBuilder stringBuilder = new StringBuilder();
+									String commenterName = issueComment.getUser().getLogin();
 
-					AppUtil.copyToClipboard(context, issueComment.getHtmlUrl(), context.getString(R.string.copyIssueUrlToastMsg));
-					dialog.dismiss();
-				});
+									if (!commenterName.equals(
+											((BaseActivity) context)
+													.getAccount()
+													.getAccount()
+													.getUserName())) {
+										stringBuilder
+												.append("@")
+												.append(commenterName)
+												.append("\n\n");
+									}
 
-				open.setOnClickListener(v1 -> {
+									String[] lines = issueComment.getBody().split("\\R");
 
-					AppUtil.openUrlInBrowser(context, issueComment.getHtmlUrl());
-					dialog.dismiss();
-				});
+									for (String line : lines) {
+										stringBuilder.append(">").append(line).append("\n");
+									}
 
-				commentMenuQuote.setOnClickListener(v1 -> {
-					StringBuilder stringBuilder = new StringBuilder();
-					String commenterName = issueComment.getUser().getLogin();
+									stringBuilder.append("\n");
 
-					if(!commenterName.equals(((BaseActivity) context).getAccount().getAccount().getUserName())) {
-						stringBuilder.append("@").append(commenterName).append("\n\n");
-					}
+									Bundle bundle = new Bundle();
+									bundle.putString("commentBody", stringBuilder.toString());
+									bundle.putBoolean("cursorToEnd", true);
 
-					String[] lines = issueComment.getBody().split("\\R");
+									dialog.dismiss();
+									BottomSheetReplyFragment.newInstance(bundle, issue)
+											.show(fragmentManager, "replyBottomSheet");
+								});
 
-					for(String line : lines) {
-						stringBuilder.append(">").append(line).append("\n");
-					}
+						commentMenuCopy.setOnClickListener(
+								v1 -> {
+									ClipboardManager clipboard =
+											(ClipboardManager)
+													Objects.requireNonNull(context)
+															.getSystemService(
+																	Context.CLIPBOARD_SERVICE);
+									assert clipboard != null;
 
-					stringBuilder.append("\n");
+									ClipData clip =
+											ClipData.newPlainText(
+													"Comment on issue #" + issue.getIssueIndex(),
+													issueComment.getBody());
+									clipboard.setPrimaryClip(clip);
 
-					Bundle bundle = new Bundle();
-					bundle.putString("commentBody", stringBuilder.toString());
-					bundle.putBoolean("cursorToEnd", true);
+									dialog.dismiss();
+									Toasty.success(
+											context,
+											context.getString(R.string.copyIssueCommentToastMsg));
+								});
 
-					dialog.dismiss();
-					BottomSheetReplyFragment.newInstance(bundle, issue).show(fragmentManager, "replyBottomSheet");
-				});
-
-				commentMenuCopy.setOnClickListener(v1 -> {
-					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
-					assert clipboard != null;
-
-					ClipData clip = ClipData.newPlainText("Comment on issue #" + issue.getIssueIndex(), issueComment.getBody());
-					clipboard.setPrimaryClip(clip);
-
-					dialog.dismiss();
-					Toasty.success(context, context.getString(R.string.copyIssueCommentToastMsg));
-				});
-
-				commentMenuDelete.setOnClickListener(v1 -> {
-					deleteIssueComment(context, Math.toIntExact(issueComment.getId()), getBindingAdapterPosition());
-					dialog.dismiss();
-				});
-
-			});
-
-			new Handler().postDelayed(() -> {
-				if(!AppUtil.checkGhostUsers(userLoginId)) {
-					avatar.setOnClickListener(loginId -> {
-						Intent intent = new Intent(context, ProfileActivity.class);
-						intent.putExtra("username", userLoginId);
-						context.startActivity(intent);
+						commentMenuDelete.setOnClickListener(
+								v1 -> {
+									deleteIssueComment(
+											context,
+											Math.toIntExact(issueComment.getId()),
+											getBindingAdapterPosition());
+									dialog.dismiss();
+								});
 					});
 
-					avatar.setOnLongClickListener(loginId -> {
-						AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-						return true;
-					});
-				}
-			}, 500);
+			new Handler()
+					.postDelayed(
+							() -> {
+								if (!AppUtil.checkGhostUsers(userLoginId)) {
+									avatar.setOnClickListener(
+											loginId -> {
+												Intent intent =
+														new Intent(context, ProfileActivity.class);
+												intent.putExtra("username", userLoginId);
+												context.startActivity(intent);
+											});
+
+									avatar.setOnLongClickListener(
+											loginId -> {
+												AppUtil.copyToClipboard(
+														context,
+														userLoginId,
+														context.getString(
+																R.string.copyLoginIdToClipBoard,
+																userLoginId));
+												return true;
+											});
+								}
+							},
+							500);
 		}
 
 		void bindData(TimelineComment timelineComment) {
@@ -390,221 +462,387 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
 
 			this.issueComment = timelineComment;
 
-			if(timelineLastView) {
-				//timelineLine2.setVisibility(View.GONE);
+			if (timelineLastView) {
+				// timelineLine2.setVisibility(View.GONE);
 			}
 
 			StringBuilder infoBuilder = null;
-			if(issueComment.getCreatedAt() != null) {
+			if (issueComment.getCreatedAt() != null) {
 
-				if(timeFormat.equals("pretty")) {
-					infoBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreatedAt(), locale, "pretty", context));
-					information.setOnClickListener(v -> TimeHelper.customDateFormatForToastDateFormat(issueComment.getCreatedAt()));
-				}
-				else if(timeFormat.equals("normal")) {
-					infoBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreatedAt(), locale, "normal", context));
+				if (timeFormat.equals("pretty")) {
+					infoBuilder =
+							new StringBuilder(
+									TimeHelper.formatTime(
+											issueComment.getCreatedAt(),
+											locale,
+											"pretty",
+											context));
+					information.setOnClickListener(
+							v ->
+									TimeHelper.customDateFormatForToastDateFormat(
+											issueComment.getCreatedAt()));
+				} else if (timeFormat.equals("normal")) {
+					infoBuilder =
+							new StringBuilder(
+									TimeHelper.formatTime(
+											issueComment.getCreatedAt(),
+											locale,
+											"normal",
+											context));
 				}
 
-				if(!issueComment.getCreatedAt().equals(issueComment.getUpdatedAt())) {
-					if(infoBuilder != null) {
-						infoBuilder.append(context.getString(R.string.colorfulBulletSpan)).append(context.getString(R.string.modifiedText));
+				if (!issueComment.getCreatedAt().equals(issueComment.getUpdatedAt())) {
+					if (infoBuilder != null) {
+						infoBuilder
+								.append(context.getString(R.string.colorfulBulletSpan))
+								.append(context.getString(R.string.modifiedText));
 					}
 				}
 			}
 			String info = infoBuilder.toString();
 
 			// label view in timeline
-			if(issueComment.getType().equalsIgnoreCase("label")) {
+			if (issueComment.getType().equalsIgnoreCase("label")) {
 
 				int color = Color.parseColor("#" + issueComment.getLabel().getColor());
 				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(issueComment.getLabel().getName(), Typeface.DEFAULT, textSize, AppUtil.getPixelsFromDensity(context, 10))).height(height).endConfig()
-					.buildRoundRect(issueComment.getLabel().getName(), color, AppUtil.getPixelsFromDensity(context, 18));
+				TextDrawable drawable =
+						TextDrawable.builder()
+								.beginConfig()
+								.useFont(Typeface.DEFAULT)
+								.textColor(new ColorInverter().getContrastColor(color))
+								.fontSize(textSize)
+								.width(
+										LabelWidthCalculator.calculateLabelWidth(
+												issueComment.getLabel().getName(),
+												Typeface.DEFAULT,
+												textSize,
+												AppUtil.getPixelsFromDensity(context, 10)))
+								.height(height)
+								.endConfig()
+								.buildRoundRect(
+										issueComment.getLabel().getName(),
+										color,
+										AppUtil.getPixelsFromDensity(context, 18));
 
 				TextView textView = new TextView(context);
 				String text;
 
-				if(issueComment.getBody().equals("")) {
-					text = context.getString(R.string.timelineRemovedLabel, issueComment.getUser().getLogin(), info);
-					timelineIcon.setColorFilter(context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
-				}
-				else {
-					text = context.getString(R.string.timelineAddedLabel, issueComment.getUser().getLogin(), info);
+				if (issueComment.getBody().equals("")) {
+					text =
+							context.getString(
+									R.string.timelineRemovedLabel,
+									issueComment.getUser().getLogin(),
+									info);
+					timelineIcon.setColorFilter(
+							context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
+				} else {
+					text =
+							context.getString(
+									R.string.timelineAddedLabel,
+									issueComment.getUser().getLogin(),
+									info);
 				}
 
-				timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_tag));
+				timelineIcon.setImageDrawable(
+						ContextCompat.getDrawable(context, R.drawable.ic_tag));
 
 				SpannableString spannableString = new SpannableString(text.replace('|', ' '));
 
-				drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+				drawable.setBounds(
+						0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
 				ImageSpan image = new ImageSpan(drawable);
 
-				new Handler().postDelayed(() -> {
-
-					spannableString.setSpan(image, text.indexOf('|'), text.indexOf('|') + 1, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
-					textView.setText(spannableString);
-					timelineData.addView(textView);
-				}, 250);
+				new Handler()
+						.postDelayed(
+								() -> {
+									spannableString.setSpan(
+											image,
+											text.indexOf('|'),
+											text.indexOf('|') + 1,
+											Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+									textView.setText(spannableString);
+									timelineData.addView(textView);
+								},
+								250);
 			}
 			// pull/push/commit data view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("pull_push")) {
+			else if (issueComment.getType().equalsIgnoreCase("pull_push")) {
 
 				TextView start = new TextView(context);
 
 				JSONObject commitsObj = null;
 				try {
 					commitsObj = new JSONObject(issueComment.getBody());
+				} catch (JSONException ignored) {
 				}
-				catch(JSONException ignored) {}
 
 				JSONArray commitsShaArray = null;
 				try {
 					commitsShaArray = Objects.requireNonNull(commitsObj).getJSONArray("commit_ids");
-				}
-				catch(JSONException ignored) {}
-
-				String commitText = context.getResources().getString(R.string.commits).toLowerCase();
-				if(Objects.requireNonNull(commitsShaArray).length() == 1) {
-					commitText = context.getResources().getString(R.string.commitText).toLowerCase();
+				} catch (JSONException ignored) {
 				}
 
-				String commitString = context.getString(R.string.timelineAddedCommit, issueComment.getUser().getLogin(), commitText, info);
+				String commitText =
+						context.getResources().getString(R.string.commits).toLowerCase();
+				if (Objects.requireNonNull(commitsShaArray).length() == 1) {
+					commitText =
+							context.getResources().getString(R.string.commitText).toLowerCase();
+				}
+
+				String commitString =
+						context.getString(
+								R.string.timelineAddedCommit,
+								issueComment.getUser().getLogin(),
+								commitText,
+								info);
 				start.setText(HtmlCompat.fromHtml(commitString, HtmlCompat.FROM_HTML_MODE_LEGACY));
 				start.setTextSize(fontSize);
 
 				timelineData.setOrientation(LinearLayout.VERTICAL);
-				timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_commit));
+				timelineIcon.setImageDrawable(
+						ContextCompat.getDrawable(context, R.drawable.ic_commit));
 				timelineData.addView(start);
 
-				for(int i = 0; i < Objects.requireNonNull(commitsShaArray).length(); i++) {
+				for (int i = 0; i < Objects.requireNonNull(commitsShaArray).length(); i++) {
 
 					try {
 
-						String timelineCommits = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightBlue, null) + "'>" + StringUtils.substring(String.valueOf(commitsShaArray.get(i)), 0, 10) + "</font>";
+						String timelineCommits =
+								"<font color='"
+										+ ResourcesCompat.getColor(
+												context.getResources(), R.color.lightBlue, null)
+										+ "'>"
+										+ StringUtils.substring(
+												String.valueOf(commitsShaArray.get(i)), 0, 10)
+										+ "</font>";
 
 						TextView dynamicCommitTv = new TextView(context);
 						dynamicCommitTv.setId(View.generateViewId());
 
-						dynamicCommitTv.setText(HtmlCompat.fromHtml(timelineCommits, HtmlCompat.FROM_HTML_MODE_LEGACY));
+						dynamicCommitTv.setText(
+								HtmlCompat.fromHtml(
+										timelineCommits, HtmlCompat.FROM_HTML_MODE_LEGACY));
 
 						JSONArray finalCommitsArray = commitsShaArray;
 						int finalI = i;
 
-						dynamicCommitTv.setOnClickListener(v14 -> {
-							intent = IssueContext.fromIntent(((IssueDetailActivity) context).getIntent()).getRepository().getIntent(context, CommitDetailActivity.class);
-							try {
-								intent.putExtra("sha", (String) finalCommitsArray.get(finalI));
-							}
-							catch(JSONException ignored) {}
-							context.startActivity(intent);
-						});
+						dynamicCommitTv.setOnClickListener(
+								v14 -> {
+									intent =
+											IssueContext.fromIntent(
+															((IssueDetailActivity) context)
+																	.getIntent())
+													.getRepository()
+													.getIntent(context, CommitDetailActivity.class);
+									try {
+										intent.putExtra(
+												"sha", (String) finalCommitsArray.get(finalI));
+									} catch (JSONException ignored) {
+									}
+									context.startActivity(intent);
+								});
 
 						timelineData.setOrientation(LinearLayout.VERTICAL);
 						timelineData.addView(dynamicCommitTv);
+					} catch (JSONException ignored) {
 					}
-					catch(JSONException ignored) {}
 				}
 			}
 			// assignees data view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("assignees")) {
+			else if (issueComment.getType().equalsIgnoreCase("assignees")) {
 
 				TextView start = new TextView(context);
 
-				if(issueComment.isRemovedAssignee()) {
+				if (issueComment.isRemovedAssignee()) {
 
-					if(issueComment.getUser().getLogin().equalsIgnoreCase(issueComment.getAssignee().getLogin())) {
-						start.setText(context.getString(R.string.timelineAssigneesRemoved, issueComment.getUser().getLogin(), info));
+					if (issueComment
+							.getUser()
+							.getLogin()
+							.equalsIgnoreCase(issueComment.getAssignee().getLogin())) {
+						start.setText(
+								context.getString(
+										R.string.timelineAssigneesRemoved,
+										issueComment.getUser().getLogin(),
+										info));
+					} else {
+						start.setText(
+								context.getString(
+										R.string.timelineAssigneesUnassigned,
+										issueComment.getAssignee().getLogin(),
+										issueComment.getUser().getLogin(),
+										info));
 					}
-					else {
-						start.setText(context.getString(R.string.timelineAssigneesUnassigned, issueComment.getAssignee().getLogin(), issueComment.getUser().getLogin(), info));
-					}
-					timelineIcon.setColorFilter(context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
-				}
-				else {
-					if(issueComment.getUser().getLogin().equalsIgnoreCase(issueComment.getAssignee().getLogin())) {
-						start.setText(context.getString(R.string.timelineAssigneesSelfAssigned, issueComment.getUser().getLogin(), info));
-					}
-					else {
-						start.setText(context.getString(R.string.timelineAssigneesAssigned, issueComment.getAssignee().getLogin(), issueComment.getUser().getLogin(), info));
+					timelineIcon.setColorFilter(
+							context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
+				} else {
+					if (issueComment
+							.getUser()
+							.getLogin()
+							.equalsIgnoreCase(issueComment.getAssignee().getLogin())) {
+						start.setText(
+								context.getString(
+										R.string.timelineAssigneesSelfAssigned,
+										issueComment.getUser().getLogin(),
+										info));
+					} else {
+						start.setText(
+								context.getString(
+										R.string.timelineAssigneesAssigned,
+										issueComment.getAssignee().getLogin(),
+										issueComment.getUser().getLogin(),
+										info));
 					}
 				}
 				start.setTextSize(fontSize);
 
-				timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_person));
+				timelineIcon.setImageDrawable(
+						ContextCompat.getDrawable(context, R.drawable.ic_person));
 				timelineData.addView(start);
 			}
 			// milestone data view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("milestone")) {
+			else if (issueComment.getType().equalsIgnoreCase("milestone")) {
 
 				TextView start = new TextView(context);
 
-				if(issueComment.getMilestone() != null) {
-					start.setText(context.getString(R.string.timelineMilestoneAdded, issueComment.getUser().getLogin(), issueComment.getMilestone().getTitle(), info));
-				}
-				else {
-					start.setText(context.getString(R.string.timelineMilestoneRemoved, issueComment.getUser().getLogin(), issueComment.getOldMilestone().getTitle(), info));
-					timelineIcon.setColorFilter(context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
+				if (issueComment.getMilestone() != null) {
+					start.setText(
+							context.getString(
+									R.string.timelineMilestoneAdded,
+									issueComment.getUser().getLogin(),
+									issueComment.getMilestone().getTitle(),
+									info));
+				} else {
+					start.setText(
+							context.getString(
+									R.string.timelineMilestoneRemoved,
+									issueComment.getUser().getLogin(),
+									issueComment.getOldMilestone().getTitle(),
+									info));
+					timelineIcon.setColorFilter(
+							context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
 				}
 				start.setTextSize(fontSize);
 
-				timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_milestone));
+				timelineIcon.setImageDrawable(
+						ContextCompat.getDrawable(context, R.drawable.ic_milestone));
 				timelineData.addView(start);
 			}
 			// status view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("close") || issueComment.getType().equalsIgnoreCase("reopen") || issueComment.getType().equalsIgnoreCase("merge_pull") || issueComment.getType()
-				.equalsIgnoreCase("commit_ref")) {
+			else if (issueComment.getType().equalsIgnoreCase("close")
+					|| issueComment.getType().equalsIgnoreCase("reopen")
+					|| issueComment.getType().equalsIgnoreCase("merge_pull")
+					|| issueComment.getType().equalsIgnoreCase("commit_ref")) {
 
 				TextView start = new TextView(context);
 
-				if(issue.getIssueType().equalsIgnoreCase("Issue")) {
-					if(issueComment.getType().equals("close")) {
-						start.setText(context.getString(R.string.timelineStatusClosedIssue, issueComment.getUser().getLogin(), info));
-						timelineIcon.setColorFilter(context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
-					}
-					else if(issueComment.getType().equalsIgnoreCase("reopen")) {
-						start.setText(context.getString(R.string.timelineStatusReopenedIssue, issueComment.getUser().getLogin(), info));
-					}
-					else if(issueComment.getType().equalsIgnoreCase("commit_ref")) {
-						String commitString = context.getString(R.string.timelineStatusRefIssue, issueComment.getUser().getLogin(), ResourcesCompat.getColor(context.getResources(), R.color.lightBlue, null), context.getResources().getString(R.string.commitText).toLowerCase(), info);
-						start.setText(HtmlCompat.fromHtml(commitString, HtmlCompat.FROM_HTML_MODE_LEGACY));
-						timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_bookmark));
+				if (issue.getIssueType().equalsIgnoreCase("Issue")) {
+					if (issueComment.getType().equals("close")) {
+						start.setText(
+								context.getString(
+										R.string.timelineStatusClosedIssue,
+										issueComment.getUser().getLogin(),
+										info));
+						timelineIcon.setColorFilter(
+								context.getResources()
+										.getColor(R.color.iconIssuePrClosedColor, null));
+					} else if (issueComment.getType().equalsIgnoreCase("reopen")) {
+						start.setText(
+								context.getString(
+										R.string.timelineStatusReopenedIssue,
+										issueComment.getUser().getLogin(),
+										info));
+					} else if (issueComment.getType().equalsIgnoreCase("commit_ref")) {
+						String commitString =
+								context.getString(
+										R.string.timelineStatusRefIssue,
+										issueComment.getUser().getLogin(),
+										ResourcesCompat.getColor(
+												context.getResources(), R.color.lightBlue, null),
+										context.getResources()
+												.getString(R.string.commitText)
+												.toLowerCase(),
+										info);
+						start.setText(
+								HtmlCompat.fromHtml(
+										commitString, HtmlCompat.FROM_HTML_MODE_LEGACY));
+						timelineIcon.setImageDrawable(
+								ContextCompat.getDrawable(context, R.drawable.ic_bookmark));
 
-						start.setOnClickListener(v14 -> {
-							intent = IssueContext.fromIntent(((IssueDetailActivity) context).getIntent()).getRepository().getIntent(context, CommitDetailActivity.class);
-							intent.putExtra("sha", issueComment.getRefCommitSha());
-							context.startActivity(intent);
-						});
+						start.setOnClickListener(
+								v14 -> {
+									intent =
+											IssueContext.fromIntent(
+															((IssueDetailActivity) context)
+																	.getIntent())
+													.getRepository()
+													.getIntent(context, CommitDetailActivity.class);
+									intent.putExtra("sha", issueComment.getRefCommitSha());
+									context.startActivity(intent);
+								});
 					}
-					timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_issue));
-				}
-				else if(issue.getIssueType().equalsIgnoreCase("Pull")) {
-					if(issueComment.getType().equalsIgnoreCase("close")) {
-						start.setText(context.getString(R.string.timelineStatusClosedPr, issueComment.getUser().getLogin(), info));
-						timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_pull_request));
-						timelineIcon.setColorFilter(context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
-					}
-					else if(issueComment.getType().equalsIgnoreCase("merge_pull")) {
-						start.setText(context.getString(R.string.timelineStatusMergedPr, issueComment.getUser().getLogin(), info));
-						timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_pull_request));
-						timelineIcon.setColorFilter(context.getResources().getColor(R.color.iconPrMergedColor, null));
-					}
-					else if(issueComment.getType().equalsIgnoreCase("commit_ref")) {
-						String commitString = context.getString(R.string.timelineStatusRefPr, issueComment.getUser().getLogin(), ResourcesCompat.getColor(context.getResources(), R.color.lightBlue, null), context.getResources().getString(R.string.commitText).toLowerCase(), info);
-						start.setText(HtmlCompat.fromHtml(commitString, HtmlCompat.FROM_HTML_MODE_LEGACY));
-						timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_bookmark));
+					timelineIcon.setImageDrawable(
+							ContextCompat.getDrawable(context, R.drawable.ic_issue));
+				} else if (issue.getIssueType().equalsIgnoreCase("Pull")) {
+					if (issueComment.getType().equalsIgnoreCase("close")) {
+						start.setText(
+								context.getString(
+										R.string.timelineStatusClosedPr,
+										issueComment.getUser().getLogin(),
+										info));
+						timelineIcon.setImageDrawable(
+								ContextCompat.getDrawable(context, R.drawable.ic_pull_request));
+						timelineIcon.setColorFilter(
+								context.getResources()
+										.getColor(R.color.iconIssuePrClosedColor, null));
+					} else if (issueComment.getType().equalsIgnoreCase("merge_pull")) {
+						start.setText(
+								context.getString(
+										R.string.timelineStatusMergedPr,
+										issueComment.getUser().getLogin(),
+										info));
+						timelineIcon.setImageDrawable(
+								ContextCompat.getDrawable(context, R.drawable.ic_pull_request));
+						timelineIcon.setColorFilter(
+								context.getResources().getColor(R.color.iconPrMergedColor, null));
+					} else if (issueComment.getType().equalsIgnoreCase("commit_ref")) {
+						String commitString =
+								context.getString(
+										R.string.timelineStatusRefPr,
+										issueComment.getUser().getLogin(),
+										ResourcesCompat.getColor(
+												context.getResources(), R.color.lightBlue, null),
+										context.getResources()
+												.getString(R.string.commitText)
+												.toLowerCase(),
+										info);
+						start.setText(
+								HtmlCompat.fromHtml(
+										commitString, HtmlCompat.FROM_HTML_MODE_LEGACY));
+						timelineIcon.setImageDrawable(
+								ContextCompat.getDrawable(context, R.drawable.ic_bookmark));
 
-						start.setOnClickListener(v14 -> {
-							intent = IssueContext.fromIntent(((IssueDetailActivity) context).getIntent()).getRepository().getIntent(context, CommitDetailActivity.class);
-							intent.putExtra("sha", issueComment.getRefCommitSha());
-							context.startActivity(intent);
-						});
-					}
-					else {
-						start.setText(context.getString(R.string.timelineStatusReopenedPr, issueComment.getUser().getLogin(), info));
-						timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_pull_request));
+						start.setOnClickListener(
+								v14 -> {
+									intent =
+											IssueContext.fromIntent(
+															((IssueDetailActivity) context)
+																	.getIntent())
+													.getRepository()
+													.getIntent(context, CommitDetailActivity.class);
+									intent.putExtra("sha", issueComment.getRefCommitSha());
+									context.startActivity(intent);
+								});
+					} else {
+						start.setText(
+								context.getString(
+										R.string.timelineStatusReopenedPr,
+										issueComment.getUser().getLogin(),
+										info));
+						timelineIcon.setImageDrawable(
+								ContextCompat.getDrawable(context, R.drawable.ic_pull_request));
 					}
 				}
 				start.setTextSize(fontSize);
@@ -612,203 +850,346 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
 				timelineData.addView(start);
 			}
 			// review data view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("review_request") || issueComment.getType().equalsIgnoreCase("review") || issueComment.getType().equalsIgnoreCase("dismiss_review")) {
+			else if (issueComment.getType().equalsIgnoreCase("review_request")
+					|| issueComment.getType().equalsIgnoreCase("review")
+					|| issueComment.getType().equalsIgnoreCase("dismiss_review")) {
 
 				TextView start = new TextView(context);
 
-				if(issueComment.getType().equalsIgnoreCase("review")) {
+				if (issueComment.getType().equalsIgnoreCase("review")) {
 					timelineView.setVisibility(View.GONE);
 					timelineDividerView.setVisibility(View.GONE);
-				}
-				else if(issueComment.getType().equalsIgnoreCase("dismiss_review")) {
+				} else if (issueComment.getType().equalsIgnoreCase("dismiss_review")) {
 					timelineView.setVisibility(View.GONE);
 					timelineDividerView.setVisibility(View.GONE);
-				}
-				else if(issueComment.getType().equalsIgnoreCase("review_request")) {
-					start.setText(context.getString(R.string.timelineReviewRequest, issueComment.getUser().getLogin(), issueComment.getAssignee().getLogin(), info));
-					timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_unwatch));
+				} else if (issueComment.getType().equalsIgnoreCase("review_request")) {
+					start.setText(
+							context.getString(
+									R.string.timelineReviewRequest,
+									issueComment.getUser().getLogin(),
+									issueComment.getAssignee().getLogin(),
+									info));
+					timelineIcon.setImageDrawable(
+							ContextCompat.getDrawable(context, R.drawable.ic_unwatch));
 				}
 				start.setTextSize(fontSize);
 
 				timelineData.addView(start);
 			}
 			// change title data view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("change_title")) {
+			else if (issueComment.getType().equalsIgnoreCase("change_title")) {
 
 				TextView start = new TextView(context);
-				start.setText(context.getString(R.string.timelineChangeTitle, issueComment.getUser().getLogin(), issueComment.getOldTitle(), issueComment.getNewTitle(), info));
+				start.setText(
+						context.getString(
+								R.string.timelineChangeTitle,
+								issueComment.getUser().getLogin(),
+								issueComment.getOldTitle(),
+								issueComment.getNewTitle(),
+								info));
 				start.setTextSize(fontSize);
 
-				timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_edit));
+				timelineIcon.setImageDrawable(
+						ContextCompat.getDrawable(context, R.drawable.ic_edit));
 				timelineData.addView(start);
 			}
 			// lock/unlock data view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("lock") || issueComment.getType().equalsIgnoreCase("unlock")) {
+			else if (issueComment.getType().equalsIgnoreCase("lock")
+					|| issueComment.getType().equalsIgnoreCase("unlock")) {
 
 				TextView start = new TextView(context);
 
-				if(issueComment.getType().equalsIgnoreCase("lock")) {
-					start.setText(context.getString(R.string.timelineLocked, issueComment.getUser().getLogin(), issueComment.getBody(), info));
-					timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_lock));
-				}
-				else if(issueComment.getType().equalsIgnoreCase("unlock")) {
-					start.setText(context.getString(R.string.timelineUnlocked, issueComment.getUser().getLogin(), info));
-					timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_key));
+				if (issueComment.getType().equalsIgnoreCase("lock")) {
+					start.setText(
+							context.getString(
+									R.string.timelineLocked,
+									issueComment.getUser().getLogin(),
+									issueComment.getBody(),
+									info));
+					timelineIcon.setImageDrawable(
+							ContextCompat.getDrawable(context, R.drawable.ic_lock));
+				} else if (issueComment.getType().equalsIgnoreCase("unlock")) {
+					start.setText(
+							context.getString(
+									R.string.timelineUnlocked,
+									issueComment.getUser().getLogin(),
+									info));
+					timelineIcon.setImageDrawable(
+							ContextCompat.getDrawable(context, R.drawable.ic_key));
 				}
 				start.setTextSize(fontSize);
 
 				timelineData.addView(start);
 			}
 			// dependency data view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("add_dependency") || issueComment.getType().equalsIgnoreCase("remove_dependency")) {
+			else if (issueComment.getType().equalsIgnoreCase("add_dependency")
+					|| issueComment.getType().equalsIgnoreCase("remove_dependency")) {
 
 				TextView start = new TextView(context);
 
-				if(issueComment.getType().equalsIgnoreCase("add_dependency")) {
-					start.setText(context.getString(R.string.timelineDependencyAdded, issueComment.getUser().getLogin(), issueComment.getDependentIssue().getNumber(), info));
-				}
-				else if(issueComment.getType().equalsIgnoreCase("remove_dependency")) {
-					start.setText(context.getString(R.string.timelineDependencyRemoved, issueComment.getUser().getLogin(), issueComment.getDependentIssue().getNumber(), info));
-					timelineIcon.setColorFilter(context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
+				if (issueComment.getType().equalsIgnoreCase("add_dependency")) {
+					start.setText(
+							context.getString(
+									R.string.timelineDependencyAdded,
+									issueComment.getUser().getLogin(),
+									issueComment.getDependentIssue().getNumber(),
+									info));
+				} else if (issueComment.getType().equalsIgnoreCase("remove_dependency")) {
+					start.setText(
+							context.getString(
+									R.string.timelineDependencyRemoved,
+									issueComment.getUser().getLogin(),
+									issueComment.getDependentIssue().getNumber(),
+									info));
+					timelineIcon.setColorFilter(
+							context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
 				}
 				start.setTextSize(fontSize);
 
-				timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_dependency));
+				timelineIcon.setImageDrawable(
+						ContextCompat.getDrawable(context, R.drawable.ic_dependency));
 				timelineData.addView(start);
 			}
 			// project data view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("project") || issueComment.getType().equalsIgnoreCase("project_board")) {
+			else if (issueComment.getType().equalsIgnoreCase("project")
+					|| issueComment.getType().equalsIgnoreCase("project_board")) {
 
 				TextView start = new TextView(context);
 
-				if(issueComment.getProjectId() > 0) {
-					start.setText(context.getString(R.string.timelineProjectAdded, issueComment.getUser().getLogin(), info));
-				}
-				else {
-					start.setText(context.getString(R.string.timelineProjectRemoved, issueComment.getUser().getLogin(), info));
-					timelineIcon.setColorFilter(context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
+				if (issueComment.getProjectId() > 0) {
+					start.setText(
+							context.getString(
+									R.string.timelineProjectAdded,
+									issueComment.getUser().getLogin(),
+									info));
+				} else {
+					start.setText(
+							context.getString(
+									R.string.timelineProjectRemoved,
+									issueComment.getUser().getLogin(),
+									info));
+					timelineIcon.setColorFilter(
+							context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
 				}
 				start.setTextSize(fontSize);
 
-				timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_kanban));
+				timelineIcon.setImageDrawable(
+						ContextCompat.getDrawable(context, R.drawable.ic_kanban));
 				timelineData.addView(start);
 			}
 			// due date/deadline data view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("added_deadline") || issueComment.getType().equalsIgnoreCase("modified_deadline") || issueComment.getType().equalsIgnoreCase("removed_deadline")) {
+			else if (issueComment.getType().equalsIgnoreCase("added_deadline")
+					|| issueComment.getType().equalsIgnoreCase("modified_deadline")
+					|| issueComment.getType().equalsIgnoreCase("removed_deadline")) {
 
 				TextView start = new TextView(context);
 
 				// TODO pretty-print
-				if(issueComment.getType().equalsIgnoreCase("added_deadline")) {
-					start.setText(context.getString(R.string.timelineDueDateAdded, issueComment.getUser().getLogin(), issueComment.getBody(), info));
-				}
-				else if(issueComment.getType().equalsIgnoreCase("modified_deadline")) {
+				if (issueComment.getType().equalsIgnoreCase("added_deadline")) {
 					start.setText(
-						context.getString(R.string.timelineDueDateModified, issueComment.getUser().getLogin(), issueComment.getBody().split("\\|")[0], issueComment.getBody().split("\\|")[1], info));
-				}
-				else if(issueComment.getType().equalsIgnoreCase("removed_deadline")) {
-					start.setText(context.getString(R.string.timelineDueDateRemoved, issueComment.getUser().getLogin(), issueComment.getBody(), info));
-					timelineIcon.setColorFilter(context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
+							context.getString(
+									R.string.timelineDueDateAdded,
+									issueComment.getUser().getLogin(),
+									issueComment.getBody(),
+									info));
+				} else if (issueComment.getType().equalsIgnoreCase("modified_deadline")) {
+					start.setText(
+							context.getString(
+									R.string.timelineDueDateModified,
+									issueComment.getUser().getLogin(),
+									issueComment.getBody().split("\\|")[0],
+									issueComment.getBody().split("\\|")[1],
+									info));
+				} else if (issueComment.getType().equalsIgnoreCase("removed_deadline")) {
+					start.setText(
+							context.getString(
+									R.string.timelineDueDateRemoved,
+									issueComment.getUser().getLogin(),
+									issueComment.getBody(),
+									info));
+					timelineIcon.setColorFilter(
+							context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
 				}
 				start.setTextSize(fontSize);
 
-				timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_clock));
+				timelineIcon.setImageDrawable(
+						ContextCompat.getDrawable(context, R.drawable.ic_clock));
 				timelineData.addView(start);
 			}
 			// branch data view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("change_target_branch") || issueComment.getType().equalsIgnoreCase("delete_branch")) {
+			else if (issueComment.getType().equalsIgnoreCase("change_target_branch")
+					|| issueComment.getType().equalsIgnoreCase("delete_branch")) {
 
 				TextView start = new TextView(context);
 
-				if(issueComment.getType().equalsIgnoreCase("change_target_branch")) {
-					start.setText(context.getString(R.string.timelineBranchChanged, issueComment.getUser().getLogin(), issueComment.getOldRef(), issueComment.getNewRef(), info));
-				}
-				else if(issueComment.getType().equalsIgnoreCase("delete_branch")) {
-					start.setText(context.getString(R.string.timelineBranchDeleted, issueComment.getUser().getLogin(), issueComment.getOldRef(), info));
-					timelineIcon.setColorFilter(context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
+				if (issueComment.getType().equalsIgnoreCase("change_target_branch")) {
+					start.setText(
+							context.getString(
+									R.string.timelineBranchChanged,
+									issueComment.getUser().getLogin(),
+									issueComment.getOldRef(),
+									issueComment.getNewRef(),
+									info));
+				} else if (issueComment.getType().equalsIgnoreCase("delete_branch")) {
+					start.setText(
+							context.getString(
+									R.string.timelineBranchDeleted,
+									issueComment.getUser().getLogin(),
+									issueComment.getOldRef(),
+									info));
+					timelineIcon.setColorFilter(
+							context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
 				}
 				start.setTextSize(fontSize);
 
-				timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_branch));
+				timelineIcon.setImageDrawable(
+						ContextCompat.getDrawable(context, R.drawable.ic_branch));
 				timelineData.addView(start);
 			}
 			// time tracking data view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("start_tracking") || issueComment.getType().equalsIgnoreCase("stop_tracking") || issueComment.getType()
-				.equalsIgnoreCase("cancel_tracking") || issueComment.getType().equalsIgnoreCase("add_time_manual") || issueComment.getType().equalsIgnoreCase("delete_time_manual")) {
+			else if (issueComment.getType().equalsIgnoreCase("start_tracking")
+					|| issueComment.getType().equalsIgnoreCase("stop_tracking")
+					|| issueComment.getType().equalsIgnoreCase("cancel_tracking")
+					|| issueComment.getType().equalsIgnoreCase("add_time_manual")
+					|| issueComment.getType().equalsIgnoreCase("delete_time_manual")) {
 
 				TextView start = new TextView(context);
 
-				if(issueComment.getType().equalsIgnoreCase("start_tracking")) {
-					start.setText(context.getString(R.string.timelineTimeTrackingStart, issueComment.getUser().getLogin(), info));
-				}
-				else if(issueComment.getType().equalsIgnoreCase("stop_tracking")) {
-					start.setText(context.getString(R.string.timelineTimeTrackingStop, issueComment.getUser().getLogin(), info));
-				}
-				else if(issueComment.getType().equalsIgnoreCase("cancel_tracking")) {
-					start.setText(context.getString(R.string.timelineTimeTrackingCancel, issueComment.getUser().getLogin(), info));
-					timelineIcon.setColorFilter(context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
-				}
-				else if(issueComment.getType().equalsIgnoreCase("add_time_manual")) {
-					start.setText(context.getString(R.string.timelineTimeTrackingAddManualTime, issueComment.getUser().getLogin(), issueComment.getBody(), info));
-				}
-				else if(issueComment.getType().equalsIgnoreCase("delete_time_manual")) {
-					start.setText(context.getString(R.string.timelineTimeTrackingDeleteManualTime, issueComment.getUser().getLogin(), issueComment.getBody(), info));
-					timelineIcon.setColorFilter(context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
+				if (issueComment.getType().equalsIgnoreCase("start_tracking")) {
+					start.setText(
+							context.getString(
+									R.string.timelineTimeTrackingStart,
+									issueComment.getUser().getLogin(),
+									info));
+				} else if (issueComment.getType().equalsIgnoreCase("stop_tracking")) {
+					start.setText(
+							context.getString(
+									R.string.timelineTimeTrackingStop,
+									issueComment.getUser().getLogin(),
+									info));
+				} else if (issueComment.getType().equalsIgnoreCase("cancel_tracking")) {
+					start.setText(
+							context.getString(
+									R.string.timelineTimeTrackingCancel,
+									issueComment.getUser().getLogin(),
+									info));
+					timelineIcon.setColorFilter(
+							context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
+				} else if (issueComment.getType().equalsIgnoreCase("add_time_manual")) {
+					start.setText(
+							context.getString(
+									R.string.timelineTimeTrackingAddManualTime,
+									issueComment.getUser().getLogin(),
+									issueComment.getBody(),
+									info));
+				} else if (issueComment.getType().equalsIgnoreCase("delete_time_manual")) {
+					start.setText(
+							context.getString(
+									R.string.timelineTimeTrackingDeleteManualTime,
+									issueComment.getUser().getLogin(),
+									issueComment.getBody(),
+									info));
+					timelineIcon.setColorFilter(
+							context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
 				}
 				start.setTextSize(fontSize);
 
-				timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_clock));
+				timelineIcon.setImageDrawable(
+						ContextCompat.getDrawable(context, R.drawable.ic_clock));
 				timelineData.addView(start);
 			}
 			// issue/pr refs data view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("change_issue_ref") || issueComment.getType().equalsIgnoreCase("issue_ref") || issueComment.getType().equalsIgnoreCase("comment_ref") || issueComment.getType()
-				.equalsIgnoreCase("pull_ref")) {
+			else if (issueComment.getType().equalsIgnoreCase("change_issue_ref")
+					|| issueComment.getType().equalsIgnoreCase("issue_ref")
+					|| issueComment.getType().equalsIgnoreCase("comment_ref")
+					|| issueComment.getType().equalsIgnoreCase("pull_ref")) {
 
 				RecyclerView recyclerView = new RecyclerView(context);
 
-				if(issueComment.getType().equalsIgnoreCase("change_issue_ref")) {
-					String text = context.getString(R.string.timelineChangeIssueRef, issueComment.getUser().getLogin(), issueComment.getNewRef(), info);
-					Markdown.render(context, EmojiParser.parseToUnicode(text), recyclerView, issue.getRepository());
-					timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_branch));
-				}
-				else if(issueComment.getType().equalsIgnoreCase("comment_ref") || issueComment.getType().equalsIgnoreCase("issue_ref") || issueComment.getType().equalsIgnoreCase("pull_ref")) {
+				if (issueComment.getType().equalsIgnoreCase("change_issue_ref")) {
+					String text =
+							context.getString(
+									R.string.timelineChangeIssueRef,
+									issueComment.getUser().getLogin(),
+									issueComment.getNewRef(),
+									info);
+					Markdown.render(
+							context,
+							EmojiParser.parseToUnicode(text),
+							recyclerView,
+							issue.getRepository());
+					timelineIcon.setImageDrawable(
+							ContextCompat.getDrawable(context, R.drawable.ic_branch));
+				} else if (issueComment.getType().equalsIgnoreCase("comment_ref")
+						|| issueComment.getType().equalsIgnoreCase("issue_ref")
+						|| issueComment.getType().equalsIgnoreCase("pull_ref")) {
 
-					if(issue.getIssueType().equalsIgnoreCase("Issue")) {
-						String text = context.getString(R.string.timelineRefIssue, issueComment.getUser().getLogin(), issueComment.getRefIssue().getNumber(), info);
-						Markdown.render(context, EmojiParser.parseToUnicode(text), recyclerView, issue.getRepository());
+					if (issue.getIssueType().equalsIgnoreCase("Issue")) {
+						String text =
+								context.getString(
+										R.string.timelineRefIssue,
+										issueComment.getUser().getLogin(),
+										issueComment.getRefIssue().getNumber(),
+										info);
+						Markdown.render(
+								context,
+								EmojiParser.parseToUnicode(text),
+								recyclerView,
+								issue.getRepository());
+					} else if (issue.getIssueType().equalsIgnoreCase("Pull")) {
+						String text =
+								context.getString(
+										R.string.timelineRefPr,
+										issueComment.getUser().getLogin(),
+										issueComment.getRefIssue().getNumber(),
+										info);
+						Markdown.render(
+								context,
+								EmojiParser.parseToUnicode(text),
+								recyclerView,
+								issue.getRepository());
 					}
-					else if(issue.getIssueType().equalsIgnoreCase("Pull")) {
-						String text = context.getString(R.string.timelineRefPr, issueComment.getUser().getLogin(), issueComment.getRefIssue().getNumber(), info);
-						Markdown.render(context, EmojiParser.parseToUnicode(text), recyclerView, issue.getRepository());
-					}
-					timelineIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_bookmark));
+					timelineIcon.setImageDrawable(
+							ContextCompat.getDrawable(context, R.drawable.ic_bookmark));
 				}
 
 				timelineData.addView(recyclerView);
 			}
 			// code data view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("code")) {
+			else if (issueComment.getType().equalsIgnoreCase("code")) {
 				timelineView.setVisibility(View.GONE);
 				timelineDividerView.setVisibility(View.GONE);
 			}
 			// schedule pr view in timeline
-			else if(issueComment.getType().equalsIgnoreCase("pull_scheduled_merge") || issueComment.getType().equalsIgnoreCase("pull_cancel_scheduled_merge")) {
+			else if (issueComment.getType().equalsIgnoreCase("pull_scheduled_merge")
+					|| issueComment.getType().equalsIgnoreCase("pull_cancel_scheduled_merge")) {
 				timelineView.setVisibility(View.GONE);
 				timelineDividerView.setVisibility(View.GONE);
-			}
-			else {
+			} else {
 				timelineView.setVisibility(View.GONE);
 			}
 
 			// comment data view in timeline
-			if(issueComment.getType().equalsIgnoreCase("comment")) {
+			if (issueComment.getType().equalsIgnoreCase("comment")) {
 
 				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(avatar);
+				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(avatar);
 
-				Markdown.render(context, EmojiParser.parseToUnicode(issueComment.getBody()), comment, issue.getRepository());
+				Markdown.render(
+						context,
+						EmojiParser.parseToUnicode(issueComment.getBody()),
+						comment,
+						issue.getRepository());
 
 				information.setText(info);
 
@@ -819,18 +1200,16 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
 				ReactionList reactionList = new ReactionList(context, bundle1);
 
 				commentReactionBadges.addView(reactionList);
-				reactionList.setOnReactionAddedListener(() -> {
-
-					if(commentReactionBadges.getVisibility() != View.VISIBLE) {
-						commentReactionBadges.post(() -> commentReactionBadges.setVisibility(View.VISIBLE));
-					}
-				});
-			}
-			else {
+				reactionList.setOnReactionAddedListener(
+						() -> {
+							if (commentReactionBadges.getVisibility() != View.VISIBLE) {
+								commentReactionBadges.post(
+										() -> commentReactionBadges.setVisibility(View.VISIBLE));
+							}
+						});
+			} else {
 				commentView.setVisibility(View.GONE);
 			}
 		}
-
 	}
-
 }
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 510e86d5..e0902080 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
@@ -21,6 +21,10 @@ import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.vdurmont.emoji.EmojiParser;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Locale;
 import org.gitnex.tea4j.v2.models.Issue;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
@@ -36,15 +40,10 @@ import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.IssueContext;
 import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.Locale;
 
 /**
  * @author M M Arif
  */
-
 public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
@@ -60,8 +59,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		tinyDb = TinyDB.getInstance(context);
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		LayoutInflater inflater = LayoutInflater.from(context);
 		return new IssuesHolder(inflater.inflate(R.layout.list_issues, parent, false));
@@ -70,7 +68,10 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 	@Override
 	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.run();
 		}
@@ -134,21 +135,34 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 			frameLabelsDots = itemView.findViewById(R.id.frameLabelsDots);
 			commentIcon = itemView.findViewById(R.id.comment_icon);
 
-			new Handler().postDelayed(() -> {
-				if(!AppUtil.checkGhostUsers(issueObject.getUser().getLogin())) {
+			new Handler()
+					.postDelayed(
+							() -> {
+								if (!AppUtil.checkGhostUsers(issueObject.getUser().getLogin())) {
 
-					issueAssigneeAvatar.setOnLongClickListener(loginId -> {
-						AppUtil.copyToClipboard(context, issueObject.getUser().getLogin(), context.getString(R.string.copyLoginIdToClipBoard, issueObject.getUser().getLogin()));
-						return true;
-					});
+									issueAssigneeAvatar.setOnLongClickListener(
+											loginId -> {
+												AppUtil.copyToClipboard(
+														context,
+														issueObject.getUser().getLogin(),
+														context.getString(
+																R.string.copyLoginIdToClipBoard,
+																issueObject.getUser().getLogin()));
+												return true;
+											});
 
-					issueAssigneeAvatar.setOnClickListener(v -> {
-						Intent intent = new Intent(context, ProfileActivity.class);
-						intent.putExtra("username", issueObject.getUser().getLogin());
-						context.startActivity(intent);
-					});
-				}
-			}, 500);
+									issueAssigneeAvatar.setOnClickListener(
+											v -> {
+												Intent intent =
+														new Intent(context, ProfileActivity.class);
+												intent.putExtra(
+														"username",
+														issueObject.getUser().getLogin());
+												context.startActivity(intent);
+											});
+								}
+							},
+							500);
 		}
 
 		@SuppressLint("SetTextI18n")
@@ -159,33 +173,54 @@ 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) {
+			if (issue.getLabels() != null) {
 
-				if(!tinyDb.getBoolean("showLabelsInList", false)) { // default
+				if (!tinyDb.getBoolean("showLabelsInList", false)) { // default
 
 					labelsScrollViewWithText.setVisibility(View.GONE);
 					labelsScrollViewDots.setVisibility(View.VISIBLE);
 					frameLabelsDots.removeAllViews();
 
-					for(int i = 0; i < issue.getLabels().size(); i++) {
+					for (int i = 0; i < issue.getLabels().size(); i++) {
 
 						String labelColor = issue.getLabels().get(i).getColor();
 						int color = Color.parseColor("#" + labelColor);
@@ -195,19 +230,25 @@ 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);
 					}
-				}
-				else {
+				} else {
 
 					labelsScrollViewDots.setVisibility(View.GONE);
 					labelsScrollViewWithText.setVisibility(View.VISIBLE);
 					frameLabels.removeAllViews();
 
-					for(int i = 0; i < issue.getLabels().size(); i++) {
+					for (int i = 0; i < issue.getLabels().size(); i++) {
 
 						String labelColor = issue.getLabels().get(i).getColor();
 						String labelName = issue.getLabels().get(i).getName();
@@ -221,9 +262,24 @@ 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()
-							.buildRoundRect(labelName, color, AppUtil.getPixelsFromDensity(context, 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(context, 8)))
+										.height(height)
+										.endConfig()
+										.buildRoundRect(
+												labelName,
+												color,
+												AppUtil.getPixelsFromDensity(context, 18));
 
 						labelsView.setImageDrawable(drawable);
 						frameLabels.addView(labelsView);
@@ -231,35 +287,53 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 				}
 			}
 
-			if(issue.getComments() > 15) {
-				commentIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_flame));
-				commentIcon.setColorFilter(context.getResources().getColor(R.color.releasePre, null));
+			if (issue.getComments() > 15) {
+				commentIcon.setImageDrawable(
+						ContextCompat.getDrawable(context, R.drawable.ic_flame));
+				commentIcon.setColorFilter(
+						context.getResources().getColor(R.color.releasePre, null));
 			}
 
-			switch(timeFormat) {
-				case "pretty": {
-					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));
-					break;
-				}
-				case "normal": {
-					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);
-					String createdTime = formatter.format(issue.getCreatedAt());
-					this.issueCreatedTime.setText(createdTime);
-					break;
-				}
+			switch (timeFormat) {
+				case "pretty":
+					{
+						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));
+						break;
+					}
+				case "normal":
+					{
+						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);
+						String createdTime = formatter.format(issue.getCreatedAt());
+						this.issueCreatedTime.setText(createdTime);
+						break;
+					}
 			}
-
 		}
-
 	}
-
 }
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 96ff1e0d..84a4ab44 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
@@ -15,6 +15,7 @@ import androidx.core.widget.ImageViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.card.MaterialCardView;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Label;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateLabelActivity;
@@ -23,12 +24,10 @@ import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.ColorInverter;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
 public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsViewHolder> {
 
 	private final List<Label> labelsList;
@@ -42,10 +41,12 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
 		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);
+	@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);
 	}
 
@@ -93,58 +94,76 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
 			labelName = itemView.findViewById(R.id.labelName);
 			ImageView labelsOptionsMenu = itemView.findViewById(R.id.labelsOptionsMenu);
 
-			if((type.equals("repo") && !((RepoDetailActivity) itemView.getContext()).repository.getPermissions().isPush()) || (type.equals(
-				"org") && (((OrganizationDetailActivity) itemView.getContext()).permissions == null || !((OrganizationDetailActivity) itemView.getContext()).permissions.isIsOwner()))) {
+			if ((type.equals("repo")
+							&& !((RepoDetailActivity) itemView.getContext())
+									.repository
+									.getPermissions()
+									.isPush())
+					|| (type.equals("org")
+							&& (((OrganizationDetailActivity) itemView.getContext()).permissions
+											== null
+									|| !((OrganizationDetailActivity) itemView.getContext())
+											.permissions.isIsOwner()))) {
 				labelsOptionsMenu.setVisibility(View.GONE);
 			}
-			labelsOptionsMenu.setOnClickListener(v -> {
+			labelsOptionsMenu.setOnClickListener(
+					v -> {
+						final Context context = v.getContext();
 
-				final Context context = v.getContext();
+						@SuppressLint("InflateParams")
+						View view =
+								LayoutInflater.from(context)
+										.inflate(R.layout.bottom_sheet_labels_in_list, null);
 
-				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_labels_in_list, null);
+						TextView labelMenuEdit = view.findViewById(R.id.labelMenuEdit);
+						TextView labelMenuDelete = view.findViewById(R.id.labelMenuDelete);
+						TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-				TextView labelMenuEdit = view.findViewById(R.id.labelMenuEdit);
-				TextView labelMenuDelete = view.findViewById(R.id.labelMenuDelete);
-				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+						bottomSheetHeader.setText(labels.getName());
+						BottomSheetDialog dialog = new BottomSheetDialog(context);
+						dialog.setContentView(view);
+						dialog.show();
 
-				bottomSheetHeader.setText(labels.getName());
-				BottomSheetDialog dialog = new BottomSheetDialog(context);
-				dialog.setContentView(view);
-				dialog.show();
+						labelMenuEdit.setOnClickListener(
+								editLabel -> {
+									Intent intent = new Intent(context, CreateLabelActivity.class);
+									intent.putExtra("labelId", String.valueOf(labels.getId()));
+									intent.putExtra("labelTitle", labels.getName());
+									intent.putExtra("labelColor", labels.getColor());
+									intent.putExtra("labelAction", "edit");
+									intent.putExtra("type", type);
+									intent.putExtra("orgName", orgName);
+									if (type.equals("repo")) {
+										intent.putExtra(
+												RepositoryContext.INTENT_EXTRA,
+												((RepoDetailActivity) itemView.getContext())
+														.repository);
+									}
+									context.startActivity(intent);
+									dialog.dismiss();
+								});
 
-				labelMenuEdit.setOnClickListener(editLabel -> {
-
-					Intent intent = new Intent(context, CreateLabelActivity.class);
-					intent.putExtra("labelId", String.valueOf(labels.getId()));
-					intent.putExtra("labelTitle", labels.getName());
-					intent.putExtra("labelColor", labels.getColor());
-					intent.putExtra("labelAction", "edit");
-					intent.putExtra("type", type);
-					intent.putExtra("orgName", orgName);
-					if(type.equals("repo")) {
-						intent.putExtra(RepositoryContext.INTENT_EXTRA, ((RepoDetailActivity) itemView.getContext()).repository);
-					}
-					context.startActivity(intent);
-					dialog.dismiss();
-				});
-
-				labelMenuDelete.setOnClickListener(deleteLabel -> {
-					RepositoryContext repo;
-					if(type.equals("repo")) {
-						repo = ((RepoDetailActivity) itemView.getContext()).repository;
-					}
-					else {
-						repo = null;
-					}
-
-					AlertDialogs.labelDeleteDialog(context, labels.getName(), String.valueOf(labels.getId()), type, orgName, repo);
-					dialog.dismiss();
-				});
-
-			});
+						labelMenuDelete.setOnClickListener(
+								deleteLabel -> {
+									RepositoryContext repo;
+									if (type.equals("repo")) {
+										repo =
+												((RepoDetailActivity) itemView.getContext())
+														.repository;
+									} else {
+										repo = null;
+									}
 
+									AlertDialogs.labelDeleteDialog(
+											context,
+											labels.getName(),
+											String.valueOf(labels.getId()),
+											type,
+											orgName,
+											repo);
+									dialog.dismiss();
+								});
+					});
 		}
-
 	}
-
 }
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 8b73fd47..b54839e2 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/LabelsListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/LabelsListAdapter.java
@@ -9,16 +9,15 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.v2.models.Label;
-import org.mian.gitnex.R;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
+import org.gitnex.tea4j.v2.models.Label;
+import org.mian.gitnex.R;
 
 /**
  * @author M M Arif
  */
-
 public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.LabelsViewHolder> {
 
 	private final List<Label> labels;
@@ -27,18 +26,23 @@ public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.La
 	private List<Integer> currentLabelsIds;
 	private List<Integer> labelsIds = new ArrayList<>();
 
-	public LabelsListAdapter(List<Label> labelsMain, LabelsListAdapterListener labelsListener, List<Integer> currentLabelsIds) {
+	public LabelsListAdapter(
+			List<Label> labelsMain,
+			LabelsListAdapterListener labelsListener,
+			List<Integer> currentLabelsIds) {
 
 		this.labels = labelsMain;
 		this.labelsListener = labelsListener;
 		this.currentLabelsIds = currentLabelsIds;
 	}
 
-	@NonNull
-	@Override
-	public LabelsListAdapter.LabelsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+	@NonNull @Override
+	public LabelsListAdapter.LabelsViewHolder onCreateViewHolder(
+			@NonNull ViewGroup parent, int viewType) {
 
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.custom_labels_list, parent, false);
+		View v =
+				LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.custom_labels_list, parent, false);
 		return new LabelsListAdapter.LabelsViewHolder(v);
 	}
 
@@ -53,9 +57,9 @@ public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.La
 		holder.labelText.setText(currentItem.getName());
 		holder.labelColor.setBackgroundColor(color);
 
-		for(int i = 0; i < labelsIds.size(); i++) {
+		for (int i = 0; i < labelsIds.size(); i++) {
 
-			if(labelsStrings.contains(currentItem.getName())) {
+			if (labelsStrings.contains(currentItem.getName())) {
 
 				holder.labelSelection.setChecked(true);
 			}
@@ -63,9 +67,9 @@ public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.La
 
 		currentLabelsIds = new ArrayList<>(new LinkedHashSet<>(currentLabelsIds));
 
-		for(int i = 0; i < currentLabelsIds.size(); i++) {
+		for (int i = 0; i < currentLabelsIds.size(); i++) {
 
-			if(currentLabelsIds.contains(currentItem.getId().intValue())) {
+			if (currentLabelsIds.contains(currentItem.getId().intValue())) {
 
 				holder.labelSelection.setChecked(true);
 				labelsIds.add(currentLabelsIds.get(i));
@@ -74,22 +78,21 @@ public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.La
 
 		labelsListener.labelsIdsInterface(labelsIds);
 
-		holder.labelSelection.setOnCheckedChangeListener((buttonView, isChecked) -> {
+		holder.labelSelection.setOnCheckedChangeListener(
+				(buttonView, isChecked) -> {
+					if (isChecked) {
 
-			if(isChecked) {
+						labelsStrings.add(currentItem.getName());
+						labelsIds.add(currentItem.getId().intValue());
+					} else {
 
-				labelsStrings.add(currentItem.getName());
-				labelsIds.add(currentItem.getId().intValue());
-			}
-			else {
+						labelsStrings.remove(currentItem.getName());
+						labelsIds.remove(Integer.valueOf(currentItem.getId().intValue()));
+					}
 
-				labelsStrings.remove(currentItem.getName());
-				labelsIds.remove(Integer.valueOf(currentItem.getId().intValue()));
-			}
-
-			labelsListener.labelsInterface(labelsStrings);
-			labelsListener.labelsIdsInterface(labelsIds);
-		});
+					labelsListener.labelsInterface(labelsStrings);
+					labelsListener.labelsIdsInterface(labelsIds);
+				});
 
 		labelsIds = new ArrayList<>(new LinkedHashSet<>(labelsIds));
 	}
@@ -111,7 +114,6 @@ public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.La
 		void labelsInterface(List<String> data);
 
 		void labelsIdsInterface(List<Integer> data);
-
 	}
 
 	static class LabelsViewHolder extends RecyclerView.ViewHolder {
@@ -129,7 +131,5 @@ public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.La
 			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 7db45307..9087246c 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
@@ -13,6 +13,11 @@ import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.vdurmont.emoji.EmojiParser;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
 import org.gitnex.tea4j.v2.models.Milestone;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.MilestoneActions;
@@ -22,16 +27,10 @@ import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
 
 /**
  * @author M M Arif
  */
-
 public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
@@ -40,23 +39,27 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
-	public MilestonesAdapter(Context ctx, List<Milestone> dataListMain, RepositoryContext repository) {
+	public MilestonesAdapter(
+			Context ctx, List<Milestone> dataListMain, RepositoryContext repository) {
 		this.repository = repository;
 		this.context = ctx;
 		this.dataList = dataListMain;
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		LayoutInflater inflater = LayoutInflater.from(context);
-		return new MilestonesAdapter.DataHolder(inflater.inflate(R.layout.list_milestones, parent, false));
+		return new MilestonesAdapter.DataHolder(
+				inflater.inflate(R.layout.list_milestones, parent, false));
 	}
 
 	@Override
 	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 
 			isLoading = true;
 			loadMoreListener.onLoadMore();
@@ -82,7 +85,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
 	public void setMoreDataAvailable(boolean moreDataAvailable) {
 		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
+		if (!isMoreDataAvailable) {
 			loadMoreListener.onLoadFinished();
 		}
 	}
@@ -108,7 +111,6 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 		void onLoadMore();
 
 		void onLoadFinished();
-
 	}
 
 	class DataHolder extends RecyclerView.ViewHolder {
@@ -133,50 +135,53 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 			msProgress = itemView.findViewById(R.id.milestoneProgress);
 			ImageView milestonesMenu = itemView.findViewById(R.id.milestonesMenu);
 
-			if(!((RepoDetailActivity) itemView.getContext()).repository.getPermissions().isPush()) {
+			if (!((RepoDetailActivity) itemView.getContext())
+					.repository
+					.getPermissions()
+					.isPush()) {
 				milestonesMenu.setVisibility(View.GONE);
 			}
-			milestonesMenu.setOnClickListener(v -> {
+			milestonesMenu.setOnClickListener(
+					v -> {
+						Context ctx = v.getContext();
+						int milestoneId_ = Integer.parseInt(String.valueOf(milestones.getId()));
 
-				Context ctx = v.getContext();
-				int milestoneId_ = Integer.parseInt(String.valueOf(milestones.getId()));
+						@SuppressLint("InflateParams")
+						View view =
+								LayoutInflater.from(ctx)
+										.inflate(R.layout.bottom_sheet_milestones_in_list, null);
 
-				@SuppressLint("InflateParams") View view = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_milestones_in_list, null);
+						TextView closeMilestone = view.findViewById(R.id.closeMilestone);
+						TextView openMilestone = view.findViewById(R.id.openMilestone);
 
-				TextView closeMilestone = view.findViewById(R.id.closeMilestone);
-				TextView openMilestone = view.findViewById(R.id.openMilestone);
+						BottomSheetDialog dialog = new BottomSheetDialog(ctx);
+						dialog.setContentView(view);
+						dialog.show();
 
-				BottomSheetDialog dialog = new BottomSheetDialog(ctx);
-				dialog.setContentView(view);
-				dialog.show();
+						if (milestones.getState().equals("open")) {
 
-				if(milestones.getState().equals("open")) {
+							closeMilestone.setVisibility(View.VISIBLE);
+							openMilestone.setVisibility(View.GONE);
+						} else {
 
-					closeMilestone.setVisibility(View.VISIBLE);
-					openMilestone.setVisibility(View.GONE);
-				}
-				else {
+							closeMilestone.setVisibility(View.GONE);
+							openMilestone.setVisibility(View.VISIBLE);
+						}
 
-					closeMilestone.setVisibility(View.GONE);
-					openMilestone.setVisibility(View.VISIBLE);
-				}
-
-				closeMilestone.setOnClickListener(v12 -> {
-
-					MilestoneActions.closeMilestone(ctx, milestoneId_, repository);
-					dialog.dismiss();
-					updateAdapter(getBindingAdapterPosition());
-				});
-
-				openMilestone.setOnClickListener(v12 -> {
-
-					MilestoneActions.openMilestone(ctx, milestoneId_, repository);
-					dialog.dismiss();
-					updateAdapter(getBindingAdapterPosition());
-				});
-
-			});
+						closeMilestone.setOnClickListener(
+								v12 -> {
+									MilestoneActions.closeMilestone(ctx, milestoneId_, repository);
+									dialog.dismiss();
+									updateAdapter(getBindingAdapterPosition());
+								});
 
+						openMilestone.setOnClickListener(
+								v12 -> {
+									MilestoneActions.openMilestone(ctx, milestoneId_, repository);
+									dialog.dismiss();
+									updateAdapter(getBindingAdapterPosition());
+								});
+					});
 		}
 
 		@SuppressLint("SetTextI18n")
@@ -189,43 +194,63 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
 			Markdown.render(context, dataModel.getTitle(), msTitle);
 
-			if(!dataModel.getDescription().equals("")) {
+			if (!dataModel.getDescription().equals("")) {
 
-				Markdown.render(context, EmojiParser.parseToUnicode(dataModel.getDescription()), msDescription);
-			}
-			else {
+				Markdown.render(
+						context,
+						EmojiParser.parseToUnicode(dataModel.getDescription()),
+						msDescription);
+			} else {
 
 				msDescription.setText(context.getString(R.string.milestoneNoDescription));
 			}
 
-			msOpenIssues.setText(context.getString(R.string.milestoneIssueStatusOpen, dataModel.getOpenIssues()));
-			msClosedIssues.setText(context.getString(R.string.milestoneIssueStatusClosed, dataModel.getClosedIssues()));
+			msOpenIssues.setText(
+					context.getString(
+							R.string.milestoneIssueStatusOpen, dataModel.getOpenIssues()));
+			msClosedIssues.setText(
+					context.getString(
+							R.string.milestoneIssueStatusClosed, dataModel.getClosedIssues()));
 
-			if((dataModel.getOpenIssues() + dataModel.getClosedIssues()) > 0) {
+			if ((dataModel.getOpenIssues() + dataModel.getClosedIssues()) > 0) {
 
-				if(dataModel.getOpenIssues() == 0) {
+				if (dataModel.getOpenIssues() == 0) {
 
 					msProgress.setProgress(100);
-					msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, 100), context));
-				}
-				else {
+					msProgress.setOnClickListener(
+							new ClickListener(
+									context.getResources()
+											.getString(R.string.milestoneCompletion, 100),
+									context));
+				} else {
 
-					int msCompletion = (int) (100 * dataModel.getClosedIssues() / (dataModel.getOpenIssues() + dataModel.getClosedIssues()));
-					msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, msCompletion), context));
+					int msCompletion =
+							(int)
+									(100
+											* dataModel.getClosedIssues()
+											/ (dataModel.getOpenIssues()
+													+ dataModel.getClosedIssues()));
+					msProgress.setOnClickListener(
+							new ClickListener(
+									context.getResources()
+											.getString(R.string.milestoneCompletion, msCompletion),
+									context));
 					msProgress.setProgress(msCompletion);
 				}
 
-			}
-			else {
+			} else {
 
 				msProgress.setProgress(0);
-				msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, 0), context));
+				msProgress.setOnClickListener(
+						new ClickListener(
+								context.getResources().getString(R.string.milestoneCompletion, 0),
+								context));
 			}
 
-			if(dataModel.getDueOn() != null) {
+			if (dataModel.getDueOn() != null) {
 
 				String TAG = "MilestonesAdapter";
-				if(timeFormat.equals("normal") || timeFormat.equals("pretty")) {
+				if (timeFormat.equals("normal") || timeFormat.equals("pretty")) {
 
 					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", new Locale(locale));
 					Date date = dataModel.getDueOn();
@@ -233,16 +258,22 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 					assert date != null;
 					String dueDate = formatter.format(date);
 
-					if(date.before(new Date())) {
-						msDueDate.setTextColor(ResourcesCompat.getColor(context.getResources(), R.color.darkRed, null));
+					if (date.before(new Date())) {
+						msDueDate.setTextColor(
+								ResourcesCompat.getColor(
+										context.getResources(), R.color.darkRed, null));
 					}
 
 					msDueDate.setText(dueDate);
-					msDueDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(dataModel.getDueOn()), context));
-				}
-				else if(timeFormat.equals("normal1")) {
+					msDueDate.setOnClickListener(
+							new ClickListener(
+									TimeHelper.customDateFormatForToastDateFormat(
+											dataModel.getDueOn()),
+									context));
+				} else if (timeFormat.equals("normal1")) {
 
-					SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", new Locale(locale));
+					SimpleDateFormat formatter =
+							new SimpleDateFormat("dd-MM-yyyy", new Locale(locale));
 
 					Date date1 = dataModel.getDueOn();
 
@@ -251,13 +282,10 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 					msDueDate.setText(dueDate);
 				}
 
-			}
-			else {
+			} else {
 
 				msDueDate.setText(context.getString(R.string.milestoneNoDueDate));
 			}
 		}
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/MostVisitedReposAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MostVisitedReposAdapter.java
index c5d63049..ef4df63d 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MostVisitedReposAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MostVisitedReposAdapter.java
@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.List;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.database.api.BaseApi;
@@ -22,13 +23,12 @@ import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
-public class MostVisitedReposAdapter extends RecyclerView.Adapter<MostVisitedReposAdapter.MostVisitedViewHolder> {
+public class MostVisitedReposAdapter
+		extends RecyclerView.Adapter<MostVisitedReposAdapter.MostVisitedViewHolder> {
 
 	private List<Repository> mostVisitedReposList;
 	private final Context ctx;
@@ -53,31 +53,47 @@ public class MostVisitedReposAdapter extends RecyclerView.Adapter<MostVisitedRep
 			mostVisited = itemView.findViewById(R.id.most_visited);
 			resetCounter = itemView.findViewById(R.id.reset_counter);
 
-			itemView.setOnClickListener(v -> {
+			itemView.setOnClickListener(
+					v -> {
+						Context context = v.getContext();
+						RepositoryContext repositoryContext =
+								new RepositoryContext(
+										repository.getRepositoryOwner(),
+										repository.getRepositoryName(),
+										context);
+						Intent intent =
+								repositoryContext.getIntent(context, RepoDetailActivity.class);
+						context.startActivity(intent);
+					});
 
-				Context context = v.getContext();
-				RepositoryContext repositoryContext = new RepositoryContext(repository.getRepositoryOwner(), repository.getRepositoryName(), context);
-				Intent intent = repositoryContext.getIntent(context, RepoDetailActivity.class);
-				context.startActivity(intent);
-			});
+			resetCounter.setOnClickListener(
+					itemDelete -> {
+						MaterialAlertDialogBuilder materialAlertDialogBuilder =
+								new MaterialAlertDialogBuilder(
+										ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
-			resetCounter.setOnClickListener(itemDelete -> {
+						materialAlertDialogBuilder
+								.setTitle(ctx.getString(R.string.reset))
+								.setMessage(
+										ctx.getString(
+												R.string.resetCounterDialogMessage,
+												repository.getRepositoryName()))
+								.setPositiveButton(
+										R.string.reset,
+										(dialog, whichButton) -> {
+											int getRepositoryId = repository.getRepositoryId();
+											resetRepositoryCounter(getBindingAdapterPosition());
 
-				MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
-
-				materialAlertDialogBuilder.setTitle(ctx.getString(R.string.reset)).setMessage(ctx.getString(R.string.resetCounterDialogMessage, repository.getRepositoryName()))
-					.setPositiveButton(R.string.reset, (dialog, whichButton) -> {
-
-						int getRepositoryId = repository.getRepositoryId();
-						resetRepositoryCounter(getBindingAdapterPosition());
-
-						RepositoriesApi repositoriesApi = BaseApi.getInstance(ctx, RepositoriesApi.class);
-						assert repositoriesApi != null;
-						repositoriesApi.updateRepositoryMostVisited(0, getRepositoryId);
-					}).setNeutralButton(R.string.cancelButton, null).show();
-			});
+											RepositoriesApi repositoriesApi =
+													BaseApi.getInstance(ctx, RepositoriesApi.class);
+											assert repositoriesApi != null;
+											repositoriesApi.updateRepositoryMostVisited(
+													0, getRepositoryId);
+										})
+								.setNeutralButton(R.string.cancelButton, null)
+								.show();
+					});
 		}
-
 	}
 
 	private void resetRepositoryCounter(int position) {
@@ -93,10 +109,11 @@ public class MostVisitedReposAdapter extends RecyclerView.Adapter<MostVisitedRep
 		this.mostVisitedReposList = reposListMain;
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public MostVisitedViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_most_visited_repos, parent, false);
+		View v =
+				LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.list_most_visited_repos, parent, false);
 		return new MostVisitedViewHolder(v);
 	}
 
@@ -110,7 +127,16 @@ public class MostVisitedReposAdapter extends RecyclerView.Adapter<MostVisitedRep
 		ColorGenerator generator = ColorGenerator.Companion.getMATERIAL();
 		int color = generator.getColor(currentItem.getRepositoryOwner());
 		String firstCharacter = String.valueOf(currentItem.getRepositoryOwner().charAt(0));
-		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 14);
+		TextDrawable drawable =
+				TextDrawable.builder()
+						.beginConfig()
+						.useFont(Typeface.DEFAULT)
+						.fontSize(18)
+						.toUpperCase()
+						.width(28)
+						.height(28)
+						.endConfig()
+						.buildRoundRect(firstCharacter, color, 14);
 
 		holder.image.setImageDrawable(drawable);
 		holder.orgName.setText(currentItem.getRepositoryOwner());
@@ -133,5 +159,4 @@ public class MostVisitedReposAdapter extends RecyclerView.Adapter<MostVisitedRep
 		mostVisitedReposList = 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 558f56a9..ccd13c0c 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MyProfileEmailsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyProfileEmailsAdapter.java
@@ -10,15 +10,15 @@ import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Email;
 import org.mian.gitnex.R;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
-public class MyProfileEmailsAdapter extends RecyclerView.Adapter<MyProfileEmailsAdapter.EmailsViewHolder> {
+public class MyProfileEmailsAdapter
+		extends RecyclerView.Adapter<MyProfileEmailsAdapter.EmailsViewHolder> {
 
 	private final List<Email> emailsList;
 	private final Context context;
@@ -28,29 +28,45 @@ public class MyProfileEmailsAdapter extends RecyclerView.Adapter<MyProfileEmails
 		this.emailsList = emailsListMain;
 	}
 
-	@NonNull
-	@Override
-	public MyProfileEmailsAdapter.EmailsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_emails, parent, false);
+	@NonNull @Override
+	public MyProfileEmailsAdapter.EmailsViewHolder onCreateViewHolder(
+			@NonNull ViewGroup parent, int viewType) {
+		View v =
+				LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.list_profile_emails, parent, false);
 		return new MyProfileEmailsAdapter.EmailsViewHolder(v);
 	}
 
 	@Override
-	public void onBindViewHolder(@NonNull MyProfileEmailsAdapter.EmailsViewHolder holder, int position) {
+	public void onBindViewHolder(
+			@NonNull MyProfileEmailsAdapter.EmailsViewHolder holder, int position) {
 
 		Email currentItem = emailsList.get(position);
 
 		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);
+		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);
 			holder.emailPrimary.setImageDrawable(drawable);
-		}
-		else {
+		} else {
 			holder.emailPrimary.setVisibility(View.GONE);
 		}
-
 	}
 
 	@Override
@@ -68,9 +84,6 @@ public class MyProfileEmailsAdapter extends RecyclerView.Adapter<MyProfileEmails
 
 			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 e226da13..2750ea36 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
@@ -14,16 +14,15 @@ import androidx.core.content.res.ResourcesCompat;
 import androidx.core.text.HtmlCompat;
 import androidx.core.widget.ImageViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
+import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.gitnex.tea4j.v2.models.NotificationThread;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.AppUtil;
-import java.util.List;
 
 /**
  * @author opyale
  */
-
 public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
@@ -32,7 +31,11 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
 	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;
@@ -40,19 +43,20 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
 		this.onNotificationClickedListener = onNotificationClickedListener;
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		LayoutInflater inflater = LayoutInflater.from(context);
-		return new NotificationsAdapter.NotificationsHolder(inflater.inflate(R.layout.list_notifications, parent, false));
+		return new NotificationsAdapter.NotificationsHolder(
+				inflater.inflate(R.layout.list_notifications, parent, false));
 	}
 
 	@Override
 	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading) {
+		if (position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading) {
 			isLoading = true;
 		}
-		((NotificationsAdapter.NotificationsHolder) holder).bindData(notificationThreads.get(position));
+		((NotificationsAdapter.NotificationsHolder) holder)
+				.bindData(notificationThreads.get(position));
 	}
 
 	@Override
@@ -83,13 +87,11 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
 	public interface OnNotificationClickedListener {
 
 		void onNotificationClicked(NotificationThread notificationThread);
-
 	}
 
 	public interface OnMoreClickedListener {
 
 		void onMoreClicked(NotificationThread notificationThread);
-
 	}
 
 	class NotificationsHolder extends RecyclerView.ViewHolder {
@@ -118,30 +120,37 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
 			String url = notificationThread.getSubject().getUrl();
 			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>";
+			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>";
 			}
 
-			subject.setText(HtmlCompat.fromHtml(subjectId + " " + notificationThread.getSubject().getTitle(), HtmlCompat.FROM_HTML_MODE_LEGACY));
-			if(!notificationThread.getSubject().getType().equalsIgnoreCase("repository")) {
+			subject.setText(
+					HtmlCompat.fromHtml(
+							subjectId + " " + notificationThread.getSubject().getTitle(),
+							HtmlCompat.FROM_HTML_MODE_LEGACY));
+			if (!notificationThread.getSubject().getType().equalsIgnoreCase("repository")) {
 				repository.setText(notificationThread.getRepository().getFullName());
-			}
-			else {
+			} else {
 				repository.setVisibility(View.GONE);
 				pinned.setVisibility(View.GONE);
 				pinned = itemView.findViewById(R.id.pinnedVertical);
 			}
 
-			if(notificationThread.isPinned()) {
+			if (notificationThread.isPinned()) {
 				pinned.setVisibility(View.VISIBLE);
-			}
-			else {
+			} else {
 				pinned.setVisibility(View.GONE);
 			}
 
-			switch(notificationThread.getSubject().getType().toLowerCase()) {
-
+			switch (notificationThread.getSubject().getType().toLowerCase()) {
 				case "pull":
 					type.setImageResource(R.drawable.ic_pull_request);
 					break;
@@ -158,29 +167,36 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
 				default:
 					type.setImageResource(R.drawable.ic_question);
 					break;
-
 			}
 
-			switch(notificationThread.getSubject().getState().toLowerCase()) {
-
+			switch (notificationThread.getSubject().getState().toLowerCase()) {
 				case "closed":
-					ImageViewCompat.setImageTintList(type, ColorStateList.valueOf(context.getResources().getColor(R.color.iconIssuePrClosedColor)));
+					ImageViewCompat.setImageTintList(
+							type,
+							ColorStateList.valueOf(
+									context.getResources()
+											.getColor(R.color.iconIssuePrClosedColor)));
 					break;
 				case "merged":
-					ImageViewCompat.setImageTintList(type, ColorStateList.valueOf(context.getResources().getColor(R.color.iconPrMergedColor)));
+					ImageViewCompat.setImageTintList(
+							type,
+							ColorStateList.valueOf(
+									context.getResources().getColor(R.color.iconPrMergedColor)));
 					break;
 
 				default:
 				case "open":
-					ImageViewCompat.setImageTintList(type, ColorStateList.valueOf(AppUtil.getColorFromAttribute(context, R.attr.iconsColor)));
+					ImageViewCompat.setImageTintList(
+							type,
+							ColorStateList.valueOf(
+									AppUtil.getColorFromAttribute(context, R.attr.iconsColor)));
 					break;
 			}
 
-			frame.setOnClickListener(v -> onNotificationClickedListener.onNotificationClicked(notificationThread));
+			frame.setOnClickListener(
+					v -> onNotificationClickedListener.onNotificationClicked(notificationThread));
 
 			more.setOnClickListener(v -> onMoreClickedListener.onMoreClicked(notificationThread));
 		}
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/OrganizationAddUserToTeamMemberAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/OrganizationAddUserToTeamMemberAdapter.java
index 78952648..d12e56f6 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/OrganizationAddUserToTeamMemberAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/OrganizationAddUserToTeamMemberAdapter.java
@@ -11,6 +11,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.BaseActivity;
@@ -21,7 +22,6 @@ import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -29,99 +29,112 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
-public class OrganizationAddUserToTeamMemberAdapter extends RecyclerView.Adapter<OrganizationAddUserToTeamMemberAdapter.UserSearchViewHolder> {
+public class OrganizationAddUserToTeamMemberAdapter
+		extends RecyclerView.Adapter<OrganizationAddUserToTeamMemberAdapter.UserSearchViewHolder> {
 
 	private final List<User> usersSearchList;
 	private final Context context;
 	private final int teamId;
 	private final String orgName;
 
-	public OrganizationAddUserToTeamMemberAdapter(List<User> dataList, Context ctx, int teamId, String orgName) {
+	public OrganizationAddUserToTeamMemberAdapter(
+			List<User> dataList, Context ctx, int teamId, String orgName) {
 		this.context = ctx;
 		this.usersSearchList = dataList;
 		this.teamId = teamId;
 		this.orgName = orgName;
 	}
 
-	@NonNull
-	@Override
-	public OrganizationAddUserToTeamMemberAdapter.UserSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_collaborators_search, parent, false);
+	@NonNull @Override
+	public OrganizationAddUserToTeamMemberAdapter.UserSearchViewHolder onCreateViewHolder(
+			@NonNull ViewGroup parent, int viewType) {
+		View v =
+				LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.list_collaborators_search, parent, false);
 		return new OrganizationAddUserToTeamMemberAdapter.UserSearchViewHolder(v);
 	}
 
 	@Override
-	public void onBindViewHolder(@NonNull final OrganizationAddUserToTeamMemberAdapter.UserSearchViewHolder holder, int position) {
+	public void onBindViewHolder(
+			@NonNull final OrganizationAddUserToTeamMemberAdapter.UserSearchViewHolder holder,
+			int position) {
 
 		User currentItem = usersSearchList.get(position);
 		holder.userInfo = currentItem;
 		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-		if(!currentItem.getFullName().equals("")) {
+		if (!currentItem.getFullName().equals("")) {
 
 			holder.userFullName.setText(Html.fromHtml(currentItem.getFullName()));
-		}
-		else {
+		} else {
 
-			holder.userFullName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
+			holder.userFullName.setText(
+					context.getResources()
+							.getString(R.string.usernameWithAt, currentItem.getLogin()));
 		}
 
-		holder.userName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
+		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);
+		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);
 		}
 
-		if(getItemCount() > 0) {
+		if (getItemCount() > 0) {
 
-			final String loginUid = ((BaseActivity) context).getAccount().getAccount().getUserName();
+			final String loginUid =
+					((BaseActivity) context).getAccount().getAccount().getUserName();
 
-			Call<User> call = RetrofitClient.getApiInterface(context).orgListTeamMember((long) teamId, currentItem.getLogin());
+			Call<User> call =
+					RetrofitClient.getApiInterface(context)
+							.orgListTeamMember((long) teamId, currentItem.getLogin());
 
-			call.enqueue(new Callback<>() {
+			call.enqueue(
+					new Callback<>() {
 
-				@Override
-				public void onResponse(@NonNull Call<User> call, @NonNull Response<User> response) {
+						@Override
+						public void onResponse(
+								@NonNull Call<User> call, @NonNull Response<User> response) {
 
-					if(response.code() == 200) {
+							if (response.code() == 200) {
 
-						if(!currentItem.getLogin().equals(loginUid)) {
-							holder.addMemberButtonRemove.setVisibility(View.VISIBLE);
-						}
-						else {
-							holder.addMemberButtonRemove.setVisibility(View.GONE);
+								if (!currentItem.getLogin().equals(loginUid)) {
+									holder.addMemberButtonRemove.setVisibility(View.VISIBLE);
+								} else {
+									holder.addMemberButtonRemove.setVisibility(View.GONE);
+								}
+
+							} else if (response.code() == 404) {
+
+								if (!currentItem.getLogin().equals(loginUid)) {
+									holder.addMemberButtonAdd.setVisibility(View.VISIBLE);
+								} else {
+									holder.addMemberButtonAdd.setVisibility(View.GONE);
+								}
+
+							} else {
+								holder.addMemberButtonRemove.setVisibility(View.GONE);
+								holder.addMemberButtonAdd.setVisibility(View.GONE);
+							}
 						}
 
-					}
-					else if(response.code() == 404) {
+						@Override
+						public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {
 
-						if(!currentItem.getLogin().equals(loginUid)) {
-							holder.addMemberButtonAdd.setVisibility(View.VISIBLE);
+							Toasty.error(
+									context,
+									context.getResources()
+											.getString(R.string.genericServerResponseError));
 						}
-						else {
-							holder.addMemberButtonAdd.setVisibility(View.GONE);
-						}
-
-					}
-					else {
-						holder.addMemberButtonRemove.setVisibility(View.GONE);
-						holder.addMemberButtonAdd.setVisibility(View.GONE);
-					}
-
-				}
-
-				@Override
-				public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {
-
-					Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
-				}
-
-			});
-
+					});
 		}
-
 	}
 
 	@Override
@@ -147,26 +160,45 @@ public class OrganizationAddUserToTeamMemberAdapter extends RecyclerView.Adapter
 			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))));
+			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))));
 
-			new Handler().postDelayed(() -> {
-				if(!AppUtil.checkGhostUsers(userInfo.getLogin())) {
+			new Handler()
+					.postDelayed(
+							() -> {
+								if (!AppUtil.checkGhostUsers(userInfo.getLogin())) {
 
-					userAvatar.setOnClickListener(loginId -> {
-						Intent intent = new Intent(context, ProfileActivity.class);
-						intent.putExtra("username", userInfo.getLogin());
-						context.startActivity(intent);
-					});
+									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;
-					});
-				}
-			}, 500);
+									userAvatar.setOnLongClickListener(
+											loginId -> {
+												AppUtil.copyToClipboard(
+														context,
+														userInfo.getLogin(),
+														context.getString(
+																R.string.copyLoginIdToClipBoard,
+																userInfo.getLogin()));
+												return true;
+											});
+								}
+							},
+							500);
 		}
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamMembersPreviewAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamMembersPreviewAdapter.java
index 5e3619c0..dcbeee4a 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamMembersPreviewAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamMembersPreviewAdapter.java
@@ -7,18 +7,18 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.List;
 
 /**
  * @author opyale
  */
-
-public class OrganizationTeamMembersPreviewAdapter extends RecyclerView.Adapter<OrganizationTeamMembersPreviewAdapter.ViewHolder> {
+public class OrganizationTeamMembersPreviewAdapter
+		extends RecyclerView.Adapter<OrganizationTeamMembersPreviewAdapter.ViewHolder> {
 
 	private final Context context;
 	private final List<User> userData;
@@ -28,10 +28,11 @@ public class OrganizationTeamMembersPreviewAdapter extends RecyclerView.Adapter<
 		this.userData = userInfo;
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(context).inflate(R.layout.list_organization_members_preview, parent, false);
+		View v =
+				LayoutInflater.from(context)
+						.inflate(R.layout.list_organization_members_preview, parent, false);
 		return new ViewHolder(v);
 	}
 
@@ -39,8 +40,14 @@ public class OrganizationTeamMembersPreviewAdapter extends RecyclerView.Adapter<
 	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
@@ -56,7 +63,5 @@ public class OrganizationTeamMembersPreviewAdapter extends RecyclerView.Adapter<
 			super(itemView);
 			avatar = itemView.findViewById(R.id.avatar);
 		}
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamRepositoriesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamRepositoriesAdapter.java
index 939ab597..71a8ea74 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamRepositoriesAdapter.java
@@ -13,6 +13,9 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.Repository;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
@@ -20,9 +23,6 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -30,8 +30,8 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
-public class OrganizationTeamRepositoriesAdapter extends RecyclerView.Adapter<OrganizationTeamRepositoriesAdapter.TeamReposViewHolder> {
+public class OrganizationTeamRepositoriesAdapter
+		extends RecyclerView.Adapter<OrganizationTeamRepositoriesAdapter.TeamReposViewHolder> {
 
 	private final List<Repository> reposList;
 	private final Context context;
@@ -40,7 +40,8 @@ public class OrganizationTeamRepositoriesAdapter extends RecyclerView.Adapter<Or
 	private final String teamName;
 	private final List<Repository> reposArr;
 
-	public OrganizationTeamRepositoriesAdapter(List<Repository> dataList, Context ctx, int teamId, String orgName, String teamName) {
+	public OrganizationTeamRepositoriesAdapter(
+			List<Repository> dataList, Context ctx, int teamId, String orgName, String teamName) {
 		this.context = ctx;
 		this.reposList = dataList;
 		this.teamId = teamId;
@@ -65,44 +66,62 @@ public class OrganizationTeamRepositoriesAdapter extends RecyclerView.Adapter<Or
 			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);
+			// addRepoButtonAdd.setVisibility(View.VISIBLE);
+			// addRepoButtonRemove.setVisibility(View.GONE);
 
-			new Handler(Looper.getMainLooper()).postDelayed(OrganizationTeamRepositoriesAdapter.this::getTeamRepos, 200);
+			new Handler(Looper.getMainLooper())
+					.postDelayed(OrganizationTeamRepositoriesAdapter.this::getTeamRepos, 200);
 
-			new Handler(Looper.getMainLooper()).postDelayed(() -> {
+			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);
 
-				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));
 
-			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));
+			addRepoButtonRemove.setOnClickListener(
+					v ->
+							AlertDialogs.removeRepoDialog(
+									context,
+									orgName,
+									repoInfo.getName(),
+									Integer.parseInt(String.valueOf(teamId)),
+									teamName));
 		}
-
 	}
 
-	@NonNull
-	@Override
-	public OrganizationTeamRepositoriesAdapter.TeamReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_collaborators_search, parent, false);
+	@NonNull @Override
+	public OrganizationTeamRepositoriesAdapter.TeamReposViewHolder onCreateViewHolder(
+			@NonNull ViewGroup parent, int viewType) {
+		View v =
+				LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.list_collaborators_search, parent, false);
 		return new OrganizationTeamRepositoriesAdapter.TeamReposViewHolder(v);
 	}
 
 	@Override
-	public void onBindViewHolder(@NonNull final OrganizationTeamRepositoriesAdapter.TeamReposViewHolder holder, int position) {
+	public void onBindViewHolder(
+			@NonNull final OrganizationTeamRepositoriesAdapter.TeamReposViewHolder holder,
+			int position) {
 
 		Repository currentItem = reposList.get(position);
 		holder.repoInfo = currentItem;
@@ -110,17 +129,33 @@ public class OrganizationTeamRepositoriesAdapter extends RecyclerView.Adapter<Or
 
 		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()), 14);
+		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()),
+								14);
 
-		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);
-		}
-		else {
+		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);
+		} else {
 			holder.repoAvatar.setImageDrawable(drawable);
 		}
-
 	}
 
 	@Override
@@ -130,26 +165,31 @@ public class OrganizationTeamRepositoriesAdapter extends RecyclerView.Adapter<Or
 
 	private void getTeamRepos() {
 
-		if(getItemCount() > 0) {
-			Call<List<Repository>> call = RetrofitClient.getApiInterface(context).orgListTeamRepos((long) teamId, 1, 50);
+		if (getItemCount() > 0) {
+			Call<List<Repository>> call =
+					RetrofitClient.getApiInterface(context).orgListTeamRepos((long) teamId, 1, 50);
 
-			call.enqueue(new Callback<>() {
-				@Override
-				public void onResponse(@NonNull Call<List<Repository>> call, @NonNull Response<List<Repository>> response) {
+			call.enqueue(
+					new Callback<>() {
+						@Override
+						public void onResponse(
+								@NonNull Call<List<Repository>> call,
+								@NonNull Response<List<Repository>> response) {
 
-					if(response.code() == 200) {
+							if (response.code() == 200) {
 
-						for(int i = 0; i < Objects.requireNonNull(response.body()).size(); i++) {
-							reposArr.addAll(response.body());
+								for (int i = 0;
+										i < Objects.requireNonNull(response.body()).size();
+										i++) {
+									reposArr.addAll(response.body());
+								}
+							}
 						}
-					}
-				}
 
-				@Override
-				public void onFailure(@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
-				}
-			});
+						@Override
+						public void onFailure(
+								@NonNull Call<List<Repository>> call, @NonNull Throwable t) {}
+					});
 		}
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamsAdapter.java
index 73affc6f..1e6f143f 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamsAdapter.java
@@ -12,15 +12,15 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.gitnex.tea4j.v2.models.OrganizationPermissions;
 import org.gitnex.tea4j.v2.models.Team;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OrganizationTeamInfoActivity;
 import org.mian.gitnex.clients.RetrofitClient;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -28,8 +28,9 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
-public class OrganizationTeamsAdapter extends RecyclerView.Adapter<OrganizationTeamsAdapter.OrgTeamsViewHolder> implements Filterable {
+public class OrganizationTeamsAdapter
+		extends RecyclerView.Adapter<OrganizationTeamsAdapter.OrgTeamsViewHolder>
+		implements Filterable {
 
 	private final List<Team> teamList;
 	private final Context context;
@@ -62,23 +63,28 @@ public class OrganizationTeamsAdapter extends RecyclerView.Adapter<OrganizationT
 			userInfos = new ArrayList<>();
 			adapter = new OrganizationTeamMembersPreviewAdapter(itemView.getContext(), userInfos);
 
-			membersPreview.setLayoutManager(new LinearLayoutManager(itemView.getContext(), RecyclerView.HORIZONTAL, false));
+			membersPreview.setLayoutManager(
+					new LinearLayoutManager(itemView.getContext(), RecyclerView.HORIZONTAL, false));
 			membersPreview.setAdapter(adapter);
 
-			itemView.setOnClickListener(v -> {
-				Context context = v.getContext();
+			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);
-			});
+						Intent intent = new Intent(context, OrganizationTeamInfoActivity.class);
+						intent.putExtra("team", team);
+						intent.putExtra("permissions", permissions);
+						intent.putExtra("orgName", orgName);
+						context.startActivity(intent);
+					});
 		}
-
 	}
 
-	public OrganizationTeamsAdapter(Context ctx, List<Team> teamListMain, OrganizationPermissions permissions, String orgName) {
+	public OrganizationTeamsAdapter(
+			Context ctx,
+			List<Team> teamListMain,
+			OrganizationPermissions permissions,
+			String orgName) {
 		this.context = ctx;
 		this.teamList = teamListMain;
 		this.permissions = permissions;
@@ -86,15 +92,18 @@ public class OrganizationTeamsAdapter extends RecyclerView.Adapter<OrganizationT
 		this.orgName = orgName;
 	}
 
-	@NonNull
-	@Override
-	public OrganizationTeamsAdapter.OrgTeamsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_organization_teams, parent, false);
+	@NonNull @Override
+	public OrganizationTeamsAdapter.OrgTeamsViewHolder onCreateViewHolder(
+			@NonNull ViewGroup parent, int viewType) {
+		View v =
+				LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.list_organization_teams, parent, false);
 		return new OrganizationTeamsAdapter.OrgTeamsViewHolder(v);
 	}
 
 	@Override
-	public void onBindViewHolder(@NonNull OrganizationTeamsAdapter.OrgTeamsViewHolder holder, int position) {
+	public void onBindViewHolder(
+			@NonNull OrganizationTeamsAdapter.OrgTeamsViewHolder holder, int position) {
 
 		Team currentItem = teamList.get(position);
 
@@ -107,28 +116,37 @@ public class OrganizationTeamsAdapter extends RecyclerView.Adapter<OrganizationT
 		holder.userInfos.clear();
 		holder.adapter.notifyDataSetChanged();
 
-		RetrofitClient.getApiInterface(context).orgListTeamMembers(currentItem.getId(), null, null).enqueue(new Callback<List<User>>() {
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
-				if(response.isSuccessful() && response.body() != null && response.body().size() > 0) {
+		RetrofitClient.getApiInterface(context)
+				.orgListTeamMembers(currentItem.getId(), null, null)
+				.enqueue(
+						new Callback<List<User>>() {
+							@Override
+							public void onResponse(
+									@NonNull Call<List<User>> call,
+									@NonNull Response<List<User>> response) {
+								if (response.isSuccessful()
+										&& response.body() != null
+										&& response.body().size() > 0) {
 
-					holder.membersPreviewFrame.setVisibility(View.VISIBLE);
-					holder.userInfos.addAll(response.body().stream().limit(Math.min(response.body().size(), 6)).collect(Collectors.toList()));
+									holder.membersPreviewFrame.setVisibility(View.VISIBLE);
+									holder.userInfos.addAll(
+											response.body().stream()
+													.limit(Math.min(response.body().size(), 6))
+													.collect(Collectors.toList()));
 
-					holder.adapter.notifyDataSetChanged();
-				}
-			}
+									holder.adapter.notifyDataSetChanged();
+								}
+							}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
-			}
-		});
+							@Override
+							public void onFailure(
+									@NonNull Call<List<User>> call, @NonNull Throwable t) {}
+						});
 
-		if(currentItem.getDescription() != null && !currentItem.getDescription().isEmpty()) {
+		if (currentItem.getDescription() != null && !currentItem.getDescription().isEmpty()) {
 			holder.teamDescription.setVisibility(View.VISIBLE);
 			holder.teamDescription.setText(currentItem.getDescription());
-		}
-		else {
+		} else {
 			holder.teamDescription.setVisibility(View.GONE);
 			holder.teamDescription.setText("");
 		}
@@ -144,36 +162,38 @@ public class OrganizationTeamsAdapter extends RecyclerView.Adapter<OrganizationT
 		return orgTeamsFilter;
 	}
 
-	private final Filter orgTeamsFilter = new Filter() {
-		@Override
-		protected FilterResults performFiltering(CharSequence constraint) {
-			List<Team> filteredList = new ArrayList<>();
+	private final Filter orgTeamsFilter =
+			new Filter() {
+				@Override
+				protected FilterResults performFiltering(CharSequence constraint) {
+					List<Team> filteredList = new ArrayList<>();
 
-			if(constraint == null || constraint.length() == 0) {
-				filteredList.addAll(teamListFull);
-			}
-			else {
-				String filterPattern = constraint.toString().toLowerCase().trim();
+					if (constraint == null || constraint.length() == 0) {
+						filteredList.addAll(teamListFull);
+					} else {
+						String filterPattern = constraint.toString().toLowerCase().trim();
 
-				for(Team item : teamListFull) {
-					if(item.getName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
-						filteredList.add(item);
+						for (Team item : teamListFull) {
+							if (item.getName().toLowerCase().contains(filterPattern)
+									|| item.getDescription()
+											.toLowerCase()
+											.contains(filterPattern)) {
+								filteredList.add(item);
+							}
+						}
 					}
+
+					FilterResults results = new FilterResults();
+					results.values = filteredList;
+
+					return results;
 				}
-			}
-
-			FilterResults results = new FilterResults();
-			results.values = filteredList;
-
-			return results;
-		}
-
-		@Override
-		protected void publishResults(CharSequence constraint, FilterResults results) {
-			teamList.clear();
-			teamList.addAll((List<Team>) results.values);
-			notifyDataSetChanged();
-		}
-	};
 
+				@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/OrganizationsListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
index c7f7d0c4..dff86717 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
@@ -12,62 +12,65 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Organization;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OrganizationDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
-public class OrganizationsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable {
+public class OrganizationsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+		implements Filterable {
 
 	private final Context context;
 	private final List<Organization> orgListFull;
 	private List<Organization> orgList;
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
-	private final Filter orgFilter = new Filter() {
+	private final Filter orgFilter =
+			new Filter() {
 
-		@Override
-		protected FilterResults performFiltering(CharSequence constraint) {
+				@Override
+				protected FilterResults performFiltering(CharSequence constraint) {
 
-			List<Organization> filteredList = new ArrayList<>();
+					List<Organization> filteredList = new ArrayList<>();
 
-			if(constraint == null || constraint.length() == 0) {
+					if (constraint == null || constraint.length() == 0) {
 
-				filteredList.addAll(orgListFull);
-			}
-			else {
+						filteredList.addAll(orgListFull);
+					} else {
 
-				String filterPattern = constraint.toString().toLowerCase().trim();
+						String filterPattern = constraint.toString().toLowerCase().trim();
 
-				for(Organization item : orgListFull) {
-					if(item.getUsername().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
-						filteredList.add(item);
+						for (Organization item : orgListFull) {
+							if (item.getUsername().toLowerCase().contains(filterPattern)
+									|| item.getDescription()
+											.toLowerCase()
+											.contains(filterPattern)) {
+								filteredList.add(item);
+							}
+						}
 					}
+
+					FilterResults results = new FilterResults();
+					results.values = filteredList;
+
+					return results;
 				}
-			}
 
-			FilterResults results = new FilterResults();
-			results.values = filteredList;
+				@Override
+				protected void publishResults(CharSequence constraint, FilterResults results) {
 
-			return results;
-		}
-
-		@Override
-		protected void publishResults(CharSequence constraint, FilterResults results) {
-
-			orgList.clear();
-			orgList.addAll((List) results.values);
-			notifyDataChanged();
-		}
-	};
+					orgList.clear();
+					orgList.addAll((List) results.values);
+					notifyDataChanged();
+				}
+			};
 
 	public OrganizationsListAdapter(Context ctx, List<Organization> orgListMain) {
 		this.context = ctx;
@@ -75,16 +78,19 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<RecyclerView.
 		orgListFull = new ArrayList<>(orgList);
 	}
 
-	@NonNull
-	@Override
+	@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));
+		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) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.onLoadMore();
 		}
@@ -104,7 +110,7 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<RecyclerView.
 
 	public void setMoreDataAvailable(boolean moreDataAvailable) {
 		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
+		if (!isMoreDataAvailable) {
 			loadMoreListener.onLoadFinished();
 		}
 	}
@@ -134,9 +140,7 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<RecyclerView.
 
 		protected abstract void onLoadMore();
 
-		public void onLoadFinished() {
-		}
-
+		public void onLoadFinished() {}
 	}
 
 	class OrgHolder extends RecyclerView.ViewHolder {
@@ -153,12 +157,13 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<RecyclerView.
 			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);
-			});
+			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) {
@@ -168,17 +173,21 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<RecyclerView.
 			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);
+			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("")) {
+			if (!org.getDescription().equals("")) {
 				orgDescription.setVisibility(View.VISIBLE);
 				orgDescription.setText(org.getDescription());
-			}
-			else {
+			} 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 204e48a4..61cdefc7 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
@@ -21,6 +21,8 @@ import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.vdurmont.emoji.EmojiParser;
+import java.util.List;
+import java.util.Locale;
 import org.gitnex.tea4j.v2.models.PullRequest;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
@@ -35,13 +37,10 @@ import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.IssueContext;
-import java.util.List;
-import java.util.Locale;
 
 /**
  * @author M M Arif
  */
-
 public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
@@ -54,17 +53,20 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 		this.prList = prListMain;
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		LayoutInflater inflater = LayoutInflater.from(context);
-		return new PullRequestsAdapter.PullRequestsHolder(inflater.inflate(R.layout.list_pr, parent, false));
+		return new PullRequestsAdapter.PullRequestsHolder(
+				inflater.inflate(R.layout.list_pr, parent, false));
 	}
 
 	@Override
 	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.run();
 		}
@@ -126,30 +128,51 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 			frameLabelsDots = itemView.findViewById(R.id.frameLabelsDots);
 			commentIcon = itemView.findViewById(R.id.comment_icon);
 
-			View.OnClickListener openPr = v -> {
-				Intent intentPrDetail = new IssueContext(pullRequestObject, ((RepoDetailActivity) context).repository).getIntent(context, IssueDetailActivity.class);
-				context.startActivity(intentPrDetail);
-			};
+			View.OnClickListener openPr =
+					v -> {
+						Intent intentPrDetail =
+								new IssueContext(
+												pullRequestObject,
+												((RepoDetailActivity) context).repository)
+										.getIntent(context, IssueDetailActivity.class);
+						context.startActivity(intentPrDetail);
+					};
 
 			itemView.setOnClickListener(openPr);
 			frameLabels.setOnClickListener(openPr);
 			frameLabelsDots.setOnClickListener(openPr);
 
-			new Handler().postDelayed(() -> {
-				if(!AppUtil.checkGhostUsers(pullRequestObject.getUser().getLogin())) {
+			new Handler()
+					.postDelayed(
+							() -> {
+								if (!AppUtil.checkGhostUsers(
+										pullRequestObject.getUser().getLogin())) {
 
-					assigneeAvatar.setOnClickListener(v -> {
-						Intent intent = new Intent(context, ProfileActivity.class);
-						intent.putExtra("username", pullRequestObject.getUser().getLogin());
-						context.startActivity(intent);
-					});
+									assigneeAvatar.setOnClickListener(
+											v -> {
+												Intent intent =
+														new Intent(context, ProfileActivity.class);
+												intent.putExtra(
+														"username",
+														pullRequestObject.getUser().getLogin());
+												context.startActivity(intent);
+											});
 
-					assigneeAvatar.setOnLongClickListener(loginId -> {
-						AppUtil.copyToClipboard(context, pullRequestObject.getUser().getLogin(), context.getString(R.string.copyLoginIdToClipBoard, pullRequestObject.getUser().getLogin()));
-						return true;
-					});
-				}
-			}, 500);
+									assigneeAvatar.setOnLongClickListener(
+											loginId -> {
+												AppUtil.copyToClipboard(
+														context,
+														pullRequestObject.getUser().getLogin(),
+														context.getString(
+																R.string.copyLoginIdToClipBoard,
+																pullRequestObject
+																		.getUser()
+																		.getLogin()));
+												return true;
+											});
+								}
+							},
+							500);
 		}
 
 		@SuppressLint("SetTextI18n")
@@ -160,23 +183,32 @@ 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) {
+			if (pullRequest.getLabels() != null) {
 
-				if(!tinyDb.getBoolean("showLabelsInList", false)) { // default
+				if (!tinyDb.getBoolean("showLabelsInList", false)) { // default
 
 					labelsScrollViewWithText.setVisibility(View.GONE);
 					labelsScrollViewDots.setVisibility(View.VISIBLE);
 					frameLabelsDots.removeAllViews();
 
-					for(int i = 0; i < pullRequest.getLabels().size(); i++) {
+					for (int i = 0; i < pullRequest.getLabels().size(); i++) {
 
 						String labelColor = pullRequest.getLabels().get(i).getColor();
 						int color = Color.parseColor("#" + labelColor);
@@ -186,19 +218,25 @@ 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);
 					}
-				}
-				else {
+				} else {
 
 					labelsScrollViewDots.setVisibility(View.GONE);
 					labelsScrollViewWithText.setVisibility(View.VISIBLE);
 					frameLabels.removeAllViews();
 
-					for(int i = 0; i < pullRequest.getLabels().size(); i++) {
+					for (int i = 0; i < pullRequest.getLabels().size(); i++) {
 
 						String labelColor = pullRequest.getLabels().get(i).getColor();
 						String labelName = pullRequest.getLabels().get(i).getName();
@@ -212,9 +250,24 @@ 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()
-							.buildRoundRect(labelName, color, AppUtil.getPixelsFromDensity(context, 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(context, 8)))
+										.height(height)
+										.endConfig()
+										.buildRoundRect(
+												labelName,
+												color,
+												AppUtil.getPixelsFromDensity(context, 18));
 
 						labelsView.setImageDrawable(drawable);
 						frameLabels.addView(labelsView);
@@ -222,22 +275,37 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 				}
 			}
 
-			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));
+			this.prCreatedTime.setText(
+					TimeHelper.formatTime(pullRequest.getCreatedAt(), locale, timeFormat, context));
 
-			if(pullRequest.getComments() > 15) {
-				commentIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_flame));
-				commentIcon.setColorFilter(context.getResources().getColor(R.color.releasePre, null));
+			if (pullRequest.getComments() > 15) {
+				commentIcon.setImageDrawable(
+						ContextCompat.getDrawable(context, R.drawable.ic_flame));
+				commentIcon.setColorFilter(
+						context.getResources().getColor(R.color.releasePre, null));
 			}
 
-			if(timeFormat.equals("pretty")) {
-				this.prCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(pullRequest.getCreatedAt()), context));
+			if (timeFormat.equals("pretty")) {
+				this.prCreatedTime.setOnClickListener(
+						new ClickListener(
+								TimeHelper.customDateFormatForToastDateFormat(
+										pullRequest.getCreatedAt()),
+								context));
 			}
 		}
-
 	}
-
 }
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 972bd230..f4039163 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReactionAuthorsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReactionAuthorsAdapter.java
@@ -8,18 +8,18 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.List;
 
 /**
  * @author opyale
  */
-
-public class ReactionAuthorsAdapter extends RecyclerView.Adapter<ReactionAuthorsAdapter.ViewHolder> {
+public class ReactionAuthorsAdapter
+		extends RecyclerView.Adapter<ReactionAuthorsAdapter.ViewHolder> {
 
 	private final Context context;
 	private final List<User> userInfos;
@@ -29,23 +29,29 @@ public class ReactionAuthorsAdapter extends RecyclerView.Adapter<ReactionAuthors
 		this.userInfos = userInfos;
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		return new ViewHolder(LayoutInflater.from(context).inflate(R.layout.list_reaction_authors, parent, false));
+		return new ViewHolder(
+				LayoutInflater.from(context)
+						.inflate(R.layout.list_reaction_authors, parent, false));
 	}
 
 	@Override
 	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()) {
+		if (userInfo.getFullName() == null || userInfo.getFullName().isEmpty()) {
 			holder.authorFullName.setVisibility(View.GONE);
-		}
-		else {
+		} else {
 			holder.authorFullName.setText(userInfo.getFullName());
 			holder.authorFullName.setVisibility(View.VISIBLE);
 		}
@@ -72,7 +78,5 @@ public class ReactionAuthorsAdapter extends RecyclerView.Adapter<ReactionAuthors
 			authorFullName = itemView.findViewById(R.id.authorFullName);
 			authorLogin = itemView.findViewById(R.id.authorLogin);
 		}
-
 	}
-
 }
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 8b03190d..0d544ae1 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
@@ -15,6 +15,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.List;
+import java.util.Locale;
 import org.gitnex.tea4j.v2.models.Release;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.MainActivity;
@@ -31,8 +33,6 @@ import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.structs.FragmentRefreshListener;
-import java.util.List;
-import java.util.Locale;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -40,7 +40,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.ReleasesViewHolder> {
 
 	private final Context context;
@@ -52,7 +51,13 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
-	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;
@@ -61,10 +66,12 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 		this.fragmentReleasesBinding = fragmentReleasesBinding;
 	}
 
-	@NonNull
-	@Override
-	public ReleasesAdapter.ReleasesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_releases, parent, false);
+	@NonNull @Override
+	public ReleasesAdapter.ReleasesViewHolder onCreateViewHolder(
+			@NonNull ViewGroup parent, int viewType) {
+		View v =
+				LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.list_releases, parent, false);
 		return new ReleasesAdapter.ReleasesViewHolder(v);
 	}
 
@@ -81,72 +88,88 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 
 		holder.releaseName.setText(currentItem.getName());
 
-		if(currentItem.isPrerelease()) {
+		if (currentItem.isPrerelease()) {
 			holder.releaseType.setBackgroundResource(R.drawable.shape_pre_release);
 			holder.releaseType.setText(R.string.releaseTypePre);
-		}
-		else if(currentItem.isDraft()) {
+		} else if (currentItem.isDraft()) {
 			holder.releaseType.setBackgroundResource(R.drawable.shape_draft_release);
 			holder.releaseType.setText(R.string.releaseDraftText);
-		}
-		else {
+		} else {
 			holder.releaseType.setBackgroundResource(R.drawable.shape_stable_release);
 			holder.releaseType.setText(R.string.releaseTypeStable);
 		}
 
-		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);
+		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);
 		}
 
-		holder.authorName.setText(context.getResources().getString(R.string.releasePublishedBy, currentItem.getAuthor().getLogin()));
+		holder.authorName.setText(
+				context.getResources()
+						.getString(
+								R.string.releasePublishedBy, currentItem.getAuthor().getLogin()));
 
-		if(currentItem.getTagName() != null) {
+		if (currentItem.getTagName() != null) {
 			holder.releaseTag.setText(currentItem.getTagName());
 		}
 
-		if(currentItem.getPublishedAt() != null) {
-			holder.releaseDate.setText(TimeHelper.formatTime(currentItem.getPublishedAt(), locale, timeFormat, context));
+		if (currentItem.getPublishedAt() != null) {
+			holder.releaseDate.setText(
+					TimeHelper.formatTime(
+							currentItem.getPublishedAt(), locale, timeFormat, context));
 		}
 
-		if(timeFormat.equals("pretty")) {
-			holder.releaseDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getPublishedAt()), context));
+		if (timeFormat.equals("pretty")) {
+			holder.releaseDate.setOnClickListener(
+					new ClickListener(
+							TimeHelper.customDateFormatForToastDateFormat(
+									currentItem.getPublishedAt()),
+							context));
 		}
 
-		if(!currentItem.getBody().equals("")) {
+		if (!currentItem.getBody().equals("")) {
 			Markdown.render(context, currentItem.getBody(), holder.releaseBodyContent);
-		}
-		else {
+		} else {
 			holder.releaseBodyContent.setText(R.string.noReleaseBodyContent);
 		}
 
-		holder.downloadCopyFrame.setOnClickListener(v -> {
+		holder.downloadCopyFrame.setOnClickListener(
+				v -> {
+					if (holder.downloads.getVisibility() == View.GONE) {
 
-			if(holder.downloads.getVisibility() == View.GONE) {
+						holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_down);
+						holder.downloads.setVisibility(View.VISIBLE);
+					} else {
 
-				holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_down);
-				holder.downloads.setVisibility(View.VISIBLE);
-			}
-			else {
+						holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_right);
+						holder.downloads.setVisibility(View.GONE);
+					}
+				});
 
-				holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_right);
-				holder.downloads.setVisibility(View.GONE);
-			}
+		holder.releaseZipDownloadFrame.setOnClickListener(
+				v -> startDownload.onRefresh(currentItem.getZipballUrl()));
+		holder.releaseTarDownloadFrame.setOnClickListener(
+				v -> startDownload.onRefresh(currentItem.getTarballUrl()));
 
-		});
-
-		holder.releaseZipDownloadFrame.setOnClickListener(v -> startDownload.onRefresh(currentItem.getZipballUrl()));
-		holder.releaseTarDownloadFrame.setOnClickListener(v -> startDownload.onRefresh(currentItem.getTarballUrl()));
-
-		ReleasesDownloadsAdapter adapter = new ReleasesDownloadsAdapter(currentItem.getAssets(), startDownload);
+		ReleasesDownloadsAdapter adapter =
+				new ReleasesDownloadsAdapter(currentItem.getAssets(), startDownload);
 		holder.downloadList.setAdapter(adapter);
 
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.onLoadMore();
 		}
 
-		if(!((RepoDetailActivity) context).repository.getPermissions().isPush()) {
+		if (!((RepoDetailActivity) context).repository.getPermissions().isPush()) {
 			holder.optionsMenu.setVisibility(View.GONE);
 		}
 	}
@@ -158,7 +181,7 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 
 	public void setMoreDataAvailable(boolean moreDataAvailable) {
 		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
+		if (!isMoreDataAvailable) {
 			loadMoreListener.onLoadFinished();
 		}
 	}
@@ -185,38 +208,76 @@ 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) {
 
-		MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		MaterialAlertDialogBuilder materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(
+						context, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
-		materialAlertDialogBuilder.setTitle(String.format(context.getString(R.string.deleteGenericTitle), releaseName)).setMessage(R.string.deleteReleaseConfirmation)
-			.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> RetrofitClient.getApiInterface(context).repoDeleteRelease(owner, repo, releaseId).enqueue(new Callback<>() {
+		materialAlertDialogBuilder
+				.setTitle(
+						String.format(context.getString(R.string.deleteGenericTitle), releaseName))
+				.setMessage(R.string.deleteReleaseConfirmation)
+				.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);
+															}
+														} 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) {
+													@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();
+														Toasty.error(
+																context,
+																context.getString(
+																		R.string.genericError));
+													}
+												}))
+				.setNeutralButton(R.string.cancelButton, null)
+				.show();
 	}
 
 	public interface OnLoadMoreListener {
@@ -224,7 +285,6 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 		void onLoadMore();
 
 		void onLoadFinished();
-
 	}
 
 	protected class ReleasesViewHolder extends RecyclerView.ViewHolder {
@@ -268,37 +328,55 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 			downloadList.setHasFixedSize(true);
 			downloadList.setLayoutManager(new LinearLayoutManager(itemView.getContext()));
 
-			new Handler().postDelayed(() -> {
-				if(!AppUtil.checkGhostUsers(releases.getAuthor().getLogin())) {
+			new Handler()
+					.postDelayed(
+							() -> {
+								if (!AppUtil.checkGhostUsers(releases.getAuthor().getLogin())) {
 
-					authorAvatar.setOnClickListener(loginId -> {
-						Context context = loginId.getContext();
+									authorAvatar.setOnClickListener(
+											loginId -> {
+												Context context = loginId.getContext();
 
-						Intent intent = new Intent(context, ProfileActivity.class);
-						intent.putExtra("username", releases.getAuthor().getLogin());
-						context.startActivity(intent);
+												Intent intent =
+														new Intent(context, ProfileActivity.class);
+												intent.putExtra(
+														"username",
+														releases.getAuthor().getLogin());
+												context.startActivity(intent);
+											});
+								}
+							},
+							500);
+
+			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();
+								});
 					});
-				}
-			}, 500);
-
-			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 ae4d9264..a472dff3 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesDownloadsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReleasesDownloadsAdapter.java
@@ -6,43 +6,47 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Attachment;
 import org.mian.gitnex.R;
 import org.mian.gitnex.structs.FragmentRefreshListener;
-import java.util.List;
 
 /**
  * @author M M Arif
- **/
-
-public class ReleasesDownloadsAdapter extends RecyclerView.Adapter<ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder> {
+ */
+public class ReleasesDownloadsAdapter
+		extends RecyclerView.Adapter<ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder> {
 
 	private final List<Attachment> releasesDownloadsList;
 	private final FragmentRefreshListener startDownload;
 
-	ReleasesDownloadsAdapter(List<Attachment> releasesDownloadsMain, FragmentRefreshListener startDownload) {
+	ReleasesDownloadsAdapter(
+			List<Attachment> releasesDownloadsMain, FragmentRefreshListener startDownload) {
 
 		this.releasesDownloadsList = releasesDownloadsMain;
 		this.startDownload = startDownload;
 	}
 
-	@NonNull
-	@Override
-	public ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_releases_downloads, parent, false);
+	@NonNull @Override
+	public ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder onCreateViewHolder(
+			@NonNull ViewGroup parent, int viewType) {
+		View v =
+				LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.list_releases_downloads, parent, false);
 		return new ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder(v);
 	}
 
 	@Override
-	public void onBindViewHolder(@NonNull ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder holder, int position) {
+	public void onBindViewHolder(
+			@NonNull ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder holder, int position) {
 
 		Attachment currentItem = releasesDownloadsList.get(position);
 
-		if(currentItem.getName() != null) {
+		if (currentItem.getName() != null) {
 
 			holder.downloadName.setText(currentItem.getName());
-			holder.downloadName.setOnClickListener(v -> startDownload.onRefresh(currentItem.getBrowserDownloadUrl()));
-
+			holder.downloadName.setOnClickListener(
+					v -> startDownload.onRefresh(currentItem.getBrowserDownloadUrl()));
 		}
 	}
 
@@ -60,7 +64,5 @@ public class ReleasesDownloadsAdapter extends RecyclerView.Adapter<ReleasesDownl
 			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 56aa45b8..db64650e 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java
@@ -14,6 +14,10 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Locale;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
@@ -24,15 +28,10 @@ import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.Locale;
 
 /**
  * @author M M Arif
  */
-
 public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
@@ -41,23 +40,27 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 	private boolean isLoading = false;
 	private boolean isMoreDataAvailable = true;
 
-	public RepoForksAdapter(Context ctx, List<org.gitnex.tea4j.v2.models.Repository> forksListMain) {
+	public RepoForksAdapter(
+			Context ctx, List<org.gitnex.tea4j.v2.models.Repository> forksListMain) {
 
 		this.context = ctx;
 		this.forksList = forksListMain;
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		LayoutInflater inflater = LayoutInflater.from(context);
-		return new RepoForksAdapter.ForksHolder(inflater.inflate(R.layout.list_repositories, parent, false));
+		return new RepoForksAdapter.ForksHolder(
+				inflater.inflate(R.layout.list_repositories, parent, false));
 	}
 
 	@Override
 	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.run();
 		}
@@ -133,74 +136,104 @@ 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);
-				}
-				else {
+			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);
+				} else {
 					image.setImageDrawable(drawable);
 				}
-			}
-			else {
+			} else {
 				image.setImageDrawable(drawable);
 			}
 
-			if(forksModel.getUpdatedAt() != null) {
+			if (forksModel.getUpdatedAt() != null) {
 
-				switch(timeFormat) {
-					case "pretty": {
-						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));
-						break;
-					}
-					case "normal": {
-						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);
-						String createdTime = formatter.format(forksModel.getUpdatedAt());
-						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						break;
-					}
+				switch (timeFormat) {
+					case "pretty":
+						{
+							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));
+							break;
+						}
+					case "normal":
+						{
+							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);
+							String createdTime = formatter.format(forksModel.getUpdatedAt());
+							repoLastUpdated.setText(
+									context.getString(R.string.lastUpdatedAt, createdTime));
+							break;
+						}
 				}
-			}
-			else {
+			} else {
 				repoLastUpdated.setVisibility(View.GONE);
 			}
 
-			if(!forksModel.getDescription().equals("")) {
+			if (!forksModel.getDescription().equals("")) {
 				repoDescription.setText(forksModel.getDescription());
-			}
-			else {
+			} else {
 				repoDescription.setText(context.getString(R.string.noDataDescription));
 			}
 
-			if(isRepoAdmin == null) {
+			if (isRepoAdmin == null) {
 				isRepoAdmin = new CheckBox(context);
 			}
 			isRepoAdmin.setChecked(forksModel.getPermissions().isAdmin());
 
-			itemView.setOnClickListener(v -> {
+			itemView.setOnClickListener(
+					v -> {
+						Context context = v.getContext();
 
-				Context context = v.getContext();
+						RepositoryContext repo = new RepositoryContext(userRepositories, context);
+						repo.saveToDB(context);
+						Intent intent = repo.getIntent(context, RepoDetailActivity.class);
 
-				RepositoryContext repo = new RepositoryContext(userRepositories, context);
-				repo.saveToDB(context);
-				Intent intent = repo.getIntent(context, RepoDetailActivity.class);
-
-				context.startActivity(intent);
-
-			});
+						context.startActivity(intent);
+					});
 		}
-
 	}
-
 }
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 218221b2..362ee3ca 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@@ -16,6 +16,11 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
@@ -26,17 +31,12 @@ import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
 
 /**
  * @author M M Arif
  */
-
-public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable {
+public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+		implements Filterable {
 
 	private final Context context;
 	private final List<org.gitnex.tea4j.v2.models.Repository> reposListFull;
@@ -45,58 +45,65 @@ public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 	private List<org.gitnex.tea4j.v2.models.Repository> reposList;
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
-	private final Filter reposFilter = new Filter() {
+	private final Filter reposFilter =
+			new Filter() {
 
-		@Override
-		protected FilterResults performFiltering(CharSequence constraint) {
+				@Override
+				protected FilterResults performFiltering(CharSequence constraint) {
 
-			List<org.gitnex.tea4j.v2.models.Repository> filteredList = new ArrayList<>();
+					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();
+					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);
+						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;
 				}
-			}
 
-			FilterResults results = new FilterResults();
-			results.values = filteredList;
+				@Override
+				protected void publishResults(CharSequence constraint, FilterResults results) {
 
-			return results;
-		}
+					reposList.clear();
+					reposList.addAll((List) results.values);
+					notifyDataChanged();
+				}
+			};
 
-		@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) {
+	public ReposListAdapter(
+			List<org.gitnex.tea4j.v2.models.Repository> reposListMain, Context ctx) {
 		this.context = ctx;
 		this.reposList = reposListMain;
 		reposListFull = new ArrayList<>(reposList);
 		this.tinyDb = TinyDB.getInstance(context);
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		LayoutInflater inflater = LayoutInflater.from(context);
-		return new ReposListAdapter.ReposHolder(inflater.inflate(R.layout.list_repositories, parent, false));
+		return new ReposListAdapter.ReposHolder(
+				inflater.inflate(R.layout.list_repositories, parent, false));
 	}
 
 	@Override
 	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.onLoadMore();
 		}
@@ -116,7 +123,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 
 	public void setMoreDataAvailable(boolean moreDataAvailable) {
 		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
+		if (!isMoreDataAvailable) {
 			loadMoreListener.onLoadFinished();
 		}
 	}
@@ -147,7 +154,6 @@ public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 		void onLoadMore();
 
 		void onLoadFinished();
-
 	}
 
 	class ReposHolder extends RecyclerView.ViewHolder {
@@ -174,16 +180,17 @@ public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 			repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
 			spacerView = itemView.findViewById(R.id.spacerView);
 
-			itemView.setOnClickListener(v -> {
-				Context context = v.getContext();
-				RepositoryContext repo = new RepositoryContext(userRepositories, context);
-				repo.saveToDB(context);
-				Intent intent = repo.getIntent(context, RepoDetailActivity.class);
-				if(isUserOrg) {
-					intent.putExtra("openedFromUserOrg", true);
-				}
-				context.startActivity(intent);
-			});
+			itemView.setOnClickListener(
+					v -> {
+						Context context = v.getContext();
+						RepositoryContext repo = new RepositoryContext(userRepositories, context);
+						repo.saveToDB(context);
+						Intent intent = repo.getIntent(context, RepoDetailActivity.class);
+						if (isUserOrg) {
+							intent.putExtra("openedFromUserOrg", true);
+						}
+						context.startActivity(intent);
+					});
 		}
 
 		@SuppressLint("SetTextI18n")
@@ -202,65 +209,96 @@ 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, 14);
+			TextDrawable drawable =
+					TextDrawable.builder()
+							.beginConfig()
+							.useFont(Typeface.DEFAULT)
+							.fontSize(18)
+							.toUpperCase()
+							.width(28)
+							.height(28)
+							.endConfig()
+							.buildRoundRect(firstCharacter, color, 14);
 
-			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);
-				}
-				else {
+			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);
+				} else {
 					image.setImageDrawable(drawable);
 				}
-			}
-			else {
+			} else {
 				image.setImageDrawable(drawable);
 			}
 
-			if(repositories.getUpdatedAt() != null) {
+			if (repositories.getUpdatedAt() != null) {
 
-				switch(timeFormat) {
-					case "pretty": {
-						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));
-						break;
-					}
-					case "normal": {
-						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);
-						String createdTime = formatter.format(repositories.getUpdatedAt());
-						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						break;
-					}
+				switch (timeFormat) {
+					case "pretty":
+						{
+							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));
+							break;
+						}
+					case "normal":
+						{
+							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);
+							String createdTime = formatter.format(repositories.getUpdatedAt());
+							repoLastUpdated.setText(
+									context.getString(R.string.lastUpdatedAt, createdTime));
+							break;
+						}
 				}
-			}
-			else {
+			} else {
 				repoLastUpdated.setVisibility(View.GONE);
 			}
 
-			if(!repositories.getDescription().equals("")) {
+			if (!repositories.getDescription().equals("")) {
 				repoDescription.setVisibility(View.VISIBLE);
 				repoDescription.setText(repositories.getDescription());
 				spacerView.setVisibility(View.GONE);
-			}
-			else {
+			} else {
 				repoDescription.setVisibility(View.GONE);
 				spacerView.setVisibility(View.VISIBLE);
 			}
 
-			if(isRepoAdmin == null) {
+			if (isRepoAdmin == null) {
 				isRepoAdmin = new CheckBox(context);
 			}
 			isRepoAdmin.setChecked(repositories.getPermissions().isAdmin());
 		}
-
 	}
-
 }
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 3d583778..763be3f7 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/TagsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/TagsAdapter.java
@@ -12,6 +12,7 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Tag;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
@@ -20,7 +21,6 @@ import org.mian.gitnex.databinding.FragmentReleasesBinding;
 import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.structs.FragmentRefreshListener;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -28,7 +28,6 @@ import retrofit2.Response;
 /**
  * @author qwerty287
  */
-
 public class TagsAdapter extends RecyclerView.Adapter<TagsAdapter.TagsViewHolder> {
 
 	private final Context context;
@@ -40,7 +39,13 @@ public class TagsAdapter extends RecyclerView.Adapter<TagsAdapter.TagsViewHolder
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
-	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;
@@ -49,10 +54,10 @@ public class TagsAdapter extends RecyclerView.Adapter<TagsAdapter.TagsViewHolder
 		this.fragmentReleasesBinding = fragmentReleasesBinding;
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public TagsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_tags, parent, false);
+		View v =
+				LayoutInflater.from(parent.getContext()).inflate(R.layout.list_tags, parent, false);
 		return new TagsViewHolder(v);
 	}
 
@@ -64,35 +69,38 @@ public class TagsAdapter extends RecyclerView.Adapter<TagsAdapter.TagsViewHolder
 
 		holder.tagName.setText(currentItem.getName());
 
-		if(!currentItem.getMessage().equals("")) {
+		if (!currentItem.getMessage().equals("")) {
 			Markdown.render(context, currentItem.getMessage(), holder.tagBody);
-		}
-		else {
+		} else {
 			holder.tagBody.setVisibility(View.GONE);
 		}
 
-		holder.downloadCopyFrame.setOnClickListener(v -> {
+		holder.downloadCopyFrame.setOnClickListener(
+				v -> {
+					if (holder.downloads.getVisibility() == View.GONE) {
 
-			if(holder.downloads.getVisibility() == View.GONE) {
+						holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_down);
+						holder.downloads.setVisibility(View.VISIBLE);
+					} else {
 
-				holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_down);
-				holder.downloads.setVisibility(View.VISIBLE);
-			}
-			else {
+						holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_right);
+						holder.downloads.setVisibility(View.GONE);
+					}
+				});
 
-				holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_right);
-				holder.downloads.setVisibility(View.GONE);
-			}
-		});
-
-		if(!((RepoDetailActivity) context).repository.getPermissions().isPush()) {
+		if (!((RepoDetailActivity) context).repository.getPermissions().isPush()) {
 			holder.options.setVisibility(View.GONE);
 		}
 
-		holder.releaseZipDownloadFrame.setOnClickListener(v -> startDownload.onRefresh(currentItem.getZipballUrl()));
-		holder.releaseTarDownloadFrame.setOnClickListener(v -> startDownload.onRefresh(currentItem.getTarballUrl()));
+		holder.releaseZipDownloadFrame.setOnClickListener(
+				v -> startDownload.onRefresh(currentItem.getZipballUrl()));
+		holder.releaseTarDownloadFrame.setOnClickListener(
+				v -> startDownload.onRefresh(currentItem.getTarballUrl()));
 
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.onLoadMore();
 		}
@@ -105,7 +113,7 @@ public class TagsAdapter extends RecyclerView.Adapter<TagsAdapter.TagsViewHolder
 
 	public void setMoreDataAvailable(boolean moreDataAvailable) {
 		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
+		if (!isMoreDataAvailable) {
 			loadMoreListener.onLoadFinished();
 		}
 	}
@@ -132,39 +140,83 @@ public class TagsAdapter extends RecyclerView.Adapter<TagsAdapter.TagsViewHolder
 		notifyItemRangeChanged(position, tags.size());
 	}
 
-	private void tagDeleteDialog(final Context context, final String tagName, final String owner, final String repo, int position) {
+	private void tagDeleteDialog(
+			final Context context,
+			final String tagName,
+			final String owner,
+			final String repo,
+			int position) {
 
-		MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context).setTitle(String.format(context.getString(R.string.deleteGenericTitle), tagName))
-			.setMessage(R.string.deleteTagConfirmation).setCancelable(false).setNeutralButton(R.string.cancelButton, null)
-			.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> RetrofitClient.getApiInterface(context).repoDeleteTag(owner, repo, tagName).enqueue(new Callback<>() {
+		MaterialAlertDialogBuilder materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(context)
+						.setTitle(
+								String.format(
+										context.getString(R.string.deleteGenericTitle), tagName))
+						.setMessage(R.string.deleteTagConfirmation)
+						.setCancelable(false)
+						.setNeutralButton(R.string.cancelButton, null)
+						.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);
+																	}
+																} 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));
+																}
+															}
 
-				@Override
-				public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+															@Override
+															public void onFailure(
+																	@NonNull Call<Void> call,
+																	@NonNull Throwable t) {
 
-					Toasty.error(context, context.getString(R.string.genericError));
-				}
-			})).setNeutralButton(R.string.cancelButton, null);
+																Toasty.error(
+																		context,
+																		context.getString(
+																				R.string
+																						.genericError));
+															}
+														}))
+						.setNeutralButton(R.string.cancelButton, null);
 
 		materialAlertDialogBuilder.create().show();
 	}
@@ -174,7 +226,6 @@ public class TagsAdapter extends RecyclerView.Adapter<TagsAdapter.TagsViewHolder
 		void onLoadMore();
 
 		void onLoadFinished();
-
 	}
 
 	protected class TagsViewHolder extends RecyclerView.ViewHolder {
@@ -202,24 +253,32 @@ public class TagsAdapter extends RecyclerView.Adapter<TagsAdapter.TagsViewHolder
 			downloadDropdownIcon = itemView.findViewById(R.id.downloadDropdownIcon);
 			options = itemView.findViewById(R.id.tagsOptionsMenu);
 
-			options.setOnClickListener(v -> {
-				final Context context = v.getContext();
+			options.setOnClickListener(
+					v -> {
+						final Context context = v.getContext();
 
-				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_tag_in_list, null);
+						@SuppressLint("InflateParams")
+						View view =
+								LayoutInflater.from(context)
+										.inflate(R.layout.bottom_sheet_tag_in_list, null);
 
-				TextView delete = view.findViewById(R.id.tagMenuDelete);
+						TextView delete = view.findViewById(R.id.tagMenuDelete);
 
-				BottomSheetDialog dialog = new BottomSheetDialog(context);
-				dialog.setContentView(view);
-				dialog.show();
+						BottomSheetDialog dialog = new BottomSheetDialog(context);
+						dialog.setContentView(view);
+						dialog.show();
 
-				delete.setOnClickListener(v1 -> {
-					tagDeleteDialog(context, tagsHolder.getName(), owner, repo, getBindingAdapterPosition());
-					dialog.dismiss();
-				});
-			});
+						delete.setOnClickListener(
+								v1 -> {
+									tagDeleteDialog(
+											context,
+											tagsHolder.getName(),
+											owner,
+											repo,
+											getBindingAdapterPosition());
+									dialog.dismiss();
+								});
+					});
 		}
-
 	}
-
 }
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 e978d036..6afe4475 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java
@@ -14,6 +14,9 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import io.mikael.urlbuilder.UrlBuilder;
+import java.util.List;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.NotificationCount;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.AddNewAccountActivity;
@@ -26,17 +29,14 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
-import java.util.Objects;
-import io.mikael.urlbuilder.UrlBuilder;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
-public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapter.UserAccountsViewHolder> {
+public class UserAccountsAdapter
+		extends RecyclerView.Adapter<UserAccountsAdapter.UserAccountsViewHolder> {
 
 	private final List<UserAccount> userAccountsList;
 	private final Context context;
@@ -46,7 +46,9 @@ 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();
+		this.userAccountsList =
+				Objects.requireNonNull(BaseApi.getInstance(context, UserAccountsApi.class))
+						.usersAccounts();
 		this.tinyDB = TinyDB.getInstance(context);
 	}
 
@@ -62,40 +64,53 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 
 		Call<NotificationCount> call = RetrofitClient.getApiInterface(context).notifyNewAvailable();
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<NotificationCount> call, @NonNull retrofit2.Response<NotificationCount> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<NotificationCount> call,
+							@NonNull retrofit2.Response<NotificationCount> response) {
 
-				NotificationCount notificationCount = response.body();
+						NotificationCount notificationCount = response.body();
 
-				if(response.code() == 200) {
+						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);
+							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) {
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<NotificationCount> call, @NonNull Throwable t) {}
+				});
 	}
 
-	@NonNull
-	@Override
-	public UserAccountsAdapter.UserAccountsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+	@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);
+		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) {
+	public void onBindViewHolder(
+			@NonNull UserAccountsAdapter.UserAccountsViewHolder holder, int position) {
 
 		UserAccount currentItem = userAccountsList.get(position);
 
@@ -105,22 +120,26 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 		holder.accountName = currentItem.getAccountName();
 
 		holder.userId.setText(currentItem.getUserName());
-		if(currentItem.isLoggedIn()) {
+		if (currentItem.isLoggedIn()) {
 			holder.accountUrl.setText(url);
-		}
-		else {
+		} else {
 			holder.accountUrl.setText(context.getString(R.string.notLoggedIn, url));
 		}
 
 		int imgRadius = AppUtil.getPixelsFromDensity(context, 60);
 
-		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);
+		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()) {
+		if (tinyDB.getInt("currentActiveAccountId") == currentItem.getAccountId()) {
 			holder.activeAccount.setVisibility(View.VISIBLE);
-		}
-		else {
+		} else {
 			holder.deleteAccount.setVisibility(View.VISIBLE);
 		}
 	}
@@ -150,73 +169,99 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 			deleteAccount = itemView.findViewById(R.id.deleteAccount);
 			repoAvatar = itemView.findViewById(R.id.repoAvatar);
 
-			deleteAccount.setOnClickListener(itemDelete -> {
+			deleteAccount.setOnClickListener(
+					itemDelete -> {
+						MaterialAlertDialogBuilder materialAlertDialogBuilder =
+								new MaterialAlertDialogBuilder(context)
+										.setTitle(
+												context.getResources()
+														.getString(
+																R.string.removeAccountPopupTitle))
+										.setMessage(
+												context.getResources()
+														.getString(
+																R.string.removeAccountPopupMessage))
+										.setNeutralButton(
+												context.getResources()
+														.getString(R.string.cancelButton),
+												null)
+										.setPositiveButton(
+												context.getResources()
+														.getString(R.string.removeButton),
+												(dialog, which) -> {
+													updateLayoutByPosition(
+															getBindingAdapterPosition());
+													UserAccountsApi userAccountsApi =
+															BaseApi.getInstance(
+																	context, UserAccountsApi.class);
+													assert userAccountsApi != null;
+													userAccountsApi.deleteAccount(
+															Integer.parseInt(
+																	String.valueOf(accountId)));
+												});
 
-				MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context).setTitle(context.getResources().getString(R.string.removeAccountPopupTitle))
-					.setMessage(context.getResources().getString(R.string.removeAccountPopupMessage)).setNeutralButton(context.getResources().getString(R.string.cancelButton), null)
-					.setPositiveButton(context.getResources().getString(R.string.removeButton), (dialog, which) -> {
-
-						updateLayoutByPosition(getBindingAdapterPosition());
-						UserAccountsApi userAccountsApi = BaseApi.getInstance(context, UserAccountsApi.class);
-						assert userAccountsApi != null;
-						userAccountsApi.deleteAccount(Integer.parseInt(String.valueOf(accountId)));
+						materialAlertDialogBuilder.create().show();
 					});
 
-				materialAlertDialogBuilder.create().show();
-			});
+			itemView.setOnClickListener(
+					switchAccount -> {
+						UserAccountsApi userAccountsApi =
+								BaseApi.getInstance(context, UserAccountsApi.class);
+						assert userAccountsApi != null;
+						UserAccount userAccount = userAccountsApi.getAccountByName(accountName);
 
-			itemView.setOnClickListener(switchAccount -> {
+						if (!userAccount.isLoggedIn()) {
+							UrlBuilder url =
+									UrlBuilder.fromString(userAccount.getInstanceUrl())
+											.withPath("/");
 
-				UserAccountsApi userAccountsApi = BaseApi.getInstance(context, UserAccountsApi.class);
-				assert userAccountsApi != null;
-				UserAccount userAccount = userAccountsApi.getAccountByName(accountName);
+							String host;
+							if (url.scheme.equals("http")) {
+								if (url.port == 80 || url.port == 0) {
+									host = url.hostName;
+								} else {
+									host = url.hostName + ":" + url.port;
+								}
+							} else {
+								if (url.port == 443 || url.port == 0) {
+									host = url.hostName;
+								} else {
+									host = url.hostName + ":" + url.port;
+								}
+							}
 
-				if(!userAccount.isLoggedIn()) {
-					UrlBuilder url = UrlBuilder.fromString(userAccount.getInstanceUrl()).withPath("/");
+							Toasty.warning(context, context.getString(R.string.logInAgain));
+							dialog.dismiss();
 
-					String host;
-					if(url.scheme.equals("http")) {
-						if(url.port == 80 || url.port == 0) {
-							host = url.hostName;
+							Intent i = new Intent(context, AddNewAccountActivity.class);
+							i.putExtra("instanceUrl", host);
+							i.putExtra("scheme", url.scheme);
+							i.putExtra("token", userAccount.getToken());
+							context.startActivity(i);
+							return;
 						}
-						else {
-							host = url.hostName + ":" + url.port;
+
+						if (tinyDB.getInt("currentActiveAccountId") != userAccount.getAccountId()) {
+							if (AppUtil.switchToAccount(context, userAccount)) {
+
+								String url =
+										UrlBuilder.fromString(userAccount.getInstanceUrl())
+												.withPath("/")
+												.toString();
+
+								Toasty.success(
+										context,
+										context.getResources()
+												.getString(
+														R.string.switchAccountSuccess,
+														userAccount.getUserName(),
+														url));
+								getNotificationsCount();
+								((Activity) context).recreate();
+								dialog.dismiss();
+							}
 						}
-					}
-					else {
-						if(url.port == 443 || url.port == 0) {
-							host = url.hostName;
-						}
-						else {
-							host = url.hostName + ":" + url.port;
-						}
-					}
-
-					Toasty.warning(context, context.getString(R.string.logInAgain));
-					dialog.dismiss();
-
-					Intent i = new Intent(context, AddNewAccountActivity.class);
-					i.putExtra("instanceUrl", host);
-					i.putExtra("scheme", url.scheme);
-					i.putExtra("token", userAccount.getToken());
-					context.startActivity(i);
-					return;
-				}
-
-				if(tinyDB.getInt("currentActiveAccountId") != userAccount.getAccountId()) {
-					if(AppUtil.switchToAccount(context, userAccount)) {
-
-						String url = UrlBuilder.fromString(userAccount.getInstanceUrl()).withPath("/").toString();
-
-						Toasty.success(context, context.getResources().getString(R.string.switchAccountSuccess, userAccount.getUserName(), url));
-						getNotificationsCount();
-						((Activity) context).recreate();
-						dialog.dismiss();
-					}
-				}
-			});
+					});
 		}
-
 	}
-
 }
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 5dc5b671..1e99cc7a 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java
@@ -15,43 +15,47 @@ import androidx.annotation.NonNull;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import io.mikael.urlbuilder.UrlBuilder;
+import java.util.List;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.AddNewAccountActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.database.models.UserAccount;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.List;
-import io.mikael.urlbuilder.UrlBuilder;
 
 /**
  * @author M M Arif
  */
-
-public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNavAdapter.UserAccountsViewHolder> {
+public class UserAccountsNavAdapter
+		extends RecyclerView.Adapter<UserAccountsNavAdapter.UserAccountsViewHolder> {
 
 	private final DrawerLayout drawer;
 	private final List<UserAccount> userAccountsList;
 	private final Context context;
 
-	public UserAccountsNavAdapter(Context ctx, List<UserAccount> userAccountsListMain, DrawerLayout drawerLayout) {
+	public UserAccountsNavAdapter(
+			Context ctx, List<UserAccount> userAccountsListMain, DrawerLayout drawerLayout) {
 
 		this.context = ctx;
 		this.userAccountsList = userAccountsListMain;
 		this.drawer = drawerLayout;
 	}
 
-	@NonNull
-	@Override
-	public UserAccountsNavAdapter.UserAccountsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+	@NonNull @Override
+	public UserAccountsNavAdapter.UserAccountsViewHolder onCreateViewHolder(
+			@NonNull ViewGroup parent, int viewType) {
 
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.nav_user_accounts, parent, false);
+		View v =
+				LayoutInflater.from(parent.getContext())
+						.inflate(R.layout.nav_user_accounts, parent, false);
 		return new UserAccountsViewHolder(v);
 	}
 
 	@SuppressLint("DefaultLocale")
 	@Override
-	public void onBindViewHolder(@NonNull UserAccountsNavAdapter.UserAccountsViewHolder holder, int position) {
+	public void onBindViewHolder(
+			@NonNull UserAccountsNavAdapter.UserAccountsViewHolder holder, int position) {
 
 		UserAccount currentItem = userAccountsList.get(position);
 
@@ -59,8 +63,14 @@ public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNav
 
 		int imageSize = AppUtil.getPixelsFromDensity(context, 36);
 
-		PicassoService.getInstance(context).get().load(url + "assets/img/favicon.png").placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(18, 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(18, 0))
+				.resize(imageSize, imageSize)
+				.centerCrop()
+				.into(holder.userAccountAvatar);
 	}
 
 	@Override
@@ -77,15 +87,15 @@ public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNav
 		RecyclerView listView = dialog.findViewById(R.id.accountsList);
 		Button newAccount = dialog.findViewById(R.id.newAccount);
 
-		if(dialog.getWindow() != null) {
+		if (dialog.getWindow() != null) {
 			dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
 		}
 
-		newAccount.setOnClickListener(item -> {
-			context.startActivity(new Intent(context, AddNewAccountActivity.class));
-			dialog.dismiss();
-
-		});
+		newAccount.setOnClickListener(
+				item -> {
+					context.startActivity(new Intent(context, AddNewAccountActivity.class));
+					dialog.dismiss();
+				});
 
 		UserAccountsAdapter arrayAdapter = new UserAccountsAdapter(context, dialog);
 		listView.setLayoutManager(new LinearLayoutManager(context));
@@ -103,12 +113,11 @@ public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNav
 
 			userAccountAvatar = itemView.findViewById(R.id.userAccountAvatar);
 
-			itemView.setOnClickListener(item -> {
-				customDialogUserAccountsList();
-				drawer.closeDrawers();
-			});
+			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 13b24967..75bb5ca6 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UserGridAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserGridAdapter.java
@@ -12,19 +12,18 @@ import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
 public class UserGridAdapter extends BaseAdapter implements Filterable {
 
 	private final List<User> membersList;
@@ -45,18 +44,22 @@ public class UserGridAdapter extends BaseAdapter implements Filterable {
 			memberName = v.findViewById(R.id.userNameTv);
 			userName = v.findViewById(R.id.userName);
 
-			v.setOnClickListener(loginId -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", userLoginId);
-				context.startActivity(intent);
-			});
+			v.setOnClickListener(
+					loginId -> {
+						Intent intent = new Intent(context, ProfileActivity.class);
+						intent.putExtra("username", userLoginId);
+						context.startActivity(intent);
+					});
 
-			v.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-				return true;
-			});
+			v.setOnLongClickListener(
+					loginId -> {
+						AppUtil.copyToClipboard(
+								context,
+								userLoginId,
+								context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
+						return true;
+					});
 		}
-
 	}
 
 	public UserGridAdapter(Context ctx, List<User> membersListMain) {
@@ -87,13 +90,12 @@ public class UserGridAdapter extends BaseAdapter implements Filterable {
 
 		UserGridAdapter.ViewHolder viewHolder;
 
-		if(finalView == null) {
+		if (finalView == null) {
 
 			finalView = LayoutInflater.from(context).inflate(R.layout.list_users_grid, null);
 			viewHolder = new ViewHolder(finalView);
 			finalView.setTag(viewHolder);
-		}
-		else {
+		} else {
 
 			viewHolder = (UserGridAdapter.ViewHolder) finalView.getTag();
 		}
@@ -107,17 +109,24 @@ public class UserGridAdapter extends BaseAdapter implements Filterable {
 		User currentItem = membersList.get(position);
 		int imgRadius = AppUtil.getPixelsFromDensity(context, 0);
 
-		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();
 
-		if(!currentItem.getFullName().equals("")) {
+		if (!currentItem.getFullName().equals("")) {
 
 			viewHolder.memberName.setText(Html.fromHtml(currentItem.getFullName()));
-			viewHolder.userName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
-		}
-		else {
+			viewHolder.userName.setText(
+					context.getResources()
+							.getString(R.string.usernameWithAt, currentItem.getLogin()));
+		} else {
 
 			viewHolder.memberName.setText(currentItem.getLogin());
 			viewHolder.userName.setVisibility(View.GONE);
@@ -129,39 +138,39 @@ public class UserGridAdapter extends BaseAdapter implements Filterable {
 		return membersFilter;
 	}
 
-	private final Filter membersFilter = new Filter() {
-		@Override
-		protected FilterResults performFiltering(CharSequence constraint) {
-			List<User> filteredList = new ArrayList<>();
+	private final Filter membersFilter =
+			new Filter() {
+				@Override
+				protected FilterResults performFiltering(CharSequence constraint) {
+					List<User> filteredList = new ArrayList<>();
 
-			if(constraint == null || constraint.length() == 0) {
+					if (constraint == null || constraint.length() == 0) {
 
-				filteredList.addAll(membersListFull);
-			}
-			else {
+						filteredList.addAll(membersListFull);
+					} else {
 
-				String filterPattern = constraint.toString().toLowerCase().trim();
+						String filterPattern = constraint.toString().toLowerCase().trim();
 
-				for(User item : membersListFull) {
-					if(item.getFullName().toLowerCase().contains(filterPattern) || item.getLogin().toLowerCase().contains(filterPattern)) {
-						filteredList.add(item);
+						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;
 				}
-			}
 
-			FilterResults results = new FilterResults();
-			results.values = filteredList;
-
-			return results;
-		}
-
-		@Override
-		protected void publishResults(CharSequence constraint, FilterResults results) {
-
-			membersList.clear();
-			membersList.addAll((List) results.values);
-			notifyDataSetChanged();
-		}
-	};
+				@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/UsersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UsersAdapter.java
index da0cd5d3..f82f2ccb 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UsersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UsersAdapter.java
@@ -12,18 +12,17 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
 public class UsersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context context;
@@ -36,8 +35,7 @@ public class UsersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		this.followersList = dataList;
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		LayoutInflater inflater = LayoutInflater.from(context);
 		return new UsersAdapter.UsersHolder(inflater.inflate(R.layout.list_users, parent, false));
@@ -45,7 +43,10 @@ public class UsersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
 	@Override
 	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.run();
 		}
@@ -95,21 +96,32 @@ public class UsersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 			userFullName = itemView.findViewById(R.id.userFullName);
 			userName = itemView.findViewById(R.id.userName);
 
-			new Handler().postDelayed(() -> {
-				if(!AppUtil.checkGhostUsers(userInfo.getLogin())) {
+			new Handler()
+					.postDelayed(
+							() -> {
+								if (!AppUtil.checkGhostUsers(userInfo.getLogin())) {
 
-					itemView.setOnClickListener(loginId -> {
-						Intent intent = new Intent(context, ProfileActivity.class);
-						intent.putExtra("username", userInfo.getLogin());
-						context.startActivity(intent);
-					});
+									itemView.setOnClickListener(
+											loginId -> {
+												Intent intent =
+														new Intent(context, ProfileActivity.class);
+												intent.putExtra("username", userInfo.getLogin());
+												context.startActivity(intent);
+											});
 
-					itemView.setOnLongClickListener(loginId -> {
-						AppUtil.copyToClipboard(context, userInfo.getLogin(), context.getString(R.string.copyLoginIdToClipBoard, userInfo.getLogin()));
-						return true;
-					});
-				}
-			}, 500);
+									itemView.setOnLongClickListener(
+											loginId -> {
+												AppUtil.copyToClipboard(
+														context,
+														userInfo.getLogin(),
+														context.getString(
+																R.string.copyLoginIdToClipBoard,
+																userInfo.getLogin()));
+												return true;
+											});
+								}
+							},
+							500);
 		}
 
 		@SuppressLint("SetTextI18n")
@@ -117,21 +129,24 @@ public class UsersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 			this.userInfo = userInfo;
 			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-			if(!userInfo.getFullName().equals("")) {
+			if (!userInfo.getFullName().equals("")) {
 				userFullName.setText(Html.fromHtml(userInfo.getFullName()));
-				userName.setText(context.getResources().getString(R.string.usernameWithAt, userInfo.getLogin()));
-			}
-			else {
+				userName.setText(
+						context.getResources()
+								.getString(R.string.usernameWithAt, userInfo.getLogin()));
+			} else {
 				userFullName.setText(userInfo.getLogin());
 				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);
 		}
-
 	}
-
 }
-
-
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 758ded81..3a03e2ae 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/WikiListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/WikiListAdapter.java
@@ -16,6 +16,7 @@ import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.WikiPageMetaData;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
@@ -26,7 +27,6 @@ import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -34,7 +34,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class WikiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
 	private final Context ctx;
@@ -45,7 +44,12 @@ public class WikiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 	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;
@@ -53,8 +57,7 @@ public class WikiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 		this.fragmentWikiBinding = fragmentWikiBinding;
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		LayoutInflater inflater = LayoutInflater.from(ctx);
 		return new WikiListAdapter.WikisHolder(inflater.inflate(R.layout.list_wiki, parent, false));
@@ -62,7 +65,10 @@ public class WikiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
 	@Override
 	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		if (position >= getItemCount() - 1
+				&& isMoreDataAvailable
+				&& !isLoading
+				&& loadMoreListener != null) {
 			isLoading = true;
 			loadMoreListener.onLoadMore();
 		}
@@ -88,7 +94,7 @@ public class WikiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
 	public void setMoreDataAvailable(boolean moreDataAvailable) {
 		isMoreDataAvailable = moreDataAvailable;
-		if(!isMoreDataAvailable) {
+		if (!isMoreDataAvailable) {
 			loadMoreListener.onLoadFinished();
 		}
 	}
@@ -109,37 +115,72 @@ public class WikiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 		notifyDataChanged();
 	}
 
-	private void deleteWiki(final String owner, final String repo, final String pageName, int position, final Context context) {
+	private void deleteWiki(
+			final String owner,
+			final String repo,
+			final String pageName,
+			int position,
+			final Context context) {
 
-		MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		MaterialAlertDialogBuilder materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(
+						context, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
-		materialAlertDialogBuilder.setTitle(String.format(context.getString(R.string.deleteGenericTitle), pageName)).setMessage(context.getString(R.string.deleteWikiPageMessage, pageName))
-			.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> RetrofitClient.getApiInterface(context).repoDeleteWikiPage(owner, repo, pageName).enqueue(new Callback<>() {
+		materialAlertDialogBuilder
+				.setTitle(String.format(context.getString(R.string.deleteGenericTitle), pageName))
+				.setMessage(context.getString(R.string.deleteWikiPageMessage, pageName))
+				.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) {
+													@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));
-					}
-				}
+														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) {
+													@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();
+														Toasty.error(
+																context,
+																context.getString(
+																		R.string.genericError));
+													}
+												}))
+				.setNeutralButton(R.string.cancelButton, null)
+				.show();
 	}
 
 	public interface OnLoadMoreListener {
@@ -147,7 +188,6 @@ public class WikiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 		void onLoadMore();
 
 		void onLoadFinished();
-
 	}
 
 	class WikisHolder extends RecyclerView.ViewHolder {
@@ -166,46 +206,61 @@ public class WikiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 			wikiLastUpdatedBy = itemView.findViewById(R.id.wiki_last_updated_by);
 			wikiMenu = itemView.findViewById(R.id.wiki_menu);
 
-			itemView.setOnClickListener(v -> {
+			itemView.setOnClickListener(
+					v -> {
+						Intent intent = new Intent(ctx, WikiActivity.class);
+						intent.putExtra("pageName", wikiPageMeta.getTitle());
+						intent.putExtra(
+								RepositoryContext.INTENT_EXTRA,
+								((RepoDetailActivity) itemView.getContext()).repository);
+						ctx.startActivity(intent);
+					});
 
-				Intent intent = new Intent(ctx, WikiActivity.class);
-				intent.putExtra("pageName", wikiPageMeta.getTitle());
-				intent.putExtra(RepositoryContext.INTENT_EXTRA, ((RepoDetailActivity) itemView.getContext()).repository);
-				ctx.startActivity(intent);
-			});
+			wikiMenu.setOnClickListener(
+					v -> {
+						Context ctx = v.getContext();
 
-			wikiMenu.setOnClickListener(v -> {
+						View view =
+								LayoutInflater.from(ctx)
+										.inflate(
+												R.layout.bottom_sheet_wiki_in_list,
+												itemView.findViewById(android.R.id.content),
+												false);
 
-				Context ctx = v.getContext();
+						TextView bottomSheetHeader = view.findViewById(R.id.bottom_sheet_header);
+						TextView editWiki = view.findViewById(R.id.edit_wiki);
+						TextView deleteWiki = view.findViewById(R.id.delete_wiki);
 
-				View view = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_wiki_in_list, itemView.findViewById(android.R.id.content), false);
+						bottomSheetHeader.setText(wikiPageMeta.getTitle());
 
-				TextView bottomSheetHeader = view.findViewById(R.id.bottom_sheet_header);
-				TextView editWiki = view.findViewById(R.id.edit_wiki);
-				TextView deleteWiki = view.findViewById(R.id.delete_wiki);
+						BottomSheetDialog dialog = new BottomSheetDialog(ctx);
+						dialog.setContentView(view);
+						dialog.show();
 
-				bottomSheetHeader.setText(wikiPageMeta.getTitle());
+						editWiki.setOnClickListener(
+								v12 -> {
+									Intent intent = new Intent(ctx, WikiActivity.class);
+									intent.putExtra("pageName", wikiPageMeta.getTitle());
+									intent.putExtra("action", "edit");
+									intent.putExtra(
+											RepositoryContext.INTENT_EXTRA,
+											((RepoDetailActivity) itemView.getContext())
+													.repository);
+									ctx.startActivity(intent);
+									dialog.dismiss();
+								});
 
-				BottomSheetDialog dialog = new BottomSheetDialog(ctx);
-				dialog.setContentView(view);
-				dialog.show();
-
-				editWiki.setOnClickListener(v12 -> {
-
-					Intent intent = new Intent(ctx, WikiActivity.class);
-					intent.putExtra("pageName", wikiPageMeta.getTitle());
-					intent.putExtra("action", "edit");
-					intent.putExtra(RepositoryContext.INTENT_EXTRA, ((RepoDetailActivity) itemView.getContext()).repository);
-					ctx.startActivity(intent);
-					dialog.dismiss();
-				});
-
-				deleteWiki.setOnClickListener(v12 -> {
-
-					deleteWiki(repoOwner, repoName, wikiPageMeta.getTitle(), getAbsoluteAdapterPosition(), ctx);
-					dialog.dismiss();
-				});
-			});
+						deleteWiki.setOnClickListener(
+								v12 -> {
+									deleteWiki(
+											repoOwner,
+											repoName,
+											wikiPageMeta.getTitle(),
+											getAbsoluteAdapterPosition(),
+											ctx);
+									dialog.dismiss();
+								});
+					});
 		}
 
 		@SuppressLint("SetTextI18n")
@@ -214,26 +269,55 @@ 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());
 			if (wikiPageMetaData.getTitle() != null && wikiPageMetaData.getTitle().length() > 0) {
 				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, 14);
+				TextDrawable drawable =
+						TextDrawable.builder()
+								.beginConfig()
+								.useFont(Typeface.DEFAULT)
+								.fontSize(18)
+								.toUpperCase()
+								.width(28)
+								.height(28)
+								.endConfig()
+								.buildRoundRect(firstCharacter, color, 14);
 				avatar.setImageDrawable(drawable);
 			} else {
 				avatar.setVisibility(View.GONE);
 			}
 
-			if(!((RepoDetailActivity) ctx).repository.getPermissions().isPush()) {
+			if (!((RepoDetailActivity) ctx).repository.getPermissions().isPush()) {
 				wikiMenu.setVisibility(View.GONE);
 			}
 		}
-
 	}
-
 }
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 364474bb..fcd5615e 100644
--- a/app/src/main/java/org/mian/gitnex/clients/PicassoService.java
+++ b/app/src/main/java/org/mian/gitnex/clients/PicassoService.java
@@ -4,20 +4,19 @@ import android.content.Context;
 import android.util.Log;
 import com.squareup.picasso.OkHttp3Downloader;
 import com.squareup.picasso.Picasso;
-import org.mian.gitnex.activities.BaseActivity;
-import org.mian.gitnex.helpers.PicassoCache;
-import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 import java.io.File;
 import java.security.SecureRandom;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.X509TrustManager;
 import okhttp3.OkHttpClient;
+import org.mian.gitnex.activities.BaseActivity;
+import org.mian.gitnex.helpers.PicassoCache;
+import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 
 /**
  * @author opyale
  */
-
 public class PicassoService {
 
 	private static volatile PicassoService picassoService;
@@ -34,10 +33,15 @@ public class PicassoService {
 			SSLContext sslContext = SSLContext.getInstance("TLS");
 
 			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(context);
-			sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom());
+			sslContext.init(
+					null, new X509TrustManager[] {memorizingTrustManager}, new SecureRandom());
 
-			OkHttpClient.Builder okHttpClient = new OkHttpClient.Builder().sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
-				.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()));
+			OkHttpClient.Builder okHttpClient =
+					new OkHttpClient.Builder()
+							.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
+							.hostnameVerifier(
+									memorizingTrustManager.wrapHostnameVerifier(
+											HttpsURLConnection.getDefaultHostnameVerifier()));
 
 			builder.downloader(new OkHttp3Downloader(okHttpClient.build()));
 			/*builder.listener((picasso, uri, exception) -> {
@@ -49,8 +53,7 @@ public class PicassoService {
 
 			picasso = builder.memoryCache(new PicassoCache(cachePath, context)).build();
 
-		}
-		catch(Exception e) {
+		} catch (Exception e) {
 
 			Log.e("PicassoService", e.toString());
 		}
@@ -58,23 +61,20 @@ public class PicassoService {
 
 	public static synchronized PicassoService getInstance(Context context) {
 
-		if(picassoService == null) {
-			synchronized(PicassoService.class) {
-				if(picassoService == null) {
+		if (picassoService == null) {
+			synchronized (PicassoService.class) {
+				if (picassoService == null) {
 					picassoService = new PicassoService(context);
 				}
 			}
 		}
 
 		return 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 f12b5324..1619ce6e 100644
--- a/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java
+++ b/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java
@@ -3,6 +3,23 @@ package org.mian.gitnex.clients;
 import android.content.Context;
 import android.util.Log;
 import com.google.gson.GsonBuilder;
+import java.io.File;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.security.SecureRandom;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.X509TrustManager;
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
 import org.gitnex.tea4j.v2.apis.AdminApi;
 import org.gitnex.tea4j.v2.apis.IssueApi;
 import org.gitnex.tea4j.v2.apis.MiscellaneousApi;
@@ -23,23 +40,6 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.FilesData;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
-import java.io.File;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.security.SecureRandom;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.X509TrustManager;
-import okhttp3.Cache;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
 import retrofit2.Converter;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -48,13 +48,17 @@ import retrofit2.converter.scalars.ScalarsConverterFactory;
 /**
  * @author M M Arif
  */
-
 public class RetrofitClient {
 
 	private static final Map<String, ApiInterface> apiInterfaces = new ConcurrentHashMap<>();
 	private static final Map<String, WebApi> webInterfaces = new ConcurrentHashMap<>();
 
-	private static Retrofit createRetrofit(Context context, String instanceUrl, boolean cacheEnabled, String token, File cacheFile) {
+	private static Retrofit createRetrofit(
+			Context context,
+			String instanceUrl,
+			boolean cacheEnabled,
+			String token,
+			File cacheFile) {
 
 		TinyDB tinyDB = TinyDB.getInstance(context);
 
@@ -66,37 +70,70 @@ public class RetrofitClient {
 			SSLContext sslContext = SSLContext.getInstance("TLS");
 
 			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(context);
-			sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom());
+			sslContext.init(
+					null, new X509TrustManager[] {memorizingTrustManager}, new SecureRandom());
 
 			ApiKeyAuth auth = new ApiKeyAuth("header", "Authorization");
 			auth.setApiKey(token);
-			OkHttpClient.Builder okHttpClient = new OkHttpClient.Builder()
-				//				.addInterceptor(logging)
-				.addInterceptor(auth).sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
-				.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()));
+			OkHttpClient.Builder okHttpClient =
+					new OkHttpClient.Builder()
+							//				.addInterceptor(logging)
+							.addInterceptor(auth)
+							.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
+							.hostnameVerifier(
+									memorizingTrustManager.wrapHostnameVerifier(
+											HttpsURLConnection.getDefaultHostnameVerifier()));
 
-			if(cacheEnabled && cacheFile != null) {
+			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 -> {
+				okHttpClient
+						.cache(cache)
+						.addInterceptor(
+								chain -> {
+									Request request = chain.request();
 
-					Request request = chain.request();
+									request =
+											AppUtil.hasNetworkConnection(context)
+													? request.newBuilder()
+															.header(
+																	"Cache-Control",
+																	"public, max-age=" + 60)
+															.build()
+													: request.newBuilder()
+															.header(
+																	"Cache-Control",
+																	"public, only-if-cached, max-stale="
+																			+ 60 * 60 * 24 * 30)
+															.build();
 
-					request = AppUtil.hasNetworkConnection(context) ? request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build() :
-						request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build();
-
-					return chain.proceed(request);
-
-				});
+									return chain.proceed(request);
+								});
 			}
 
-			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();
+			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();
 
-		}
-		catch(Exception e) {
+		} catch (Exception e) {
 
 			Log.e("onFailureRetrofit", e.toString());
 		}
@@ -105,8 +142,11 @@ 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) {
@@ -114,18 +154,25 @@ 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));
 	}
 
-	public static ApiInterface getApiInterface(Context context, String url, String token, File cacheFile) {
+	public static ApiInterface getApiInterface(
+			Context context, String url, String token, File cacheFile) {
 
 		String key = token.hashCode() + "@" + url;
-		if(!apiInterfaces.containsKey(key)) {
-			synchronized(RetrofitClient.class) {
-				if(!apiInterfaces.containsKey(key)) {
+		if (!apiInterfaces.containsKey(key)) {
+			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;
@@ -134,17 +181,20 @@ public class RetrofitClient {
 		}
 
 		return apiInterfaces.get(key);
-
 	}
 
-	public static WebApi getWebInterface(Context context, String url, String token, File cacheFile) {
+	public static WebApi getWebInterface(
+			Context context, String url, String token, File cacheFile) {
 
 		String key = token.hashCode() + "@" + url;
-		if(!webInterfaces.containsKey(key)) {
-			synchronized(RetrofitClient.class) {
-				if(!webInterfaces.containsKey(key)) {
+		if (!webInterfaces.containsKey(key)) {
+			synchronized (RetrofitClient.class) {
+				if (!webInterfaces.containsKey(key)) {
 
-					WebApi webInterface = Objects.requireNonNull(createRetrofit(context, url, false, token, cacheFile)).create(WebApi.class);
+					WebApi webInterface =
+							Objects.requireNonNull(
+											createRetrofit(context, url, false, token, cacheFile))
+									.create(WebApi.class);
 					webInterfaces.put(key, webInterface);
 
 					return webInterface;
@@ -153,12 +203,20 @@ public class RetrofitClient {
 		}
 
 		return webInterfaces.get(key);
-
 	}
 
-	public interface ApiInterface extends AdminApi, OrganizationApi, IssueApi, RepositoryApi, MiscellaneousApi, NotificationApi, UserApi, SettingsApi, OTPApi, CustomApi, PackageApi {
-
-	}
+	public interface ApiInterface
+			extends AdminApi,
+					OrganizationApi,
+					IssueApi,
+					RepositoryApi,
+					MiscellaneousApi,
+					NotificationApi,
+					UserApi,
+					SettingsApi,
+					OTPApi,
+					CustomApi,
+					PackageApi {}
 
 	private static class DateQueryConverterFactory extends Converter.Factory {
 
@@ -167,8 +225,9 @@ public class RetrofitClient {
 		}
 
 		@Override
-		public Converter<?, String> stringConverter(@NotNull Type type, @NotNull Annotation[] annotations, @NotNull Retrofit retrofit) {
-			if(type == Date.class) {
+		public Converter<?, String> stringConverter(
+				@NotNull Type type, @NotNull Annotation[] annotations, @NotNull Retrofit retrofit) {
+			if (type == Date.class) {
 				return DateQueryConverter.INSTANCE;
 			}
 			return null;
@@ -178,22 +237,20 @@ public class RetrofitClient {
 
 			static final DateQueryConverter INSTANCE = new DateQueryConverter();
 
-			private static final ThreadLocal<DateFormat> DF = new ThreadLocal<>() {
+			private static final ThreadLocal<DateFormat> DF =
+					new ThreadLocal<>() {
 
-				@Override
-				public DateFormat initialValue() {
+						@Override
+						public DateFormat initialValue() {
 
-					return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
-				}
-			};
+							return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
+						}
+					};
 
 			@Override
 			public String convert(@NotNull Date date) {
 				return Objects.requireNonNull(DF.get()).format(date);
 			}
-
 		}
-
 	}
-
 }
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 24d09256..9b70a466 100644
--- a/app/src/main/java/org/mian/gitnex/core/MainApplication.java
+++ b/app/src/main/java/org/mian/gitnex/core/MainApplication.java
@@ -21,7 +21,6 @@ import org.mian.gitnex.notifications.Notifications;
 /**
  * @author opyale
  */
-
 public class MainApplication extends Application {
 
 	public AccountContext currentAccount;
@@ -51,26 +50,44 @@ public class MainApplication extends Application {
 
 		tinyDB = TinyDB.getInstance(context);
 
-		if(tinyDB.getBoolean("crashReportingEnabled", true)) {
+		if (tinyDB.getBoolean("crashReportingEnabled", true)) {
 
 			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.getPluginConfigurationBuilder(MailSenderConfigurationBuilder.class).withMailTo(getResources().getString(R.string.appEmail))
-				.withSubject(getResources().getString(R.string.crashReportEmailSubject, AppUtil.getAppBuildNo(context))).withReportAsFile(true).withEnabled(true);
-			ACRABuilder.getPluginConfigurationBuilder(LimiterConfigurationBuilder.class).setEnabled(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);
+			ACRABuilder.getPluginConfigurationBuilder(LimiterConfigurationBuilder.class)
+					.setEnabled(true);
 
 			ACRA.init(this, ACRABuilder);
 		}
 	}
 
 	public boolean switchToAccount(UserAccount userAccount, boolean tmp) {
-		if(!tmp || tinyDB.getInt("currentActiveAccountId") != userAccount.getAccountId()) {
+		if (!tmp || tinyDB.getInt("currentActiveAccountId") != userAccount.getAccountId()) {
 			currentAccount = new AccountContext(userAccount);
-			if(!tmp) {
+			if (!tmp) {
 				tinyDB.putInt("currentActiveAccountId", userAccount.getAccountId());
 			}
 			return true;
@@ -78,5 +95,4 @@ public class MainApplication extends Application {
 
 		return false;
 	}
-
 }
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 5d6941e5..24dd7159 100644
--- a/app/src/main/java/org/mian/gitnex/core/MainGrammarLocator.java
+++ b/app/src/main/java/org/mian/gitnex/core/MainGrammarLocator.java
@@ -1,16 +1,15 @@
 package org.mian.gitnex.core;
 
 import androidx.annotation.NonNull;
-import java.util.Set;
 import io.noties.prism4j.DefaultGrammarLocator;
 import io.noties.prism4j.Grammar;
 import io.noties.prism4j.GrammarLocator;
 import io.noties.prism4j.Prism4j;
+import java.util.Set;
 
 /**
  * @author opyale
  */
-
 public class MainGrammarLocator implements GrammarLocator {
 
 	public static final String DEFAULT_FALLBACK_LANGUAGE = "clike";
@@ -18,27 +17,24 @@ public class MainGrammarLocator implements GrammarLocator {
 	private static final DefaultGrammarLocator defaultGrammarLocator = new DefaultGrammarLocator();
 	private static volatile MainGrammarLocator instance;
 
-	private MainGrammarLocator() {
-	}
+	private MainGrammarLocator() {}
 
 	public static MainGrammarLocator getInstance() {
 
-		if(instance == null) {
-			synchronized(MainGrammarLocator.class) {
-				if(instance == null) {
+		if (instance == null) {
+			synchronized (MainGrammarLocator.class) {
+				if (instance == null) {
 					instance = new MainGrammarLocator();
 				}
 			}
 		}
 
 		return instance;
-
 	}
 
 	public String fromExtension(String extension) {
 
-		switch(extension.toLowerCase()) {
-
+		switch (extension.toLowerCase()) {
 			case "b":
 			case "bf":
 				return "brainfuck";
@@ -110,13 +106,12 @@ public class MainGrammarLocator implements GrammarLocator {
 
 			case "yaml":
 			case "yml":
-			case "properties": // This extension doesn't correspond to YAML, but it's the next best option
+			case "properties": // This extension doesn't correspond to YAML, but it's the next best
+				// option
 				return "yaml";
-
 		}
 
 		return extension;
-
 	}
 
 	@Override
@@ -125,11 +120,9 @@ public class MainGrammarLocator implements GrammarLocator {
 		return defaultGrammarLocator.grammar(prism4j, language);
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public Set<String> languages() {
 
 		return defaultGrammarLocator.languages();
 	}
-
 }
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 9eb1df8f..3fea48f0 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
@@ -2,17 +2,16 @@ package org.mian.gitnex.database.api;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
-import org.mian.gitnex.database.db.GitnexDatabase;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import org.mian.gitnex.database.db.GitnexDatabase;
 
 /**
  * @author opyale
  */
-
 public abstract class BaseApi {
 
 	protected static final ExecutorService executorService = Executors.newCachedThreadPool();
@@ -23,15 +22,17 @@ public abstract class BaseApi {
 		gitnexDatabase = GitnexDatabase.getDatabaseInstance(context);
 	}
 
-	public static <T extends BaseApi> T getInstance(@NonNull Context context, @NonNull Class<T> clazz) {
+	public static <T extends BaseApi> T getInstance(
+			@NonNull Context context, @NonNull Class<T> clazz) {
 
 		try {
 
-			if(!instances.containsKey(clazz)) {
-				synchronized(BaseApi.class) {
-					if(!instances.containsKey(clazz)) {
+			if (!instances.containsKey(clazz)) {
+				synchronized (BaseApi.class) {
+					if (!instances.containsKey(clazz)) {
 
-						T instance = clazz.getDeclaredConstructor(Context.class).newInstance(context);
+						T instance =
+								clazz.getDeclaredConstructor(Context.class).newInstance(context);
 
 						instances.put(clazz, instance);
 						return instance;
@@ -41,11 +42,12 @@ public abstract class BaseApi {
 
 			return (T) instances.get(clazz);
 
-		}
-		catch(NoSuchMethodException | IllegalAccessException | InvocationTargetException | InstantiationException ignored) {
+		} catch (NoSuchMethodException
+				| IllegalAccessException
+				| InvocationTargetException
+				| InstantiationException ignored) {
 		}
 
 		return null;
 	}
-
 }
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 65297fe3..82d925d3 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
@@ -2,15 +2,14 @@ package org.mian.gitnex.database.api;
 
 import android.content.Context;
 import androidx.lifecycle.LiveData;
+import java.util.List;
 import org.mian.gitnex.database.dao.DraftsDao;
 import org.mian.gitnex.database.models.Draft;
 import org.mian.gitnex.database.models.DraftWithRepository;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
 public class DraftsApi extends BaseApi {
 
 	private final DraftsDao draftsDao;
@@ -20,7 +19,14 @@ 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);
@@ -57,7 +63,7 @@ public class DraftsApi extends BaseApi {
 	public void deleteSingleDraft(final int draftId) {
 		final LiveData<Draft> draft = draftsDao.fetchDraftById(draftId);
 
-		if(draft != null) {
+		if (draft != null) {
 			executorService.execute(() -> draftsDao.deleteByDraftId(draftId));
 		}
 	}
@@ -70,8 +76,14 @@ public class DraftsApi extends BaseApi {
 		executorService.execute(() -> draftsDao.updateDraft(draftText, draftId, commentId));
 	}
 
-	public void updateDraftByIssueIdAsyncTask(final String draftText, final int issueId, final int draftRepositoryId, final String commentId) {
-		executorService.execute(() -> draftsDao.updateDraftByIssueId(draftText, issueId, draftRepositoryId, commentId));
+	public void updateDraftByIssueIdAsyncTask(
+			final String draftText,
+			final int issueId,
+			final int draftRepositoryId,
+			final String commentId) {
+		executorService.execute(
+				() ->
+						draftsDao.updateDraftByIssueId(
+								draftText, issueId, draftRepositoryId, commentId));
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/database/api/RepositoriesApi.java b/app/src/main/java/org/mian/gitnex/database/api/RepositoriesApi.java
index 004f8a37..c19b0519 100644
--- a/app/src/main/java/org/mian/gitnex/database/api/RepositoriesApi.java
+++ b/app/src/main/java/org/mian/gitnex/database/api/RepositoriesApi.java
@@ -2,14 +2,13 @@ package org.mian.gitnex.database.api;
 
 import android.content.Context;
 import androidx.lifecycle.LiveData;
+import java.util.List;
 import org.mian.gitnex.database.dao.RepositoriesDao;
 import org.mian.gitnex.database.models.Repository;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
 public class RepositoriesApi extends BaseApi {
 
 	private final RepositoriesDao repositoriesDao;
@@ -19,7 +18,8 @@ public class RepositoriesApi extends BaseApi {
 		repositoriesDao = gitnexDatabase.repositoriesDao();
 	}
 
-	public long insertRepository(int repoAccountId, String repositoryOwner, String repositoryName, int mostVisited) {
+	public long insertRepository(
+			int repoAccountId, String repositoryOwner, String repositoryName, int mostVisited) {
 
 		Repository repository = new Repository();
 		repository.setRepoAccountId(repoAccountId);
@@ -34,8 +34,10 @@ public class RepositoriesApi extends BaseApi {
 		return repositoriesDao.newRepository(repository);
 	}
 
-	public Repository getRepository(int repoAccountId, String repositoryOwner, String repositoryName) {
-		return repositoriesDao.getSingleRepositoryDao(repoAccountId, repositoryOwner, repositoryName);
+	public Repository getRepository(
+			int repoAccountId, String repositoryOwner, String repositoryName) {
+		return repositoriesDao.getSingleRepositoryDao(
+				repoAccountId, repositoryOwner, repositoryName);
 	}
 
 	public LiveData<List<Repository>> getAllRepositories() {
@@ -46,7 +48,8 @@ public class RepositoriesApi extends BaseApi {
 		return repositoriesDao.getAllRepositoriesByAccountDao(repoAccountId);
 	}
 
-	public Integer checkRepository(int repoAccountId, String repositoryOwner, String repositoryName) {
+	public Integer checkRepository(
+			int repoAccountId, String repositoryOwner, String repositoryName) {
 		return repositoriesDao.checkRepositoryDao(repoAccountId, repositoryOwner, repositoryName);
 	}
 
@@ -54,12 +57,18 @@ public class RepositoriesApi extends BaseApi {
 		return repositoriesDao.fetchRepositoryByIdDao(repositoryId);
 	}
 
-	public Repository fetchRepositoryByAccountIdByRepositoryId(int repositoryId, int repoAccountId) {
-		return repositoriesDao.fetchRepositoryByAccountIdByRepositoryIdDao(repositoryId, repoAccountId);
+	public Repository fetchRepositoryByAccountIdByRepositoryId(
+			int repositoryId, int repoAccountId) {
+		return repositoriesDao.fetchRepositoryByAccountIdByRepositoryIdDao(
+				repositoryId, repoAccountId);
 	}
 
-	public void updateRepositoryOwnerAndName(String repositoryOwner, String repositoryName, int repositoryId) {
-		executorService.execute(() -> repositoriesDao.updateRepositoryOwnerAndName(repositoryOwner, repositoryName, repositoryId));
+	public void updateRepositoryOwnerAndName(
+			String repositoryOwner, String repositoryName, int repositoryId) {
+		executorService.execute(
+				() ->
+						repositoriesDao.updateRepositoryOwnerAndName(
+								repositoryOwner, repositoryName, repositoryId));
 	}
 
 	public void deleteRepositoriesByAccount(final int repoAccountId) {
@@ -71,7 +80,8 @@ public class RepositoriesApi extends BaseApi {
 	}
 
 	public void updateRepositoryMostVisited(int mostVisited, int repositoryId) {
-		executorService.execute(() -> repositoriesDao.updateRepositoryMostVisited(mostVisited, repositoryId));
+		executorService.execute(
+				() -> repositoriesDao.updateRepositoryMostVisited(mostVisited, repositoryId));
 	}
 
 	public void resetAllRepositoryMostVisited(int repoAccountId) {
@@ -81,5 +91,4 @@ public class RepositoriesApi extends BaseApi {
 	public LiveData<List<Repository>> fetchAllMostVisited(int repoAccountId) {
 		return repositoriesDao.fetchAllMostVisited(repoAccountId);
 	}
-
 }
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 8e654320..3f2df36a 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
@@ -2,14 +2,13 @@ package org.mian.gitnex.database.api;
 
 import android.content.Context;
 import androidx.lifecycle.LiveData;
+import java.util.List;
 import org.mian.gitnex.database.dao.UserAccountsDao;
 import org.mian.gitnex.database.models.UserAccount;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
 public class UserAccountsApi extends BaseApi {
 
 	private final UserAccountsDao userAccountsDao;
@@ -19,7 +18,14 @@ 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);
@@ -32,15 +38,19 @@ public class UserAccountsApi extends BaseApi {
 		userAccount.setDefaultPagingNumber(defaultPagingNumber);
 
 		return userAccountsDao.createAccount(userAccount);
-
 	}
 
 	public void updateServerVersion(final String serverVersion, final int accountId) {
-		executorService.execute(() -> userAccountsDao.updateServerVersion(serverVersion, accountId));
+		executorService.execute(
+				() -> userAccountsDao.updateServerVersion(serverVersion, accountId));
 	}
 
-	public void updateServerPagingLimit(final int maxResponseItems, final int defaultPagingNumber, final int accountId) {
-		executorService.execute(() -> userAccountsDao.updateServerPagingLimit(maxResponseItems, defaultPagingNumber, accountId));
+	public void updateServerPagingLimit(
+			final int maxResponseItems, final int defaultPagingNumber, final int accountId) {
+		executorService.execute(
+				() ->
+						userAccountsDao.updateServerPagingLimit(
+								maxResponseItems, defaultPagingNumber, accountId));
 	}
 
 	public void updateToken(final int accountId, final String token) {
@@ -48,7 +58,8 @@ public class UserAccountsApi extends BaseApi {
 	}
 
 	public void updateTokenByAccountName(final String accountName, final String token) {
-		executorService.execute(() -> userAccountsDao.updateAccountTokenByAccountName(accountName, token));
+		executorService.execute(
+				() -> userAccountsDao.updateAccountTokenByAccountName(accountName, token));
 	}
 
 	public void updateUsername(final int accountId, final String newName) {
@@ -98,5 +109,4 @@ public class UserAccountsApi extends BaseApi {
 	public void login(int accountId) {
 		executorService.execute(() -> userAccountsDao.login(accountId));
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/database/dao/DraftsDao.java b/app/src/main/java/org/mian/gitnex/database/dao/DraftsDao.java
index b3ccf6f5..190f21ea 100644
--- a/app/src/main/java/org/mian/gitnex/database/dao/DraftsDao.java
+++ b/app/src/main/java/org/mian/gitnex/database/dao/DraftsDao.java
@@ -4,27 +4,30 @@ import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.Query;
+import java.util.List;
 import org.mian.gitnex.database.models.Draft;
 import org.mian.gitnex.database.models.DraftWithRepository;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
 @Dao
 public interface DraftsDao {
 
 	@Insert
 	long insertDraft(Draft drafts);
 
-	@Query("SELECT * FROM Drafts JOIN Repositories ON Repositories.repositoryId = Drafts.draftRepositoryId WHERE draftAccountId = :accountId" + " ORDER BY " + "draftId DESC")
+	@Query(
+			"SELECT * FROM Drafts JOIN Repositories ON Repositories.repositoryId = Drafts.draftRepositoryId WHERE draftAccountId = :accountId"
+					+ " ORDER BY "
+					+ "draftId DESC")
 	LiveData<List<DraftWithRepository>> fetchAllDrafts(int accountId);
 
 	@Query("SELECT * FROM Drafts WHERE draftAccountId = :accountId ORDER BY draftId DESC")
 	LiveData<List<Draft>> fetchDrafts(int accountId);
 
-	@Query("SELECT * FROM Drafts WHERE draftAccountId = :accountId and draftRepositoryId = :repositoryId")
+	@Query(
+			"SELECT * FROM Drafts WHERE draftAccountId = :accountId and draftRepositoryId = :repositoryId")
 	LiveData<Draft> fetchSingleDraftByAccountIdAndRepositoryId(int accountId, int repositoryId);
 
 	@Query("SELECT * FROM Drafts WHERE draftId = :draftId")
@@ -33,16 +36,21 @@ public interface DraftsDao {
 	@Query("SELECT * FROM Drafts WHERE issueId = :issueId")
 	LiveData<Draft> fetchDraftByIssueId(int issueId);
 
-	@Query("SELECT count(draftId) FROM Drafts WHERE issueId = :issueId AND draftRepositoryId = :draftRepositoryId AND commentId = :commentId")
+	@Query(
+			"SELECT count(draftId) FROM Drafts WHERE issueId = :issueId AND draftRepositoryId = :draftRepositoryId AND commentId = :commentId")
 	Integer checkDraftDao(int issueId, int draftRepositoryId, String commentId);
 
-	@Query("UPDATE Drafts SET draftText = :draftText, commentId = :commentId WHERE draftId = :draftId")
+	@Query(
+			"UPDATE Drafts SET draftText = :draftText, commentId = :commentId WHERE draftId = :draftId")
 	void updateDraft(String draftText, int draftId, String commentId);
 
-	@Query("UPDATE Drafts SET draftText = :draftText WHERE issueId = :issueId AND draftRepositoryId = :draftRepositoryId AND commentId = :commentId")
-	void updateDraftByIssueId(String draftText, int issueId, int draftRepositoryId, String commentId);
+	@Query(
+			"UPDATE Drafts SET draftText = :draftText WHERE issueId = :issueId AND draftRepositoryId = :draftRepositoryId AND commentId = :commentId")
+	void updateDraftByIssueId(
+			String draftText, int issueId, int draftRepositoryId, String commentId);
 
-	@Query("SELECT draftId FROM Drafts WHERE issueId = :issueId AND draftRepositoryId = :draftRepositoryId")
+	@Query(
+			"SELECT draftId FROM Drafts WHERE issueId = :issueId AND draftRepositoryId = :draftRepositoryId")
 	Integer getDraftId(int issueId, int draftRepositoryId);
 
 	@Query("DELETE FROM Drafts WHERE draftId = :draftId")
@@ -50,5 +58,4 @@ public interface DraftsDao {
 
 	@Query("DELETE FROM Drafts WHERE draftAccountId = :accountId")
 	void deleteAllDrafts(int accountId);
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/database/dao/RepositoriesDao.java b/app/src/main/java/org/mian/gitnex/database/dao/RepositoriesDao.java
index 61142956..ca819393 100644
--- a/app/src/main/java/org/mian/gitnex/database/dao/RepositoriesDao.java
+++ b/app/src/main/java/org/mian/gitnex/database/dao/RepositoriesDao.java
@@ -4,13 +4,12 @@ import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.Query;
-import org.mian.gitnex.database.models.Repository;
 import java.util.List;
+import org.mian.gitnex.database.models.Repository;
 
 /**
  * @author M M Arif
  */
-
 @Dao
 public interface RepositoriesDao {
 
@@ -23,20 +22,26 @@ public interface RepositoriesDao {
 	@Query("SELECT * FROM Repositories WHERE repoAccountId = :repoAccountId")
 	LiveData<List<Repository>> getAllRepositoriesByAccountDao(int repoAccountId);
 
-	@Query("SELECT count(repositoryId) FROM Repositories WHERE repoAccountId = :repoAccountId AND repositoryOwner = :repositoryOwner AND repositoryName = :repositoryName")
+	@Query(
+			"SELECT count(repositoryId) FROM Repositories WHERE repoAccountId = :repoAccountId AND repositoryOwner = :repositoryOwner AND repositoryName = :repositoryName")
 	Integer checkRepositoryDao(int repoAccountId, String repositoryOwner, String repositoryName);
 
-	@Query("SELECT * FROM Repositories WHERE repoAccountId = :repoAccountId AND repositoryOwner = :repositoryOwner AND repositoryName = :repositoryName")
-	Repository getSingleRepositoryDao(int repoAccountId, String repositoryOwner, String repositoryName);
+	@Query(
+			"SELECT * FROM Repositories WHERE repoAccountId = :repoAccountId AND repositoryOwner = :repositoryOwner AND repositoryName = :repositoryName")
+	Repository getSingleRepositoryDao(
+			int repoAccountId, String repositoryOwner, String repositoryName);
 
 	@Query("SELECT * FROM Repositories WHERE repositoryId = :repositoryId")
 	Repository fetchRepositoryByIdDao(int repositoryId);
 
-	@Query("SELECT * FROM Repositories WHERE repositoryId = :repositoryId AND repoAccountId = :repoAccountId")
+	@Query(
+			"SELECT * FROM Repositories WHERE repositoryId = :repositoryId AND repoAccountId = :repoAccountId")
 	Repository fetchRepositoryByAccountIdByRepositoryIdDao(int repositoryId, int repoAccountId);
 
-	@Query("UPDATE Repositories SET repositoryOwner = :repositoryOwner, repositoryName = :repositoryName  WHERE repositoryId = :repositoryId")
-	void updateRepositoryOwnerAndName(String repositoryOwner, String repositoryName, int repositoryId);
+	@Query(
+			"UPDATE Repositories SET repositoryOwner = :repositoryOwner, repositoryName = :repositoryName  WHERE repositoryId = :repositoryId")
+	void updateRepositoryOwnerAndName(
+			String repositoryOwner, String repositoryName, int repositoryId);
 
 	@Query("DELETE FROM Repositories WHERE repositoryId = :repositoryId")
 	void deleteRepository(int repositoryId);
@@ -47,10 +52,10 @@ public interface RepositoriesDao {
 	@Query("UPDATE Repositories SET mostVisited = :mostVisited WHERE repositoryId = :repositoryId")
 	void updateRepositoryMostVisited(int mostVisited, int repositoryId);
 
-	@Query("SELECT * FROM Repositories WHERE mostVisited > 0  AND repoAccountId = :repoAccountId ORDER BY mostVisited DESC LIMIT 50")
+	@Query(
+			"SELECT * FROM Repositories WHERE mostVisited > 0  AND repoAccountId = :repoAccountId ORDER BY mostVisited DESC LIMIT 50")
 	LiveData<List<Repository>> fetchAllMostVisited(int repoAccountId);
 
 	@Query("UPDATE Repositories SET mostVisited = 0 WHERE repoAccountId = :repoAccountId")
 	void resetAllRepositoryMostVisited(int repoAccountId);
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/database/dao/UserAccountsDao.java b/app/src/main/java/org/mian/gitnex/database/dao/UserAccountsDao.java
index 172e5b07..ba9a40d0 100644
--- a/app/src/main/java/org/mian/gitnex/database/dao/UserAccountsDao.java
+++ b/app/src/main/java/org/mian/gitnex/database/dao/UserAccountsDao.java
@@ -4,13 +4,12 @@ import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.Query;
-import org.mian.gitnex.database.models.UserAccount;
 import java.util.List;
+import org.mian.gitnex.database.models.UserAccount;
 
 /**
  * @author M M Arif
  */
-
 @Dao
 public interface UserAccountsDao {
 
@@ -44,7 +43,8 @@ public interface UserAccountsDao {
 	@Query("UPDATE UserAccounts SET serverVersion = :serverVersion WHERE accountId = :accountId")
 	void updateServerVersion(String serverVersion, int accountId);
 
-	@Query("UPDATE UserAccounts SET maxResponseItems = :maxResponseItems, defaultPagingNumber = :defaultPagingNumber WHERE accountId = :accountId")
+	@Query(
+			"UPDATE UserAccounts SET maxResponseItems = :maxResponseItems, defaultPagingNumber = :defaultPagingNumber WHERE accountId = :accountId")
 	void updateServerPagingLimit(int maxResponseItems, int defaultPagingNumber, int accountId);
 
 	@Query("UPDATE UserAccounts SET accountName = :accountName WHERE accountId = :accountId")
@@ -56,14 +56,17 @@ public interface UserAccountsDao {
 	@Query("UPDATE UserAccounts SET token = :token WHERE accountName = :accountName")
 	void updateAccountTokenByAccountName(String accountName, String token);
 
-	@Query("UPDATE UserAccounts SET instanceUrl = :instanceUrl, token = :token WHERE accountId = :accountId")
+	@Query(
+			"UPDATE UserAccounts SET instanceUrl = :instanceUrl, token = :token WHERE accountId = :accountId")
 	void updateHostInfo(String instanceUrl, String token, int accountId);
 
 	@Query("UPDATE UserAccounts SET userName = :userName WHERE accountId = :accountId")
 	void updateUserName(String userName, int accountId);
 
-	@Query("UPDATE UserAccounts SET instanceUrl = :instanceUrl, token = :token, userName = :userName, serverVersion = :serverVersion WHERE accountId = :accountId")
-	void updateAll(String instanceUrl, String token, String userName, String serverVersion, int accountId);
+	@Query(
+			"UPDATE UserAccounts SET instanceUrl = :instanceUrl, token = :token, userName = :userName, serverVersion = :serverVersion WHERE accountId = :accountId")
+	void updateAll(
+			String instanceUrl, String token, String userName, String serverVersion, int accountId);
 
 	@Query("UPDATE UserAccounts SET isLoggedIn = 0 WHERE accountId = :accountId")
 	void logout(int accountId);
@@ -73,5 +76,4 @@ public interface UserAccountsDao {
 
 	@Query("DELETE FROM UserAccounts WHERE accountId = :accountId")
 	void deleteAccount(int accountId);
-
 }
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 0074e28c..f0dd225f 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
@@ -17,64 +17,81 @@ import org.mian.gitnex.database.models.UserAccount;
 /**
  * @author M M Arif
  */
-
-@Database(entities = {Draft.class, Repository.class, UserAccount.class}, version = 6, exportSchema = false)
+@Database(
+		entities = {Draft.class, Repository.class, UserAccount.class},
+		version = 6,
+		exportSchema = false)
 public abstract class GitnexDatabase extends RoomDatabase {
 
 	private static final String DB_NAME = "gitnex";
-	private static final Migration MIGRATION_1_2 = new Migration(1, 2) {
-		@Override
-		public void migrate(@NonNull SupportSQLiteDatabase database) {
-			//database.execSQL("DROP TABLE Drafts");
-			database.execSQL("ALTER TABLE 'Drafts' ADD COLUMN 'commentId' TEXT");
-		}
-	};
-	private static final Migration MIGRATION_2_3 = new Migration(2, 3) {
-		@Override
-		public void migrate(@NonNull SupportSQLiteDatabase database) {
-			database.execSQL("ALTER TABLE 'Drafts' ADD COLUMN 'issueType' TEXT");
-		}
-	};
-	private static final Migration MIGRATION_3_4 = new Migration(3, 4) {
+	private static final Migration MIGRATION_1_2 =
+			new Migration(1, 2) {
+				@Override
+				public void migrate(@NonNull SupportSQLiteDatabase database) {
+					// database.execSQL("DROP TABLE Drafts");
+					database.execSQL("ALTER TABLE 'Drafts' ADD COLUMN 'commentId' TEXT");
+				}
+			};
+	private static final Migration MIGRATION_2_3 =
+			new Migration(2, 3) {
+				@Override
+				public void migrate(@NonNull SupportSQLiteDatabase database) {
+					database.execSQL("ALTER TABLE 'Drafts' ADD COLUMN 'issueType' TEXT");
+				}
+			};
+	private static final Migration MIGRATION_3_4 =
+			new Migration(3, 4) {
 
-		@Override
-		public void migrate(@NonNull SupportSQLiteDatabase database) {
-			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
+				public void migrate(@NonNull SupportSQLiteDatabase database) {
+					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
-		public void migrate(@NonNull SupportSQLiteDatabase database) {
-			database.execSQL("ALTER TABLE 'userAccounts' ADD COLUMN 'maxResponseItems' INTEGER NOT NULL DEFAULT 50");
-			database.execSQL("ALTER TABLE 'userAccounts' ADD COLUMN 'defaultPagingNumber' INTEGER NOT NULL DEFAULT 30");
-		}
-	};
-	private static final Migration MIGRATION_5_6 = new Migration(5, 6) {
+				@Override
+				public void migrate(@NonNull SupportSQLiteDatabase database) {
+					database.execSQL(
+							"ALTER TABLE 'userAccounts' ADD COLUMN 'maxResponseItems' INTEGER NOT NULL DEFAULT 50");
+					database.execSQL(
+							"ALTER TABLE 'userAccounts' ADD COLUMN 'defaultPagingNumber' INTEGER NOT NULL DEFAULT 30");
+				}
+			};
+	private static final Migration MIGRATION_5_6 =
+			new Migration(5, 6) {
 
-		@Override
-		public void migrate(@NonNull SupportSQLiteDatabase database) {
-			database.execSQL("ALTER TABLE 'Repositories' ADD COLUMN 'mostVisited' INTEGER NOT NULL DEFAULT 0");
-		}
-	};
+				@Override
+				public void migrate(@NonNull SupportSQLiteDatabase database) {
+					database.execSQL(
+							"ALTER TABLE 'Repositories' ADD COLUMN 'mostVisited' INTEGER NOT NULL DEFAULT 0");
+				}
+			};
 	private static volatile GitnexDatabase gitnexDatabase;
 
 	public static GitnexDatabase getDatabaseInstance(Context context) {
 
-		if(gitnexDatabase == null) {
-			synchronized(GitnexDatabase.class) {
-				if(gitnexDatabase == null) {
-
-					gitnexDatabase = Room.databaseBuilder(context, GitnexDatabase.class, DB_NAME)
-						//.fallbackToDestructiveMigration()
-						.allowMainThreadQueries().addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5, MIGRATION_5_6).build();
+		if (gitnexDatabase == null) {
+			synchronized (GitnexDatabase.class) {
+				if (gitnexDatabase == null) {
 
+					gitnexDatabase =
+							Room.databaseBuilder(context, GitnexDatabase.class, DB_NAME)
+									// .fallbackToDestructiveMigration()
+									.allowMainThreadQueries()
+									.addMigrations(
+											MIGRATION_1_2,
+											MIGRATION_2_3,
+											MIGRATION_3_4,
+											MIGRATION_4_5,
+											MIGRATION_5_6)
+									.build();
 				}
 			}
 		}
 
 		return gitnexDatabase;
-
 	}
 
 	public abstract DraftsDao draftsDao();
@@ -82,5 +99,4 @@ public abstract class GitnexDatabase extends RoomDatabase {
 	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 d0b14f45..3e6b410e 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
@@ -1,18 +1,26 @@
 package org.mian.gitnex.database.models;
 
+import static androidx.room.ForeignKey.CASCADE;
+
 import androidx.annotation.Nullable;
 import androidx.room.Entity;
 import androidx.room.ForeignKey;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 import java.io.Serializable;
-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)
@@ -22,12 +30,9 @@ public class Draft implements Serializable {
 	private int draftAccountId;
 	private int issueId;
 	private String draftText;
-	@Nullable
-	private String draftType;
-	@Nullable
-	private String commentId;
-	@Nullable
-	private String issueType;
+	@Nullable private String draftType;
+	@Nullable private String commentId;
+	@Nullable private String issueType;
 
 	public int getDraftId() {
 
@@ -79,8 +84,7 @@ public class Draft implements Serializable {
 		this.draftText = draftText;
 	}
 
-	@Nullable
-	public String getDraftType() {
+	@Nullable public String getDraftType() {
 
 		return draftType;
 	}
@@ -90,8 +94,7 @@ public class Draft implements Serializable {
 		this.draftType = draftType;
 	}
 
-	@Nullable
-	public String getCommentId() {
+	@Nullable public String getCommentId() {
 
 		return commentId;
 	}
@@ -101,8 +104,7 @@ public class Draft implements Serializable {
 		this.commentId = commentId;
 	}
 
-	@Nullable
-	public String getIssueType() {
+	@Nullable public String getIssueType() {
 
 		return issueType;
 	}
@@ -111,5 +113,4 @@ public class Draft implements Serializable {
 
 		this.issueType = issueType;
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/database/models/DraftWithRepository.java b/app/src/main/java/org/mian/gitnex/database/models/DraftWithRepository.java
index 147f9a44..9aa9b9dd 100644
--- a/app/src/main/java/org/mian/gitnex/database/models/DraftWithRepository.java
+++ b/app/src/main/java/org/mian/gitnex/database/models/DraftWithRepository.java
@@ -3,7 +3,6 @@ package org.mian.gitnex.database.models;
 /**
  * @author M M Arif
  */
-
 public class DraftWithRepository {
 
 	private int repositoryId;
@@ -149,5 +148,4 @@ public class DraftWithRepository {
 	public void setMostVisited(int mostVisited) {
 		this.mostVisited = mostVisited;
 	}
-
 }
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 8a86dc6b..c02de790 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
@@ -1,17 +1,25 @@
 package org.mian.gitnex.database.models;
 
+import static androidx.room.ForeignKey.CASCADE;
+
 import androidx.room.Entity;
 import androidx.room.ForeignKey;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 import java.io.Serializable;
-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)
@@ -61,5 +69,4 @@ public class Repository implements Serializable {
 	public void setMostVisited(int mostVisited) {
 		this.mostVisited = mostVisited;
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/database/models/UserAccount.java b/app/src/main/java/org/mian/gitnex/database/models/UserAccount.java
index 2e7d4a5b..e19ae76c 100644
--- a/app/src/main/java/org/mian/gitnex/database/models/UserAccount.java
+++ b/app/src/main/java/org/mian/gitnex/database/models/UserAccount.java
@@ -8,20 +8,17 @@ import java.io.Serializable;
 /**
  * @author M M Arif
  */
-
 @Entity(tableName = "userAccounts")
 public class UserAccount implements Serializable {
 
 	@PrimaryKey(autoGenerate = true)
 	private int accountId;
 
-	@Nullable
-	private String accountName;
+	@Nullable private String accountName;
 	private String instanceUrl;
 	private String userName;
 	private String token;
-	@Nullable
-	private String serverVersion;
+	@Nullable private String serverVersion;
 	private boolean isLoggedIn;
 	private int maxResponseItems;
 	private int defaultPagingNumber;
@@ -34,8 +31,7 @@ public class UserAccount implements Serializable {
 		this.accountId = accountId;
 	}
 
-	@Nullable
-	public String getAccountName() {
+	@Nullable public String getAccountName() {
 		return accountName;
 	}
 
@@ -67,8 +63,7 @@ public class UserAccount implements Serializable {
 		this.token = token;
 	}
 
-	@Nullable
-	public String getServerVersion() {
+	@Nullable public String getServerVersion() {
 		return serverVersion;
 	}
 
@@ -99,5 +94,4 @@ public class UserAccount implements Serializable {
 	public void setDefaultPagingNumber(int defaultPagingNumber) {
 		this.defaultPagingNumber = defaultPagingNumber;
 	}
-
 }
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 213249f8..77aaecbd 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/AdministrationFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/AdministrationFragment.java
@@ -17,36 +17,40 @@ import org.mian.gitnex.databinding.FragmentAdministrationBinding;
 /**
  * @author M M Arif
  */
-
 public class AdministrationFragment extends Fragment {
 
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		FragmentAdministrationBinding fragmentAdministrationBinding = FragmentAdministrationBinding.inflate(inflater, container, false);
+		FragmentAdministrationBinding fragmentAdministrationBinding =
+				FragmentAdministrationBinding.inflate(inflater, container, false);
 
-		fragmentAdministrationBinding.systemUsersFrame.setOnClickListener(v1 -> startActivity(new Intent(getContext(), AdminGetUsersActivity.class)));
+		fragmentAdministrationBinding.systemUsersFrame.setOnClickListener(
+				v1 -> startActivity(new Intent(getContext(), AdminGetUsersActivity.class)));
 
-		// if gitea version is greater/equal(1.13.0) than user installed version (installed.higherOrEqual(compareVer))
-		if(((BaseActivity) requireActivity()).getAccount().requiresVersion("1.13.0")) {
+		// if gitea version is greater/equal(1.13.0) than user installed version
+		// (installed.higherOrEqual(compareVer))
+		if (((BaseActivity) requireActivity()).getAccount().requiresVersion("1.13.0")) {
 
 			fragmentAdministrationBinding.adminCronFrame.setVisibility(View.VISIBLE);
 		}
 
-		fragmentAdministrationBinding.adminCronFrame.setOnClickListener(v1 -> startActivity(new Intent(getContext(), AdminCronTasksActivity.class)));
-		fragmentAdministrationBinding.unadoptedReposFrame.setOnClickListener(v1 -> startActivity(new Intent(getContext(), AdminUnadoptedReposActivity.class)));
+		fragmentAdministrationBinding.adminCronFrame.setOnClickListener(
+				v1 -> startActivity(new Intent(getContext(), AdminCronTasksActivity.class)));
+		fragmentAdministrationBinding.unadoptedReposFrame.setOnClickListener(
+				v1 -> startActivity(new Intent(getContext(), AdminUnadoptedReposActivity.class)));
 
 		String action = requireActivity().getIntent().getStringExtra("giteaAdminAction");
-		if(action != null) {
-			if(action.equals("users")) {
+		if (action != null) {
+			if (action.equals("users")) {
 				startActivity(new Intent(getContext(), AdminGetUsersActivity.class));
-			}
-			else if(action.equals("monitor")) {
+			} else if (action.equals("monitor")) {
 				startActivity(new Intent(getContext(), AdminCronTasksActivity.class));
 			}
 		}
 
 		return fragmentAdministrationBinding.getRoot();
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetAdminUsersFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetAdminUsersFragment.java
index 194d21b6..a44ab8ad 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetAdminUsersFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetAdminUsersFragment.java
@@ -14,23 +14,24 @@ import org.mian.gitnex.structs.BottomSheetListener;
 /**
  * @author M M Arif
  */
-
 public class BottomSheetAdminUsersFragment extends BottomSheetDialogFragment {
 
 	private BottomSheetListener bmListener;
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		BottomSheetAdminUsersBinding bottomSheetAdminUsersBinding = BottomSheetAdminUsersBinding.inflate(inflater, container, false);
+		BottomSheetAdminUsersBinding bottomSheetAdminUsersBinding =
+				BottomSheetAdminUsersBinding.inflate(inflater, container, false);
 
-		bottomSheetAdminUsersBinding.createNewUser.setOnClickListener(v1 -> {
-
-			bmListener.onButtonClicked("newUser");
-			dismiss();
-
-		});
+		bottomSheetAdminUsersBinding.createNewUser.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("newUser");
+					dismiss();
+				});
 
 		return bottomSheetAdminUsersBinding.getRoot();
 	}
@@ -41,10 +42,8 @@ public class BottomSheetAdminUsersFragment extends BottomSheetDialogFragment {
 
 		try {
 			bmListener = (BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
+		} catch (ClassCastException e) {
 			throw new ClassCastException(context + " must implement BottomSheetListener");
 		}
 	}
-
 }
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 bec089e5..4b8af043 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetDraftsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetDraftsFragment.java
@@ -15,24 +15,25 @@ import org.mian.gitnex.structs.BottomSheetListener;
 /**
  * @author M M Arif
  */
-
 public class BottomSheetDraftsFragment extends BottomSheetDialogFragment {
 
 	private final String TAG = "BottomSheetDraftsFragment";
 	private BottomSheetListener bmListener;
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		BottomSheetDraftsBinding bottomSheetDraftsBinding = BottomSheetDraftsBinding.inflate(inflater, container, false);
+		BottomSheetDraftsBinding bottomSheetDraftsBinding =
+				BottomSheetDraftsBinding.inflate(inflater, container, false);
 
-		bottomSheetDraftsBinding.deleteAllDrafts.setOnClickListener(v1 -> {
-
-			dismiss();
-			bmListener.onButtonClicked("deleteDrafts");
-
-		});
+		bottomSheetDraftsBinding.deleteAllDrafts.setOnClickListener(
+				v1 -> {
+					dismiss();
+					bmListener.onButtonClicked("deleteDrafts");
+				});
 
 		return bottomSheetDraftsBinding.getRoot();
 	}
@@ -43,10 +44,8 @@ public class BottomSheetDraftsFragment extends BottomSheetDialogFragment {
 
 		try {
 			bmListener = (BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
+		} catch (ClassCastException e) {
 			Log.e(TAG, e.toString());
 		}
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetFileViewerFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetFileViewerFragment.java
index 6efe5488..f63c2f83 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetFileViewerFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetFileViewerFragment.java
@@ -15,61 +15,62 @@ import org.mian.gitnex.structs.BottomSheetListener;
 /**
  * @author M M Arif
  */
-
 public class BottomSheetFileViewerFragment extends BottomSheetDialogFragment {
 
 	private BottomSheetListener bmListener;
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
 		RepositoryContext repository = RepositoryContext.fromBundle(requireArguments());
-		BottomSheetFileViewerBinding bottomSheetFileViewerBinding = BottomSheetFileViewerBinding.inflate(inflater, container, false);
+		BottomSheetFileViewerBinding bottomSheetFileViewerBinding =
+				BottomSheetFileViewerBinding.inflate(inflater, container, false);
 
-		if(!repository.getPermissions().isPush()) {
+		if (!repository.getPermissions().isPush()) {
 			bottomSheetFileViewerBinding.deleteFile.setVisibility(View.GONE);
 			bottomSheetFileViewerBinding.editFile.setVisibility(View.GONE);
-		}
-		else if(!requireArguments().getBoolean("editable")) {
+		} else if (!requireArguments().getBoolean("editable")) {
 			bottomSheetFileViewerBinding.editFile.setVisibility(View.GONE);
 		}
 
-		bottomSheetFileViewerBinding.downloadFile.setOnClickListener(v1 -> {
+		bottomSheetFileViewerBinding.downloadFile.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("downloadFile");
+					dismiss();
+				});
 
-			bmListener.onButtonClicked("downloadFile");
-			dismiss();
-		});
+		bottomSheetFileViewerBinding.deleteFile.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("deleteFile");
+					dismiss();
+				});
 
-		bottomSheetFileViewerBinding.deleteFile.setOnClickListener(v1 -> {
+		bottomSheetFileViewerBinding.editFile.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("editFile");
+					dismiss();
+				});
 
-			bmListener.onButtonClicked("deleteFile");
-			dismiss();
-		});
+		bottomSheetFileViewerBinding.copyUrl.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("copyUrl");
+					dismiss();
+				});
 
-		bottomSheetFileViewerBinding.editFile.setOnClickListener(v1 -> {
+		bottomSheetFileViewerBinding.share.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("share");
+					dismiss();
+				});
 
-			bmListener.onButtonClicked("editFile");
-			dismiss();
-		});
-
-		bottomSheetFileViewerBinding.copyUrl.setOnClickListener(v1 -> {
-
-			bmListener.onButtonClicked("copyUrl");
-			dismiss();
-		});
-
-		bottomSheetFileViewerBinding.share.setOnClickListener(v1 -> {
-
-			bmListener.onButtonClicked("share");
-			dismiss();
-		});
-
-		bottomSheetFileViewerBinding.open.setOnClickListener(v1 -> {
-
-			bmListener.onButtonClicked("open");
-			dismiss();
-		});
+		bottomSheetFileViewerBinding.open.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("open");
+					dismiss();
+				});
 
 		return bottomSheetFileViewerBinding.getRoot();
 	}
@@ -80,10 +81,8 @@ public class BottomSheetFileViewerFragment extends BottomSheetDialogFragment {
 
 		try {
 			bmListener = (BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
+		} catch (ClassCastException e) {
 			throw new ClassCastException(context + " must implement BottomSheetListener");
 		}
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetIssuesFilterFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetIssuesFilterFragment.java
index 78b93ead..c1528a90 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetIssuesFilterFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetIssuesFilterFragment.java
@@ -15,34 +15,39 @@ import org.mian.gitnex.structs.BottomSheetListener;
 /**
  * @author M M Arif
  */
-
 public class BottomSheetIssuesFilterFragment extends BottomSheetDialogFragment {
 
 	private BottomSheetListener bmListener;
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		BottomSheetIssuesFilterBinding bottomSheetIssuesFilterBinding = BottomSheetIssuesFilterBinding.inflate(inflater, container, false);
+		BottomSheetIssuesFilterBinding bottomSheetIssuesFilterBinding =
+				BottomSheetIssuesFilterBinding.inflate(inflater, container, false);
 
-		if(((BaseActivity) requireActivity()).getAccount().requiresVersion("1.14.0")) {
+		if (((BaseActivity) requireActivity()).getAccount().requiresVersion("1.14.0")) {
 			bottomSheetIssuesFilterBinding.filterByMilestone.setVisibility(View.VISIBLE);
-			bottomSheetIssuesFilterBinding.filterByMilestone.setOnClickListener(v1 -> {
-				bmListener.onButtonClicked("filterByMilestone");
-				dismiss();
-			});
+			bottomSheetIssuesFilterBinding.filterByMilestone.setOnClickListener(
+					v1 -> {
+						bmListener.onButtonClicked("filterByMilestone");
+						dismiss();
+					});
 		}
 
-		bottomSheetIssuesFilterBinding.openIssues.setOnClickListener(v1 -> {
-			bmListener.onButtonClicked("openIssues");
-			dismiss();
-		});
+		bottomSheetIssuesFilterBinding.openIssues.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("openIssues");
+					dismiss();
+				});
 
-		bottomSheetIssuesFilterBinding.closedIssues.setOnClickListener(v12 -> {
-			bmListener.onButtonClicked("closedIssues");
-			dismiss();
-		});
+		bottomSheetIssuesFilterBinding.closedIssues.setOnClickListener(
+				v12 -> {
+					bmListener.onButtonClicked("closedIssues");
+					dismiss();
+				});
 
 		return bottomSheetIssuesFilterBinding.getRoot();
 	}
@@ -54,10 +59,8 @@ public class BottomSheetIssuesFilterFragment extends BottomSheetDialogFragment {
 
 		try {
 			bmListener = (BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
+		} catch (ClassCastException e) {
 			throw new ClassCastException(context + " must implement BottomSheetListener");
 		}
 	}
-
 }
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 a002e1b2..9d0f3b29 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMilestonesFilterFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMilestonesFilterFragment.java
@@ -15,26 +15,30 @@ import org.mian.gitnex.structs.BottomSheetListener;
 /**
  * @author M M Arif
  */
-
 public class BottomSheetMilestonesFilterFragment extends BottomSheetDialogFragment {
 
 	private BottomSheetListener bmListener;
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @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");
-			dismiss();
-		});
+		bottomSheetMilestonesFilterBinding.openMilestone.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("openMilestone");
+					dismiss();
+				});
 
-		bottomSheetMilestonesFilterBinding.closedMilestone.setOnClickListener(v12 -> {
-			bmListener.onButtonClicked("closedMilestone");
-			dismiss();
-		});
+		bottomSheetMilestonesFilterBinding.closedMilestone.setOnClickListener(
+				v12 -> {
+					bmListener.onButtonClicked("closedMilestone");
+					dismiss();
+				});
 
 		return bottomSheetMilestonesFilterBinding.getRoot();
 	}
@@ -46,10 +50,8 @@ public class BottomSheetMilestonesFilterFragment extends BottomSheetDialogFragme
 
 		try {
 			bmListener = (BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
+		} catch (ClassCastException e) {
 			Log.e("MilestonesFilterBs", e.toString());
 		}
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMyIssuesFilterFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMyIssuesFilterFragment.java
index e29e3e36..6ddca14b 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMyIssuesFilterFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMyIssuesFilterFragment.java
@@ -14,31 +14,36 @@ import org.mian.gitnex.structs.BottomSheetListener;
 /**
  * @author M M Arif
  */
-
 public class BottomSheetMyIssuesFilterFragment extends BottomSheetDialogFragment {
 
 	private BottomSheetListener bmListener;
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		BottomSheetMyIssuesFilterBinding bottomSheetIssuesFilterBinding = BottomSheetMyIssuesFilterBinding.inflate(inflater, container, false);
+		BottomSheetMyIssuesFilterBinding bottomSheetIssuesFilterBinding =
+				BottomSheetMyIssuesFilterBinding.inflate(inflater, container, false);
 
-		bottomSheetIssuesFilterBinding.openMyIssues.setOnClickListener(v1 -> {
-			bmListener.onButtonClicked("openMyIssues");
-			dismiss();
-		});
+		bottomSheetIssuesFilterBinding.openMyIssues.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("openMyIssues");
+					dismiss();
+				});
 
-		bottomSheetIssuesFilterBinding.closedMyIssues.setOnClickListener(v12 -> {
-			bmListener.onButtonClicked("closedMyIssues");
-			dismiss();
-		});
+		bottomSheetIssuesFilterBinding.closedMyIssues.setOnClickListener(
+				v12 -> {
+					bmListener.onButtonClicked("closedMyIssues");
+					dismiss();
+				});
 
-		bottomSheetIssuesFilterBinding.assignedToMe.setOnClickListener(v12 -> {
-			bmListener.onButtonClicked("assignedToMe");
-			dismiss();
-		});
+		bottomSheetIssuesFilterBinding.assignedToMe.setOnClickListener(
+				v12 -> {
+					bmListener.onButtonClicked("assignedToMe");
+					dismiss();
+				});
 
 		return bottomSheetIssuesFilterBinding.getRoot();
 	}
@@ -50,10 +55,8 @@ public class BottomSheetMyIssuesFilterFragment extends BottomSheetDialogFragment
 
 		try {
 			bmListener = (BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
+		} catch (ClassCastException e) {
 			throw new ClassCastException(context + " must implement BottomSheetListener");
 		}
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMyProfileFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMyProfileFragment.java
index c2240302..9dcce013 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMyProfileFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMyProfileFragment.java
@@ -14,22 +14,23 @@ import org.mian.gitnex.databinding.BottomSheetProfileBinding;
 /**
  * @author M M Arif
  */
-
 public class BottomSheetMyProfileFragment extends BottomSheetDialogFragment {
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		BottomSheetProfileBinding bottomSheetProfileBinding = BottomSheetProfileBinding.inflate(inflater, container, false);
+		BottomSheetProfileBinding bottomSheetProfileBinding =
+				BottomSheetProfileBinding.inflate(inflater, container, false);
 
-		bottomSheetProfileBinding.addNewEmailAddress.setOnClickListener(v1 -> {
-
-			startActivity(new Intent(getContext(), MyProfileEmailActivity.class));
-			dismiss();
-		});
+		bottomSheetProfileBinding.addNewEmailAddress.setOnClickListener(
+				v1 -> {
+					startActivity(new Intent(getContext(), MyProfileEmailActivity.class));
+					dismiss();
+				});
 
 		return bottomSheetProfileBinding.getRoot();
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetNotificationsFilterFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetNotificationsFilterFragment.java
index 11178922..c44b8ec4 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetNotificationsFilterFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetNotificationsFilterFragment.java
@@ -13,25 +13,29 @@ import org.mian.gitnex.structs.BottomSheetListener;
 /**
  * @author opyale
  */
-
 public class BottomSheetNotificationsFilterFragment extends BottomSheetDialogFragment {
 
 	private BottomSheetListener listener;
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-		BottomSheetNotificationsFilterBinding binding = BottomSheetNotificationsFilterBinding.inflate(inflater, container, false);
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		BottomSheetNotificationsFilterBinding binding =
+				BottomSheetNotificationsFilterBinding.inflate(inflater, container, false);
 
-		binding.readNotifications.setOnClickListener(v1 -> {
-			listener.onButtonClicked("read");
-			dismiss();
-		});
+		binding.readNotifications.setOnClickListener(
+				v1 -> {
+					listener.onButtonClicked("read");
+					dismiss();
+				});
 
-		binding.unreadNotifications.setOnClickListener(v12 -> {
-			listener.onButtonClicked("unread");
-			dismiss();
-		});
+		binding.unreadNotifications.setOnClickListener(
+				v12 -> {
+					listener.onButtonClicked("unread");
+					dismiss();
+				});
 
 		return binding.getRoot();
 	}
@@ -39,5 +43,4 @@ public class BottomSheetNotificationsFilterFragment extends BottomSheetDialogFra
 	public void setOnClickListener(BottomSheetListener listener) {
 		this.listener = listener;
 	}
-
 }
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 7cc1f622..fbf79157 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetNotificationsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetNotificationsFragment.java
@@ -18,91 +18,127 @@ import org.mian.gitnex.helpers.SimpleCallback;
 /**
  * @author opyale
  */
-
 public class BottomSheetNotificationsFragment extends BottomSheetDialogFragment {
 
 	private Context context;
 	private NotificationThread notificationThread;
 	private Runnable onOptionSelectedListener;
 
-	public void onAttach(Context context, NotificationThread notificationThread, Runnable onOptionSelectedListener) {
+	public void onAttach(
+			Context context,
+			NotificationThread notificationThread,
+			Runnable onOptionSelectedListener) {
 
 		super.onAttach(context);
 
 		this.context = context;
 		this.notificationThread = notificationThread;
 		this.onOptionSelectedListener = onOptionSelectedListener;
-
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		BottomSheetNotificationsBinding bottomSheetNotificationsBinding = BottomSheetNotificationsBinding.inflate(inflater, container, false);
+		BottomSheetNotificationsBinding bottomSheetNotificationsBinding =
+				BottomSheetNotificationsBinding.inflate(inflater, container, false);
 
 		TextView markRead = bottomSheetNotificationsBinding.markRead;
 		TextView markUnread = bottomSheetNotificationsBinding.markUnread;
 		TextView markPinned = bottomSheetNotificationsBinding.markPinned;
 
-		if(notificationThread.isPinned()) {
+		if (notificationThread.isPinned()) {
 			AppUtil.setMultiVisibility(View.GONE, markUnread, markPinned);
-		}
-		else if(notificationThread.isUnread()) {
+		} else if (notificationThread.isUnread()) {
 			markUnread.setVisibility(View.GONE);
-		}
-		else {
+		} else {
 			markRead.setVisibility(View.GONE);
 		}
 
 		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();
-					/*} else {
-						Toasty.error(context, getString(R.string.genericError));
-					}*/
+													// 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) -> {
+				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
-				// 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));
-					}*/
+													// 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();
+												}));
 
 		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();
-					/*} else {
-						Toasty.error(context, getString(R.string.genericError));
-					}*/
+													// 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 05f03177..a34b16f8 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java
@@ -15,7 +15,6 @@ import org.mian.gitnex.structs.BottomSheetListener;
 /**
  * @author M M Arif
  */
-
 public class BottomSheetOrganizationFragment extends BottomSheetDialogFragment {
 
 	private final OrganizationPermissions permissions;
@@ -25,62 +24,65 @@ public class BottomSheetOrganizationFragment extends BottomSheetDialogFragment {
 		permissions = org;
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		BottomSheetOrganizationBinding bottomSheetOrganizationBinding = BottomSheetOrganizationBinding.inflate(inflater, container, false);
+		BottomSheetOrganizationBinding bottomSheetOrganizationBinding =
+				BottomSheetOrganizationBinding.inflate(inflater, container, false);
 
-		if(permissions != null) {
-			if(!permissions.isCanCreateRepository()) {
+		if (permissions != null) {
+			if (!permissions.isCanCreateRepository()) {
 				bottomSheetOrganizationBinding.createRepository.setVisibility(View.GONE);
 			}
-			if(!permissions.isIsOwner()) {
+			if (!permissions.isIsOwner()) {
 				bottomSheetOrganizationBinding.createLabel.setVisibility(View.GONE);
 				bottomSheetOrganizationBinding.createTeam.setVisibility(View.GONE);
 			}
-			if(!permissions.isCanCreateRepository() || !permissions.isIsOwner()) {
+			if (!permissions.isCanCreateRepository() || !permissions.isIsOwner()) {
 				bottomSheetOrganizationBinding.organizationHeadFrame.setVisibility(View.GONE);
 				bottomSheetOrganizationBinding.orgCreateSection.setVisibility(View.GONE);
 				bottomSheetOrganizationBinding.orgDivider.setVisibility(View.GONE);
 			}
 		}
 
-		bottomSheetOrganizationBinding.createTeam.setOnClickListener(v1 -> {
+		bottomSheetOrganizationBinding.createTeam.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("team");
+					dismiss();
+				});
 
-			bmListener.onButtonClicked("team");
-			dismiss();
-		});
+		bottomSheetOrganizationBinding.createLabel.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("label");
+					dismiss();
+				});
 
-		bottomSheetOrganizationBinding.createLabel.setOnClickListener(v1 -> {
+		bottomSheetOrganizationBinding.createRepository.setOnClickListener(
+				v12 -> {
+					bmListener.onButtonClicked("repository");
+					dismiss();
+				});
 
-			bmListener.onButtonClicked("label");
-			dismiss();
-		});
+		bottomSheetOrganizationBinding.copyOrgUrl.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("copyOrgUrl");
+					dismiss();
+				});
 
-		bottomSheetOrganizationBinding.createRepository.setOnClickListener(v12 -> {
+		bottomSheetOrganizationBinding.share.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("share");
+					dismiss();
+				});
 
-			bmListener.onButtonClicked("repository");
-			dismiss();
-		});
-
-		bottomSheetOrganizationBinding.copyOrgUrl.setOnClickListener(v1 -> {
-
-			bmListener.onButtonClicked("copyOrgUrl");
-			dismiss();
-		});
-
-		bottomSheetOrganizationBinding.share.setOnClickListener(v1 -> {
-
-			bmListener.onButtonClicked("share");
-			dismiss();
-		});
-
-		bottomSheetOrganizationBinding.open.setOnClickListener(v1 -> {
-
-			bmListener.onButtonClicked("open");
-			dismiss();
-		});
+		bottomSheetOrganizationBinding.open.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("open");
+					dismiss();
+				});
 
 		return bottomSheetOrganizationBinding.getRoot();
 	}
@@ -92,10 +94,8 @@ public class BottomSheetOrganizationFragment extends BottomSheetDialogFragment {
 
 		try {
 			bmListener = (BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
+		} catch (ClassCastException e) {
 			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 691f2d52..1d20d5ed 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationTeamsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationTeamsFragment.java
@@ -15,35 +15,35 @@ import org.mian.gitnex.structs.BottomSheetListener;
 /**
  * @author M M Arif
  */
-
 public class BottomSheetOrganizationTeamsFragment extends BottomSheetDialogFragment {
 
 	private BottomSheetListener bmListener;
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @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 -> {
+		bottomSheetOrganizationTeamsBinding.addNewMember.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("newMember");
+					dismiss();
+				});
 
-			bmListener.onButtonClicked("newMember");
-			dismiss();
-
-		});
-
-		if(!requireArguments().getBoolean("showRepo")) {
+		if (!requireArguments().getBoolean("showRepo")) {
 			bottomSheetOrganizationTeamsBinding.addRepo.setVisibility(View.GONE);
 		}
-		bottomSheetOrganizationTeamsBinding.addRepo.setOnClickListener(v1 -> {
-			bmListener.onButtonClicked("newRepo");
-			dismiss();
-
-		});
+		bottomSheetOrganizationTeamsBinding.addRepo.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("newRepo");
+					dismiss();
+				});
 
 		return bottomSheetOrganizationTeamsBinding.getRoot();
-
 	}
 
 	@Override
@@ -52,10 +52,8 @@ public class BottomSheetOrganizationTeamsFragment extends BottomSheetDialogFragm
 
 		try {
 			bmListener = (BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
+		} catch (ClassCastException e) {
 			Log.e("BsOrganizationTeams", e.toString());
 		}
 	}
-
 }
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 c3d9c5ea..0175c5a7 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetPullRequestFilterFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetPullRequestFilterFragment.java
@@ -14,26 +14,30 @@ import org.mian.gitnex.structs.BottomSheetListener;
 /**
  * @author M M Arif
  */
-
 public class BottomSheetPullRequestFilterFragment extends BottomSheetDialogFragment {
 
 	private BottomSheetListener bmListener;
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @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");
-			dismiss();
-		});
+		bottomSheetPullRequestFilterBinding.openPr.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("openPr");
+					dismiss();
+				});
 
-		bottomSheetPullRequestFilterBinding.closedPr.setOnClickListener(v12 -> {
-			bmListener.onButtonClicked("closedPr");
-			dismiss();
-		});
+		bottomSheetPullRequestFilterBinding.closedPr.setOnClickListener(
+				v12 -> {
+					bmListener.onButtonClicked("closedPr");
+					dismiss();
+				});
 
 		return bottomSheetPullRequestFilterBinding.getRoot();
 	}
@@ -45,10 +49,8 @@ public class BottomSheetPullRequestFilterFragment extends BottomSheetDialogFragm
 
 		try {
 			bmListener = (BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
+		} catch (ClassCastException e) {
 			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 6a7e65c7..e02ec35e 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReleasesTagsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReleasesTagsFragment.java
@@ -14,7 +14,6 @@ import org.mian.gitnex.structs.BottomSheetListener;
 /**
  * @author opyale
  */
-
 public class BottomSheetReleasesTagsFragment extends BottomSheetDialogFragment {
 
 	private BottomSheetListener bmListener;
@@ -26,31 +25,32 @@ public class BottomSheetReleasesTagsFragment extends BottomSheetDialogFragment {
 
 		try {
 			bmListener = (BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
+		} catch (ClassCastException e) {
 			throw new ClassCastException(context + " must implement BottomSheetListener");
 		}
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		BottomSheetReleasesTagsBinding binding = BottomSheetReleasesTagsBinding.inflate(inflater, container, false);
+		BottomSheetReleasesTagsBinding binding =
+				BottomSheetReleasesTagsBinding.inflate(inflater, container, false);
 
-		binding.tags.setOnClickListener(v1 -> {
+		binding.tags.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("tags");
+					dismiss();
+				});
 
-			bmListener.onButtonClicked("tags");
-			dismiss();
-		});
-
-		binding.releases.setOnClickListener(v12 -> {
-
-			bmListener.onButtonClicked("releases");
-			dismiss();
-		});
+		binding.releases.setOnClickListener(
+				v12 -> {
+					bmListener.onButtonClicked("releases");
+					dismiss();
+				});
 
 		return binding.getRoot();
 	}
-
 }
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 a50c344a..a05863f1 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java
@@ -21,6 +21,7 @@ import androidx.fragment.app.FragmentActivity;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import com.vdurmont.emoji.EmojiParser;
+import java.util.Objects;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.ActionResult;
 import org.mian.gitnex.actions.IssueActions;
@@ -34,12 +35,10 @@ import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.IssueContext;
-import java.util.Objects;
 
 /**
  * @author opyale
  */
-
 public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 
 	private Mode mode = Mode.SEND;
@@ -68,16 +67,20 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 		tinyDB = TinyDB.getInstance(context);
 		draftsApi = BaseApi.getInstance(context, DraftsApi.class);
 
-		currentActiveAccountId = ((BaseActivity) requireActivity()).getAccount().getAccount().getAccountId();
+		currentActiveAccountId =
+				((BaseActivity) requireActivity()).getAccount().getAccount().getAccountId();
 		issue = IssueContext.fromBundle(requireArguments());
 	}
 
 	@SuppressLint("ClickableViewAccessibility")
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		BottomSheetReplyLayoutBinding bottomSheetReplyLayoutBinding = BottomSheetReplyLayoutBinding.inflate(inflater, container, false);
+		BottomSheetReplyLayoutBinding bottomSheetReplyLayoutBinding =
+				BottomSheetReplyLayoutBinding.inflate(inflater, container, false);
 		Bundle arguments = requireArguments();
 
 		draftsHint = bottomSheetReplyLayoutBinding.draftsHint;
@@ -90,159 +93,171 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 
 		send.setEnabled(false);
 
-		if(Objects.equals(arguments.getString("commentAction"), "edit") && arguments.getString("draftId") == null) {
+		if (Objects.equals(arguments.getString("commentAction"), "edit")
+				&& arguments.getString("draftId") == null) {
 
 			send.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_save));
 			mode = Mode.EDIT;
 		}
 
-		if(arguments.getString("draftId") != null) {
+		if (arguments.getString("draftId") != null) {
 
 			draftId = Long.parseLong(arguments.getString("draftId"));
 		}
 
-		if(issue.getIssue() != null && !issue.getIssue().getTitle().isEmpty()) {
+		if (issue.getIssue() != null && !issue.getIssue().getTitle().isEmpty()) {
 
 			toolbarTitle.setText(EmojiParser.parseToUnicode(issue.getIssue().getTitle()));
-		}
-		else if(arguments.getString("draftTitle") != null) {
+		} else if (arguments.getString("draftTitle") != null) {
 
 			toolbarTitle.setText(arguments.getString("draftTitle"));
 		}
 
-		if(arguments.getString("commentBody") != null) {
+		if (arguments.getString("commentBody") != null) {
 
 			send.setEnabled(true);
 			send.setAlpha(1f);
 
 			comment.setText(arguments.getString("commentBody"));
 
-			if(arguments.getBoolean("cursorToEnd", false)) {
+			if (arguments.getBoolean("cursorToEnd", false)) {
 
 				comment.setSelection(comment.length());
 			}
 		}
 
 		comment.requestFocus();
-		comment.setOnTouchListener((v, event) -> {
+		comment.setOnTouchListener(
+				(v, event) -> {
+					BottomSheetBehavior<View> bottomSheetBehavior =
+							BottomSheetBehavior.from(
+									(View) bottomSheetReplyLayoutBinding.getRoot().getParent());
 
-			BottomSheetBehavior<View> bottomSheetBehavior = BottomSheetBehavior.from((View) bottomSheetReplyLayoutBinding.getRoot().getParent());
+					switch (event.getAction()) {
+						case MotionEvent.ACTION_DOWN:
+						case MotionEvent.ACTION_SCROLL:
+							bottomSheetBehavior.setDraggable(false);
+							break;
 
-			switch(event.getAction()) {
+						default:
+							bottomSheetBehavior.setDraggable(true);
+					}
 
-				case MotionEvent.ACTION_DOWN:
-				case MotionEvent.ACTION_SCROLL:
-					bottomSheetBehavior.setDraggable(false);
-					break;
+					return false;
+				});
 
-				default:
-					bottomSheetBehavior.setDraggable(true);
-			}
+		comment.addTextChangedListener(
+				new TextWatcher() {
 
-			return false;
-		});
+					@Override
+					public void afterTextChanged(Editable s) {
 
-		comment.addTextChangedListener(new TextWatcher() {
+						String text = comment.getText().toString();
 
-			@Override
-			public void afterTextChanged(Editable s) {
+						if (text.isEmpty()) {
 
-				String text = comment.getText().toString();
+							send.setEnabled(false);
+							send.setAlpha(0.5f);
+							saveDraft(null, true);
+						} else {
 
-				if(text.isEmpty()) {
+							send.setEnabled(true);
+							send.setAlpha(1f);
+							saveDraft(text, false);
+						}
+					}
 
-					send.setEnabled(false);
-					send.setAlpha(0.5f);
-					saveDraft(null, true);
-				}
-				else {
+					@Override
+					public void beforeTextChanged(
+							CharSequence s, int start, int count, int after) {}
 
-					send.setEnabled(true);
-					send.setAlpha(1f);
-					saveDraft(text, false);
-				}
-			}
-
-			@Override
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-			}
-
-			@Override
-			public void onTextChanged(CharSequence s, int start, int before, int count) {
-			}
-
-		});
+					@Override
+					public void onTextChanged(CharSequence s, int start, int before, int count) {}
+				});
 
 		close.setOnClickListener(v -> dismiss());
 
-		drafts.setOnClickListener(v -> {
-
-			Intent intent = new Intent(getContext(), MainActivity.class);
-			intent.putExtra("launchFragment", "drafts");
-			startActivity(intent);
-
-			dismiss();
-
-		});
-
-		send.setOnClickListener(v -> {
-
-			if(mode == Mode.SEND) {
-
-				IssueActions.reply(getContext(), comment.getText().toString(), issue).accept((status, result) -> {
-
-					if(status == ActionResult.Status.SUCCESS) {
-
-						IssueDetailActivity.commentPosted = true;
-
-						Toasty.success(getContext(), getString(R.string.commentSuccess));
-
-						if(draftId != 0 && tinyDB.getBoolean("draftsCommentsDeletionEnabled", true)) {
-							draftsApi.deleteSingleDraft((int) draftId);
-						}
-
-						if(onInteractedListener != null) {
-							onInteractedListener.run();
-						}
-					}
-					else {
-
-						Toasty.error(getContext(), getString(R.string.genericError));
-					}
+		drafts.setOnClickListener(
+				v -> {
+					Intent intent = new Intent(getContext(), MainActivity.class);
+					intent.putExtra("launchFragment", "drafts");
+					startActivity(intent);
 
 					dismiss();
-
 				});
-			}
-			else {
 
-				IssueActions.edit(getContext(), comment.getText().toString(), arguments.getInt("commentId"), issue).accept((status, result) -> {
+		send.setOnClickListener(
+				v -> {
+					if (mode == Mode.SEND) {
 
-					FragmentActivity activity = requireActivity();
-					if(activity instanceof IssueDetailActivity) {
-						((IssueDetailActivity) activity).commentEdited = true;
+						IssueActions.reply(getContext(), comment.getText().toString(), issue)
+								.accept(
+										(status, result) -> {
+											if (status == ActionResult.Status.SUCCESS) {
+
+												IssueDetailActivity.commentPosted = true;
+
+												Toasty.success(
+														getContext(),
+														getString(R.string.commentSuccess));
+
+												if (draftId != 0
+														&& tinyDB.getBoolean(
+																"draftsCommentsDeletionEnabled",
+																true)) {
+													draftsApi.deleteSingleDraft((int) draftId);
+												}
+
+												if (onInteractedListener != null) {
+													onInteractedListener.run();
+												}
+											} else {
+
+												Toasty.error(
+														getContext(),
+														getString(R.string.genericError));
+											}
+
+											dismiss();
+										});
+					} else {
+
+						IssueActions.edit(
+										getContext(),
+										comment.getText().toString(),
+										arguments.getInt("commentId"),
+										issue)
+								.accept(
+										(status, result) -> {
+											FragmentActivity activity = requireActivity();
+											if (activity instanceof IssueDetailActivity) {
+												((IssueDetailActivity) activity).commentEdited =
+														true;
+											}
+
+											if (status == ActionResult.Status.SUCCESS) {
+
+												if (draftId != 0
+														&& tinyDB.getBoolean(
+																"draftsCommentsDeletionEnabled",
+																true)) {
+													draftsApi.deleteSingleDraft((int) draftId);
+												}
+
+												if (onInteractedListener != null) {
+													onInteractedListener.run();
+												}
+											} else {
+
+												Toasty.error(
+														getContext(),
+														getString(R.string.genericError));
+											}
+
+											dismiss();
+										});
 					}
-
-					if(status == ActionResult.Status.SUCCESS) {
-
-						if(draftId != 0 && tinyDB.getBoolean("draftsCommentsDeletionEnabled", true)) {
-							draftsApi.deleteSingleDraft((int) draftId);
-						}
-
-						if(onInteractedListener != null) {
-							onInteractedListener.run();
-						}
-					}
-					else {
-
-						Toasty.error(getContext(), getString(R.string.genericError));
-					}
-
-					dismiss();
-
 				});
-			}
-		});
 
 		return bottomSheetReplyLayoutBinding.getRoot();
 	}
@@ -251,45 +266,49 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 
 		ValueAnimator valueAnimator = ValueAnimator.ofFloat(0f, 1f);
 		valueAnimator.setDuration(500);
-		valueAnimator.addUpdateListener(animation -> {
+		valueAnimator.addUpdateListener(
+				animation -> {
+					float value = (Float) animation.getAnimatedValue();
 
-			float value = (Float) animation.getAnimatedValue();
+					if (value == 0f) {
+						draftsHint.setVisibility((remove) ? View.GONE : View.VISIBLE);
+					}
 
-			if(value == 0f) {
-				draftsHint.setVisibility((remove) ? View.GONE : View.VISIBLE);
-			}
+					draftsHint.setAlpha(value);
+				});
 
-			draftsHint.setAlpha(value);
-		});
-
-		if(remove) {
+		if (remove) {
 
 			draftsApi.deleteSingleDraft((int) draftId);
 			draftId = 0;
 
 			valueAnimator.reverse();
-		}
-		else {
+		} else {
 
 			String draftType;
-			if(issue.getIssueType().equalsIgnoreCase("Issue")) {
+			if (issue.getIssueType().equalsIgnoreCase("Issue")) {
 
 				draftType = Constants.draftTypeIssue;
-			}
-			else if(issue.getIssueType().equalsIgnoreCase("Pull")) {
+			} else if (issue.getIssueType().equalsIgnoreCase("Pull")) {
 
 				draftType = Constants.draftTypePull;
-			}
-			else {
+			} else {
 
 				draftType = "";
 			}
 
-			if(draftId == 0) {
+			if (draftId == 0) {
 
-				draftId = draftsApi.insertDraft(issue.getRepository().saveToDB(requireContext()), currentActiveAccountId, issue.getIssueIndex(), text, draftType, "TODO", issue.getIssueType());
-			}
-			else {
+				draftId =
+						draftsApi.insertDraft(
+								issue.getRepository().saveToDB(requireContext()),
+								currentActiveAccountId,
+								issue.getIssueIndex(),
+								text,
+								draftType,
+								"TODO",
+								issue.getIssueType());
+			} else {
 
 				draftsApi.updateDraft(text, (int) draftId, "TODO");
 			}
@@ -304,6 +323,8 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 		this.onInteractedListener = onInteractedListener;
 	}
 
-	private enum Mode {EDIT, SEND}
-
+	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 1f059033..7b1d44b0 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java
@@ -19,7 +19,6 @@ import org.mian.gitnex.structs.BottomSheetListener;
 /**
  * @author M M Arif
  */
-
 public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
 
 	private final RepositoryContext repository;
@@ -29,11 +28,14 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
 		this.repository = repository;
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		BottomSheetRepoBinding bottomSheetRepoBinding = BottomSheetRepoBinding.inflate(inflater, container, false);
+		BottomSheetRepoBinding bottomSheetRepoBinding =
+				BottomSheetRepoBinding.inflate(inflater, container, false);
 
 		AccountContext account = ((BaseActivity) requireActivity()).getAccount();
 
@@ -55,19 +57,19 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
 		TextView createWiki = bottomSheetRepoBinding.createWiki;
 
 		boolean canPush = repository.getPermissions().isPush();
-		if(!canPush) {
+		if (!canPush) {
 			createMilestone.setVisibility(View.GONE);
 			createLabel.setVisibility(View.GONE);
 			createRelease.setVisibility(View.GONE);
 			newFile.setVisibility(View.GONE);
 		}
 
-		if(!account.requiresVersion("1.16")) {
+		if (!account.requiresVersion("1.16")) {
 			createWiki.setVisibility(View.GONE);
 		}
 
 		boolean archived = repository.getRepository().isArchived();
-		if(archived) {
+		if (archived) {
 			createIssue.setVisibility(View.GONE);
 			createPullRequest.setVisibility(View.GONE);
 			createMilestone.setVisibility(View.GONE);
@@ -77,151 +79,140 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
 			createWiki.setVisibility(View.GONE);
 		}
 
-		createLabel.setOnClickListener(v112 -> {
+		createLabel.setOnClickListener(
+				v112 -> {
+					bmListener.onButtonClicked("label");
+					dismiss();
+				});
 
-			bmListener.onButtonClicked("label");
-			dismiss();
-		});
-
-		if(repository.getRepository().isHasIssues() && !archived) {
+		if (repository.getRepository().isHasIssues() && !archived) {
 
 			createIssue.setVisibility(View.VISIBLE);
-			createIssue.setOnClickListener(v12 -> {
-
-				bmListener.onButtonClicked("newIssue");
-				dismiss();
-			});
-		}
-		else {
+			createIssue.setOnClickListener(
+					v12 -> {
+						bmListener.onButtonClicked("newIssue");
+						dismiss();
+					});
+		} else {
 
 			createIssue.setVisibility(View.GONE);
 		}
 
-		if(repository.getRepository().isHasPullRequests() && !archived) {
+		if (repository.getRepository().isHasPullRequests() && !archived) {
 
 			createPullRequest.setVisibility(View.VISIBLE);
-			createPullRequest.setOnClickListener(vPr -> {
-
-				bmListener.onButtonClicked("newPullRequest");
-				dismiss();
-			});
-		}
-		else {
+			createPullRequest.setOnClickListener(
+					vPr -> {
+						bmListener.onButtonClicked("newPullRequest");
+						dismiss();
+					});
+		} else {
 
 			createPullRequest.setVisibility(View.GONE);
 		}
 
-		createMilestone.setOnClickListener(v13 -> {
+		createMilestone.setOnClickListener(
+				v13 -> {
+					bmListener.onButtonClicked("newMilestone");
+					dismiss();
+				});
 
-			bmListener.onButtonClicked("newMilestone");
-			dismiss();
-		});
+		if (repository.getPermissions().isAdmin()) {
 
-		if(repository.getPermissions().isAdmin()) {
+			repoSettings.setOnClickListener(
+					repoSettingsView -> {
+						bmListener.onButtonClicked("repoSettings");
+						dismiss();
+					});
 
-			repoSettings.setOnClickListener(repoSettingsView -> {
+			addCollaborator.setOnClickListener(
+					v1 -> {
+						bmListener.onButtonClicked("addCollaborator");
+						dismiss();
+					});
 
-				bmListener.onButtonClicked("repoSettings");
-				dismiss();
-			});
-
-			addCollaborator.setOnClickListener(v1 -> {
-
-				bmListener.onButtonClicked("addCollaborator");
-				dismiss();
-			});
-
-			createWiki.setOnClickListener(v1 -> {
-
-				bmListener.onButtonClicked("createWiki");
-				dismiss();
-			});
-		}
-		else {
+			createWiki.setOnClickListener(
+					v1 -> {
+						bmListener.onButtonClicked("createWiki");
+						dismiss();
+					});
+		} else {
 
 			addCollaborator.setVisibility(View.GONE);
 			repoSettings.setVisibility(View.GONE);
 			createWiki.setVisibility(View.GONE);
 		}
 
-		createRelease.setOnClickListener(v14 -> {
+		createRelease.setOnClickListener(
+				v14 -> {
+					bmListener.onButtonClicked("createRelease");
+					dismiss();
+				});
 
-			bmListener.onButtonClicked("createRelease");
-			dismiss();
-		});
+		shareRepository.setOnClickListener(
+				v15 -> {
+					bmListener.onButtonClicked("shareRepo");
+					dismiss();
+				});
 
-		shareRepository.setOnClickListener(v15 -> {
+		openWebRepo.setOnClickListener(
+				v16 -> {
+					bmListener.onButtonClicked("openWebRepo");
+					dismiss();
+				});
 
-			bmListener.onButtonClicked("shareRepo");
-			dismiss();
-		});
+		copyRepoUrl.setOnClickListener(
+				copyUrl -> {
+					bmListener.onButtonClicked("copyRepoUrl");
+					dismiss();
+				});
 
-		openWebRepo.setOnClickListener(v16 -> {
+		newFile.setOnClickListener(
+				v17 -> {
+					bmListener.onButtonClicked("newFile");
+					dismiss();
+				});
 
-			bmListener.onButtonClicked("openWebRepo");
-			dismiss();
-		});
-
-		copyRepoUrl.setOnClickListener(copyUrl -> {
-
-			bmListener.onButtonClicked("copyRepoUrl");
-			dismiss();
-		});
-
-		newFile.setOnClickListener(v17 -> {
-
-			bmListener.onButtonClicked("newFile");
-			dismiss();
-		});
-
-		if(repository.isStarred()) {
+		if (repository.isStarred()) {
 
 			starRepository.setVisibility(View.GONE);
-			unStarRepository.setOnClickListener(v18 -> {
+			unStarRepository.setOnClickListener(
+					v18 -> {
+						RepositoryActions.unStarRepository(getContext(), repository);
+						bmListener.onButtonClicked("unstar");
+						dismiss();
+					});
 
-				RepositoryActions.unStarRepository(getContext(), repository);
-				bmListener.onButtonClicked("unstar");
-				dismiss();
-
-			});
-
-		}
-		else {
+		} else {
 
 			unStarRepository.setVisibility(View.GONE);
-			starRepository.setOnClickListener(v19 -> {
-
-				RepositoryActions.starRepository(getContext(), repository);
-				bmListener.onButtonClicked("star");
-				dismiss();
-
-			});
-
+			starRepository.setOnClickListener(
+					v19 -> {
+						RepositoryActions.starRepository(getContext(), repository);
+						bmListener.onButtonClicked("star");
+						dismiss();
+					});
 		}
 
-		if(repository.isWatched()) {
+		if (repository.isWatched()) {
 
 			watchRepository.setVisibility(View.GONE);
-			unWatchRepository.setOnClickListener(v110 -> {
+			unWatchRepository.setOnClickListener(
+					v110 -> {
+						RepositoryActions.unWatchRepository(getContext(), repository);
+						bmListener.onButtonClicked("unwatch");
+						dismiss();
+					});
 
-				RepositoryActions.unWatchRepository(getContext(), repository);
-				bmListener.onButtonClicked("unwatch");
-				dismiss();
-
-			});
-
-		}
-		else {
+		} else {
 
 			unWatchRepository.setVisibility(View.GONE);
-			watchRepository.setOnClickListener(v111 -> {
-
-				RepositoryActions.watchRepository(getContext(), repository);
-				bmListener.onButtonClicked("watch");
-				dismiss();
-
-			});
-
+			watchRepository.setOnClickListener(
+					v111 -> {
+						RepositoryActions.watchRepository(getContext(), repository);
+						bmListener.onButtonClicked("watch");
+						dismiss();
+					});
 		}
 
 		return bottomSheetRepoBinding.getRoot();
@@ -233,10 +224,8 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
 
 		try {
 			bmListener = (BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
+		} catch (ClassCastException e) {
 			throw new ClassCastException(context + " must implement BottomSheetListener");
 		}
 	}
-
 }
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 3f50bcb1..86a82da8 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import java.util.Objects;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.IssueActions;
 import org.mian.gitnex.actions.PullRequestActions;
@@ -24,12 +25,10 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.contexts.IssueContext;
 import org.mian.gitnex.structs.BottomSheetListener;
 import org.mian.gitnex.views.ReactionSpinner;
-import java.util.Objects;
 
 /**
  * @author M M Arif
  */
-
 public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
 	private final IssueContext issue;
@@ -41,15 +40,20 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 		issueCreator = username;
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		BottomSheetSingleIssueBinding binding = BottomSheetSingleIssueBinding.inflate(inflater, container, false);
+		BottomSheetSingleIssueBinding binding =
+				BottomSheetSingleIssueBinding.inflate(inflater, container, false);
 
 		final Context ctx = getContext();
 
-		boolean userIsCreator = issueCreator.equals(((BaseActivity) requireActivity()).getAccount().getAccount().getUserName());
+		boolean userIsCreator =
+				issueCreator.equals(
+						((BaseActivity) requireActivity()).getAccount().getAccount().getUserName());
 		boolean isRepoAdmin = issue.getRepository().getPermissions().isAdmin();
 		boolean canPush = issue.getRepository().getPermissions().isPush();
 		boolean archived = issue.getRepository().getRepository().isArchived();
@@ -62,64 +66,65 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 		TextView loadReactions = new TextView(ctx);
 		loadReactions.setText(Objects.requireNonNull(ctx).getString(R.string.genericWaitFor));
 		loadReactions.setGravity(Gravity.CENTER);
-		loadReactions.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 140));
+		loadReactions.setLayoutParams(
+				new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 140));
 		binding.commentReactionButtons.addView(loadReactions);
 
 		ReactionSpinner reactionSpinner = new ReactionSpinner(ctx, bundle);
-		reactionSpinner.setOnInteractedListener(() -> {
+		reactionSpinner.setOnInteractedListener(
+				() -> {
+					IssueDetailActivity.singleIssueUpdate = true;
 
-			IssueDetailActivity.singleIssueUpdate = true;
+					bmListener.onButtonClicked("onResume");
+					dismiss();
+				});
+		reactionSpinner.setOnLoadingFinishedListener(
+				() -> {
+					reactionSpinner.setLayoutParams(
+							new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 160));
+					binding.commentReactionButtons.removeView(loadReactions);
+					binding.commentReactionButtons.addView(reactionSpinner);
+				});
 
-			bmListener.onButtonClicked("onResume");
-			dismiss();
-		});
-		reactionSpinner.setOnLoadingFinishedListener(() -> {
-			reactionSpinner.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 160));
-			binding.commentReactionButtons.removeView(loadReactions);
-			binding.commentReactionButtons.addView(reactionSpinner);
-		});
-
-		if(issue.getIssueType().equalsIgnoreCase("Pull")) {
+		if (issue.getIssueType().equalsIgnoreCase("Pull")) {
 
 			binding.editIssue.setText(R.string.menuEditText);
 
-			boolean canPushPullSource = issue.getPullRequest().getHead().getRepo() != null ? issue.getPullRequest().getHead().getRepo().getPermissions().isPush() : false;
-			if(issue.getPullRequest().isMerged() || issue.getIssue().getState().equals("closed")) {
+			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);
-				if(canPushPullSource) {
+				if (canPushPullSource) {
 					binding.deletePrHeadBranch.setVisibility(View.VISIBLE);
-				}
-				else {
-					if(!canPush) {
+				} else {
+					if (!canPush) {
 						binding.editIssue.setVisibility(View.GONE);
 					}
 					binding.deletePrHeadBranch.setVisibility(View.GONE);
 				}
-			}
-			else {
-				if(canPushPullSource) {
+			} else {
+				if (canPushPullSource) {
 					binding.updatePullRequest.setVisibility(View.VISIBLE);
-				}
-				else {
+				} else {
 					binding.updatePullRequest.setVisibility(View.GONE);
 				}
-				if(!userIsCreator && !canPush) {
+				if (!userIsCreator && !canPush) {
 					binding.editIssue.setVisibility(View.GONE);
 				}
-				if(canPush && issue.getPullRequest().isMergeable()) {
+				if (canPush && issue.getPullRequest().isMergeable()) {
 					binding.mergePullRequest.setVisibility(View.VISIBLE);
-				}
-				else {
+				} else {
 					binding.mergePullRequest.setVisibility(View.GONE);
 				}
 				binding.deletePrHeadBranch.setVisibility(View.GONE);
 			}
 
 			binding.openFilesDiff.setVisibility(View.VISIBLE);
-		}
-		else {
-			if(!userIsCreator && !canPush) {
+		} else {
+			if (!userIsCreator && !canPush) {
 				binding.editIssue.setVisibility(View.GONE);
 			}
 			binding.updatePullRequest.setVisibility(View.GONE);
@@ -127,119 +132,140 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 			binding.deletePrHeadBranch.setVisibility(View.GONE);
 		}
 
-		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()));
-			}
-			else {
-				PullRequestActions.updatePr(requireContext(), issue.getRepository().getOwner(), issue.getRepository().getName(), String.valueOf(issue.getIssueIndex()), null);
-			}
-			dismiss();
-		});
+		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()));
+					} else {
+						PullRequestActions.updatePr(
+								requireContext(),
+								issue.getRepository().getOwner(),
+								issue.getRepository().getName(),
+								String.valueOf(issue.getIssueIndex()),
+								null);
+					}
+					dismiss();
+				});
 
-		binding.mergePullRequest.setOnClickListener(v13 -> {
+		binding.mergePullRequest.setOnClickListener(
+				v13 -> {
+					startActivity(issue.getIntent(ctx, MergePullRequestActivity.class));
+					dismiss();
+				});
 
-			startActivity(issue.getIntent(ctx, MergePullRequestActivity.class));
-			dismiss();
-		});
+		binding.deletePrHeadBranch.setOnClickListener(
+				v -> {
+					PullRequestActions.deleteHeadBranch(
+							ctx,
+							issue.getRepository().getOwner(),
+							issue.getRepository().getName(),
+							issue.getPullRequest().getHead().getRef(),
+							true);
+					dismiss();
+				});
 
-		binding.deletePrHeadBranch.setOnClickListener(v -> {
+		binding.openFilesDiff.setOnClickListener(
+				v14 -> {
+					startActivity(issue.getIntent(ctx, DiffActivity.class));
+					dismiss();
+				});
 
-			PullRequestActions.deleteHeadBranch(ctx, issue.getRepository().getOwner(), issue.getRepository().getName(), issue.getPullRequest().getHead().getRef(), true);
-			dismiss();
-		});
+		binding.editIssue.setOnClickListener(
+				v15 -> {
+					((IssueDetailActivity) requireActivity())
+							.editIssueLauncher.launch(
+									issue.getIntent(ctx, EditIssueActivity.class));
+					dismiss();
+				});
 
-		binding.openFilesDiff.setOnClickListener(v14 -> {
-			startActivity(issue.getIntent(ctx, DiffActivity.class));
-			dismiss();
-		});
+		binding.editLabels.setOnClickListener(
+				v16 -> {
+					bmListener.onButtonClicked("showLabels");
+					dismiss();
+				});
 
-		binding.editIssue.setOnClickListener(v15 -> {
-			((IssueDetailActivity) requireActivity()).editIssueLauncher.launch(issue.getIntent(ctx, EditIssueActivity.class));
-			dismiss();
-		});
+		binding.addRemoveAssignees.setOnClickListener(
+				v17 -> {
+					bmListener.onButtonClicked("showAssignees");
+					dismiss();
+				});
 
-		binding.editLabels.setOnClickListener(v16 -> {
-			bmListener.onButtonClicked("showLabels");
-			dismiss();
-		});
+		binding.shareIssue.setOnClickListener(
+				v1 -> {
+					AppUtil.sharingIntent(ctx, issue.getIssue().getHtmlUrl());
+					dismiss();
+				});
 
-		binding.addRemoveAssignees.setOnClickListener(v17 -> {
-			bmListener.onButtonClicked("showAssignees");
-			dismiss();
-		});
+		binding.copyIssueUrl.setOnClickListener(
+				v12 -> {
+					AppUtil.copyToClipboard(
+							ctx,
+							issue.getIssue().getHtmlUrl(),
+							ctx.getString(R.string.copyIssueUrlToastMsg));
+					dismiss();
+				});
 
-		binding.shareIssue.setOnClickListener(v1 -> {
+		binding.open.setOnClickListener(
+				v12 -> {
+					AppUtil.openUrlInBrowser(ctx, issue.getIssue().getHtmlUrl());
+					dismiss();
+				});
 
-			AppUtil.sharingIntent(ctx, issue.getIssue().getHtmlUrl());
-			dismiss();
-		});
-
-		binding.copyIssueUrl.setOnClickListener(v12 -> {
-
-			AppUtil.copyToClipboard(ctx, issue.getIssue().getHtmlUrl(), ctx.getString(R.string.copyIssueUrlToastMsg));
-			dismiss();
-		});
-
-		binding.open.setOnClickListener(v12 -> {
-
-			AppUtil.openUrlInBrowser(ctx, issue.getIssue().getHtmlUrl());
-			dismiss();
-		});
-
-		if(issue.getIssueType().equalsIgnoreCase("pull")) {
+		if (issue.getIssueType().equalsIgnoreCase("pull")) {
 			binding.bottomSheetHeader.setText(R.string.pullRequest);
 		}
 
-		if(issue.getIssue().getState().equals("open")) { // close issue
-			if(!userIsCreator && !canPush) {
+		if (issue.getIssue().getState().equals("open")) { // close issue
+			if (!userIsCreator && !canPush) {
 				binding.closeIssue.setVisibility(View.GONE);
-			}
-			else if(issue.getIssueType().equalsIgnoreCase("Pull")) {
+			} else if (issue.getIssueType().equalsIgnoreCase("Pull")) {
 				binding.closeIssue.setText(R.string.close);
 			}
-			binding.closeIssue.setOnClickListener(closeSingleIssue -> {
-				IssueActions.closeReopenIssue(ctx, "closed", issue);
-				dismiss();
-			});
-		}
-		else if(issue.getIssue().getState().equals("closed")) {
-			if(userIsCreator || canPush) {
+			binding.closeIssue.setOnClickListener(
+					closeSingleIssue -> {
+						IssueActions.closeReopenIssue(ctx, "closed", issue);
+						dismiss();
+					});
+		} else if (issue.getIssue().getState().equals("closed")) {
+			if (userIsCreator || canPush) {
 				binding.closeIssue.setText(R.string.reopen);
-			}
-			else {
+			} else {
 				binding.closeIssue.setVisibility(View.GONE);
 			}
-			binding.closeIssue.setOnClickListener(closeSingleIssue -> {
-				IssueActions.closeReopenIssue(ctx, "open", issue);
-				dismiss();
-			});
+			binding.closeIssue.setOnClickListener(
+					closeSingleIssue -> {
+						IssueActions.closeReopenIssue(ctx, "open", issue);
+						dismiss();
+					});
 		}
 
-		binding.subscribeIssue.setOnClickListener(subscribeToIssue -> {
+		binding.subscribeIssue.setOnClickListener(
+				subscribeToIssue -> {
+					IssueActions.subscribe(ctx, issue);
+					issue.setSubscribed(true);
+					dismiss();
+				});
 
-			IssueActions.subscribe(ctx, issue);
-			issue.setSubscribed(true);
-			dismiss();
-		});
+		binding.unsubscribeIssue.setOnClickListener(
+				unsubscribeToIssue -> {
+					IssueActions.unsubscribe(ctx, issue);
+					issue.setSubscribed(false);
+					dismiss();
+				});
 
-		binding.unsubscribeIssue.setOnClickListener(unsubscribeToIssue -> {
-
-			IssueActions.unsubscribe(ctx, issue);
-			issue.setSubscribed(false);
-			dismiss();
-		});
-
-		if(issue.isSubscribed()) {
+		if (issue.isSubscribed()) {
 			binding.subscribeIssue.setVisibility(View.GONE);
 			binding.unsubscribeIssue.setVisibility(View.VISIBLE);
-		}
-		else {
+		} else {
 			binding.subscribeIssue.setVisibility(View.VISIBLE);
 			binding.unsubscribeIssue.setVisibility(View.GONE);
 		}
 
-		if(archived) {
+		if (archived) {
 			binding.subscribeIssue.setVisibility(View.GONE);
 			binding.unsubscribeIssue.setVisibility(View.GONE);
 			binding.editIssue.setVisibility(View.GONE);
@@ -251,11 +277,10 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 			binding.bottomSheetHeaderFrame.setVisibility(View.GONE);
 			binding.mergePullRequest.setVisibility(View.GONE);
 			binding.updatePullRequest.setVisibility(View.GONE);
-			if(issue.getIssueType().equalsIgnoreCase("issue")) {
+			if (issue.getIssueType().equalsIgnoreCase("issue")) {
 				binding.issuePrDivider.setVisibility(View.GONE);
 			}
-		}
-		else if(!canPush) {
+		} else if (!canPush) {
 			binding.addRemoveAssignees.setVisibility(View.GONE);
 			binding.editLabels.setVisibility(View.GONE);
 		}
@@ -271,11 +296,9 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 		try {
 
 			bmListener = (BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
+		} catch (ClassCastException e) {
 
 			throw new ClassCastException(context + " must implement BottomSheetListener");
 		}
 	}
-
 }
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 bbae7c7d..b7a90481 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetUserProfileFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetUserProfileFragment.java
@@ -15,7 +15,6 @@ import org.mian.gitnex.structs.BottomSheetListener;
  * @author M M Arif
  * @author qwerty287
  */
-
 public class BottomSheetUserProfileFragment extends BottomSheetDialogFragment {
 
 	private final boolean following;
@@ -25,28 +24,31 @@ public class BottomSheetUserProfileFragment extends BottomSheetDialogFragment {
 		this.following = following;
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		BottomSheetUserProfileBinding bottomSheetUserProfileBinding = BottomSheetUserProfileBinding.inflate(inflater, container, false);
+		BottomSheetUserProfileBinding bottomSheetUserProfileBinding =
+				BottomSheetUserProfileBinding.inflate(inflater, container, false);
 
-		if(following) {
+		if (following) {
 			bottomSheetUserProfileBinding.unfollowUser.setVisibility(View.VISIBLE);
 			bottomSheetUserProfileBinding.followUser.setVisibility(View.GONE);
 		}
 
-		bottomSheetUserProfileBinding.followUser.setOnClickListener(v1 -> {
+		bottomSheetUserProfileBinding.followUser.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("follow");
+					dismiss();
+				});
 
-			bmListener.onButtonClicked("follow");
-			dismiss();
-		});
-
-		bottomSheetUserProfileBinding.unfollowUser.setOnClickListener(v1 -> {
-
-			bmListener.onButtonClicked("follow");
-			dismiss();
-		});
+		bottomSheetUserProfileBinding.unfollowUser.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("follow");
+					dismiss();
+				});
 
 		return bottomSheetUserProfileBinding.getRoot();
 	}
@@ -57,10 +59,8 @@ public class BottomSheetUserProfileFragment extends BottomSheetDialogFragment {
 
 		try {
 			bmListener = (BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
+		} catch (ClassCastException e) {
 			throw new ClassCastException(context + " must implement BottomSheetListener");
 		}
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetWikiFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetWikiFragment.java
index cd800fdf..b010fd19 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetWikiFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetWikiFragment.java
@@ -14,26 +14,30 @@ import org.mian.gitnex.structs.BottomSheetListener;
 /**
  * @author M M Arif
  */
-
 public class BottomSheetWikiFragment extends BottomSheetDialogFragment {
 
 	private BottomSheetListener bmListener;
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		BottomSheetWikiInListBinding bottomSheetWikiInListBinding = BottomSheetWikiInListBinding.inflate(inflater, container, false);
+		BottomSheetWikiInListBinding bottomSheetWikiInListBinding =
+				BottomSheetWikiInListBinding.inflate(inflater, container, false);
 
-		bottomSheetWikiInListBinding.editWiki.setOnClickListener(v1 -> {
-			bmListener.onButtonClicked("editWiki");
-			dismiss();
-		});
+		bottomSheetWikiInListBinding.editWiki.setOnClickListener(
+				v1 -> {
+					bmListener.onButtonClicked("editWiki");
+					dismiss();
+				});
 
-		bottomSheetWikiInListBinding.deleteWiki.setOnClickListener(v12 -> {
-			bmListener.onButtonClicked("delWiki");
-			dismiss();
-		});
+		bottomSheetWikiInListBinding.deleteWiki.setOnClickListener(
+				v12 -> {
+					bmListener.onButtonClicked("delWiki");
+					dismiss();
+				});
 
 		return bottomSheetWikiInListBinding.getRoot();
 	}
@@ -45,10 +49,8 @@ public class BottomSheetWikiFragment extends BottomSheetDialogFragment {
 
 		try {
 			bmListener = (BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
+		} catch (ClassCastException e) {
 			throw new ClassCastException(context + " must implement BottomSheetListener");
 		}
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java
index 681ae602..f3eba2c6 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java
@@ -15,7 +15,6 @@ import org.mian.gitnex.viewmodels.CollaboratorsViewModel;
 /**
  * @author M M Arif
  */
-
 public class CollaboratorsFragment extends Fragment {
 
 	public static boolean refreshCollaborators = false;
@@ -23,8 +22,7 @@ public class CollaboratorsFragment extends Fragment {
 	private CollaboratorsAdapter adapter;
 	private RepositoryContext repository;
 
-	public CollaboratorsFragment() {
-	}
+	public CollaboratorsFragment() {}
 
 	public static CollaboratorsFragment newInstance(RepositoryContext repository) {
 		CollaboratorsFragment fragment = new CollaboratorsFragment();
@@ -39,43 +37,48 @@ public class CollaboratorsFragment extends Fragment {
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		fragmentCollaboratorsBinding = FragmentCollaboratorsBinding.inflate(inflater, container, false);
+		fragmentCollaboratorsBinding =
+				FragmentCollaboratorsBinding.inflate(inflater, container, false);
 
 		fetchDataAsync(repository.getOwner(), repository.getName());
 		return fragmentCollaboratorsBinding.getRoot();
-
 	}
 
 	private void fetchDataAsync(String owner, String repo) {
 
-		CollaboratorsViewModel collaboratorsModel = new ViewModelProvider(this).get(CollaboratorsViewModel.class);
-
-		collaboratorsModel.getCollaboratorsList(owner, repo, getContext()).observe(getViewLifecycleOwner(), collaboratorsListMain -> {
-			adapter = new CollaboratorsAdapter(getContext(), collaboratorsListMain);
-			if(adapter.getCount() > 0) {
-				fragmentCollaboratorsBinding.gridView.setAdapter(adapter);
-				fragmentCollaboratorsBinding.noDataCollaborators.setVisibility(View.GONE);
-			}
-			else {
-				adapter.notifyDataSetChanged();
-				fragmentCollaboratorsBinding.gridView.setAdapter(adapter);
-				fragmentCollaboratorsBinding.noDataCollaborators.setVisibility(View.VISIBLE);
-			}
-			fragmentCollaboratorsBinding.progressBar.setVisibility(View.GONE);
-		});
+		CollaboratorsViewModel collaboratorsModel =
+				new ViewModelProvider(this).get(CollaboratorsViewModel.class);
 
+		collaboratorsModel
+				.getCollaboratorsList(owner, repo, getContext())
+				.observe(
+						getViewLifecycleOwner(),
+						collaboratorsListMain -> {
+							adapter = new CollaboratorsAdapter(getContext(), collaboratorsListMain);
+							if (adapter.getCount() > 0) {
+								fragmentCollaboratorsBinding.gridView.setAdapter(adapter);
+								fragmentCollaboratorsBinding.noDataCollaborators.setVisibility(
+										View.GONE);
+							} else {
+								adapter.notifyDataSetChanged();
+								fragmentCollaboratorsBinding.gridView.setAdapter(adapter);
+								fragmentCollaboratorsBinding.noDataCollaborators.setVisibility(
+										View.VISIBLE);
+							}
+							fragmentCollaboratorsBinding.progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	@Override
 	public void onResume() {
 
 		super.onResume();
-		if(refreshCollaborators) {
+		if (refreshCollaborators) {
 			fetchDataAsync(repository.getOwner(), repository.getName());
 			refreshCollaborators = false;
 		}
 	}
-
 }
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 76d560ad..c23073ea 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
@@ -14,6 +14,9 @@ import androidx.core.text.HtmlCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import com.vdurmont.emoji.EmojiParser;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.Commit;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.BaseActivity;
@@ -31,9 +34,6 @@ import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.IssueContext;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -41,7 +41,6 @@ import retrofit2.Response;
 /**
  * @author qwerty287
  */
-
 public class CommitDetailFragment extends Fragment {
 
 	private FragmentCommitDetailsBinding binding;
@@ -56,13 +55,15 @@ public class CommitDetailFragment extends Fragment {
 		return new CommitDetailFragment();
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
 		super.onCreateView(inflater, container, savedInstanceState);
 
-		if(binding != null) {
+		if (binding != null) {
 			return binding.getRoot();
 		}
 
@@ -90,160 +91,293 @@ 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") :
-			RetrofitClient.getWebInterface(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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<String> call, @NonNull Response<String> response) {
 
-				checkLoading();
-				switch(response.code()) {
+						checkLoading();
+						switch (response.code()) {
+							case 200:
+								assert response.body() != null;
+								fileDiffViews = ParseDiff.getFileDiffViewArray(response.body());
 
-					case 200:
-						assert response.body() != null;
-						fileDiffViews = ParseDiff.getFileDiffViewArray(response.body());
+								requireActivity()
+										.runOnUiThread(
+												() -> {
+													adapter.updateList(fileDiffViews);
+													adapter.notifyDataChanged();
+												});
+								break;
 
-						requireActivity().runOnUiThread(() -> {
-							adapter.updateList(fileDiffViews);
-							adapter.notifyDataChanged();
-						});
-						break;
+							case 401:
+								requireActivity()
+										.runOnUiThread(
+												() ->
+														AlertDialogs
+																.authorizationTokenRevokedDialog(
+																		requireContext()));
+								break;
 
-					case 401:
-						requireActivity().runOnUiThread(() -> AlertDialogs.authorizationTokenRevokedDialog(requireContext()));
-						break;
+							case 403:
+								requireActivity()
+										.runOnUiThread(
+												() ->
+														Toasty.error(
+																requireContext(),
+																getString(
+																		R.string.authorizeError)));
+								break;
 
-					case 403:
-						requireActivity().runOnUiThread(() -> Toasty.error(requireContext(), getString(R.string.authorizeError)));
-						break;
+							case 404:
+								requireActivity()
+										.runOnUiThread(
+												() ->
+														Toasty.warning(
+																requireContext(),
+																getString(R.string.apiNotFound)));
+								break;
 
-					case 404:
-						requireActivity().runOnUiThread(() -> Toasty.warning(requireContext(), getString(R.string.apiNotFound)));
-						break;
+							default:
+								requireActivity()
+										.runOnUiThread(
+												() ->
+														Toasty.error(
+																requireContext(),
+																getString(R.string.genericError)));
+						}
+					}
 
-					default:
-						requireActivity().runOnUiThread(() -> Toasty.error(requireContext(), getString(R.string.genericError)));
-				}
-			}
+					@Override
+					public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) {
 
-			@Override
-			public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) {
-
-				checkLoading();
-				if(getContext() != null) {
-					Toasty.error(requireContext(), getString(R.string.genericError));
-				}
-			}
-		});
+						checkLoading();
+						if (getContext() != null) {
+							Toasty.error(requireContext(), getString(R.string.genericError));
+						}
+					}
+				});
 	}
 
 	private void getCommit() {
 
-		RetrofitClient.getApiInterface(requireContext()).repoGetSingleCommit(repoOwner, repoName, sha).enqueue(new Callback<>() {
+		RetrofitClient.getApiInterface(requireContext())
+				.repoGetSingleCommit(repoOwner, repoName, sha)
+				.enqueue(
+						new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Commit> call, @NonNull Response<Commit> response) {
+							@Override
+							public void onResponse(
+									@NonNull Call<Commit> call,
+									@NonNull Response<Commit> response) {
 
-				checkLoading();
-				Commit commitsModel = response.body();
-				if(commitsModel == null) {
-					onFailure(call, new Throwable());
-					return;
-				}
-				String[] commitMessageParts = commitsModel.getCommit().getMessage().split("(\r\n|\n)", 2);
+								checkLoading();
+								Commit commitsModel = response.body();
+								if (commitsModel == null) {
+									onFailure(call, new Throwable());
+									return;
+								}
+								String[] commitMessageParts =
+										commitsModel.getCommit().getMessage().split("(\r\n|\n)", 2);
 
-				if(commitMessageParts.length > 1 && !commitMessageParts[1].trim().isEmpty()) {
-					binding.commitBody.setVisibility(View.VISIBLE);
-					binding.commitSubject.setText(EmojiParser.parseToUnicode(commitMessageParts[0].trim()));
-					binding.commitBody.setText(EmojiParser.parseToUnicode(commitMessageParts[1].trim()));
-				}
-				else {
-					binding.commitSubject.setText(EmojiParser.parseToUnicode(commitMessageParts[0].trim()));
-					binding.commitBody.setVisibility(View.GONE);
-				}
+								if (commitMessageParts.length > 1
+										&& !commitMessageParts[1].trim().isEmpty()) {
+									binding.commitBody.setVisibility(View.VISIBLE);
+									binding.commitSubject.setText(
+											EmojiParser.parseToUnicode(
+													commitMessageParts[0].trim()));
+									binding.commitBody.setText(
+											EmojiParser.parseToUnicode(
+													commitMessageParts[1].trim()));
+								} else {
+									binding.commitSubject.setText(
+											EmojiParser.parseToUnicode(
+													commitMessageParts[0].trim()));
+									binding.commitBody.setVisibility(View.GONE);
+								}
 
-				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));
-				}
-				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));
-				}
+								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));
+								} 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));
+								}
 
-				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.commitAuthorAvatarFrame.setVisibility(View.VISIBLE);
+									binding.commitAuthorAvatarFrame.setVisibility(View.VISIBLE);
 
-					int imgRadius = AppUtil.getPixelsFromDensity(requireContext(), 3);
+									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);
-						intent.putExtra("username", commitsModel.getAuthor().getLogin());
-						startActivity(intent);
-					});
+									binding.commitAuthorAvatar.setOnClickListener(
+											(v) -> {
+												Intent intent =
+														new Intent(
+																requireContext(),
+																ProfileActivity.class);
+												intent.putExtra(
+														"username",
+														commitsModel.getAuthor().getLogin());
+												startActivity(intent);
+											});
 
-				}
-				else {
-					binding.commitAuthorAvatar.setImageDrawable(null);
-					binding.commitAuthorAvatarFrame.setVisibility(View.GONE);
-				}
+								} else {
+									binding.commitAuthorAvatar.setImageDrawable(null);
+									binding.commitAuthorAvatarFrame.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()) {
 
-					binding.commitCommitterAvatarFrame.setVisibility(View.VISIBLE);
+									binding.commitCommitterAvatarFrame.setVisibility(View.VISIBLE);
 
-					int imgRadius = AppUtil.getPixelsFromDensity(requireContext(), 3);
+									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);
-						intent.putExtra("username", commitsModel.getCommitter().getLogin());
-						startActivity(intent);
-					});
+									binding.commitCommitterAvatar.setOnClickListener(
+											(v) -> {
+												Intent intent =
+														new Intent(
+																requireContext(),
+																ProfileActivity.class);
+												intent.putExtra(
+														"username",
+														commitsModel.getCommitter().getLogin());
+												startActivity(intent);
+											});
 
-				}
-				else {
-					binding.commitCommitterAvatar.setImageDrawable(null);
-					binding.commitCommitterAvatarFrame.setVisibility(View.GONE);
-				}
+								} else {
+									binding.commitCommitterAvatar.setImageDrawable(null);
+									binding.commitCommitterAvatarFrame.setVisibility(View.GONE);
+								}
 
-				binding.commitSha.setText(commitsModel.getSha().substring(0, Math.min(commitsModel.getSha().length(), 10)));
-				binding.commitSha.setOnClickListener((v) -> {
-					ClipboardManager clipboard = (ClipboardManager) requireContext().getSystemService(Context.CLIPBOARD_SERVICE);
-					ClipData clip = ClipData.newPlainText("commitSha", commitsModel.getSha());
-					assert clipboard != null;
-					clipboard.setPrimaryClip(clip);
-					Toasty.success(requireContext(), getString(R.string.copyShaToastMsg));
-				});
-			}
+								binding.commitSha.setText(
+										commitsModel
+												.getSha()
+												.substring(
+														0,
+														Math.min(
+																commitsModel.getSha().length(),
+																10)));
+								binding.commitSha.setOnClickListener(
+										(v) -> {
+											ClipboardManager clipboard =
+													(ClipboardManager)
+															requireContext()
+																	.getSystemService(
+																			Context
+																					.CLIPBOARD_SERVICE);
+											ClipData clip =
+													ClipData.newPlainText(
+															"commitSha", commitsModel.getSha());
+											assert clipboard != null;
+											clipboard.setPrimaryClip(clip);
+											Toasty.success(
+													requireContext(),
+													getString(R.string.copyShaToastMsg));
+										});
+							}
 
-			@Override
-			public void onFailure(@NonNull Call<Commit> call, @NonNull Throwable t) {
+							@Override
+							public void onFailure(
+									@NonNull Call<Commit> call, @NonNull Throwable t) {
 
-				checkLoading();
-				if(getContext() != null) {
-					Toasty.error(requireContext(), getString(R.string.genericError));
-					requireActivity().finish();
-				}
-			}
-		});
+								checkLoading();
+								if (getContext() != null) {
+									Toasty.error(
+											requireContext(), getString(R.string.genericError));
+									requireActivity().finish();
+								}
+							}
+						});
 	}
 
 	private void checkLoading() {
 		loadingFinished += 1;
-		if(loadingFinished >= 2) {
+		if (loadingFinished >= 2) {
 			binding.progressBar.setVisibility(View.GONE);
 		}
 	}
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 14869922..173e0551 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java
@@ -8,6 +8,9 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.DiffFilesAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -17,16 +20,12 @@ import org.mian.gitnex.helpers.FileDiffView;
 import org.mian.gitnex.helpers.ParseDiff;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.IssueContext;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Response;
 
 /**
  * @author opyale
  */
-
 public class DiffFilesFragment extends Fragment {
 
 	private FragmentDiffFilesBinding binding;
@@ -34,17 +33,17 @@ public class DiffFilesFragment extends Fragment {
 	private List<FileDiffView> fileDiffViews = new ArrayList<>();
 	private DiffFilesAdapter adapter;
 
-	public DiffFilesFragment() {
-	}
+	public DiffFilesFragment() {}
 
 	public static DiffFilesFragment newInstance() {
 		return new DiffFilesFragment();
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		if(binding != null) {
+		if (binding != null) {
 			ctx = requireContext();
 			return binding.getRoot();
 		}
@@ -61,68 +60,118 @@ public class DiffFilesFragment extends Fragment {
 		binding.diffFiles.setLayoutManager(new LinearLayoutManager(ctx));
 		binding.diffFiles.setAdapter(adapter);
 
-		getPullDiffFiles(issue.getRepository().getOwner(), issue.getRepository().getName(), String.valueOf(issue.getIssueIndex()));
+		getPullDiffFiles(
+				issue.getRepository().getOwner(),
+				issue.getRepository().getName(),
+				String.valueOf(issue.getIssueIndex()));
 
 		return binding.getRoot();
 	}
 
 	private void getPullDiffFiles(String owner, String repo, String pullIndex) {
 
-		Thread thread = new Thread(() -> {
+		Thread thread =
+				new Thread(
+						() -> {
+							Call<String> call =
+									RetrofitClient.getApiInterface(ctx)
+											.repoDownloadPullDiffOrPatch(
+													owner,
+													repo,
+													Long.valueOf(pullIndex),
+													"diff",
+													null);
 
-			Call<String> call = RetrofitClient.getApiInterface(ctx).repoDownloadPullDiffOrPatch(owner, repo, Long.valueOf(pullIndex), "diff", null);
+							try {
 
-			try {
+								Response<String> response = call.execute();
+								if (response.body() == null) {
+									Toasty.error(
+											requireContext(), getString(R.string.genericError));
+									requireActivity().finish();
+									return;
+								}
 
-				Response<String> response = call.execute();
-				if(response.body() == null) {
-					Toasty.error(requireContext(), getString(R.string.genericError));
-					requireActivity().finish();
-					return;
-				}
+								switch (response.code()) {
+									case 200:
+										fileDiffViews =
+												ParseDiff.getFileDiffViewArray(response.body());
 
-				switch(response.code()) {
+										int filesCount = fileDiffViews.size();
 
-					case 200:
-						fileDiffViews = ParseDiff.getFileDiffViewArray(response.body());
+										String toolbarTitleText =
+												(filesCount > 1)
+														? getResources()
+																.getString(
+																		R.string.fileDiffViewHeader,
+																		Integer.toString(
+																				filesCount))
+														: getResources()
+																.getString(
+																		R.string
+																				.fileDiffViewHeaderSingle,
+																		Integer.toString(
+																				filesCount));
 
-						int filesCount = fileDiffViews.size();
+										requireActivity()
+												.runOnUiThread(
+														() -> {
+															binding.toolbarTitle.setVisibility(
+																	View.VISIBLE);
+															binding.progressBar.setVisibility(
+																	View.GONE);
+															binding.toolbarTitle.setText(
+																	toolbarTitleText);
+															adapter.updateList(fileDiffViews);
+															adapter.notifyDataChanged();
+														});
+										break;
 
-						String toolbarTitleText = (filesCount > 1) ? getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)) :
-							getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount));
+									case 401:
+										requireActivity()
+												.runOnUiThread(
+														() ->
+																AlertDialogs
+																		.authorizationTokenRevokedDialog(
+																				ctx));
+										break;
 
-						requireActivity().runOnUiThread(() -> {
-							binding.toolbarTitle.setVisibility(View.VISIBLE);
-							binding.progressBar.setVisibility(View.GONE);
-							binding.toolbarTitle.setText(toolbarTitleText);
-							adapter.updateList(fileDiffViews);
-							adapter.notifyDataChanged();
+									case 403:
+										requireActivity()
+												.runOnUiThread(
+														() ->
+																Toasty.error(
+																		ctx,
+																		ctx.getString(
+																				R.string
+																						.authorizeError)));
+										break;
+
+									case 404:
+										requireActivity()
+												.runOnUiThread(
+														() ->
+																Toasty.warning(
+																		ctx,
+																		ctx.getString(
+																				R.string
+																						.apiNotFound)));
+										break;
+
+									default:
+										requireActivity()
+												.runOnUiThread(
+														() ->
+																Toasty.error(
+																		ctx,
+																		getString(
+																				R.string
+																						.genericError)));
+								}
+							} catch (IOException ignored) {
+							}
 						});
-						break;
-
-					case 401:
-						requireActivity().runOnUiThread(() -> AlertDialogs.authorizationTokenRevokedDialog(ctx));
-						break;
-
-					case 403:
-						requireActivity().runOnUiThread(() -> Toasty.error(ctx, ctx.getString(R.string.authorizeError)));
-						break;
-
-					case 404:
-						requireActivity().runOnUiThread(() -> Toasty.warning(ctx, ctx.getString(R.string.apiNotFound)));
-						break;
-
-					default:
-						requireActivity().runOnUiThread(() -> Toasty.error(ctx, getString(R.string.genericError)));
-
-				}
-			}
-			catch(IOException ignored) {
-			}
-
-		});
 
 		thread.start();
 	}
-
 }
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 01a18ef3..496f538d 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/DiffFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/DiffFragment.java
@@ -7,19 +7,18 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import java.util.Arrays;
+import java.util.Objects;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.DiffActivity;
 import org.mian.gitnex.adapters.DiffAdapter;
 import org.mian.gitnex.databinding.FragmentDiffBinding;
 import org.mian.gitnex.helpers.FileDiffView;
 import org.mian.gitnex.helpers.contexts.IssueContext;
-import java.util.Arrays;
-import java.util.Objects;
 
 /**
  * @author opyale
  */
-
 public class DiffFragment extends Fragment {
 
 	private FragmentDiffBinding binding;
@@ -29,8 +28,7 @@ public class DiffFragment extends Fragment {
 	private IssueContext issue;
 	private String type;
 
-	public DiffFragment() {
-	}
+	public DiffFragment() {}
 
 	public static DiffFragment newInstance(FileDiffView fileDiffView, IssueContext issue) {
 
@@ -39,7 +37,6 @@ public class DiffFragment extends Fragment {
 		fragment.setIssue(issue);
 		fragment.type = "pull";
 		return fragment;
-
 	}
 
 	public static DiffFragment newInstance(FileDiffView fileDiffView, String type) {
@@ -48,7 +45,6 @@ public class DiffFragment extends Fragment {
 		fragment.setFileDiffView(fileDiffView);
 		fragment.type = type;
 		return fragment;
-
 	}
 
 	public void setFileDiffView(FileDiffView fileDiffView) {
@@ -61,24 +57,44 @@ public class DiffFragment extends Fragment {
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		binding = FragmentDiffBinding.inflate(inflater, container, false);
 		ctx = requireContext();
 
-		if(Objects.equals(type, "pull")) {
-			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());
+		if (Objects.equals(type, "pull")) {
+			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.toolbarTitle.setText(fileDiffView.getFileName());
 		binding.diff.setDivider(null);
-		binding.diff.setAdapter(new DiffAdapter(ctx, getChildFragmentManager(), Arrays.asList(fileDiffView.toString().split("\\R")), issue, type));
+		binding.diff.setAdapter(
+				new DiffAdapter(
+						ctx,
+						getChildFragmentManager(),
+						Arrays.asList(fileDiffView.toString().split("\\R")),
+						issue,
+						type));
 
 		return binding.getRoot();
-
 	}
-
 }
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 ca55db1e..df74f25a 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/DraftsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/DraftsFragment.java
@@ -15,6 +15,9 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SearchView;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.adapters.DraftsAdapter;
@@ -24,14 +27,10 @@ import org.mian.gitnex.database.models.DraftWithRepository;
 import org.mian.gitnex.databinding.FragmentDraftsBinding;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * @author M M Arif
  */
-
 public class DraftsFragment extends Fragment {
 
 	private FragmentDraftsBinding fragmentDraftsBinding;
@@ -42,14 +41,16 @@ public class DraftsFragment extends Fragment {
 	private int currentActiveAccountId;
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		fragmentDraftsBinding = FragmentDraftsBinding.inflate(inflater, container, false);
 
 		ctx = getContext();
 		setHasOptionsMenu(true);
 
-		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.titleDrafts));
+		((MainActivity) requireActivity())
+				.setActionBarTitle(getResources().getString(R.string.titleDrafts));
 
 		TinyDB tinyDb = TinyDB.getInstance(ctx);
 
@@ -61,12 +62,15 @@ public class DraftsFragment extends Fragment {
 
 		adapter = new DraftsAdapter(getContext(), getChildFragmentManager(), draftsList_);
 		currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-		fragmentDraftsBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			draftsList_.clear();
-			fetchDataAsync(currentActiveAccountId);
-
-		}, 250));
+		fragmentDraftsBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											draftsList_.clear();
+											fetchDataAsync(currentActiveAccountId);
+										},
+										250));
 
 		fetchDataAsync(currentActiveAccountId);
 
@@ -75,23 +79,25 @@ public class DraftsFragment extends Fragment {
 
 	private void fetchDataAsync(int accountId) {
 
-		draftsApi.getDrafts(accountId).observe(getViewLifecycleOwner(), drafts -> {
+		draftsApi
+				.getDrafts(accountId)
+				.observe(
+						getViewLifecycleOwner(),
+						drafts -> {
+							fragmentDraftsBinding.pullToRefresh.setRefreshing(false);
+							assert drafts != null;
+							if (drafts.size() > 0) {
 
-			fragmentDraftsBinding.pullToRefresh.setRefreshing(false);
-			assert drafts != null;
-			if(drafts.size() > 0) {
+								draftsList_.clear();
+								fragmentDraftsBinding.noData.setVisibility(View.GONE);
+								draftsList_.addAll(drafts);
+								adapter.notifyDataChanged();
+								fragmentDraftsBinding.recyclerView.setAdapter(adapter);
+							} else {
 
-				draftsList_.clear();
-				fragmentDraftsBinding.noData.setVisibility(View.GONE);
-				draftsList_.addAll(drafts);
-				adapter.notifyDataChanged();
-				fragmentDraftsBinding.recyclerView.setAdapter(adapter);
-			}
-			else {
-
-				fragmentDraftsBinding.noData.setVisibility(View.VISIBLE);
-			}
-		});
+								fragmentDraftsBinding.noData.setVisibility(View.VISIBLE);
+							}
+						});
 	}
 
 	@Override
@@ -103,17 +109,16 @@ public class DraftsFragment extends Fragment {
 
 	public void deleteAllDrafts(int accountId) {
 
-		if(draftsList_.size() > 0) {
+		if (draftsList_.size() > 0) {
 
-			Objects.requireNonNull(BaseApi.getInstance(ctx, DraftsApi.class)).deleteAllDrafts(accountId);
+			Objects.requireNonNull(BaseApi.getInstance(ctx, DraftsApi.class))
+					.deleteAllDrafts(accountId);
 			draftsList_.clear();
 			adapter.notifyDataChanged();
 			Toasty.success(ctx, getResources().getString(R.string.draftsDeleteSuccess));
-		}
-		else {
+		} else {
 			Toasty.warning(ctx, getResources().getString(R.string.draftsListEmpty));
 		}
-
 	}
 
 	@Override
@@ -127,40 +132,45 @@ public class DraftsFragment extends Fragment {
 		SearchView searchView = (SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
+					@Override
+					public boolean onQueryTextSubmit(String query) {
 
-				return false;
-			}
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
+					@Override
+					public boolean onQueryTextChange(String newText) {
 
-				filter(newText);
-				return false;
-			}
-		});
+						filter(newText);
+						return false;
+					}
+				});
 	}
 
 	private void filter(String text) {
 
 		List<DraftWithRepository> arr = new ArrayList<>();
 
-		for(DraftWithRepository d : draftsList_) {
+		for (DraftWithRepository d : draftsList_) {
 
-			if(d == null || d.getRepositoryOwner() == null || d.getRepositoryName() == null || d.getDraftText() == null) {
+			if (d == null
+					|| d.getRepositoryOwner() == null
+					|| d.getRepositoryName() == null
+					|| d.getDraftText() == null) {
 				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);
 			}
 		}
 
 		adapter.updateList(arr);
 	}
-
 }
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 d0e436a0..8657194d 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/ExploreFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ExploreFragment.java
@@ -22,19 +22,21 @@ import org.mian.gitnex.helpers.TinyDB;
 /**
  * @author M M Arif
  */
-
 public class ExploreFragment extends Fragment {
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
 		View view = inflater.inflate(R.layout.fragment_explore, container, false);
 
 		Context ctx = getContext();
 		TinyDB tinyDB = TinyDB.getInstance(ctx);
 
-		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.pageTitleExplore));
+		((MainActivity) requireActivity())
+				.setActionBarTitle(getResources().getString(R.string.pageTitleExplore));
 
 		ViewPager2 viewPager = view.findViewById(R.id.containerExplore);
 		viewPager.setOffscreenPageLimit(1);
@@ -45,18 +47,24 @@ 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)};
-		new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> tab.setText(tabTitles[position])).attach();
+		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++) {
+		for (int j = 0; j < tabTitles.length; j++) {
 
 			ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
 			int tabChildCount = vgTab.getChildCount();
 
-			for(int i = 0; i < tabChildCount; i++) {
+			for (int i = 0; i < tabChildCount; i++) {
 				View tabViewChild = vgTab.getChildAt(i);
-				if(tabViewChild instanceof TextView) {
+				if (tabViewChild instanceof TextView) {
 					((TextView) tabViewChild).setTypeface(myTypeface);
 				}
 			}
@@ -71,11 +79,10 @@ public class ExploreFragment extends Fragment {
 			super(fa);
 		}
 
-		@NonNull
-		@Override
+		@NonNull @Override
 		public Fragment createFragment(int position) {
 			Fragment fragment = null;
-			switch(position) {
+			switch (position) {
 				case 0: // Repositories
 					fragment = new ExploreRepositoriesFragment();
 					break;
@@ -97,7 +104,5 @@ public class ExploreFragment extends Fragment {
 		public int getItemCount() {
 			return 4;
 		}
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/ExploreIssuesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ExploreIssuesFragment.java
index 2ea7e963..8565e453 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/ExploreIssuesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ExploreIssuesFragment.java
@@ -22,7 +22,6 @@ import org.mian.gitnex.viewmodels.IssuesViewModel;
 /**
  * @author M M Arif
  */
-
 public class ExploreIssuesFragment extends Fragment {
 
 	private IssuesViewModel issuesViewModel;
@@ -31,21 +30,27 @@ public class ExploreIssuesFragment extends Fragment {
 	private int page = 1;
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		viewBinding = FragmentSearchIssuesBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
 		issuesViewModel = new ViewModelProvider(this).get(IssuesViewModel.class);
 
-		viewBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			viewBinding.pullToRefresh.setRefreshing(false);
-			fetchDataAsync("");
-			viewBinding.progressBar.setVisibility(View.VISIBLE);
-		}, 50));
+		viewBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											viewBinding.pullToRefresh.setRefreshing(false);
+											fetchDataAsync("");
+											viewBinding.progressBar.setVisibility(View.VISIBLE);
+										},
+										50));
 
 		viewBinding.recyclerViewSearchIssues.setHasFixedSize(true);
-		viewBinding.recyclerViewSearchIssues.setLayoutManager(new LinearLayoutManager(requireActivity()));
+		viewBinding.recyclerViewSearchIssues.setLayoutManager(
+				new LinearLayoutManager(requireActivity()));
 
 		fetchDataAsync("");
 
@@ -54,38 +59,49 @@ public class ExploreIssuesFragment extends Fragment {
 
 	private void fetchDataAsync(String searchKeyword) {
 
-		issuesViewModel.getIssuesList(searchKeyword, "issues", null, "open", null, getContext()).observe(getViewLifecycleOwner(), issuesListMain -> {
+		issuesViewModel
+				.getIssuesList(searchKeyword, "issues", null, "open", null, getContext())
+				.observe(
+						getViewLifecycleOwner(),
+						issuesListMain -> {
+							adapter = new ExploreIssuesAdapter(issuesListMain, getContext());
+							adapter.setLoadMoreListener(
+									new ExploreIssuesAdapter.OnLoadMoreListener() {
 
-			adapter = new ExploreIssuesAdapter(issuesListMain, getContext());
-			adapter.setLoadMoreListener(new ExploreIssuesAdapter.OnLoadMoreListener() {
+										@Override
+										public void onLoadMore() {
 
-				@Override
-				public void onLoadMore() {
+											page += 1;
+											issuesViewModel.loadMoreIssues(
+													searchKeyword,
+													"issues",
+													null,
+													"open",
+													page,
+													null,
+													getContext(),
+													adapter);
+											viewBinding.progressBar.setVisibility(View.VISIBLE);
+										}
 
-					page += 1;
-					issuesViewModel.loadMoreIssues(searchKeyword, "issues", null, "open", page, null, getContext(), adapter);
-					viewBinding.progressBar.setVisibility(View.VISIBLE);
-				}
+										@Override
+										public void onLoadFinished() {
 
-				@Override
-				public void onLoadFinished() {
+											viewBinding.progressBar.setVisibility(View.GONE);
+										}
+									});
 
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-			});
+							if (adapter.getItemCount() > 0) {
+								viewBinding.recyclerViewSearchIssues.setAdapter(adapter);
+								viewBinding.noData.setVisibility(View.GONE);
+							} else {
+								adapter.notifyDataChanged();
+								viewBinding.recyclerViewSearchIssues.setAdapter(adapter);
+								viewBinding.noData.setVisibility(View.VISIBLE);
+							}
 
-			if(adapter.getItemCount() > 0) {
-				viewBinding.recyclerViewSearchIssues.setAdapter(adapter);
-				viewBinding.noData.setVisibility(View.GONE);
-			}
-			else {
-				adapter.notifyDataChanged();
-				viewBinding.recyclerViewSearchIssues.setAdapter(adapter);
-				viewBinding.noData.setVisibility(View.VISIBLE);
-			}
-
-			viewBinding.progressBar.setVisibility(View.GONE);
-		});
+							viewBinding.progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	@Override
@@ -96,25 +112,26 @@ public class ExploreIssuesFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				viewBinding.progressBar.setVisibility(View.VISIBLE);
-				fetchDataAsync(query);
-				searchView.setQuery(null, false);
-				searchItem.collapseActionView();
-				return false;
-			}
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						viewBinding.progressBar.setVisibility(View.VISIBLE);
+						fetchDataAsync(query);
+						searchView.setQuery(null, false);
+						searchItem.collapseActionView();
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						return false;
+					}
+				});
 	}
-
 }
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 4e3c26e8..1853a0b7 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/ExplorePublicOrganizationsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ExplorePublicOrganizationsFragment.java
@@ -12,6 +12,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Organization;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.OrganizationsListAdapter;
@@ -19,8 +21,6 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.FragmentOrganizationsBinding;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.SnackBar;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -28,7 +28,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class ExplorePublicOrganizationsFragment extends Fragment {
 
 	private final String TAG = "PublicOrganizations";
@@ -39,9 +38,11 @@ public class ExplorePublicOrganizationsFragment extends Fragment {
 	private int pageSize;
 	private int resultLimit;
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
 		fragmentPublicOrgBinding = FragmentOrganizationsBinding.inflate(inflater, container, false);
 		context = getContext();
@@ -51,25 +52,36 @@ public class ExplorePublicOrganizationsFragment extends Fragment {
 		fragmentPublicOrgBinding.addNewOrganization.setVisibility(View.GONE);
 		organizationsList = new ArrayList<>();
 
-		fragmentPublicOrgBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-			fragmentPublicOrgBinding.pullToRefresh.setRefreshing(false);
-			loadInitial(resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
+		fragmentPublicOrgBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											fragmentPublicOrgBinding.pullToRefresh.setRefreshing(
+													false);
+											loadInitial(resultLimit);
+											adapter.notifyDataChanged();
+										},
+										200));
 
 		adapter = new OrganizationsListAdapter(requireContext(), organizationsList);
-		adapter.setLoadMoreListener(new OrganizationsListAdapter.OnLoadMoreListener() {
+		adapter.setLoadMoreListener(
+				new OrganizationsListAdapter.OnLoadMoreListener() {
 
-			@Override
-			public void onLoadMore() {
-				fragmentPublicOrgBinding.recyclerView.post(() -> {
-					if(organizationsList.size() == resultLimit || pageSize == resultLimit) {
-						int page = (organizationsList.size() + resultLimit) / resultLimit;
-						loadMore(page, resultLimit);
+					@Override
+					public void onLoadMore() {
+						fragmentPublicOrgBinding.recyclerView.post(
+								() -> {
+									if (organizationsList.size() == resultLimit
+											|| pageSize == resultLimit) {
+										int page =
+												(organizationsList.size() + resultLimit)
+														/ resultLimit;
+										loadMore(page, resultLimit);
+									}
+								});
 					}
 				});
-			}
-		});
 
 		fragmentPublicOrgBinding.recyclerView.setHasFixedSize(true);
 		fragmentPublicOrgBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
@@ -82,74 +94,82 @@ public class ExplorePublicOrganizationsFragment extends Fragment {
 
 	private void loadInitial(int resultLimit) {
 
-		Call<List<Organization>> call = RetrofitClient.getApiInterface(context).orgGetAll(Constants.publicOrganizationsPageInit, resultLimit);
-		call.enqueue(new Callback<List<Organization>>() {
+		Call<List<Organization>> call =
+				RetrofitClient.getApiInterface(context)
+						.orgGetAll(Constants.publicOrganizationsPageInit, resultLimit);
+		call.enqueue(
+				new Callback<List<Organization>>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Organization>> call, @NonNull Response<List<Organization>> response) {
-				if(response.isSuccessful()) {
-					if(response.body() != null && response.body().size() > 0) {
-						organizationsList.clear();
-						organizationsList.addAll(response.body());
-						adapter.notifyDataChanged();
-						fragmentPublicOrgBinding.noDataOrg.setVisibility(View.GONE);
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Organization>> call,
+							@NonNull Response<List<Organization>> response) {
+						if (response.isSuccessful()) {
+							if (response.body() != null && response.body().size() > 0) {
+								organizationsList.clear();
+								organizationsList.addAll(response.body());
+								adapter.notifyDataChanged();
+								fragmentPublicOrgBinding.noDataOrg.setVisibility(View.GONE);
+							} else {
+								organizationsList.clear();
+								adapter.notifyDataChanged();
+								fragmentPublicOrgBinding.noDataOrg.setVisibility(View.VISIBLE);
+							}
+							fragmentPublicOrgBinding.progressBar.setVisibility(View.GONE);
+						} else if (response.code() == 404) {
+							fragmentPublicOrgBinding.noDataOrg.setVisibility(View.VISIBLE);
+							fragmentPublicOrgBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Log.e(TAG, String.valueOf(response.code()));
+						}
 					}
-					else {
-						organizationsList.clear();
-						adapter.notifyDataChanged();
-						fragmentPublicOrgBinding.noDataOrg.setVisibility(View.VISIBLE);
-					}
-					fragmentPublicOrgBinding.progressBar.setVisibility(View.GONE);
-				}
-				else if(response.code() == 404) {
-					fragmentPublicOrgBinding.noDataOrg.setVisibility(View.VISIBLE);
-					fragmentPublicOrgBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
-				Log.e(TAG, t.toString());
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
+						Log.e(TAG, t.toString());
+					}
+				});
 	}
 
 	private void loadMore(int page, int resultLimit) {
 
 		fragmentPublicOrgBinding.progressBar.setVisibility(View.VISIBLE);
-		Call<List<Organization>> call = RetrofitClient.getApiInterface(context).orgGetAll(page, resultLimit);
-		call.enqueue(new Callback<List<Organization>>() {
+		Call<List<Organization>> call =
+				RetrofitClient.getApiInterface(context).orgGetAll(page, resultLimit);
+		call.enqueue(
+				new Callback<List<Organization>>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Organization>> call, @NonNull Response<List<Organization>> response) {
-				if(response.isSuccessful()) {
-					List<Organization> result = response.body();
-					if(result != null) {
-						if(result.size() > 0) {
-							pageSize = result.size();
-							organizationsList.addAll(result);
-						}
-						else {
-							SnackBar.info(context, fragmentPublicOrgBinding.getRoot(), getString(R.string.noMoreData));
-							adapter.setMoreDataAvailable(false);
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Organization>> call,
+							@NonNull Response<List<Organization>> response) {
+						if (response.isSuccessful()) {
+							List<Organization> result = response.body();
+							if (result != null) {
+								if (result.size() > 0) {
+									pageSize = result.size();
+									organizationsList.addAll(result);
+								} else {
+									SnackBar.info(
+											context,
+											fragmentPublicOrgBinding.getRoot(),
+											getString(R.string.noMoreData));
+									adapter.setMoreDataAvailable(false);
+								}
+							}
+							adapter.notifyDataChanged();
+							fragmentPublicOrgBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Log.e(TAG, String.valueOf(response.code()));
 						}
 					}
-					adapter.notifyDataChanged();
-					fragmentPublicOrgBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
-				Log.e(TAG, t.toString());
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
+						Log.e(TAG, t.toString());
+					}
+				});
 	}
-
 }
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 9218e142..a12ed21a 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java
@@ -15,6 +15,8 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Repository;
 import org.gitnex.tea4j.v2.models.SearchResults;
 import org.mian.gitnex.R;
@@ -26,8 +28,6 @@ import org.mian.gitnex.databinding.FragmentExploreRepoBinding;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.SnackBar;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -35,7 +35,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class ExploreRepositoriesFragment extends Fragment {
 
 	private final boolean repoTypeInclude = true;
@@ -57,7 +56,8 @@ public class ExploreRepositoriesFragment extends Fragment {
 	private String searchQuery = "";
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		viewBinding = FragmentExploreRepoBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
@@ -68,18 +68,26 @@ public class ExploreRepositoriesFragment extends Fragment {
 
 		resultLimit = Constants.getCurrentResultLimit(context);
 
-		viewBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-			viewBinding.pullToRefresh.setRefreshing(false);
-			loadInitial("", resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
+		viewBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											viewBinding.pullToRefresh.setRefreshing(false);
+											loadInitial("", resultLimit);
+											adapter.notifyDataChanged();
+										},
+										200));
 
-		adapter.setLoadMoreListener(() -> viewBinding.recyclerViewReposSearch.post(() -> {
-			if(dataList.size() == resultLimit || pageSize == resultLimit) {
-				int page = (dataList.size() + resultLimit) / resultLimit;
-				loadMore("", resultLimit, page);
-			}
-		}));
+		adapter.setLoadMoreListener(
+				() ->
+						viewBinding.recyclerViewReposSearch.post(
+								() -> {
+									if (dataList.size() == resultLimit || pageSize == resultLimit) {
+										int page = (dataList.size() + resultLimit) / resultLimit;
+										loadMore("", resultLimit, page);
+									}
+								}));
 
 		viewBinding.recyclerViewReposSearch.setHasFixedSize(true);
 		viewBinding.recyclerViewReposSearch.setLayoutManager(new LinearLayoutManager(context));
@@ -92,76 +100,132 @@ 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);
-		call.enqueue(new Callback<>() {
-			@Override
-			public void onResponse(@NonNull Call<SearchResults> call, @NonNull Response<SearchResults> response) {
-				if(response.isSuccessful()) {
-					if(response.body() != null && response.body().getData().size() > 0) {
-						dataList.clear();
-						dataList.addAll(response.body().getData());
-						adapter.notifyDataChanged();
-						viewBinding.noData.setVisibility(View.GONE);
+		Call<SearchResults> call =
+				RetrofitClient.getApiInterface(context)
+						.repoSearch(
+								searchKeyword,
+								includeTopic,
+								includeDescription,
+								null,
+								null,
+								null,
+								null,
+								repoTypeInclude,
+								null,
+								includeTemplate,
+								onlyArchived,
+								null,
+								null,
+								sort,
+								order,
+								1,
+								resultLimit);
+		call.enqueue(
+				new Callback<>() {
+					@Override
+					public void onResponse(
+							@NonNull Call<SearchResults> call,
+							@NonNull Response<SearchResults> response) {
+						if (response.isSuccessful()) {
+							if (response.body() != null && response.body().getData().size() > 0) {
+								dataList.clear();
+								dataList.addAll(response.body().getData());
+								adapter.notifyDataChanged();
+								viewBinding.noData.setVisibility(View.GONE);
+							} else {
+								dataList.clear();
+								adapter.notifyDataChanged();
+								viewBinding.noData.setVisibility(View.VISIBLE);
+							}
+							viewBinding.progressBar.setVisibility(View.GONE);
+						} else if (response.code() == 404) {
+							viewBinding.noData.setVisibility(View.VISIBLE);
+							viewBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Toasty.error(
+									requireActivity(),
+									requireActivity()
+											.getResources()
+											.getString(R.string.genericError));
+						}
 					}
-					else {
-						dataList.clear();
-						adapter.notifyDataChanged();
-						viewBinding.noData.setVisibility(View.VISIBLE);
+
+					@Override
+					public void onFailure(@NonNull Call<SearchResults> call, @NonNull Throwable t) {
+
+						Toasty.error(
+								requireActivity(),
+								requireActivity()
+										.getResources()
+										.getString(R.string.genericServerResponseError));
 					}
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-				else if(response.code() == 404) {
-					viewBinding.noData.setVisibility(View.VISIBLE);
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Toasty.error(requireActivity(), requireActivity().getResources().getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<SearchResults> call, @NonNull Throwable t) {
-
-				Toasty.error(requireActivity(), requireActivity().getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
 
 	private void loadMore(String searchKeyword, int resultLimit, int page) {
 
 		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);
+		Call<SearchResults> call =
+				RetrofitClient.getApiInterface(context)
+						.repoSearch(
+								searchKeyword,
+								includeTopic,
+								includeDescription,
+								null,
+								null,
+								null,
+								null,
+								repoTypeInclude,
+								null,
+								includeTemplate,
+								onlyArchived,
+								null,
+								null,
+								sort,
+								order,
+								page,
+								resultLimit);
 
-		call.enqueue(new Callback<>() {
-			@Override
-			public void onResponse(@NonNull Call<SearchResults> call, @NonNull Response<SearchResults> response) {
-				if(response.isSuccessful()) {
-					assert response.body() != null;
-					List<Repository> result = response.body().getData();
-					if(result.size() > 0) {
-						pageSize = result.size();
-						dataList.addAll(result);
+		call.enqueue(
+				new Callback<>() {
+					@Override
+					public void onResponse(
+							@NonNull Call<SearchResults> call,
+							@NonNull Response<SearchResults> response) {
+						if (response.isSuccessful()) {
+							assert response.body() != null;
+							List<Repository> result = response.body().getData();
+							if (result.size() > 0) {
+								pageSize = result.size();
+								dataList.addAll(result);
+							} else {
+								SnackBar.info(
+										context,
+										viewBinding.getRoot(),
+										getString(R.string.noMoreData));
+								adapter.setMoreDataAvailable(false);
+							}
+							adapter.notifyDataChanged();
+							viewBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Toasty.error(
+									requireActivity(),
+									requireActivity()
+											.getResources()
+											.getString(R.string.genericError));
+						}
 					}
-					else {
-						SnackBar.info(context, viewBinding.getRoot(), getString(R.string.noMoreData));
-						adapter.setMoreDataAvailable(false);
+
+					@Override
+					public void onFailure(@NonNull Call<SearchResults> call, @NonNull Throwable t) {
+
+						Toasty.error(
+								requireActivity(),
+								requireActivity()
+										.getResources()
+										.getString(R.string.genericServerResponseError));
 					}
-					adapter.notifyDataChanged();
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Toasty.error(requireActivity(), requireActivity().getResources().getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<SearchResults> call, @NonNull Throwable t) {
-
-				Toasty.error(requireActivity(), requireActivity().getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
 
 	@Override
@@ -173,56 +237,72 @@ public class ExploreRepositoriesFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 		MenuItem filter = menu.findItem(R.id.filter_explore);
 
-		filter.setOnMenuItemClickListener(filter_ -> {
-
-			showFilterOptions();
-			return false;
-		});
+		filter.setOnMenuItemClickListener(
+				filter_ -> {
+					showFilterOptions();
+					return false;
+				});
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				viewBinding.progressBar.setVisibility(View.VISIBLE);
-				loadInitial(query, resultLimit);
-				adapter.setLoadMoreListener(() -> viewBinding.recyclerViewReposSearch.post(() -> {
-					if(dataList.size() == resultLimit || pageSize == resultLimit) {
-						int page = (dataList.size() + resultLimit) / resultLimit;
-						loadMore(query, resultLimit, page);
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						viewBinding.progressBar.setVisibility(View.VISIBLE);
+						loadInitial(query, resultLimit);
+						adapter.setLoadMoreListener(
+								() ->
+										viewBinding.recyclerViewReposSearch.post(
+												() -> {
+													if (dataList.size() == resultLimit
+															|| pageSize == resultLimit) {
+														int page =
+																(dataList.size() + resultLimit)
+																		/ resultLimit;
+														loadMore(query, resultLimit, page);
+													}
+												}));
+						searchQuery = query;
+						searchView.setQuery(null, false);
+						searchItem.collapseActionView();
+						return false;
 					}
-				}));
-				searchQuery = query;
-				searchView.setQuery(null, false);
-				searchItem.collapseActionView();
-				return false;
-			}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						return false;
+					}
+				});
 	}
 
 	private void showFilterOptions() {
 
-		MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
-		filterBinding = CustomExploreRepositoriesDialogBinding.inflate(LayoutInflater.from(context));
+		MaterialAlertDialogBuilder materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(
+						context, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		filterBinding =
+				CustomExploreRepositoriesDialogBinding.inflate(LayoutInflater.from(context));
 
 		View view = filterBinding.getRoot();
 		materialAlertDialogBuilder.setView(view);
 
-		filterBinding.includeTopic.setOnClickListener(includeTopic -> this.includeTopic = filterBinding.includeTopic.isChecked());
+		filterBinding.includeTopic.setOnClickListener(
+				includeTopic -> this.includeTopic = filterBinding.includeTopic.isChecked());
 
-		filterBinding.includeDesc.setOnClickListener(includeDesc -> this.includeDescription = filterBinding.includeDesc.isChecked());
+		filterBinding.includeDesc.setOnClickListener(
+				includeDesc -> this.includeDescription = filterBinding.includeDesc.isChecked());
 
-		filterBinding.includeTemplate.setOnClickListener(includeTemplate -> this.includeTemplate = filterBinding.includeTemplate.isChecked());
+		filterBinding.includeTemplate.setOnClickListener(
+				includeTemplate ->
+						this.includeTemplate = filterBinding.includeTemplate.isChecked());
 
-		filterBinding.onlyArchived.setOnClickListener(onlyArchived -> this.onlyArchived = filterBinding.onlyArchived.isChecked());
+		filterBinding.onlyArchived.setOnClickListener(
+				onlyArchived -> this.onlyArchived = filterBinding.onlyArchived.isChecked());
 
 		filterBinding.includeTopic.setChecked(includeTopic);
 		filterBinding.includeDesc.setChecked(includeDescription);
@@ -237,11 +317,10 @@ public class ExploreRepositoriesFragment extends Fragment {
 	public void onResume() {
 		super.onResume();
 
-		if(MainActivity.reloadRepos) {
+		if (MainActivity.reloadRepos) {
 			dataList.clear();
 			loadInitial(searchQuery, resultLimit);
 			MainActivity.reloadRepos = false;
 		}
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/ExploreUsersFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ExploreUsersFragment.java
index 53529c02..e37ce773 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/ExploreUsersFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ExploreUsersFragment.java
@@ -14,6 +14,8 @@ import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.InlineResponse2001;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
@@ -23,8 +25,6 @@ import org.mian.gitnex.databinding.FragmentExploreUsersBinding;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.SnackBar;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -32,7 +32,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class ExploreUsersFragment extends Fragment {
 
 	private FragmentExploreUsersBinding viewBinding;
@@ -44,7 +43,8 @@ public class ExploreUsersFragment extends Fragment {
 	private int resultLimit;
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		viewBinding = FragmentExploreUsersBinding.inflate(inflater, container, false);
 		context = getContext();
@@ -55,18 +55,27 @@ public class ExploreUsersFragment extends Fragment {
 		usersList = new ArrayList<>();
 		adapter = new UsersAdapter(usersList, context);
 
-		viewBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-			viewBinding.pullToRefresh.setRefreshing(false);
-			loadInitial("", resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
+		viewBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											viewBinding.pullToRefresh.setRefreshing(false);
+											loadInitial("", resultLimit);
+											adapter.notifyDataChanged();
+										},
+										200));
 
-		adapter.setLoadMoreListener(() -> viewBinding.recyclerViewExploreUsers.post(() -> {
-			if(usersList.size() == resultLimit || pageSize == resultLimit) {
-				int page = (usersList.size() + resultLimit) / resultLimit;
-				loadMore("", resultLimit, page);
-			}
-		}));
+		adapter.setLoadMoreListener(
+				() ->
+						viewBinding.recyclerViewExploreUsers.post(
+								() -> {
+									if (usersList.size() == resultLimit
+											|| pageSize == resultLimit) {
+										int page = (usersList.size() + resultLimit) / resultLimit;
+										loadMore("", resultLimit, page);
+									}
+								}));
 
 		viewBinding.recyclerViewExploreUsers.setHasFixedSize(true);
 		viewBinding.recyclerViewExploreUsers.setLayoutManager(new LinearLayoutManager(context));
@@ -79,77 +88,103 @@ public class ExploreUsersFragment extends Fragment {
 
 	private void loadInitial(String searchKeyword, int resultLimit) {
 
-		Call<InlineResponse2001> call = RetrofitClient.getApiInterface(context).userSearch(searchKeyword, null, 1, resultLimit);
-		call.enqueue(new Callback<>() {
+		Call<InlineResponse2001> call =
+				RetrofitClient.getApiInterface(context)
+						.userSearch(searchKeyword, null, 1, resultLimit);
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<InlineResponse2001> call, @NonNull Response<InlineResponse2001> response) {
-				if(response.isSuccessful()) {
-					if(response.body() != null && response.body().getData().size() > 0) {
-						usersList.clear();
-						usersList.addAll(response.body().getData());
-						adapter.notifyDataChanged();
-						viewBinding.noData.setVisibility(View.GONE);
+					@Override
+					public void onResponse(
+							@NonNull Call<InlineResponse2001> call,
+							@NonNull Response<InlineResponse2001> response) {
+						if (response.isSuccessful()) {
+							if (response.body() != null && response.body().getData().size() > 0) {
+								usersList.clear();
+								usersList.addAll(response.body().getData());
+								adapter.notifyDataChanged();
+								viewBinding.noData.setVisibility(View.GONE);
+							} else {
+								usersList.clear();
+								adapter.notifyDataChanged();
+								viewBinding.noData.setVisibility(View.VISIBLE);
+							}
+							viewBinding.progressBar.setVisibility(View.GONE);
+						} else if (response.code() == 404) {
+							viewBinding.noData.setVisibility(View.VISIBLE);
+							viewBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Toasty.error(
+									requireActivity(),
+									requireActivity()
+											.getResources()
+											.getString(R.string.genericError));
+						}
 					}
-					else {
-						usersList.clear();
-						adapter.notifyDataChanged();
-						viewBinding.noData.setVisibility(View.VISIBLE);
+
+					@Override
+					public void onFailure(
+							@NonNull Call<InlineResponse2001> call, @NonNull Throwable t) {
+
+						Toasty.error(
+								requireActivity(),
+								requireActivity()
+										.getResources()
+										.getString(R.string.genericServerResponseError));
 					}
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-				else if(response.code() == 404) {
-					viewBinding.noData.setVisibility(View.VISIBLE);
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Toasty.error(requireActivity(), requireActivity().getResources().getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<InlineResponse2001> call, @NonNull Throwable t) {
-
-				Toasty.error(requireActivity(), requireActivity().getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
 
 	private void loadMore(String searchKeyword, int resultLimit, int page) {
 
 		viewBinding.progressBar.setVisibility(View.VISIBLE);
-		Call<InlineResponse2001> call = RetrofitClient.getApiInterface(context).userSearch(searchKeyword, null, page, resultLimit);
-		call.enqueue(new Callback<>() {
+		Call<InlineResponse2001> call =
+				RetrofitClient.getApiInterface(context)
+						.userSearch(searchKeyword, null, page, resultLimit);
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<InlineResponse2001> call, @NonNull Response<InlineResponse2001> response) {
-				if(response.isSuccessful()) {
-					assert response.body() != null;
-					List<User> result = response.body().getData();
-					if(result != null) {
-						if(result.size() > 0) {
-							pageSize = result.size();
-							usersList.addAll(result);
-						}
-						else {
-							SnackBar.info(context, viewBinding.getRoot(), getString(R.string.noMoreData));
-							adapter.setMoreDataAvailable(false);
+					@Override
+					public void onResponse(
+							@NonNull Call<InlineResponse2001> call,
+							@NonNull Response<InlineResponse2001> response) {
+						if (response.isSuccessful()) {
+							assert response.body() != null;
+							List<User> result = response.body().getData();
+							if (result != null) {
+								if (result.size() > 0) {
+									pageSize = result.size();
+									usersList.addAll(result);
+								} else {
+									SnackBar.info(
+											context,
+											viewBinding.getRoot(),
+											getString(R.string.noMoreData));
+									adapter.setMoreDataAvailable(false);
+								}
+							}
+							adapter.notifyDataChanged();
+							viewBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Toasty.error(
+									requireActivity(),
+									requireActivity()
+											.getResources()
+											.getString(R.string.genericError));
 						}
 					}
-					adapter.notifyDataChanged();
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Toasty.error(requireActivity(), requireActivity().getResources().getString(R.string.genericError));
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<InlineResponse2001> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(
+							@NonNull Call<InlineResponse2001> call, @NonNull Throwable t) {
 
-				Toasty.error(requireActivity(), requireActivity().getResources().getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(
+								requireActivity(),
+								requireActivity()
+										.getResources()
+										.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	@Override
@@ -160,31 +195,38 @@ public class ExploreUsersFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				viewBinding.progressBar.setVisibility(View.VISIBLE);
-				loadInitial(query, resultLimit);
-				adapter.setLoadMoreListener(() -> viewBinding.recyclerViewExploreUsers.post(() -> {
-					if(usersList.size() == resultLimit || pageSize == resultLimit) {
-						int page = (usersList.size() + resultLimit) / resultLimit;
-						loadMore(query, resultLimit, page);
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						viewBinding.progressBar.setVisibility(View.VISIBLE);
+						loadInitial(query, resultLimit);
+						adapter.setLoadMoreListener(
+								() ->
+										viewBinding.recyclerViewExploreUsers.post(
+												() -> {
+													if (usersList.size() == resultLimit
+															|| pageSize == resultLimit) {
+														int page =
+																(usersList.size() + resultLimit)
+																		/ resultLimit;
+														loadMore(query, resultLimit, page);
+													}
+												}));
+						searchView.setQuery(null, false);
+						searchItem.collapseActionView();
+						return false;
 					}
-				}));
-				searchView.setQuery(null, false);
-				searchItem.collapseActionView();
-				return false;
-			}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						return false;
+					}
+				});
 	}
-
 }
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 6d4c4b59..5b814cdc 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
@@ -17,6 +17,11 @@ import androidx.appcompat.widget.SearchView;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import moe.feng.common.view.breadcrumbs.DefaultBreadcrumbsCallback;
+import moe.feng.common.view.breadcrumbs.model.BreadcrumbItem;
 import org.gitnex.tea4j.v2.models.ContentsResponse;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.FileViewActivity;
@@ -30,16 +35,10 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Path;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.mian.gitnex.viewmodels.FilesViewModel;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import moe.feng.common.view.breadcrumbs.DefaultBreadcrumbsCallback;
-import moe.feng.common.view.breadcrumbs.model.BreadcrumbItem;
 
 /**
  * @author M M Arif
  */
-
 public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapterListener {
 
 	private final Path path = new Path();
@@ -47,8 +46,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 	private RepositoryContext repository;
 	private FilesAdapter filesAdapter;
 
-	public FilesFragment() {
-	}
+	public FilesFragment() {}
 
 	public static FilesFragment newInstance(RepositoryContext repository) {
 
@@ -65,7 +63,8 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		binding = FragmentFilesBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
@@ -76,85 +75,114 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 		binding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 		binding.recyclerView.setAdapter(filesAdapter);
 
-		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>() {
+		binding.breadcrumbsView.setCallback(
+				new DefaultBreadcrumbsCallback<BreadcrumbItem>() {
 
-			@SuppressLint("SetTextI18n")
-			@Override
-			public void onNavigateBack(BreadcrumbItem item, int position) {
+					@SuppressLint("SetTextI18n")
+					@Override
+					public void onNavigateBack(BreadcrumbItem item, int position) {
 
-				if(position == 0) {
-					path.clear();
-				}
-				else {
-					path.pop(path.size() - position);
-				}
-				refresh();
-			}
+						if (position == 0) {
+							path.clear();
+						} else {
+							path.pop(path.size() - position);
+						}
+						refresh();
+					}
 
-			@Override
-			public void onNavigateNewLocation(BreadcrumbItem newItem, int changedPosition) {
-			}
+					@Override
+					public void onNavigateNewLocation(
+							BreadcrumbItem newItem, int changedPosition) {}
+				});
 
-		});
+		requireActivity()
+				.getOnBackPressedDispatcher()
+				.addCallback(
+						getViewLifecycleOwner(),
+						new OnBackPressedCallback(true) {
 
-		requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), new OnBackPressedCallback(true) {
+							@Override
+							public void handleOnBackPressed() {
+								if (path.size() == 0
+										|| ((RepoDetailActivity) requireActivity())
+														.viewPager.getCurrentItem()
+												!= 1) {
+									requireActivity().finish();
+									return;
+								}
+								path.remove(path.size() - 1);
+								binding.breadcrumbsView.removeLastItem();
+								if (path.size() == 0) {
+									fetchDataAsync(
+											repository.getOwner(),
+											repository.getName(),
+											repository.getBranchRef());
+								} else {
+									fetchDataAsyncSub(
+											repository.getOwner(),
+											repository.getName(),
+											path.toString(),
+											repository.getBranchRef());
+								}
+							}
+						});
 
-			@Override
-			public void handleOnBackPressed() {
-				if(path.size() == 0 || ((RepoDetailActivity) requireActivity()).viewPager.getCurrentItem() != 1) {
-					requireActivity().finish();
-					return;
-				}
-				path.remove(path.size() - 1);
-				binding.breadcrumbsView.removeLastItem();
-				if(path.size() == 0) {
-					fetchDataAsync(repository.getOwner(), repository.getName(), repository.getBranchRef());
-				}
-				else {
-					fetchDataAsyncSub(repository.getOwner(), repository.getName(), path.toString(), repository.getBranchRef());
-				}
-			}
-		});
-
-		binding.pullToRefresh.setOnRefreshListener(() -> {
-			refresh();
-			binding.pullToRefresh.setRefreshing(false);
-		});
-
-		((RepoDetailActivity) requireActivity()).setFragmentRefreshListenerFiles(repoBranch -> {
-
-			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()))));
-			refresh();
-		});
+		binding.pullToRefresh.setOnRefreshListener(
+				() -> {
+					refresh();
+					binding.pullToRefresh.setRefreshing(false);
+				});
 
+		((RepoDetailActivity) requireActivity())
+				.setFragmentRefreshListenerFiles(
+						repoBranch -> {
+							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()))));
+							refresh();
+						});
 
 		String dir = requireActivity().getIntent().getStringExtra("dir");
-		if(dir != null) {
-			for(String segment : dir.split("/")) {
-				binding.breadcrumbsView.addItem(new BreadcrumbItem(Collections.singletonList(segment)));
+		if (dir != null) {
+			for (String segment : dir.split("/")) {
+				binding.breadcrumbsView.addItem(
+						new BreadcrumbItem(Collections.singletonList(segment)));
 				path.add(segment);
 			}
 		}
 		refresh();
 
 		return binding.getRoot();
-
 	}
 
 	@Override
 	public void onClickFile(ContentsResponse file) {
 
-		switch(file.getType()) {
-
+		switch (file.getType()) {
 			case "dir":
 				path.addWithoutEncoding(file.getName());
-				binding.breadcrumbsView.addItem(new BreadcrumbItem(Collections.singletonList(file.getName())));
+				binding.breadcrumbsView.addItem(
+						new BreadcrumbItem(Collections.singletonList(file.getName())));
 				refresh();
 				break;
 
@@ -168,44 +196,46 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 			case "submodule":
 				String rawUrl = file.getSubmoduleGitUrl();
-				if(rawUrl == null) {
+				if (rawUrl == null) {
 					return;
 				}
 				Uri url = AppUtil.getUriFromGitUrl(rawUrl);
 				String host = url.getHost();
 
-				UserAccountsApi userAccountsApi = BaseApi.getInstance(requireContext(), UserAccountsApi.class);
+				UserAccountsApi userAccountsApi =
+						BaseApi.getInstance(requireContext(), UserAccountsApi.class);
 				assert userAccountsApi != null;
 				List<UserAccount> userAccounts = userAccountsApi.loggedInUserAccounts();
 				UserAccount account = null;
 
-				for(UserAccount userAccount : userAccounts) {
+				for (UserAccount userAccount : userAccounts) {
 					Uri instanceUri = Uri.parse(userAccount.getInstanceUrl());
-					if(instanceUri.getHost().toLowerCase().equals(host)) {
+					if (instanceUri.getHost().toLowerCase().equals(host)) {
 						account = userAccount;
 						// if scheme is wrong fix it
-						if(!url.getScheme().equals(instanceUri.getScheme())) {
+						if (!url.getScheme().equals(instanceUri.getScheme())) {
 							url = AppUtil.changeScheme(url, instanceUri.getScheme());
 						}
 						break;
 					}
 				}
 
-				if(account != null) {
+				if (account != null) {
 					AppUtil.switchToAccount(requireContext(), account, true);
 					List<String> splittedUrl = url.getPathSegments();
-					if(splittedUrl.size() < 2) {
+					if (splittedUrl.size() < 2) {
 						AppUtil.openUrlInBrowser(requireContext(), url.toString());
 					}
 					String owner = splittedUrl.get(splittedUrl.size() - 2);
 					String repo = splittedUrl.get(splittedUrl.size() - 1);
-					if(repo.endsWith(".git")) { // Git clone URL
+					if (repo.endsWith(".git")) { // Git clone URL
 						repo = repo.substring(0, repo.length() - 4);
 					}
 
-					startActivity(new RepositoryContext(owner, repo, requireContext()).getIntent(requireContext(), RepoDetailActivity.class));
-				}
-				else {
+					startActivity(
+							new RepositoryContext(owner, repo, requireContext())
+									.getIntent(requireContext(), RepoDetailActivity.class));
+				} else {
 					AppUtil.openUrlInBrowser(requireContext(), url.toString());
 				}
 				break;
@@ -213,10 +243,13 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 	}
 
 	public void refresh() {
-		if(path.size() > 0) {
-			fetchDataAsyncSub(repository.getOwner(), repository.getName(), path.toString(), repository.getBranchRef());
-		}
-		else {
+		if (path.size() > 0) {
+			fetchDataAsyncSub(
+					repository.getOwner(),
+					repository.getName(),
+					path.toString(),
+					repository.getBranchRef());
+		} else {
 			fetchDataAsync(repository.getOwner(), repository.getName(), repository.getBranchRef());
 		}
 	}
@@ -228,27 +261,33 @@ 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);
-			}
-
-			binding.filesFrame.setVisibility(View.VISIBLE);
-			binding.progressBar.setVisibility(View.GONE);
-
-		});
+							} else {
+								AppUtil.setMultiVisibility(
+										View.VISIBLE,
+										binding.recyclerView,
+										binding.filesFrame,
+										binding.noDataFiles);
+							}
 
+							binding.filesFrame.setVisibility(View.VISIBLE);
+							binding.progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	private void fetchDataAsyncSub(String owner, String repo, String filesDir, String ref) {
@@ -257,26 +296,38 @@ 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);
-			}
-
-			binding.filesFrame.setVisibility(View.VISIBLE);
-			binding.progressBar.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);
+							}
 
+							binding.filesFrame.setVisibility(View.VISIBLE);
+							binding.progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	@Override
@@ -293,25 +344,23 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 		SearchView searchView = (SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-		searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
+					@Override
+					public boolean onQueryTextChange(String newText) {
 
-				if(binding.recyclerView.getAdapter() != null) {
-					filesAdapter.getFilter().filter(newText);
-				}
+						if (binding.recyclerView.getAdapter() != null) {
+							filesAdapter.getFilter().filter(newText);
+						}
 
-				return false;
-			}
-
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
-
-		});
+						return false;
+					}
 
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
+				});
 	}
-
 }
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 e9449de3..5a96b7b7 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java
@@ -15,6 +15,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Issue;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
@@ -25,8 +27,6 @@ import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.SnackBar;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -34,7 +34,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class IssuesFragment extends Fragment {
 
 	public static boolean resumeIssues = false;
@@ -54,9 +53,11 @@ public class IssuesFragment extends Fragment {
 		return f;
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
 		fragmentIssuesBinding = FragmentIssuesBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
@@ -68,72 +69,150 @@ public class IssuesFragment extends Fragment {
 
 		issuesList = new ArrayList<>();
 
-		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);
-			adapter.notifyDataChanged();
-		}, 200));
+		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);
+											adapter.notifyDataChanged();
+										},
+										200));
 
 		adapter = new IssuesAdapter(context, issuesList);
-		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());
-			}
-		}));
+		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());
+									}
+								}));
 
 		fragmentIssuesBinding.recyclerView.setHasFixedSize(true);
 		fragmentIssuesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
 		fragmentIssuesBinding.recyclerView.setAdapter(adapter);
 
-		((RepoDetailActivity) requireActivity()).setFragmentRefreshListener(issueState -> {
+		((RepoDetailActivity) requireActivity())
+				.setFragmentRefreshListener(
+						issueState -> {
+							if (issueState.equals("closed")) {
+								menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
+							} else {
+								menu.getItem(1).setIcon(R.drawable.ic_filter);
+							}
 
-			if(issueState.equals("closed")) {
-				menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
-			}
-			else {
-				menu.getItem(1).setIcon(R.drawable.ic_filter);
-			}
+							issuesList.clear();
 
-			issuesList.clear();
+							adapter = new IssuesAdapter(context, issuesList);
+							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());
+														}
+													}));
 
-			adapter = new IssuesAdapter(context, issuesList);
-			adapter.setLoadMoreListener(() -> fragmentIssuesBinding.recyclerView.post(() -> {
+							fragmentIssuesBinding.progressBar.setVisibility(View.VISIBLE);
+							fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE);
 
-				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());
-				}
-			}));
+							loadInitial(
+									repository.getOwner(),
+									repository.getName(),
+									resultLimit,
+									requestType,
+									issueState,
+									repository.getIssueMilestoneFilterName(),
+									null);
+							fragmentIssuesBinding.recyclerView.setAdapter(adapter);
+						});
 
-			fragmentIssuesBinding.progressBar.setVisibility(View.VISIBLE);
-			fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE);
+		((RepoDetailActivity) requireActivity())
+				.setFragmentRefreshListenerFilterIssuesByMilestone(
+						filterIssueByMilestone -> {
+							issuesList.clear();
 
-			loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, issueState, repository.getIssueMilestoneFilterName(), null);
-			fragmentIssuesBinding.recyclerView.setAdapter(adapter);
-		});
+							adapter = new IssuesAdapter(context, issuesList);
+							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());
+														}
+													}));
 
-		((RepoDetailActivity) requireActivity()).setFragmentRefreshListenerFilterIssuesByMilestone(filterIssueByMilestone -> {
+							fragmentIssuesBinding.progressBar.setVisibility(View.VISIBLE);
+							fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE);
 
-			issuesList.clear();
+							loadInitial(
+									repository.getOwner(),
+									repository.getName(),
+									resultLimit,
+									requestType,
+									repository.getIssueState().toString(),
+									filterIssueByMilestone,
+									null);
+							fragmentIssuesBinding.recyclerView.setAdapter(adapter);
+						});
 
-			adapter = new IssuesAdapter(context, issuesList);
-			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());
-				}
-			}));
-
-			fragmentIssuesBinding.progressBar.setVisibility(View.VISIBLE);
-			fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE);
-
-			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();
 	}
@@ -141,86 +220,143 @@ public class IssuesFragment extends Fragment {
 	@Override
 	public void onResume() {
 		super.onResume();
-		if(resumeIssues) {
-			loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, repository.getIssueState().toString(), repository.getIssueMilestoneFilterName(), null);
+		if (resumeIssues) {
+			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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Issue>> call, @NonNull Response<List<Issue>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Issue>> call,
+							@NonNull Response<List<Issue>> response) {
 
-				if(response.code() == 200) {
-					assert response.body() != null;
-					if(response.body().size() > 0) {
-						issuesList.clear();
-						issuesList.addAll(response.body());
-						adapter.notifyDataChanged();
-						fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE);
+						if (response.code() == 200) {
+							assert response.body() != null;
+							if (response.body().size() > 0) {
+								issuesList.clear();
+								issuesList.addAll(response.body());
+								adapter.notifyDataChanged();
+								fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE);
+							} else {
+								issuesList.clear();
+								adapter.notifyDataChanged();
+								fragmentIssuesBinding.noDataIssues.setVisibility(View.VISIBLE);
+							}
+							fragmentIssuesBinding.progressBar.setVisibility(View.GONE);
+						} else if (response.code() == 404) {
+							fragmentIssuesBinding.noDataIssues.setVisibility(View.VISIBLE);
+							fragmentIssuesBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Toasty.error(context, getString(R.string.genericError));
+						}
 					}
-					else {
-						issuesList.clear();
-						adapter.notifyDataChanged();
-						fragmentIssuesBinding.noDataIssues.setVisibility(View.VISIBLE);
-					}
-					fragmentIssuesBinding.progressBar.setVisibility(View.GONE);
-				}
-				else if(response.code() == 404) {
-					fragmentIssuesBinding.noDataIssues.setVisibility(View.VISIBLE);
-					fragmentIssuesBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Toasty.error(context, getString(R.string.genericError));
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Issue>> call, @NonNull Throwable t) {
-				Toasty.error(context, getString(R.string.genericServerResponseError));
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<Issue>> call, @NonNull Throwable t) {
+						Toasty.error(context, getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	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.enqueue(new Callback<>() {
+		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
-			public void onResponse(@NonNull Call<List<Issue>> call, @NonNull Response<List<Issue>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Issue>> call,
+							@NonNull Response<List<Issue>> response) {
 
-				if(response.code() == 200) {
-					List<Issue> result = response.body();
-					assert result != null;
-					if(result.size() > 0) {
-						pageSize = result.size();
-						issuesList.addAll(result);
+						if (response.code() == 200) {
+							List<Issue> result = response.body();
+							assert result != null;
+							if (result.size() > 0) {
+								pageSize = result.size();
+								issuesList.addAll(result);
+							} else {
+								SnackBar.info(
+										context,
+										fragmentIssuesBinding.getRoot(),
+										getString(R.string.noMoreData));
+								adapter.setMoreDataAvailable(false);
+							}
+							adapter.notifyDataChanged();
+							fragmentIssuesBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Toasty.error(context, getString(R.string.genericError));
+						}
 					}
-					else {
-						SnackBar.info(context, fragmentIssuesBinding.getRoot(), getString(R.string.noMoreData));
-						adapter.setMoreDataAvailable(false);
-					}
-					adapter.notifyDataChanged();
-					fragmentIssuesBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Toasty.error(context, getString(R.string.genericError));
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Issue>> call, @NonNull Throwable t) {
-				Toasty.error(context, getString(R.string.genericServerResponseError));
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<Issue>> call, @NonNull Throwable t) {
+						Toasty.error(context, getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	@Override
@@ -231,32 +367,39 @@ public class IssuesFragment extends Fragment {
 		inflater.inflate(R.menu.filter_menu, menu);
 		super.onCreateOptionsMenu(menu, inflater);
 
-		if(repository.getIssueState().toString().equals("closed")) {
+		if (repository.getIssueState().toString().equals("closed")) {
 			menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
-		}
-		else {
+		} else {
 			menu.getItem(1).setIcon(R.drawable.ic_filter);
 		}
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				loadInitial(repository.getOwner(), repository.getName(), resultLimit, requestType, repository.getIssueState().toString(), repository.getIssueMilestoneFilterName(), query);
-				searchView.setQuery(null, false);
-				searchItem.collapseActionView();
-				return false;
-			}
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						loadInitial(
+								repository.getOwner(),
+								repository.getName(),
+								resultLimit,
+								requestType,
+								repository.getIssueState().toString(),
+								repository.getIssueMilestoneFilterName(),
+								query);
+						searchView.setQuery(null, false);
+						searchItem.collapseActionView();
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						return false;
+					}
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/LabelsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/LabelsFragment.java
index 0e18ad70..a5bc03ef 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/LabelsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/LabelsFragment.java
@@ -23,7 +23,6 @@ import org.mian.gitnex.viewmodels.LabelsViewModel;
 /**
  * @author M M Arif
  */
-
 public class LabelsFragment extends Fragment {
 
 	private ProgressBar mProgressBar;
@@ -33,8 +32,7 @@ public class LabelsFragment extends Fragment {
 
 	private RepositoryContext repository;
 
-	public LabelsFragment() {
-	}
+	public LabelsFragment() {}
 
 	public static LabelsFragment newInstance(RepositoryContext repository) {
 
@@ -50,9 +48,11 @@ public class LabelsFragment extends Fragment {
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		FragmentLabelsBinding fragmentLabelsBinding = FragmentLabelsBinding.inflate(inflater, container, false);
+		FragmentLabelsBinding fragmentLabelsBinding =
+				FragmentLabelsBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
 
 		final SwipeRefreshLayout swipeRefresh = fragmentLabelsBinding.pullToRefresh;
@@ -64,11 +64,18 @@ public class LabelsFragment extends Fragment {
 
 		mProgressBar = fragmentLabelsBinding.progressBar;
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			swipeRefresh.setRefreshing(false);
-			LabelsViewModel.loadLabelsList(repository.getOwner(), repository.getName(), getContext());
-		}, 200));
+		swipeRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											swipeRefresh.setRefreshing(false);
+											LabelsViewModel.loadLabelsList(
+													repository.getOwner(),
+													repository.getName(),
+													getContext());
+										},
+										200));
 
 		fetchDataAsync(repository.getOwner(), repository.getName());
 
@@ -80,9 +87,10 @@ public class LabelsFragment extends Fragment {
 
 		super.onResume();
 
-		if(CreateLabelActivity.refreshLabels) {
+		if (CreateLabelActivity.refreshLabels) {
 
-			LabelsViewModel.loadLabelsList(repository.getOwner(), repository.getName(), getContext());
+			LabelsViewModel.loadLabelsList(
+					repository.getOwner(), repository.getName(), getContext());
 			CreateLabelActivity.refreshLabels = false;
 		}
 	}
@@ -91,24 +99,26 @@ public class LabelsFragment extends Fragment {
 
 		LabelsViewModel labelsModel = new ViewModelProvider(this).get(LabelsViewModel.class);
 
-		labelsModel.getLabelsList(owner, repo, getContext()).observe(getViewLifecycleOwner(), labelsListMain -> {
+		labelsModel
+				.getLabelsList(owner, repo, getContext())
+				.observe(
+						getViewLifecycleOwner(),
+						labelsListMain -> {
+							adapter =
+									new LabelsAdapter(getContext(), labelsListMain, "repo", owner);
 
-			adapter = new LabelsAdapter(getContext(), labelsListMain, "repo", owner);
+							if (adapter.getItemCount() > 0) {
 
-			if(adapter.getItemCount() > 0) {
+								mRecyclerView.setAdapter(adapter);
+								noData.setVisibility(View.GONE);
+							} else {
 
-				mRecyclerView.setAdapter(adapter);
-				noData.setVisibility(View.GONE);
-			}
-			else {
+								adapter.notifyDataChanged();
+								mRecyclerView.setAdapter(adapter);
+								noData.setVisibility(View.VISIBLE);
+							}
 
-				adapter.notifyDataChanged();
-				mRecyclerView.setAdapter(adapter);
-				noData.setVisibility(View.VISIBLE);
-			}
-
-			mProgressBar.setVisibility(View.GONE);
-		});
+							mProgressBar.setVisibility(View.GONE);
+						});
 	}
-
 }
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 c47a8a1f..c159eacc 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
@@ -16,6 +16,8 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Milestone;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
@@ -23,13 +25,10 @@ import org.mian.gitnex.adapters.MilestonesAdapter;
 import org.mian.gitnex.databinding.FragmentMilestonesBinding;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.mian.gitnex.viewmodels.MilestonesViewModel;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @author M M Arif
  */
-
 public class MilestonesFragment extends Fragment {
 
 	private MilestonesViewModel milestonesViewModel;
@@ -55,7 +54,8 @@ public class MilestonesFragment extends Fragment {
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		viewBinding = FragmentMilestonesBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
@@ -73,31 +73,39 @@ public class MilestonesFragment extends Fragment {
 		viewBinding.recyclerView.setHasFixedSize(true);
 		viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
 
-		viewBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+		viewBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											page = 1;
+											dataList.clear();
+											viewBinding.pullToRefresh.setRefreshing(false);
+											fetchDataAsync(
+													repository.getOwner(),
+													repository.getName(),
+													state);
+										},
+										50));
 
-			page = 1;
-			dataList.clear();
-			viewBinding.pullToRefresh.setRefreshing(false);
-			fetchDataAsync(repository.getOwner(), repository.getName(), state);
-		}, 50));
+		((RepoDetailActivity) requireActivity())
+				.setFragmentRefreshListenerMilestone(
+						milestoneState -> {
+							state = milestoneState;
+							if (milestoneState.equals("open")) {
+								menu.getItem(1).setIcon(R.drawable.ic_filter);
+							} else {
+								menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
+							}
 
-		((RepoDetailActivity) requireActivity()).setFragmentRefreshListenerMilestone(milestoneState -> {
+							page = 1;
+							dataList.clear();
+							viewBinding.progressBar.setVisibility(View.VISIBLE);
+							viewBinding.noDataMilestone.setVisibility(View.GONE);
 
-			state = milestoneState;
-			if(milestoneState.equals("open")) {
-				menu.getItem(1).setIcon(R.drawable.ic_filter);
-			}
-			else {
-				menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
-			}
-
-			page = 1;
-			dataList.clear();
-			viewBinding.progressBar.setVisibility(View.VISIBLE);
-			viewBinding.noDataMilestone.setVisibility(View.GONE);
-
-			fetchDataAsync(repository.getOwner(), repository.getName(), milestoneState);
-		});
+							fetchDataAsync(
+									repository.getOwner(), repository.getName(), milestoneState);
+						});
 
 		fetchDataAsync(repository.getOwner(), repository.getName(), state);
 		return viewBinding.getRoot();
@@ -105,47 +113,61 @@ public class MilestonesFragment extends Fragment {
 
 	private void fetchDataAsync(String repoOwner, String repoName, String state) {
 
-		milestonesViewModel.getMilestonesList(repoOwner, repoName, state, getContext()).observe(getViewLifecycleOwner(), milestonesListMain -> {
+		milestonesViewModel
+				.getMilestonesList(repoOwner, repoName, state, getContext())
+				.observe(
+						getViewLifecycleOwner(),
+						milestonesListMain -> {
+							adapter =
+									new MilestonesAdapter(
+											getContext(), milestonesListMain, repository);
+							adapter.setLoadMoreListener(
+									new MilestonesAdapter.OnLoadMoreListener() {
 
-			adapter = new MilestonesAdapter(getContext(), milestonesListMain, repository);
-			adapter.setLoadMoreListener(new MilestonesAdapter.OnLoadMoreListener() {
+										@Override
+										public void onLoadMore() {
 
-				@Override
-				public void onLoadMore() {
+											page += 1;
+											milestonesViewModel.loadMoreMilestones(
+													repoOwner,
+													repoName,
+													page,
+													state,
+													getContext(),
+													adapter);
+											viewBinding.progressBar.setVisibility(View.VISIBLE);
+										}
 
-					page += 1;
-					milestonesViewModel.loadMoreMilestones(repoOwner, repoName, page, state, getContext(), adapter);
-					viewBinding.progressBar.setVisibility(View.VISIBLE);
-				}
+										@Override
+										public void onLoadFinished() {
 
-				@Override
-				public void onLoadFinished() {
+											viewBinding.progressBar.setVisibility(View.GONE);
+										}
+									});
 
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-			});
+							if (adapter.getItemCount() > 0) {
+								viewBinding.recyclerView.setAdapter(adapter);
+								viewBinding.noDataMilestone.setVisibility(View.GONE);
+								dataList.addAll(milestonesListMain);
+								if (milestoneId != null) {
+									viewBinding.recyclerView.scrollToPosition(
+											getMilestoneIndex(
+													Integer.parseInt(milestoneId),
+													milestonesListMain));
+								}
+							} else {
+								adapter.notifyDataChanged();
+								viewBinding.recyclerView.setAdapter(adapter);
+								viewBinding.noDataMilestone.setVisibility(View.VISIBLE);
+							}
 
-			if(adapter.getItemCount() > 0) {
-				viewBinding.recyclerView.setAdapter(adapter);
-				viewBinding.noDataMilestone.setVisibility(View.GONE);
-				dataList.addAll(milestonesListMain);
-				if(milestoneId != null) {
-					viewBinding.recyclerView.scrollToPosition(getMilestoneIndex(Integer.parseInt(milestoneId), milestonesListMain));
-				}
-			}
-			else {
-				adapter.notifyDataChanged();
-				viewBinding.recyclerView.setAdapter(adapter);
-				viewBinding.noDataMilestone.setVisibility(View.VISIBLE);
-			}
-
-			viewBinding.progressBar.setVisibility(View.GONE);
-		});
+							viewBinding.progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	private static int getMilestoneIndex(int milestoneId, List<Milestone> milestones) {
-		for(Milestone milestone : milestones) {
-			if(milestone.getId() == milestoneId) {
+		for (Milestone milestone : milestones) {
+			if (milestone.getId() == milestoneId) {
 				return milestones.indexOf(milestone);
 			}
 		}
@@ -161,40 +183,42 @@ public class MilestonesFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
+					@Override
+					public boolean onQueryTextSubmit(String query) {
 
-				return false;
-			}
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
+					@Override
+					public boolean onQueryTextChange(String newText) {
 
-				filter(newText);
-				return false;
-			}
-		});
+						filter(newText);
+						return false;
+					}
+				});
 	}
 
 	private void filter(String text) {
 
 		List<Milestone> arr = new ArrayList<>();
 
-		for(Milestone d : dataList) {
-			if(d == null || d.getTitle() == null || d.getDescription() == null) {
+		for (Milestone d : dataList) {
+			if (d == null || d.getTitle() == null || d.getDescription() == null) {
 				continue;
 			}
-			if(d.getTitle().toLowerCase().contains(text) || d.getDescription().toLowerCase().contains(text)) {
+			if (d.getTitle().toLowerCase().contains(text)
+					|| d.getDescription().toLowerCase().contains(text)) {
 				arr.add(d);
 			}
 		}
 
 		adapter.updateList(arr);
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MostVisitedReposFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MostVisitedReposFragment.java
index 0d09a0c9..5cef5abf 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MostVisitedReposFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MostVisitedReposFragment.java
@@ -16,6 +16,9 @@ import androidx.appcompat.widget.SearchView;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.adapters.MostVisitedReposAdapter;
@@ -25,14 +28,10 @@ import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.databinding.FragmentDraftsBinding;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * @author M M Arif
  */
-
 public class MostVisitedReposFragment extends Fragment {
 
 	private FragmentDraftsBinding fragmentDraftsBinding;
@@ -43,14 +42,16 @@ public class MostVisitedReposFragment extends Fragment {
 	private int currentActiveAccountId;
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		fragmentDraftsBinding = FragmentDraftsBinding.inflate(inflater, container, false);
 
 		ctx = getContext();
 		setHasOptionsMenu(true);
 
-		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navMostVisited));
+		((MainActivity) requireActivity())
+				.setActionBarTitle(getResources().getString(R.string.navMostVisited));
 
 		TinyDB tinyDb = TinyDB.getInstance(ctx);
 
@@ -62,11 +63,15 @@ public class MostVisitedReposFragment extends Fragment {
 
 		adapter = new MostVisitedReposAdapter(ctx, mostVisitedReposList);
 		currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-		fragmentDraftsBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			mostVisitedReposList.clear();
-			fetchDataAsync(currentActiveAccountId);
-		}, 250));
+		fragmentDraftsBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											mostVisitedReposList.clear();
+											fetchDataAsync(currentActiveAccountId);
+										},
+										250));
 
 		fetchDataAsync(currentActiveAccountId);
 
@@ -75,35 +80,37 @@ public class MostVisitedReposFragment extends Fragment {
 
 	private void fetchDataAsync(int accountId) {
 
-		repositoriesApi.fetchAllMostVisited(accountId).observe(getViewLifecycleOwner(), mostVisitedRepos -> {
+		repositoriesApi
+				.fetchAllMostVisited(accountId)
+				.observe(
+						getViewLifecycleOwner(),
+						mostVisitedRepos -> {
+							fragmentDraftsBinding.pullToRefresh.setRefreshing(false);
+							assert mostVisitedRepos != null;
+							if (mostVisitedRepos.size() > 0) {
 
-			fragmentDraftsBinding.pullToRefresh.setRefreshing(false);
-			assert mostVisitedRepos != null;
-			if(mostVisitedRepos.size() > 0) {
+								mostVisitedReposList.clear();
+								fragmentDraftsBinding.noData.setVisibility(View.GONE);
+								mostVisitedReposList.addAll(mostVisitedRepos);
+								adapter.notifyDataChanged();
+								fragmentDraftsBinding.recyclerView.setAdapter(adapter);
+							} else {
 
-				mostVisitedReposList.clear();
-				fragmentDraftsBinding.noData.setVisibility(View.GONE);
-				mostVisitedReposList.addAll(mostVisitedRepos);
-				adapter.notifyDataChanged();
-				fragmentDraftsBinding.recyclerView.setAdapter(adapter);
-			}
-			else {
-
-				fragmentDraftsBinding.noData.setVisibility(View.VISIBLE);
-			}
-		});
+								fragmentDraftsBinding.noData.setVisibility(View.VISIBLE);
+							}
+						});
 	}
 
 	public void resetAllRepositoryCounter(int accountId) {
 
-		if(mostVisitedReposList.size() > 0) {
+		if (mostVisitedReposList.size() > 0) {
 
-			Objects.requireNonNull(BaseApi.getInstance(ctx, RepositoriesApi.class)).resetAllRepositoryMostVisited(accountId);
+			Objects.requireNonNull(BaseApi.getInstance(ctx, RepositoriesApi.class))
+					.resetAllRepositoryMostVisited(accountId);
 			mostVisitedReposList.clear();
 			adapter.notifyDataChanged();
 			Toasty.success(ctx, getResources().getString(R.string.resetMostReposCounter));
-		}
-		else {
+		} else {
 			Toasty.warning(ctx, getResources().getString(R.string.noDataFound));
 		}
 	}
@@ -119,37 +126,43 @@ public class MostVisitedReposFragment extends Fragment {
 		SearchView searchView = (SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
+					@Override
+					public boolean onQueryTextSubmit(String query) {
 
-				return false;
-			}
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
+					@Override
+					public boolean onQueryTextChange(String newText) {
 
-				filter(newText);
-				return false;
-			}
-		});
+						filter(newText);
+						return false;
+					}
+				});
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 
-		if(item.getItemId() == R.id.reset_menu_item) {
+		if (item.getItemId() == R.id.reset_menu_item) {
 
-			if(mostVisitedReposList.size() == 0) {
+			if (mostVisitedReposList.size() == 0) {
 				Toasty.warning(ctx, getResources().getString(R.string.noDataFound));
-			}
-			else {
-				new MaterialAlertDialogBuilder(ctx).setTitle(R.string.reset).setMessage(R.string.resetCounterAllDialogMessage).setPositiveButton(R.string.reset, (dialog, which) -> {
-
-					resetAllRepositoryCounter(currentActiveAccountId);
-					dialog.dismiss();
-				}).setNeutralButton(R.string.cancelButton, null).show();
+			} else {
+				new MaterialAlertDialogBuilder(ctx)
+						.setTitle(R.string.reset)
+						.setMessage(R.string.resetCounterAllDialogMessage)
+						.setPositiveButton(
+								R.string.reset,
+								(dialog, which) -> {
+									resetAllRepositoryCounter(currentActiveAccountId);
+									dialog.dismiss();
+								})
+						.setNeutralButton(R.string.cancelButton, null)
+						.show();
 			}
 		}
 
@@ -160,18 +173,18 @@ public class MostVisitedReposFragment extends Fragment {
 
 		List<Repository> arr = new ArrayList<>();
 
-		for(Repository d : mostVisitedReposList) {
+		for (Repository d : mostVisitedReposList) {
 
-			if(d == null || d.getRepositoryOwner() == null || d.getRepositoryName() == null) {
+			if (d == null || d.getRepositoryOwner() == null || d.getRepositoryName() == null) {
 				continue;
 			}
 
-			if(d.getRepositoryOwner().toLowerCase().contains(text) || d.getRepositoryName().toLowerCase().contains(text)) {
+			if (d.getRepositoryOwner().toLowerCase().contains(text)
+					|| d.getRepositoryName().toLowerCase().contains(text)) {
 				arr.add(d);
 			}
 		}
 
 		adapter.updateList(arr);
 	}
-
 }
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 9cb77571..f0a9b53c 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java
@@ -23,7 +23,6 @@ import org.mian.gitnex.viewmodels.IssuesViewModel;
 /**
  * @author M M Arif
  */
-
 public class MyIssuesFragment extends Fragment {
 
 	public String state = "open";
@@ -35,7 +34,8 @@ public class MyIssuesFragment extends Fragment {
 	private Menu menu;
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		fragmentIssuesBinding = FragmentIssuesBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
@@ -44,31 +44,43 @@ public class MyIssuesFragment extends Fragment {
 		fragmentIssuesBinding.recyclerView.setHasFixedSize(true);
 		fragmentIssuesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-		((MainActivity) requireActivity()).setFragmentRefreshListenerMyIssues(myIssues -> {
+		((MainActivity) requireActivity())
+				.setFragmentRefreshListenerMyIssues(
+						myIssues -> {
+							state = myIssues;
+							if (state.equals("closed")) {
+								menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
+							} else {
+								menu.getItem(1).setIcon(R.drawable.ic_filter);
+							}
 
-			state = myIssues;
-			if(state.equals("closed")) {
-				menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
-			}
-			else {
-				menu.getItem(1).setIcon(R.drawable.ic_filter);
-			}
+							assignedToMe = state.equals("assignedToMe");
 
-			assignedToMe = state.equals("assignedToMe");
+							fragmentIssuesBinding.progressBar.setVisibility(View.VISIBLE);
+							fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE);
 
-			fragmentIssuesBinding.progressBar.setVisibility(View.VISIBLE);
-			fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE);
+							fetchDataAsync(null, state, assignedToMe);
+						});
 
-			fetchDataAsync(null, state, assignedToMe);
-		});
-
-		fragmentIssuesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			page = 1;
-			fragmentIssuesBinding.pullToRefresh.setRefreshing(false);
-			issuesViewModel.loadIssuesList(null, "issues", true, state, assignedToMe, getContext());
-			fragmentIssuesBinding.progressBar.setVisibility(View.VISIBLE);
-		}, 50));
+		fragmentIssuesBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											page = 1;
+											fragmentIssuesBinding.pullToRefresh.setRefreshing(
+													false);
+											issuesViewModel.loadIssuesList(
+													null,
+													"issues",
+													true,
+													state,
+													assignedToMe,
+													getContext());
+											fragmentIssuesBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										},
+										50));
 
 		fetchDataAsync(null, state, assignedToMe);
 
@@ -77,38 +89,51 @@ public class MyIssuesFragment extends Fragment {
 
 	private void fetchDataAsync(String query, String state, boolean assignedToMe) {
 
-		issuesViewModel.getIssuesList(query, "issues", true, state, assignedToMe, getContext()).observe(getViewLifecycleOwner(), issuesListMain -> {
+		issuesViewModel
+				.getIssuesList(query, "issues", true, state, assignedToMe, getContext())
+				.observe(
+						getViewLifecycleOwner(),
+						issuesListMain -> {
+							adapter = new ExploreIssuesAdapter(issuesListMain, getContext());
+							adapter.setLoadMoreListener(
+									new ExploreIssuesAdapter.OnLoadMoreListener() {
 
-			adapter = new ExploreIssuesAdapter(issuesListMain, getContext());
-			adapter.setLoadMoreListener(new ExploreIssuesAdapter.OnLoadMoreListener() {
+										@Override
+										public void onLoadMore() {
 
-				@Override
-				public void onLoadMore() {
+											page += 1;
+											issuesViewModel.loadMoreIssues(
+													query,
+													"issues",
+													true,
+													state,
+													page,
+													assignedToMe,
+													getContext(),
+													adapter);
+											fragmentIssuesBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										}
 
-					page += 1;
-					issuesViewModel.loadMoreIssues(query, "issues", true, state, page, assignedToMe, getContext(), adapter);
-					fragmentIssuesBinding.progressBar.setVisibility(View.VISIBLE);
-				}
+										@Override
+										public void onLoadFinished() {
 
-				@Override
-				public void onLoadFinished() {
+											fragmentIssuesBinding.progressBar.setVisibility(
+													View.GONE);
+										}
+									});
 
-					fragmentIssuesBinding.progressBar.setVisibility(View.GONE);
-				}
-			});
+							if (adapter.getItemCount() > 0) {
+								fragmentIssuesBinding.recyclerView.setAdapter(adapter);
+								fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE);
+							} else {
+								adapter.notifyDataChanged();
+								fragmentIssuesBinding.recyclerView.setAdapter(adapter);
+								fragmentIssuesBinding.noDataIssues.setVisibility(View.VISIBLE);
+							}
 
-			if(adapter.getItemCount() > 0) {
-				fragmentIssuesBinding.recyclerView.setAdapter(adapter);
-				fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE);
-			}
-			else {
-				adapter.notifyDataChanged();
-				fragmentIssuesBinding.recyclerView.setAdapter(adapter);
-				fragmentIssuesBinding.noDataIssues.setVisibility(View.VISIBLE);
-			}
-
-			fragmentIssuesBinding.progressBar.setVisibility(View.GONE);
-		});
+							fragmentIssuesBinding.progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	@Override
@@ -120,24 +145,25 @@ public class MyIssuesFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				fetchDataAsync(query, state, assignedToMe);
-				searchView.setQuery(null, false);
-				searchItem.collapseActionView();
-				return false;
-			}
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						fetchDataAsync(query, state, assignedToMe);
+						searchView.setQuery(null, false);
+						searchItem.collapseActionView();
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						return false;
+					}
+				});
 	}
-
 }
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 c2e56166..9f5f9e1f 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java
@@ -21,7 +21,6 @@ import org.mian.gitnex.viewmodels.ProfileEmailsViewModel;
 /**
  * @author M M Arif
  */
-
 public class MyProfileEmailsFragment extends Fragment {
 
 	public static boolean refreshEmails = false;
@@ -31,13 +30,14 @@ public class MyProfileEmailsFragment extends Fragment {
 	private RecyclerView mRecyclerView;
 	private TextView noDataEmails;
 
-	public MyProfileEmailsFragment() {
-	}
+	public MyProfileEmailsFragment() {}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		FragmentProfileEmailsBinding fragmentProfileEmailsBinding = FragmentProfileEmailsBinding.inflate(inflater, container, false);
+		FragmentProfileEmailsBinding fragmentProfileEmailsBinding =
+				FragmentProfileEmailsBinding.inflate(inflater, container, false);
 		profileEmailsViewModel = new ViewModelProvider(this).get(ProfileEmailsViewModel.class);
 
 		final SwipeRefreshLayout swipeRefresh = fragmentProfileEmailsBinding.pullToRefresh;
@@ -50,12 +50,15 @@ public class MyProfileEmailsFragment extends Fragment {
 
 		mProgressBar = fragmentProfileEmailsBinding.progressBar;
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			swipeRefresh.setRefreshing(false);
-			profileEmailsViewModel.loadEmailsList(getContext());
-
-		}, 200));
+		swipeRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											swipeRefresh.setRefreshing(false);
+											profileEmailsViewModel.loadEmailsList(getContext());
+										},
+										200));
 
 		fetchDataAsync();
 
@@ -64,30 +67,31 @@ public class MyProfileEmailsFragment extends Fragment {
 
 	private void fetchDataAsync() {
 
-		profileEmailsViewModel.getEmailsList(getContext()).observe(getViewLifecycleOwner(), emailsListMain -> {
-			adapter = new MyProfileEmailsAdapter(getContext(), emailsListMain);
-			if(adapter.getItemCount() > 0) {
-				mRecyclerView.setAdapter(adapter);
-				noDataEmails.setVisibility(View.GONE);
-			}
-			else {
-				adapter.notifyDataSetChanged();
-				mRecyclerView.setAdapter(adapter);
-				noDataEmails.setVisibility(View.VISIBLE);
-			}
-			mProgressBar.setVisibility(View.GONE);
-		});
-
+		profileEmailsViewModel
+				.getEmailsList(getContext())
+				.observe(
+						getViewLifecycleOwner(),
+						emailsListMain -> {
+							adapter = new MyProfileEmailsAdapter(getContext(), emailsListMain);
+							if (adapter.getItemCount() > 0) {
+								mRecyclerView.setAdapter(adapter);
+								noDataEmails.setVisibility(View.GONE);
+							} else {
+								adapter.notifyDataSetChanged();
+								mRecyclerView.setAdapter(adapter);
+								noDataEmails.setVisibility(View.VISIBLE);
+							}
+							mProgressBar.setVisibility(View.GONE);
+						});
 	}
 
 	@Override
 	public void onResume() {
 		super.onResume();
 
-		if(refreshEmails) {
+		if (refreshEmails) {
 			profileEmailsViewModel.loadEmailsList(getContext());
 			refreshEmails = false;
 		}
 	}
-
 }
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 c8752367..31586d2e 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowersFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowersFragment.java
@@ -11,6 +11,8 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.UsersAdapter;
@@ -18,8 +20,6 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.FragmentProfileFollowersFollowingBinding;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.SnackBar;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -27,7 +27,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class MyProfileFollowersFragment extends Fragment {
 
 	private final String TAG = "MyProfileFollowersFragment";
@@ -39,7 +38,8 @@ public class MyProfileFollowersFragment extends Fragment {
 	private int resultLimit;
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		viewBinding = FragmentProfileFollowersFollowingBinding.inflate(inflater, container, false);
 		context = getContext();
@@ -48,18 +48,26 @@ public class MyProfileFollowersFragment extends Fragment {
 		adapter = new UsersAdapter(dataList, context);
 		resultLimit = Constants.getCurrentResultLimit(context);
 
-		viewBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-			viewBinding.pullToRefresh.setRefreshing(false);
-			loadInitial(resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
+		viewBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											viewBinding.pullToRefresh.setRefreshing(false);
+											loadInitial(resultLimit);
+											adapter.notifyDataChanged();
+										},
+										200));
 
-		adapter.setLoadMoreListener(() -> viewBinding.recyclerView.post(() -> {
-			if(dataList.size() == resultLimit || pageSize == resultLimit) {
-				int page = (dataList.size() + resultLimit) / resultLimit;
-				loadMore(resultLimit, page);
-			}
-		}));
+		adapter.setLoadMoreListener(
+				() ->
+						viewBinding.recyclerView.post(
+								() -> {
+									if (dataList.size() == resultLimit || pageSize == resultLimit) {
+										int page = (dataList.size() + resultLimit) / resultLimit;
+										loadMore(resultLimit, page);
+									}
+								}));
 
 		viewBinding.recyclerView.setHasFixedSize(true);
 		viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
@@ -72,71 +80,76 @@ public class MyProfileFollowersFragment extends Fragment {
 
 	private void loadInitial(int resultLimit) {
 
-		Call<List<User>> call = RetrofitClient.getApiInterface(context).userCurrentListFollowers(1, resultLimit);
-		call.enqueue(new Callback<List<User>>() {
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
-				if(response.isSuccessful()) {
-					if(response.body() != null && response.body().size() > 0) {
-						dataList.clear();
-						dataList.addAll(response.body());
-						adapter.notifyDataChanged();
-						viewBinding.noData.setVisibility(View.GONE);
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(context).userCurrentListFollowers(1, resultLimit);
+		call.enqueue(
+				new Callback<List<User>>() {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
+						if (response.isSuccessful()) {
+							if (response.body() != null && response.body().size() > 0) {
+								dataList.clear();
+								dataList.addAll(response.body());
+								adapter.notifyDataChanged();
+								viewBinding.noData.setVisibility(View.GONE);
+							} else {
+								dataList.clear();
+								adapter.notifyDataChanged();
+								viewBinding.noData.setVisibility(View.VISIBLE);
+							}
+							viewBinding.progressBar.setVisibility(View.GONE);
+						} else if (response.code() == 404) {
+							viewBinding.noData.setVisibility(View.VISIBLE);
+							viewBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Log.e(TAG, String.valueOf(response.code()));
+						}
 					}
-					else {
-						dataList.clear();
-						adapter.notifyDataChanged();
-						viewBinding.noData.setVisibility(View.VISIBLE);
-					}
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-				else if(response.code() == 404) {
-					viewBinding.noData.setVisibility(View.VISIBLE);
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
-				Log.e(TAG, t.toString());
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
+						Log.e(TAG, t.toString());
+					}
+				});
 	}
 
 	private void loadMore(int resultLimit, int page) {
 
 		viewBinding.progressBar.setVisibility(View.VISIBLE);
-		Call<List<User>> call = RetrofitClient.getApiInterface(context).userCurrentListFollowers(page, resultLimit);
-		call.enqueue(new Callback<List<User>>() {
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
-				if(response.isSuccessful()) {
-					assert response.body() != null;
-					List<User> result = response.body();
-					if(result.size() > 0) {
-						pageSize = result.size();
-						dataList.addAll(result);
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(context).userCurrentListFollowers(page, resultLimit);
+		call.enqueue(
+				new Callback<List<User>>() {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
+						if (response.isSuccessful()) {
+							assert response.body() != null;
+							List<User> result = response.body();
+							if (result.size() > 0) {
+								pageSize = result.size();
+								dataList.addAll(result);
+							} else {
+								SnackBar.info(
+										context,
+										viewBinding.getRoot(),
+										getString(R.string.noMoreData));
+								adapter.setMoreDataAvailable(false);
+							}
+							adapter.notifyDataChanged();
+							viewBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Log.e(TAG, String.valueOf(response.code()));
+						}
 					}
-					else {
-						SnackBar.info(context, viewBinding.getRoot(), getString(R.string.noMoreData));
-						adapter.setMoreDataAvailable(false);
-					}
-					adapter.notifyDataChanged();
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
-				Log.e(TAG, t.toString());
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
+						Log.e(TAG, t.toString());
+					}
+				});
 	}
-
 }
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 046993b1..1a972c3f 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowingFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowingFragment.java
@@ -11,6 +11,8 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.UsersAdapter;
@@ -18,8 +20,6 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.FragmentProfileFollowersFollowingBinding;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.SnackBar;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -27,7 +27,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class MyProfileFollowingFragment extends Fragment {
 
 	private final String TAG = "MyProfileFollowingFragment";
@@ -39,7 +38,8 @@ public class MyProfileFollowingFragment extends Fragment {
 	private int resultLimit;
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		viewBinding = FragmentProfileFollowersFollowingBinding.inflate(inflater, container, false);
 		context = getContext();
@@ -48,18 +48,26 @@ public class MyProfileFollowingFragment extends Fragment {
 		adapter = new UsersAdapter(dataList, context);
 		resultLimit = Constants.getCurrentResultLimit(context);
 
-		viewBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-			viewBinding.pullToRefresh.setRefreshing(false);
-			loadInitial(resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
+		viewBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											viewBinding.pullToRefresh.setRefreshing(false);
+											loadInitial(resultLimit);
+											adapter.notifyDataChanged();
+										},
+										200));
 
-		adapter.setLoadMoreListener(() -> viewBinding.recyclerView.post(() -> {
-			if(dataList.size() == resultLimit || pageSize == resultLimit) {
-				int page = (dataList.size() + resultLimit) / resultLimit;
-				loadMore(resultLimit, page);
-			}
-		}));
+		adapter.setLoadMoreListener(
+				() ->
+						viewBinding.recyclerView.post(
+								() -> {
+									if (dataList.size() == resultLimit || pageSize == resultLimit) {
+										int page = (dataList.size() + resultLimit) / resultLimit;
+										loadMore(resultLimit, page);
+									}
+								}));
 
 		viewBinding.recyclerView.setHasFixedSize(true);
 		viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
@@ -72,73 +80,78 @@ public class MyProfileFollowingFragment extends Fragment {
 
 	private void loadInitial(int resultLimit) {
 
-		Call<List<User>> call = RetrofitClient.getApiInterface(context).userCurrentListFollowing(1, resultLimit);
-		call.enqueue(new Callback<List<User>>() {
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(context).userCurrentListFollowing(1, resultLimit);
+		call.enqueue(
+				new Callback<List<User>>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
-				if(response.isSuccessful()) {
-					if(response.body() != null && response.body().size() > 0) {
-						dataList.clear();
-						dataList.addAll(response.body());
-						adapter.notifyDataChanged();
-						viewBinding.noData.setVisibility(View.GONE);
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
+						if (response.isSuccessful()) {
+							if (response.body() != null && response.body().size() > 0) {
+								dataList.clear();
+								dataList.addAll(response.body());
+								adapter.notifyDataChanged();
+								viewBinding.noData.setVisibility(View.GONE);
+							} else {
+								dataList.clear();
+								adapter.notifyDataChanged();
+								viewBinding.noData.setVisibility(View.VISIBLE);
+							}
+							viewBinding.progressBar.setVisibility(View.GONE);
+						} else if (response.code() == 404) {
+							viewBinding.noData.setVisibility(View.VISIBLE);
+							viewBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Log.e(TAG, String.valueOf(response.code()));
+						}
 					}
-					else {
-						dataList.clear();
-						adapter.notifyDataChanged();
-						viewBinding.noData.setVisibility(View.VISIBLE);
-					}
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-				else if(response.code() == 404) {
-					viewBinding.noData.setVisibility(View.VISIBLE);
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
-				Log.e(TAG, t.toString());
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
+						Log.e(TAG, t.toString());
+					}
+				});
 	}
 
 	private void loadMore(int resultLimit, int page) {
 
 		viewBinding.progressBar.setVisibility(View.VISIBLE);
-		Call<List<User>> call = RetrofitClient.getApiInterface(context).userCurrentListFollowing(page, resultLimit);
-		call.enqueue(new Callback<List<User>>() {
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(context).userCurrentListFollowing(page, resultLimit);
+		call.enqueue(
+				new Callback<List<User>>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
-				if(response.isSuccessful()) {
-					assert response.body() != null;
-					List<User> result = response.body();
-					if(result.size() > 0) {
-						pageSize = result.size();
-						dataList.addAll(result);
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
+						if (response.isSuccessful()) {
+							assert response.body() != null;
+							List<User> result = response.body();
+							if (result.size() > 0) {
+								pageSize = result.size();
+								dataList.addAll(result);
+							} else {
+								SnackBar.info(
+										context,
+										viewBinding.getRoot(),
+										getString(R.string.noMoreData));
+								adapter.setMoreDataAvailable(false);
+							}
+							adapter.notifyDataChanged();
+							viewBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Log.e(TAG, String.valueOf(response.code()));
+						}
 					}
-					else {
-						SnackBar.info(context, viewBinding.getRoot(), getString(R.string.noMoreData));
-						adapter.setMoreDataAvailable(false);
-					}
-					adapter.notifyDataChanged();
-					viewBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
-				Log.e(TAG, t.toString());
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
+						Log.e(TAG, t.toString());
+					}
+				});
 	}
-
 }
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 af750f33..91d733c0 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFragment.java
@@ -23,6 +23,8 @@ import androidx.viewpager.widget.ViewPager;
 import com.google.android.material.progressindicator.LinearProgressIndicator;
 import com.google.android.material.tabs.TabLayout;
 import com.squareup.picasso.Callback;
+import java.util.Locale;
+import jp.wasabeef.picasso.transformations.BlurTransformation;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.BaseActivity;
 import org.mian.gitnex.activities.MainActivity;
@@ -32,40 +34,41 @@ import org.mian.gitnex.helpers.ColorInverter;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.contexts.AccountContext;
-import java.util.Locale;
-import jp.wasabeef.picasso.transformations.BlurTransformation;
 
 /**
  * @author M M Arif
  */
-
 public class MyProfileFragment extends Fragment {
 
 	private Context ctx;
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
 		ctx = getContext();
 
 		View v = inflater.inflate(R.layout.fragment_profile, container, false);
 		setHasOptionsMenu(true);
 
-		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navProfile));
+		((MainActivity) requireActivity())
+				.setActionBarTitle(getResources().getString(R.string.navProfile));
 
 		AccountContext account = ((BaseActivity) requireActivity()).getAccount();
-		if(account.getUserInfo() != null) {
+		if (account.getUserInfo() != null) {
 			viewData(v, account);
-		}
-		else {
+		} else {
 			// we have to wait until loading is finished
 			LinearProgressIndicator loading = v.findViewById(R.id.loadingIndicator);
 			loading.setVisibility(View.VISIBLE);
-			((MainActivity) requireActivity()).setProfileInitListener((text) -> {
-				loading.setVisibility(View.GONE);
-				viewData(v, account);
-			});
+			((MainActivity) requireActivity())
+					.setProfileInitListener(
+							(text) -> {
+								loading.setVisibility(View.GONE);
+								viewData(v, account);
+							});
 		}
 
 		return v;
@@ -84,16 +87,14 @@ public class MyProfileFragment extends Fragment {
 
 		int id = item.getItemId();
 
-		if(id == android.R.id.home) {
+		if (id == android.R.id.home) {
 			((MainActivity) ctx).finish();
 			return true;
-		}
-		else if(id == R.id.profileMenu) {
+		} else if (id == R.id.profileMenu) {
 			BottomSheetMyProfileFragment bottomSheet = new BottomSheetMyProfileFragment();
 			bottomSheet.show(getChildFragmentManager(), "profileBottomSheet");
 			return true;
-		}
-		else {
+		} else {
 			return super.onOptionsItemSelected(item);
 		}
 	}
@@ -109,48 +110,71 @@ public class MyProfileFragment extends Fragment {
 		TextView userLanguage = v.findViewById(R.id.userLanguage);
 		ImageView userLanguageIcon = v.findViewById(R.id.userLanguageIcon);
 
-		String[] userLanguageCodes = account.getUserInfo().getLanguage() != null ? account.getUserInfo().getLanguage().split("-") : new String[]{""};
+		String[] userLanguageCodes =
+				account.getUserInfo().getLanguage() != null
+						? account.getUserInfo().getLanguage().split("-")
+						: new String[] {""};
 
-		if(userLanguageCodes.length >= 2) {
+		if (userLanguageCodes.length >= 2) {
 			Locale locale = new Locale(userLanguageCodes[0], userLanguageCodes[1]);
 			userLanguage.setText(locale.getDisplayLanguage());
-		}
-		else {
+		} else {
 			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, 60);
 
-		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());
+		MyProfileFragment.SectionsPagerAdapter mSectionsPagerAdapter =
+				new SectionsPagerAdapter(getChildFragmentManager());
 
 		ViewPager mViewPager = v.findViewById(R.id.container);
 		mViewPager.setAdapter(mSectionsPagerAdapter);
@@ -161,23 +185,24 @@ public class MyProfileFragment extends Fragment {
 		ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
 		int tabsCount = vg.getChildCount();
 
-		for(int j = 0; j < tabsCount; j++) {
+		for (int j = 0; j < tabsCount; j++) {
 
 			ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
 			int tabChildCount = vgTab.getChildCount();
 
-			for(int i = 0; i < tabChildCount; i++) {
+			for (int i = 0; i < tabChildCount; i++) {
 
 				View tabViewChild = vgTab.getChildAt(i);
 
-				if(tabViewChild instanceof TextView) {
+				if (tabViewChild instanceof TextView) {
 					((TextView) tabViewChild).setTypeface(myTypeface);
 				}
 			}
 		}
 
 		mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
-		tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
+		tabLayout.addOnTabSelectedListener(
+				new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
 	}
 
 	public static class SectionsPagerAdapter extends FragmentStatePagerAdapter {
@@ -186,12 +211,10 @@ public class MyProfileFragment extends Fragment {
 			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
 		}
 
-		@NonNull
-		@Override
+		@NonNull @Override
 		public Fragment getItem(int position) {
 
-			switch(position) {
-
+			switch (position) {
 				case 0: // followers
 					return new MyProfileFollowersFragment();
 
@@ -200,7 +223,6 @@ public class MyProfileFragment extends Fragment {
 
 				case 2: // emails
 					return new MyProfileEmailsFragment();
-
 			}
 
 			return null;
@@ -210,7 +232,5 @@ public class MyProfileFragment extends Fragment {
 		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 00ac85f0..0b6b858a 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java
@@ -27,7 +27,6 @@ import org.mian.gitnex.viewmodels.RepositoriesViewModel;
 /**
  * @author M M Arif
  */
-
 public class MyRepositoriesFragment extends Fragment {
 
 	private RepositoriesViewModel repositoriesViewModel;
@@ -37,35 +36,47 @@ public class MyRepositoriesFragment extends Fragment {
 	private int resultLimit;
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		fragmentRepositoriesBinding = FragmentRepositoriesBinding.inflate(inflater, container, false);
+		fragmentRepositoriesBinding =
+				FragmentRepositoriesBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
-		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navMyRepos));
+		((MainActivity) requireActivity())
+				.setActionBarTitle(getResources().getString(R.string.navMyRepos));
 		repositoriesViewModel = new ViewModelProvider(this).get(RepositoriesViewModel.class);
 
-		final String userLogin = ((BaseActivity) requireActivity()).getAccount().getAccount().getUserName();
+		final String userLogin =
+				((BaseActivity) requireActivity()).getAccount().getAccount().getUserName();
 
 		resultLimit = Constants.getCurrentResultLimit(getContext());
 
-		fragmentRepositoriesBinding.addNewRepo.setOnClickListener(view -> {
-			Intent intent = new Intent(view.getContext(), CreateRepoActivity.class);
-			startActivity(intent);
-		});
+		fragmentRepositoriesBinding.addNewRepo.setOnClickListener(
+				view -> {
+					Intent intent = new Intent(view.getContext(), CreateRepoActivity.class);
+					startActivity(intent);
+				});
 
 		fragmentRepositoriesBinding.recyclerView.setHasFixedSize(true);
-		fragmentRepositoriesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		fragmentRepositoriesBinding.recyclerView.setLayoutManager(
+				new LinearLayoutManager(getContext()));
 
 		fragmentRepositoriesBinding.recyclerView.setPadding(0, 0, 0, 220);
 		fragmentRepositoriesBinding.recyclerView.setClipToPadding(false);
 
-		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			page = 1;
-			fragmentRepositoriesBinding.pullToRefresh.setRefreshing(false);
-			fetchDataAsync(userLogin);
-			fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
-		}, 50));
+		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											page = 1;
+											fragmentRepositoriesBinding.pullToRefresh.setRefreshing(
+													false);
+											fetchDataAsync(userLogin);
+											fragmentRepositoriesBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										},
+										50));
 
 		fetchDataAsync(userLogin);
 
@@ -74,51 +85,63 @@ public class MyRepositoriesFragment extends Fragment {
 
 	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);
+										}
 
-					page += 1;
-					repositoriesViewModel.loadMoreRepos(page, resultLimit, userLogin, "myRepos", null, getContext(), adapter);
-					fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
-				}
+										@Override
+										public void onLoadFinished() {
 
-				@Override
-				public void onLoadFinished() {
+											fragmentRepositoriesBinding.progressBar.setVisibility(
+													View.GONE);
+										}
+									});
 
-					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);
+							}
 
-			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);
-		});
+							fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	@Override
 	public void onResume() {
 		super.onResume();
-		final String userLogin = ((BaseActivity) requireActivity()).getAccount().getAccount().getUserName();
+		final String userLogin =
+				((BaseActivity) requireActivity()).getAccount().getAccount().getUserName();
 
-		if(MainActivity.reloadRepos) {
+		if (MainActivity.reloadRepos) {
 			page = 1;
 			fetchDataAsync(userLogin);
 			MainActivity.reloadRepos = false;
 		}
-
 	}
 
 	@Override
@@ -128,25 +151,25 @@ public class MyRepositoriesFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
-
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				if(fragmentRepositoriesBinding.recyclerView.getAdapter() != null) {
-					adapter.getFilter().filter(newText);
-				}
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						if (fragmentRepositoriesBinding.recyclerView.getAdapter() != null) {
+							adapter.getFilter().filter(newText);
+						}
+						return false;
+					}
+				});
 	}
-
 }
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 e41729c4..20e5b190 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java
@@ -15,6 +15,10 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
 import org.apache.commons.lang3.StringUtils;
 import org.gitnex.tea4j.v2.models.NotificationThread;
 import org.mian.gitnex.R;
@@ -29,17 +33,14 @@ import org.mian.gitnex.helpers.SimpleCallback;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.IssueContext;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * @author opyale
  * @author M M Arif
  */
-
-public class NotificationsFragment extends Fragment implements NotificationsAdapter.OnNotificationClickedListener, NotificationsAdapter.OnMoreClickedListener {
+public class NotificationsFragment extends Fragment
+		implements NotificationsAdapter.OnNotificationClickedListener,
+				NotificationsAdapter.OnMoreClickedListener {
 
 	private final List<NotificationThread> notificationThreads = new ArrayList<>();
 	private FragmentNotificationsBinding viewBinding;
@@ -59,9 +60,11 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 		super.onCreate(savedInstanceState);
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
 		viewBinding = FragmentNotificationsBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
@@ -79,50 +82,67 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 		viewBinding.notifications.setLayoutManager(linearLayoutManager);
 		viewBinding.notifications.setAdapter(notificationsAdapter);
 
-		viewBinding.notifications.addOnScrollListener(new RecyclerView.OnScrollListener() {
+		viewBinding.notifications.addOnScrollListener(
+				new RecyclerView.OnScrollListener() {
 
-			@Override
-			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+					@Override
+					public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
 
-				if(!recyclerView.canScrollVertically(1) && dy != 0) {
-					pageCurrentIndex++;
-					loadNotifications(true);
-				}
+						if (!recyclerView.canScrollVertically(1) && dy != 0) {
+							pageCurrentIndex++;
+							loadNotifications(true);
+						}
 
-				if(currentFilterMode.equalsIgnoreCase("unread")) {
-					if(dy > 0 && viewBinding.markAllAsRead.isShown()) {
-						viewBinding.markAllAsRead.setVisibility(View.GONE);
+						if (currentFilterMode.equalsIgnoreCase("unread")) {
+							if (dy > 0 && viewBinding.markAllAsRead.isShown()) {
+								viewBinding.markAllAsRead.setVisibility(View.GONE);
+							} else if (dy < 0) {
+								viewBinding.markAllAsRead.setVisibility(View.VISIBLE);
+							}
+						}
 					}
-					else if(dy < 0) {
-						viewBinding.markAllAsRead.setVisibility(View.VISIBLE);
-					}
-				}
-			}
 
-			@Override
-			public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
-				super.onScrollStateChanged(recyclerView, newState);
-			}
-		});
+					@Override
+					public void onScrollStateChanged(
+							@NonNull RecyclerView recyclerView, int newState) {
+						super.onScrollStateChanged(recyclerView, newState);
+					}
+				});
 
 		viewBinding.markAllAsRead.setOnClickListener(
-			v1 -> RetrofitClient.getApiInterface(context).notifyReadList(null, "false", Arrays.asList("unread", "pinned"), "read").enqueue((SimpleCallback<List<NotificationThread>>) (call, voidResponse) -> {
+				v1 ->
+						RetrofitClient.getApiInterface(context)
+								.notifyReadList(
+										null, "false", 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));
+		viewBinding.pullToRefresh.setOnRefreshListener(
+				() -> {
+					viewBinding.pullToRefresh.setRefreshing(false);
 					pageCurrentIndex = 1;
 					loadNotifications(false);
-				}
-				else {
-					activity.runOnUiThread(() -> Toasty.error(context, getString(R.string.genericError)));
-				}
-			}));
-
-		viewBinding.pullToRefresh.setOnRefreshListener(() -> {
-			viewBinding.pullToRefresh.setRefreshing(false);
-			pageCurrentIndex = 1;
-			loadNotifications(false);
-		});
+				});
 
 		loadNotifications(true);
 		return viewBinding.getRoot();
@@ -132,59 +152,76 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 
 		viewBinding.noDataNotifications.setVisibility(View.GONE);
 		viewBinding.progressBar.setVisibility(View.VISIBLE);
-		String[] filter = currentFilterMode.equals("read") ? new String[]{"pinned", "read"} : new String[]{"pinned", "unread"};
+		String[] filter =
+				currentFilterMode.equals("read")
+						? new String[] {"pinned", "read"}
+						: new String[] {"pinned", "unread"};
 
-		RetrofitClient.getApiInterface(context).notifyGetList(false, Arrays.asList(filter), null, null, null, pageCurrentIndex, pageResultLimit)
-			.enqueue((SimpleCallback<List<NotificationThread>>) (call1, listResponse) -> {
+		RetrofitClient.getApiInterface(context)
+				.notifyGetList(
+						false,
+						Arrays.asList(filter),
+						null,
+						null,
+						null,
+						pageCurrentIndex,
+						pageResultLimit)
+				.enqueue(
+						(SimpleCallback<List<NotificationThread>>)
+								(call1, listResponse) -> {
+									if (listResponse.isPresent()
+											&& listResponse.get().isSuccessful()
+											&& listResponse.get().body() != null) {
+										if (!append) {
+											notificationThreads.clear();
+										}
 
-				if(listResponse.isPresent() && listResponse.get().isSuccessful() && listResponse.get().body() != null) {
-					if(!append) {
-						notificationThreads.clear();
-					}
+										if (listResponse.get().body() != null) {
+											notificationThreads.addAll(
+													Objects.requireNonNull(
+															listResponse.get().body()));
+										} else {
+											notificationsAdapter.setMoreDataAvailable(false);
+										}
 
+										if (!append
+												|| Objects.requireNonNull(listResponse.get().body())
+																.size()
+														> 0) {
+											notificationsAdapter.notifyDataChanged();
+										}
+									}
 
-					if(listResponse.get().body() != null) {
-						notificationThreads.addAll(Objects.requireNonNull(listResponse.get().body()));
-					}
-					else {
-						notificationsAdapter.setMoreDataAvailable(false);
-					}
+									AppUtil.setMultiVisibility(View.GONE, viewBinding.progressBar);
 
-					if(!append || Objects.requireNonNull(listResponse.get().body()).size() > 0) {
-						notificationsAdapter.notifyDataChanged();
-					}
-				}
+									if (notificationThreads.isEmpty()) {
+										viewBinding.noDataNotifications.setVisibility(View.VISIBLE);
+									} else {
+										viewBinding.noDataNotifications.setVisibility(View.GONE);
+									}
 
-				AppUtil.setMultiVisibility(View.GONE, viewBinding.progressBar);
-
-				if(notificationThreads.isEmpty()) {
-					viewBinding.noDataNotifications.setVisibility(View.VISIBLE);
-				}
-				else {
-					viewBinding.noDataNotifications.setVisibility(View.GONE);
-				}
-
-				if(currentFilterMode.equalsIgnoreCase("unread")) {
-					if(notificationThreads.isEmpty()) {
-						viewBinding.markAllAsRead.setVisibility(View.GONE);
-					}
-					else {
-						viewBinding.markAllAsRead.setVisibility(View.VISIBLE);
-					}
-				}
-			});
+									if (currentFilterMode.equalsIgnoreCase("unread")) {
+										if (notificationThreads.isEmpty()) {
+											viewBinding.markAllAsRead.setVisibility(View.GONE);
+										} else {
+											viewBinding.markAllAsRead.setVisibility(View.VISIBLE);
+										}
+									}
+								});
 	}
 
 	private void changeFilterMode() {
 
-		int filterIcon = currentFilterMode.equalsIgnoreCase("read") ? R.drawable.ic_filter_closed : R.drawable.ic_filter;
+		int filterIcon =
+				currentFilterMode.equalsIgnoreCase("read")
+						? R.drawable.ic_filter_closed
+						: R.drawable.ic_filter;
 
 		menu.getItem(0).setIcon(filterIcon);
 
-		if(currentFilterMode.equalsIgnoreCase("read")) {
+		if (currentFilterMode.equalsIgnoreCase("read")) {
 			viewBinding.markAllAsRead.setVisibility(View.GONE);
-		}
-		else {
+		} else {
 			viewBinding.markAllAsRead.setVisibility(View.VISIBLE);
 		}
 	}
@@ -202,17 +239,19 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 	@Override
 	public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 
-		if(item.getItemId() == R.id.filterNotifications) {
+		if (item.getItemId() == R.id.filterNotifications) {
 
-			BottomSheetNotificationsFilterFragment bottomSheetNotificationsFilterFragment = new BottomSheetNotificationsFilterFragment();
-			bottomSheetNotificationsFilterFragment.show(getChildFragmentManager(), "notificationsFilterBottomSheet");
-			bottomSheetNotificationsFilterFragment.setOnClickListener((text) -> {
-				currentFilterMode = text;
-				changeFilterMode();
-				pageCurrentIndex = 1;
-				loadNotifications(false);
-
-			});
+			BottomSheetNotificationsFilterFragment bottomSheetNotificationsFilterFragment =
+					new BottomSheetNotificationsFilterFragment();
+			bottomSheetNotificationsFilterFragment.show(
+					getChildFragmentManager(), "notificationsFilterBottomSheet");
+			bottomSheetNotificationsFilterFragment.setOnClickListener(
+					(text) -> {
+						currentFilterMode = text;
+						changeFilterMode();
+						pageCurrentIndex = 1;
+						loadNotifications(false);
+					});
 			return true;
 		}
 		return super.onOptionsItemSelected(item);
@@ -221,42 +260,65 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 	@Override
 	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);
-				//}
-			});
+		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);
+										// }
+									});
 		}
 
-		if(StringUtils.containsAny(notificationThread.getSubject().getType().toLowerCase(), "pull", "issue")) {
+		if (StringUtils.containsAny(
+				notificationThread.getSubject().getType().toLowerCase(), "pull", "issue")) {
 
-			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
+			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);
-		}
-		else if(notificationThread.getSubject().getType().equalsIgnoreCase("repository")) {
-			startActivity(new RepositoryContext(notificationThread.getRepository(), context).getIntent(context, RepoDetailActivity.class));
+		} else if (notificationThread.getSubject().getType().equalsIgnoreCase("repository")) {
+			startActivity(
+					new RepositoryContext(notificationThread.getRepository(), context)
+							.getIntent(context, RepoDetailActivity.class));
 		}
 	}
 
 	@Override
 	public void onMoreClicked(NotificationThread notificationThread) {
-		BottomSheetNotificationsFragment bottomSheetNotificationsFragment = new BottomSheetNotificationsFragment();
-		bottomSheetNotificationsFragment.onAttach(context, notificationThread, () -> {
-			pageCurrentIndex = 1;
-			loadNotifications(false);
-		});
-		bottomSheetNotificationsFragment.show(getChildFragmentManager(), "notificationsBottomSheet");
+		BottomSheetNotificationsFragment bottomSheetNotificationsFragment =
+				new BottomSheetNotificationsFragment();
+		bottomSheetNotificationsFragment.onAttach(
+				context,
+				notificationThread,
+				() -> {
+					pageCurrentIndex = 1;
+					loadNotifications(false);
+				});
+		bottomSheetNotificationsFragment.show(
+				getChildFragmentManager(), "notificationsBottomSheet");
 	}
-
 }
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 32c27625..2178cbbe 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
@@ -25,7 +25,6 @@ import retrofit2.Callback;
 /**
  * @author M M Arif
  */
-
 public class OrganizationInfoFragment extends Fragment {
 
 	private static final String orgNameF = "param1";
@@ -38,8 +37,7 @@ public class OrganizationInfoFragment extends Fragment {
 	private TextView orgLocationInfo;
 	private LinearLayout orgInfoLayout;
 
-	public OrganizationInfoFragment() {
-	}
+	public OrganizationInfoFragment() {}
 
 	public static OrganizationInfoFragment newInstance(String param1) {
 		OrganizationInfoFragment fragment = new OrganizationInfoFragment();
@@ -52,15 +50,17 @@ public class OrganizationInfoFragment extends Fragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		if(getArguments() != null) {
+		if (getArguments() != null) {
 			orgName = getArguments().getString(orgNameF);
 		}
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		FragmentOrganizationInfoBinding fragmentOrganizationInfoBinding = FragmentOrganizationInfoBinding.inflate(inflater, container, false);
+		FragmentOrganizationInfoBinding fragmentOrganizationInfoBinding =
+				FragmentOrganizationInfoBinding.inflate(inflater, container, false);
 
 		ctx = getContext();
 
@@ -77,69 +77,70 @@ public class OrganizationInfoFragment extends Fragment {
 		getOrgInfo(orgName);
 
 		return fragmentOrganizationInfoBinding.getRoot();
-
 	}
 
 	private void getOrgInfo(final String owner) {
 
 		Call<Organization> call = RetrofitClient.getApiInterface(getContext()).orgGet(owner);
 
-		call.enqueue(new Callback<Organization>() {
+		call.enqueue(
+				new Callback<Organization>() {
 
-			@Override
-			public void onResponse(@NonNull Call<Organization> call, @NonNull retrofit2.Response<Organization> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<Organization> call,
+							@NonNull retrofit2.Response<Organization> response) {
 
-				Organization orgInfo = response.body();
+						Organization orgInfo = response.body();
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					orgInfoLayout.setVisibility(View.VISIBLE);
+							orgInfoLayout.setVisibility(View.VISIBLE);
 
-					assert orgInfo != null;
+							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);
-					}
-					else {
-						orgDescInfo.setText(getString(R.string.noDataDescription));
+							if (!orgInfo.getDescription().isEmpty()) {
+								Markdown.render(ctx, orgInfo.getDescription(), orgDescInfo);
+							} else {
+								orgDescInfo.setText(getString(R.string.noDataDescription));
+							}
+
+							if (!orgInfo.getWebsite().isEmpty()) {
+								orgWebsiteInfo.setText(orgInfo.getWebsite());
+							} else {
+								orgWebsiteInfo.setText(getString(R.string.noDataWebsite));
+							}
+
+							if (!orgInfo.getLocation().isEmpty()) {
+								orgLocationInfo.setText(orgInfo.getLocation());
+							} else {
+								orgLocationInfo.setText(getString(R.string.noDataLocation));
+							}
+
+							mProgressBar.setVisibility(View.GONE);
+
+						} else if (response.code() == 404) {
+
+							mProgressBar.setVisibility(View.GONE);
+
+						} else {
+							Log.e("onFailure", String.valueOf(response.code()));
+						}
 					}
 
-					if(!orgInfo.getWebsite().isEmpty()) {
-						orgWebsiteInfo.setText(orgInfo.getWebsite());
+					@Override
+					public void onFailure(@NonNull Call<Organization> call, @NonNull Throwable t) {
+						Log.e("onFailure", t.toString());
 					}
-					else {
-						orgWebsiteInfo.setText(getString(R.string.noDataWebsite));
-					}
-
-					if(!orgInfo.getLocation().isEmpty()) {
-						orgLocationInfo.setText(orgInfo.getLocation());
-					}
-					else {
-						orgLocationInfo.setText(getString(R.string.noDataLocation));
-					}
-
-					mProgressBar.setVisibility(View.GONE);
-
-				}
-				else if(response.code() == 404) {
-
-					mProgressBar.setVisibility(View.GONE);
-
-				}
-				else {
-					Log.e("onFailure", String.valueOf(response.code()));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Organization> call, @NonNull Throwable t) {
-				Log.e("onFailure", t.toString());
-			}
-		});
-
+				});
 	}
-
 }
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 beea83aa..dff1b91b 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationLabelsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationLabelsFragment.java
@@ -22,7 +22,6 @@ import org.mian.gitnex.viewmodels.OrganizationLabelsViewModel;
 /**
  * @author M M Arif
  */
-
 public class OrganizationLabelsFragment extends Fragment {
 
 	private OrganizationLabelsViewModel organizationLabelsViewModel;
@@ -49,18 +48,21 @@ public class OrganizationLabelsFragment extends Fragment {
 
 		super.onCreate(savedInstanceState);
 
-		if(getArguments() != null) {
+		if (getArguments() != null) {
 
 			repoOwner = getArguments().getString(repoOwnerF);
 		}
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		FragmentLabelsBinding fragmentLabelsBinding = FragmentLabelsBinding.inflate(inflater, container, false);
+		FragmentLabelsBinding fragmentLabelsBinding =
+				FragmentLabelsBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
-		organizationLabelsViewModel = new ViewModelProvider(this).get(OrganizationLabelsViewModel.class);
+		organizationLabelsViewModel =
+				new ViewModelProvider(this).get(OrganizationLabelsViewModel.class);
 
 		final SwipeRefreshLayout swipeRefresh = fragmentLabelsBinding.pullToRefresh;
 		noData = fragmentLabelsBinding.noData;
@@ -71,17 +73,20 @@ public class OrganizationLabelsFragment extends Fragment {
 
 		mProgressBar = fragmentLabelsBinding.progressBar;
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			swipeRefresh.setRefreshing(false);
-			OrganizationLabelsViewModel.loadOrgLabelsList(repoOwner, getContext(), mProgressBar, noData);
-
-		}, 200));
+		swipeRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											swipeRefresh.setRefreshing(false);
+											OrganizationLabelsViewModel.loadOrgLabelsList(
+													repoOwner, getContext(), mProgressBar, noData);
+										},
+										200));
 
 		fetchDataAsync(repoOwner);
 
 		return fragmentLabelsBinding.getRoot();
-
 	}
 
 	@Override
@@ -89,34 +94,35 @@ public class OrganizationLabelsFragment extends Fragment {
 
 		super.onResume();
 
-		if(CreateLabelActivity.refreshLabels) {
+		if (CreateLabelActivity.refreshLabels) {
 
-			OrganizationLabelsViewModel.loadOrgLabelsList(repoOwner, getContext(), mProgressBar, noData);
+			OrganizationLabelsViewModel.loadOrgLabelsList(
+					repoOwner, getContext(), mProgressBar, noData);
 			CreateLabelActivity.refreshLabels = false;
 		}
 	}
 
 	private void fetchDataAsync(String owner) {
 
-		organizationLabelsViewModel.getOrgLabelsList(owner, getContext(), mProgressBar, noData).observe(getViewLifecycleOwner(), labelsListMain -> {
+		organizationLabelsViewModel
+				.getOrgLabelsList(owner, getContext(), mProgressBar, noData)
+				.observe(
+						getViewLifecycleOwner(),
+						labelsListMain -> {
+							adapter = new LabelsAdapter(getContext(), labelsListMain, type, owner);
 
-			adapter = new LabelsAdapter(getContext(), labelsListMain, type, owner);
+							if (adapter.getItemCount() > 0) {
 
-			if(adapter.getItemCount() > 0) {
+								mRecyclerView.setAdapter(adapter);
+								noData.setVisibility(View.GONE);
+							} else {
 
-				mRecyclerView.setAdapter(adapter);
-				noData.setVisibility(View.GONE);
-			}
-			else {
-
-				adapter.notifyDataChanged();
-				mRecyclerView.setAdapter(adapter);
-				noData.setVisibility(View.VISIBLE);
-			}
-
-			mProgressBar.setVisibility(View.GONE);
-		});
+								adapter.notifyDataChanged();
+								mRecyclerView.setAdapter(adapter);
+								noData.setVisibility(View.VISIBLE);
+							}
 
+							mProgressBar.setVisibility(View.GONE);
+						});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationMembersFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationMembersFragment.java
index 4138e3e0..549eeb4d 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationMembersFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationMembersFragment.java
@@ -23,7 +23,6 @@ import org.mian.gitnex.viewmodels.MembersByOrgViewModel;
 /**
  * @author M M Arif
  */
-
 public class OrganizationMembersFragment extends Fragment {
 
 	private TextView noDataMembers;
@@ -33,8 +32,7 @@ public class OrganizationMembersFragment extends Fragment {
 	private GridView mGridView;
 	private ProgressBar progressBar;
 
-	public OrganizationMembersFragment() {
-	}
+	public OrganizationMembersFragment() {}
 
 	public static OrganizationMembersFragment newInstance(String param1) {
 		OrganizationMembersFragment fragment = new OrganizationMembersFragment();
@@ -47,15 +45,17 @@ public class OrganizationMembersFragment extends Fragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		if(getArguments() != null) {
+		if (getArguments() != null) {
 			orgName = getArguments().getString(orgNameF);
 		}
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		FragmentOrganizationMembersBinding fragmentMembersByOrgBinding = FragmentOrganizationMembersBinding.inflate(inflater, container, false);
+		FragmentOrganizationMembersBinding fragmentMembersByOrgBinding =
+				FragmentOrganizationMembersBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
 
 		noDataMembers = fragmentMembersByOrgBinding.noDataMembers;
@@ -70,23 +70,26 @@ public class OrganizationMembersFragment extends Fragment {
 
 	private void fetchDataAsync(String owner) {
 
-		MembersByOrgViewModel membersModel = new ViewModelProvider(this).get(MembersByOrgViewModel.class);
+		MembersByOrgViewModel membersModel =
+				new ViewModelProvider(this).get(MembersByOrgViewModel.class);
 
-		membersModel.getMembersList(owner, getContext()).observe(getViewLifecycleOwner(), membersListMain -> {
-			adapter = new UserGridAdapter(getContext(), membersListMain);
-			if(adapter.getCount() > 0) {
-				mGridView.setAdapter(adapter);
-				noDataMembers.setVisibility(View.GONE);
-			}
-			else {
-				adapter.notifyDataSetChanged();
-				mGridView.setAdapter(adapter);
-				noDataMembers.setVisibility(View.VISIBLE);
-			}
-
-			progressBar.setVisibility(View.GONE);
-		});
+		membersModel
+				.getMembersList(owner, getContext())
+				.observe(
+						getViewLifecycleOwner(),
+						membersListMain -> {
+							adapter = new UserGridAdapter(getContext(), membersListMain);
+							if (adapter.getCount() > 0) {
+								mGridView.setAdapter(adapter);
+								noDataMembers.setVisibility(View.GONE);
+							} else {
+								adapter.notifyDataSetChanged();
+								mGridView.setAdapter(adapter);
+								noDataMembers.setVisibility(View.VISIBLE);
+							}
 
+							progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	@Override
@@ -98,29 +101,29 @@ public class OrganizationMembersFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-		//searchView.setQueryHint(getContext().getString(R.string.strFilter));
+		// searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
-		if(!connToInternet) {
+		if (!connToInternet) {
 			return;
 		}
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
-
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				if(mGridView.getAdapter() != null) {
-					adapter.getFilter().filter(newText);
-				}
-				return false;
-			}
-		});
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						if (mGridView.getAdapter() != null) {
+							adapter.getFilter().filter(newText);
+						}
+						return false;
+					}
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationRepositoriesFragment.java
index d1689a37..70a60833 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationRepositoriesFragment.java
@@ -24,7 +24,6 @@ import org.mian.gitnex.viewmodels.RepositoriesViewModel;
 /**
  * @author M M Arif
  */
-
 public class OrganizationRepositoriesFragment extends Fragment {
 
 	private RepositoriesViewModel repositoriesViewModel;
@@ -35,8 +34,7 @@ public class OrganizationRepositoriesFragment extends Fragment {
 	private static final String getOrgName = null;
 	private String orgName;
 
-	public OrganizationRepositoriesFragment() {
-	}
+	public OrganizationRepositoriesFragment() {}
 
 	public static OrganizationRepositoriesFragment newInstance(String orgName) {
 		OrganizationRepositoriesFragment fragment = new OrganizationRepositoriesFragment();
@@ -49,15 +47,17 @@ public class OrganizationRepositoriesFragment extends Fragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		if(getArguments() != null) {
+		if (getArguments() != null) {
 			orgName = getArguments().getString(getOrgName);
 		}
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		fragmentRepositoriesBinding = FragmentRepositoriesBinding.inflate(inflater, container, false);
+		fragmentRepositoriesBinding =
+				FragmentRepositoriesBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
 		repositoriesViewModel = new ViewModelProvider(this).get(RepositoriesViewModel.class);
 
@@ -66,59 +66,77 @@ public class OrganizationRepositoriesFragment extends Fragment {
 		fragmentRepositoriesBinding.addNewRepo.setVisibility(View.GONE);
 
 		fragmentRepositoriesBinding.recyclerView.setHasFixedSize(true);
-		fragmentRepositoriesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		fragmentRepositoriesBinding.recyclerView.setLayoutManager(
+				new LinearLayoutManager(getContext()));
 
-		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			page = 1;
-			fragmentRepositoriesBinding.pullToRefresh.setRefreshing(false);
-			fetchDataAsync();
-			fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
-		}, 50));
+		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											page = 1;
+											fragmentRepositoriesBinding.pullToRefresh.setRefreshing(
+													false);
+											fetchDataAsync();
+											fragmentRepositoriesBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										},
+										50));
 
 		page = 1;
 		fetchDataAsync();
 
 		return fragmentRepositoriesBinding.getRoot();
 	}
-
 	;
 
 	private void fetchDataAsync() {
 
-		repositoriesViewModel.getRepositories(page, resultLimit, "", "org", orgName, getContext()).observe(getViewLifecycleOwner(), reposListMain -> {
+		repositoriesViewModel
+				.getRepositories(page, resultLimit, "", "org", orgName, getContext())
+				.observe(
+						getViewLifecycleOwner(),
+						reposListMain -> {
+							adapter = new ReposListAdapter(reposListMain, getContext());
+							adapter.isUserOrg = true;
+							adapter.setLoadMoreListener(
+									new ReposListAdapter.OnLoadMoreListener() {
 
-			adapter = new ReposListAdapter(reposListMain, getContext());
-			adapter.isUserOrg = true;
-			adapter.setLoadMoreListener(new ReposListAdapter.OnLoadMoreListener() {
+										@Override
+										public void onLoadMore() {
 
-				@Override
-				public void onLoadMore() {
+											page += 1;
+											repositoriesViewModel.loadMoreRepos(
+													page,
+													resultLimit,
+													"",
+													"org",
+													orgName,
+													getContext(),
+													adapter);
+											fragmentRepositoriesBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										}
 
-					page += 1;
-					repositoriesViewModel.loadMoreRepos(page, resultLimit, "", "org", orgName, getContext(), adapter);
-					fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
-				}
+										@Override
+										public void onLoadFinished() {
 
-				@Override
-				public void onLoadFinished() {
+											fragmentRepositoriesBinding.progressBar.setVisibility(
+													View.GONE);
+										}
+									});
 
-					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);
+							}
 
-			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);
-		});
+							fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	@Override
@@ -126,11 +144,11 @@ public class OrganizationRepositoriesFragment extends Fragment {
 
 		super.onResume();
 
-		if(MainActivity.reloadRepos) {
-			repositoriesViewModel.loadReposList(page, resultLimit, null, "org", orgName, getContext());
+		if (MainActivity.reloadRepos) {
+			repositoriesViewModel.loadReposList(
+					page, resultLimit, null, "org", orgName, getContext());
 			MainActivity.reloadRepos = false;
 		}
-
 	}
 
 	@Override
@@ -140,23 +158,24 @@ public class OrganizationRepositoriesFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				if(fragmentRepositoriesBinding.recyclerView.getAdapter() != null) {
-					adapter.getFilter().filter(newText);
-				}
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						if (fragmentRepositoriesBinding.recyclerView.getAdapter() != null) {
+							adapter.getFilter().filter(newText);
+						}
+						return false;
+					}
+				});
 	}
-
 }
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 82fec3af..bd2cb311 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoMembersFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoMembersFragment.java
@@ -7,6 +7,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Team;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
@@ -14,8 +16,6 @@ import org.mian.gitnex.adapters.UserGridAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.FragmentOrganizationTeamInfoMembersBinding;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -23,7 +23,6 @@ import retrofit2.Response;
 /**
  * @author opyale
  */
-
 public class OrganizationTeamInfoMembersFragment extends Fragment {
 
 	private final List<User> teamUserInfo = new ArrayList<>();
@@ -32,8 +31,7 @@ public class OrganizationTeamInfoMembersFragment extends Fragment {
 	private Team team;
 	private UserGridAdapter adapter;
 
-	public OrganizationTeamInfoMembersFragment() {
-	}
+	public OrganizationTeamInfoMembersFragment() {}
 
 	public static OrganizationTeamInfoMembersFragment newInstance(Team team) {
 		OrganizationTeamInfoMembersFragment fragment = new OrganizationTeamInfoMembersFragment();
@@ -46,7 +44,8 @@ public class OrganizationTeamInfoMembersFragment extends Fragment {
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		binding = FragmentOrganizationTeamInfoMembersBinding.inflate(inflater, container, false);
 		ctx = getContext();
 
@@ -61,37 +60,41 @@ public class OrganizationTeamInfoMembersFragment extends Fragment {
 
 	private void fetchMembersAsync() {
 
-		Call<List<User>> call = RetrofitClient.getApiInterface(ctx).orgListTeamMembers(team.getId(), null, null);
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(ctx).orgListTeamMembers(team.getId(), null, null);
 
 		binding.progressBar.setVisibility(View.VISIBLE);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
-				if(response.isSuccessful() && response.body() != null && response.body().size() > 0) {
-					teamUserInfo.clear();
-					teamUserInfo.addAll(response.body());
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
+						if (response.isSuccessful()
+								&& response.body() != null
+								&& response.body().size() > 0) {
+							teamUserInfo.clear();
+							teamUserInfo.addAll(response.body());
 
-					adapter.notifyDataSetChanged();
+							adapter.notifyDataSetChanged();
 
-					binding.noDataMembers.setVisibility(View.GONE);
-					binding.members.setVisibility(View.VISIBLE);
-				}
-				else {
-					binding.members.setVisibility(View.GONE);
-					binding.noDataMembers.setVisibility(View.VISIBLE);
-				}
+							binding.noDataMembers.setVisibility(View.GONE);
+							binding.members.setVisibility(View.VISIBLE);
+						} else {
+							binding.members.setVisibility(View.GONE);
+							binding.noDataMembers.setVisibility(View.VISIBLE);
+						}
 
-				binding.progressBar.setVisibility(View.GONE);
-			}
+						binding.progressBar.setVisibility(View.GONE);
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoPermissionsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoPermissionsFragment.java
index d28a58cc..7f758e94 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoPermissionsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoPermissionsFragment.java
@@ -6,25 +6,24 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import java.util.Collections;
 import org.gitnex.tea4j.v2.models.Team;
 import org.mian.gitnex.R;
 import org.mian.gitnex.databinding.FragmentOrganizationTeamInfoPermissionsBinding;
-import java.util.Collections;
 
 /**
  * @author opyale
  */
-
 public class OrganizationTeamInfoPermissionsFragment extends Fragment {
 
 	private FragmentOrganizationTeamInfoPermissionsBinding binding;
 	private Team team;
 
-	public OrganizationTeamInfoPermissionsFragment() {
-	}
+	public OrganizationTeamInfoPermissionsFragment() {}
 
 	public static OrganizationTeamInfoPermissionsFragment newInstance(Team team) {
-		OrganizationTeamInfoPermissionsFragment fragment = new OrganizationTeamInfoPermissionsFragment();
+		OrganizationTeamInfoPermissionsFragment fragment =
+				new OrganizationTeamInfoPermissionsFragment();
 
 		Bundle bundle = new Bundle();
 		bundle.putSerializable("team", team);
@@ -34,17 +33,19 @@ public class OrganizationTeamInfoPermissionsFragment extends Fragment {
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		binding = FragmentOrganizationTeamInfoPermissionsBinding.inflate(inflater, container, false);
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		binding =
+				FragmentOrganizationTeamInfoPermissionsBinding.inflate(inflater, container, false);
 
 		team = (Team) requireArguments().getSerializable("team");
 
 		StringBuilder permissions = new StringBuilder();
 
 		// Future proofing in case of gitea becoming able to assign multiple permissions per team
-		for(String permission : Collections.singletonList(team.getPermission().getValue())) {
+		for (String permission : Collections.singletonList(team.getPermission().getValue())) {
 
-			switch(permission) {
+			switch (permission) {
 				case "none":
 					permissions.append(getString(R.string.teamPermissionNone)).append("\n");
 					break;
@@ -68,5 +69,4 @@ public class OrganizationTeamInfoPermissionsFragment extends Fragment {
 
 		return binding.getRoot();
 	}
-
 }
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 8f56a436..3c587af6 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoReposFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoReposFragment.java
@@ -25,7 +25,6 @@ import org.mian.gitnex.viewmodels.RepositoriesViewModel;
 /**
  * @author M M Arif
  */
-
 public class OrganizationTeamInfoReposFragment extends Fragment {
 
 	public static boolean repoAdded = false;
@@ -48,9 +47,11 @@ public class OrganizationTeamInfoReposFragment extends Fragment {
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		fragmentRepositoriesBinding = FragmentRepositoriesBinding.inflate(inflater, container, false);
+		fragmentRepositoriesBinding =
+				FragmentRepositoriesBinding.inflate(inflater, container, false);
 
 		resultLimit = Constants.getCurrentResultLimit(getContext());
 		setHasOptionsMenu(true);
@@ -61,15 +62,22 @@ public class OrganizationTeamInfoReposFragment extends Fragment {
 		fragmentRepositoriesBinding.addNewRepo.setVisibility(View.GONE);
 
 		fragmentRepositoriesBinding.recyclerView.setHasFixedSize(true);
-		fragmentRepositoriesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		fragmentRepositoriesBinding.recyclerView.setLayoutManager(
+				new LinearLayoutManager(getContext()));
 
-		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			page = 1;
-			fragmentRepositoriesBinding.pullToRefresh.setRefreshing(false);
-			fetchDataAsync();
-			fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
-		}, 50));
+		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											page = 1;
+											fragmentRepositoriesBinding.pullToRefresh.setRefreshing(
+													false);
+											fetchDataAsync();
+											fragmentRepositoriesBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										},
+										50));
 
 		fetchDataAsync();
 
@@ -78,45 +86,58 @@ 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);
+										}
 
-					page += 1;
-					repositoriesViewModel.loadMoreRepos(page, resultLimit, String.valueOf(team.getId()), "team", null, getContext(), adapter);
-					fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
-				}
+										@Override
+										public void onLoadFinished() {
 
-				@Override
-				public void onLoadFinished() {
+											fragmentRepositoriesBinding.progressBar.setVisibility(
+													View.GONE);
+										}
+									});
 
-					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);
+							}
 
-			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);
-		});
+							fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	@Override
 	public void onResume() {
 		super.onResume();
 
-		if(repoAdded) {
+		if (repoAdded) {
 			page = 1;
 			fetchDataAsync();
 			MainActivity.reloadRepos = false;
@@ -130,25 +151,25 @@ public class OrganizationTeamInfoReposFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				if(fragmentRepositoriesBinding.recyclerView.getAdapter() != null) {
-					adapter.getFilter().filter(newText);
-				}
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						if (fragmentRepositoriesBinding.recyclerView.getAdapter() != null) {
+							adapter.getFilter().filter(newText);
+						}
+						return false;
+					}
+				});
 	}
-
 }
-
diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamsFragment.java
index 68965adf..7ff60ea6 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamsFragment.java
@@ -27,7 +27,6 @@ import org.mian.gitnex.viewmodels.TeamsByOrgViewModel;
 /**
  * @author M M Arif
  */
-
 public class OrganizationTeamsFragment extends Fragment {
 
 	private TeamsByOrgViewModel teamsByOrgViewModel;
@@ -41,10 +40,10 @@ public class OrganizationTeamsFragment extends Fragment {
 	private OrganizationPermissions permissions;
 	private OrganizationTeamsAdapter adapter;
 
-	public OrganizationTeamsFragment() {
-	}
+	public OrganizationTeamsFragment() {}
 
-	public static OrganizationTeamsFragment newInstance(String param1, OrganizationPermissions permissions) {
+	public static OrganizationTeamsFragment newInstance(
+			String param1, OrganizationPermissions permissions) {
 		OrganizationTeamsFragment fragment = new OrganizationTeamsFragment();
 		Bundle args = new Bundle();
 		args.putString(orgNameF, param1);
@@ -56,16 +55,18 @@ public class OrganizationTeamsFragment extends Fragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		if(getArguments() != null) {
+		if (getArguments() != null) {
 			orgName = getArguments().getString(orgNameF);
 			permissions = (OrganizationPermissions) getArguments().getSerializable("permissions");
 		}
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		FragmentOrganizationTeamsBinding fragmentTeamsByOrgBinding = FragmentOrganizationTeamsBinding.inflate(inflater, container, false);
+		FragmentOrganizationTeamsBinding fragmentTeamsByOrgBinding =
+				FragmentOrganizationTeamsBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
 		teamsByOrgViewModel = new ViewModelProvider(this).get(TeamsByOrgViewModel.class);
 
@@ -79,12 +80,19 @@ public class OrganizationTeamsFragment extends Fragment {
 
 		mProgressBar = fragmentTeamsByOrgBinding.progressBar;
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			swipeRefresh.setRefreshing(false);
-			teamsByOrgViewModel.loadTeamsByOrgList(orgName, getContext(), noDataTeams, mProgressBar);
-
-		}, 200));
+		swipeRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											swipeRefresh.setRefreshing(false);
+											teamsByOrgViewModel.loadTeamsByOrgList(
+													orgName,
+													getContext(),
+													noDataTeams,
+													mProgressBar);
+										},
+										200));
 
 		fetchDataAsync(orgName);
 
@@ -94,28 +102,33 @@ public class OrganizationTeamsFragment extends Fragment {
 	@Override
 	public void onResume() {
 		super.onResume();
-		if(resumeTeams) {
-			teamsByOrgViewModel.loadTeamsByOrgList(orgName, getContext(), noDataTeams, mProgressBar);
+		if (resumeTeams) {
+			teamsByOrgViewModel.loadTeamsByOrgList(
+					orgName, getContext(), noDataTeams, mProgressBar);
 			resumeTeams = false;
 		}
 	}
 
 	private void fetchDataAsync(String owner) {
 
-		teamsByOrgViewModel.getTeamsByOrg(owner, getContext(), noDataTeams, mProgressBar).observe(getViewLifecycleOwner(), orgTeamsListMain -> {
-			adapter = new OrganizationTeamsAdapter(getContext(), orgTeamsListMain, permissions, orgName);
-			if(adapter.getItemCount() > 0) {
-				mRecyclerView.setAdapter(adapter);
-				noDataTeams.setVisibility(View.GONE);
-			}
-			else {
-				adapter.notifyDataSetChanged();
-				mRecyclerView.setAdapter(adapter);
-				noDataTeams.setVisibility(View.VISIBLE);
-			}
-			mProgressBar.setVisibility(View.GONE);
-		});
-
+		teamsByOrgViewModel
+				.getTeamsByOrg(owner, getContext(), noDataTeams, mProgressBar)
+				.observe(
+						getViewLifecycleOwner(),
+						orgTeamsListMain -> {
+							adapter =
+									new OrganizationTeamsAdapter(
+											getContext(), orgTeamsListMain, permissions, orgName);
+							if (adapter.getItemCount() > 0) {
+								mRecyclerView.setAdapter(adapter);
+								noDataTeams.setVisibility(View.GONE);
+							} else {
+								adapter.notifyDataSetChanged();
+								mRecyclerView.setAdapter(adapter);
+								noDataTeams.setVisibility(View.VISIBLE);
+							}
+							mProgressBar.setVisibility(View.GONE);
+						});
 	}
 
 	@Override
@@ -125,24 +138,24 @@ public class OrganizationTeamsFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
-
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				if(mRecyclerView.getAdapter() != null) {
-					adapter.getFilter().filter(newText);
-				}
-				return false;
-			}
-		});
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						if (mRecyclerView.getAdapter() != null) {
+							adapter.getFilter().filter(newText);
+						}
+						return false;
+					}
+				});
 	}
-
 }
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 032a82fb..7549fc19 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java
@@ -26,7 +26,6 @@ import org.mian.gitnex.viewmodels.OrganizationsViewModel;
 /**
  * @author M M Arif
  */
-
 public class OrganizationsFragment extends Fragment {
 
 	public static boolean orgCreated = false;
@@ -37,34 +36,45 @@ public class OrganizationsFragment extends Fragment {
 	private int resultLimit;
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		fragmentOrganizationsBinding = FragmentOrganizationsBinding.inflate(inflater, container, false);
+		fragmentOrganizationsBinding =
+				FragmentOrganizationsBinding.inflate(inflater, container, false);
 
 		setHasOptionsMenu(true);
-		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navOrg));
+		((MainActivity) requireActivity())
+				.setActionBarTitle(getResources().getString(R.string.navOrg));
 		organizationsViewModel = new ViewModelProvider(this).get(OrganizationsViewModel.class);
 
 		resultLimit = Constants.getCurrentResultLimit(getContext());
 
-		fragmentOrganizationsBinding.addNewOrganization.setOnClickListener(view -> {
-			Intent intent = new Intent(view.getContext(), CreateOrganizationActivity.class);
-			startActivity(intent);
-		});
+		fragmentOrganizationsBinding.addNewOrganization.setOnClickListener(
+				view -> {
+					Intent intent = new Intent(view.getContext(), CreateOrganizationActivity.class);
+					startActivity(intent);
+				});
 
 		fragmentOrganizationsBinding.recyclerView.setHasFixedSize(true);
-		fragmentOrganizationsBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		fragmentOrganizationsBinding.recyclerView.setLayoutManager(
+				new LinearLayoutManager(getContext()));
 
 		fragmentOrganizationsBinding.recyclerView.setPadding(0, 0, 0, 220);
 		fragmentOrganizationsBinding.recyclerView.setClipToPadding(false);
 
-		fragmentOrganizationsBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			page = 1;
-			fragmentOrganizationsBinding.pullToRefresh.setRefreshing(false);
-			fetchDataAsync();
-			fragmentOrganizationsBinding.progressBar.setVisibility(View.VISIBLE);
-		}, 50));
+		fragmentOrganizationsBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											page = 1;
+											fragmentOrganizationsBinding.pullToRefresh
+													.setRefreshing(false);
+											fetchDataAsync();
+											fragmentOrganizationsBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										},
+										50));
 
 		fetchDataAsync();
 
@@ -73,45 +83,51 @@ public class OrganizationsFragment extends Fragment {
 
 	private void fetchDataAsync() {
 
-		organizationsViewModel.getUserOrg(page, resultLimit, getContext()).observe(getViewLifecycleOwner(), orgListMain -> {
+		organizationsViewModel
+				.getUserOrg(page, resultLimit, getContext())
+				.observe(
+						getViewLifecycleOwner(),
+						orgListMain -> {
+							adapter = new OrganizationsListAdapter(requireContext(), orgListMain);
+							adapter.setLoadMoreListener(
+									new OrganizationsListAdapter.OnLoadMoreListener() {
 
-			adapter = new OrganizationsListAdapter(requireContext(), orgListMain);
-			adapter.setLoadMoreListener(new OrganizationsListAdapter.OnLoadMoreListener() {
+										@Override
+										public void onLoadMore() {
 
-				@Override
-				public void onLoadMore() {
+											page += 1;
+											organizationsViewModel.loadMoreOrgList(
+													page, resultLimit, getContext(), adapter);
+											fragmentOrganizationsBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										}
 
-					page += 1;
-					organizationsViewModel.loadMoreOrgList(page, resultLimit, getContext(), adapter);
-					fragmentOrganizationsBinding.progressBar.setVisibility(View.VISIBLE);
-				}
+										@Override
+										public void onLoadFinished() {
 
-				@Override
-				public void onLoadFinished() {
+											fragmentOrganizationsBinding.progressBar.setVisibility(
+													View.GONE);
+										}
+									});
 
-					fragmentOrganizationsBinding.progressBar.setVisibility(View.GONE);
-				}
-			});
+							if (adapter.getItemCount() > 0) {
+								fragmentOrganizationsBinding.recyclerView.setAdapter(adapter);
+								fragmentOrganizationsBinding.noDataOrg.setVisibility(View.GONE);
+							} else {
+								adapter.notifyDataChanged();
+								fragmentOrganizationsBinding.recyclerView.setAdapter(adapter);
+								fragmentOrganizationsBinding.noDataOrg.setVisibility(View.VISIBLE);
+							}
 
-			if(adapter.getItemCount() > 0) {
-				fragmentOrganizationsBinding.recyclerView.setAdapter(adapter);
-				fragmentOrganizationsBinding.noDataOrg.setVisibility(View.GONE);
-			}
-			else {
-				adapter.notifyDataChanged();
-				fragmentOrganizationsBinding.recyclerView.setAdapter(adapter);
-				fragmentOrganizationsBinding.noDataOrg.setVisibility(View.VISIBLE);
-			}
-
-			fragmentOrganizationsBinding.progressBar.setVisibility(View.GONE);
-		});
+							fragmentOrganizationsBinding.progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	@Override
 	public void onResume() {
 		super.onResume();
 
-		if(orgCreated) {
+		if (orgCreated) {
 			organizationsViewModel.loadOrgList(page, resultLimit, getContext());
 			orgCreated = false;
 		}
@@ -124,24 +140,25 @@ public class OrganizationsFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				if(fragmentOrganizationsBinding.recyclerView.getAdapter() != null) {
-					adapter.getFilter().filter(newText);
-				}
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						if (fragmentOrganizationsBinding.recyclerView.getAdapter() != null) {
+							adapter.getFilter().filter(newText);
+						}
+						return false;
+					}
+				});
 	}
-
 }
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 7c7ef9a5..0ec55756 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/PullRequestChangesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/PullRequestChangesFragment.java
@@ -14,51 +14,54 @@ import org.mian.gitnex.databinding.FragmentPrChangesBinding;
 /**
  * @author qwerty287
  */
-
 public class PullRequestChangesFragment extends Fragment {
 
 	private final DiffFilesFragment diffFilesFragment = DiffFilesFragment.newInstance();
-	private final PullRequestCommitsFragment pullRequestCommitsFragment = PullRequestCommitsFragment.newInstance();
+	private final PullRequestCommitsFragment pullRequestCommitsFragment =
+			PullRequestCommitsFragment.newInstance();
 	private FragmentPrChangesBinding binding;
 
-	public PullRequestChangesFragment() {
-	}
+	public PullRequestChangesFragment() {}
 
 	public static PullRequestChangesFragment newInstance() {
 		return new PullRequestChangesFragment();
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		binding = FragmentPrChangesBinding.inflate(inflater, container, false);
 
 		binding.close.setOnClickListener(v -> requireActivity().finish());
 
-		binding.container.setAdapter(new FragmentStateAdapter(requireActivity()) {
+		binding.container.setAdapter(
+				new FragmentStateAdapter(requireActivity()) {
 
-			@NonNull
-			@Override
-			public Fragment createFragment(int position) {
+					@NonNull @Override
+					public Fragment createFragment(int position) {
 
-				if(position == 0) {
-					return diffFilesFragment;
-				}
-				else {
-					return pullRequestCommitsFragment;
-				}
-			}
+						if (position == 0) {
+							return diffFilesFragment;
+						} else {
+							return pullRequestCommitsFragment;
+						}
+					}
 
-			@Override
-			public int getItemCount() {
+					@Override
+					public int getItemCount() {
 
-				return 2;
-			}
-		});
-		String[] tabs = new String[]{getString(R.string.tabTextFiles), getString(R.string.commits)};
-		new TabLayoutMediator(binding.tabs, binding.container, (tab, position) -> tab.setText(tabs[position])).attach();
+						return 2;
+					}
+				});
+		String[] tabs =
+				new String[] {getString(R.string.tabTextFiles), getString(R.string.commits)};
+		new TabLayoutMediator(
+						binding.tabs,
+						binding.container,
+						(tab, position) -> tab.setText(tabs[position]))
+				.attach();
 
 		return binding.getRoot();
 	}
-
 }
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 6e01f1d9..42a1142b 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/PullRequestCommitsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/PullRequestCommitsFragment.java
@@ -16,6 +16,8 @@ import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Commit;
 import org.jetbrains.annotations.NotNull;
 import org.mian.gitnex.R;
@@ -25,8 +27,6 @@ import org.mian.gitnex.databinding.ActivityCommitsBinding;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.IssueContext;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -44,17 +44,17 @@ public class PullRequestCommitsFragment extends Fragment {
 	private int pageSize = 1;
 	private CommitsAdapter adapter;
 
-	public PullRequestCommitsFragment() {
-	}
+	public PullRequestCommitsFragment() {}
 
 	public static PullRequestCommitsFragment newInstance() {
 		return new PullRequestCommitsFragment();
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		if(binding != null) {
+		if (binding != null) {
 			ctx = requireContext();
 			return binding.getRoot();
 		}
@@ -66,28 +66,41 @@ public class PullRequestCommitsFragment extends Fragment {
 
 		resultLimit = Constants.getCurrentResultLimit(ctx);
 
-		binding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			binding.pullToRefresh.setRefreshing(false);
-			loadInitial(issue, resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
-		RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+		binding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											binding.pullToRefresh.setRefreshing(false);
+											loadInitial(issue, resultLimit);
+											adapter.notifyDataChanged();
+										},
+										200));
+		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);
 
 		adapter = new CommitsAdapter(ctx, commitsList);
-		adapter.setLoadMoreListener(() -> binding.recyclerView.post(() -> {
+		adapter.setLoadMoreListener(
+				() ->
+						binding.recyclerView.post(
+								() -> {
+									if (commitsList.size() == resultLimit
+											|| pageSize == resultLimit) {
 
-			if(commitsList.size() == resultLimit || pageSize == resultLimit) {
-
-				int page = (commitsList.size() + resultLimit) / resultLimit;
-				loadMore(page, issue, resultLimit);
-			}
-		}));
+										int page = (commitsList.size() + resultLimit) / resultLimit;
+										loadMore(page, issue, resultLimit);
+									}
+								}));
 
 		binding.recyclerView.setHasFixedSize(true);
 		binding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
@@ -107,96 +120,110 @@ 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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Commit>> call, @NonNull Response<List<Commit>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Commit>> call,
+							@NonNull Response<List<Commit>> response) {
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					assert response.body() != null;
-					if(response.body().size() > 0) {
+							assert response.body() != null;
+							if (response.body().size() > 0) {
 
-						commitsList.clear();
-						commitsList.addAll(response.body());
-						adapter.notifyDataChanged();
-						binding.noDataCommits.setVisibility(View.GONE);
+								commitsList.clear();
+								commitsList.addAll(response.body());
+								adapter.notifyDataChanged();
+								binding.noDataCommits.setVisibility(View.GONE);
+							} else {
+
+								commitsList.clear();
+								adapter.notifyDataChanged();
+								binding.noDataCommits.setVisibility(View.VISIBLE);
+							}
+						}
+						if (response.code() == 409) {
+
+							binding.noDataCommits.setVisibility(View.VISIBLE);
+						} else {
+
+							Log.e(TAG, String.valueOf(response.code()));
+						}
+
+						binding.progressBar.setVisibility(View.GONE);
 					}
-					else {
 
-						commitsList.clear();
-						adapter.notifyDataChanged();
-						binding.noDataCommits.setVisibility(View.VISIBLE);
+					@Override
+					public void onFailure(@NonNull Call<List<Commit>> call, @NonNull Throwable t) {
+
+						Toasty.error(
+								ctx, getResources().getString(R.string.genericServerResponseError));
 					}
-				}
-				if(response.code() == 409) {
-
-					binding.noDataCommits.setVisibility(View.VISIBLE);
-				}
-				else {
-
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-
-				binding.progressBar.setVisibility(View.GONE);
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Commit>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getResources().getString(R.string.genericServerResponseError));
-			}
-
-		});
-
+				});
 	}
 
 	private void loadMore(final int page, IssueContext issue, int resultLimit) {
 
 		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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Commit>> call, @NonNull Response<List<Commit>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Commit>> call,
+							@NonNull Response<List<Commit>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					List<Commit> result = response.body();
-					assert result != null;
+							List<Commit> result = response.body();
+							assert result != null;
 
-					if(result.size() > 0) {
+							if (result.size() > 0) {
 
-						pageSize = result.size();
-						commitsList.addAll(result);
-					}
-					else {
+								pageSize = result.size();
+								commitsList.addAll(result);
+							} else {
 
-						adapter.setMoreDataAvailable(false);
+								adapter.setMoreDataAvailable(false);
+							}
+
+							adapter.notifyDataChanged();
+						} else {
+
+							Log.e(TAG, String.valueOf(response.code()));
+						}
+
+						binding.progressBar.setVisibility(View.GONE);
 					}
 
-					adapter.notifyDataChanged();
-				}
-				else {
-
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-
-				binding.progressBar.setVisibility(View.GONE);
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Commit>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getResources().getString(R.string.genericServerResponseError));
-			}
-
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<Commit>> call, @NonNull Throwable t) {
 
+						Toasty.error(
+								ctx, getResources().getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	@Override
@@ -205,34 +232,36 @@ public class PullRequestCommitsFragment extends Fragment {
 		inflater.inflate(R.menu.search_menu, menu);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
+					@Override
+					public boolean onQueryTextSubmit(String query) {
 
-				return false;
-			}
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
+					@Override
+					public boolean onQueryTextChange(String newText) {
 
-				filter(newText);
-				return true;
-			}
-
-		});
+						filter(newText);
+						return true;
+					}
+				});
 	}
 
 	private void filter(String text) {
 
 		List<Commit> arr = new ArrayList<>();
 
-		for(Commit d : commitsList) {
+		for (Commit d : commitsList) {
 
-			if(d.getCommit().getMessage().toLowerCase().contains(text) || d.getSha().toLowerCase().contains(text)) {
+			if (d.getCommit().getMessage().toLowerCase().contains(text)
+					|| d.getSha().toLowerCase().contains(text)) {
 
 				arr.add(d);
 			}
@@ -240,5 +269,4 @@ public class PullRequestCommitsFragment extends Fragment {
 
 		adapter.updateList(arr);
 	}
-
 }
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 247340f9..c872e60e 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java
@@ -17,6 +17,8 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.PullRequest;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
@@ -26,8 +28,6 @@ import org.mian.gitnex.databinding.FragmentPullRequestsBinding;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -35,7 +35,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class PullRequestsFragment extends Fragment {
 
 	public static boolean resumePullRequests = false;
@@ -56,11 +55,14 @@ public class PullRequestsFragment extends Fragment {
 		return f;
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		fragmentPullRequestsBinding = FragmentPullRequestsBinding.inflate(inflater, container, false);
+		fragmentPullRequestsBinding =
+				FragmentPullRequestsBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
 		context = getContext();
 
@@ -70,55 +72,92 @@ public class PullRequestsFragment extends Fragment {
 		prList = new ArrayList<>();
 		repository = RepositoryContext.fromBundle(requireArguments());
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-			swipeRefresh.setRefreshing(false);
-			loadInitial(repository.getOwner(), repository.getName(), pageSize, repository.getPrState().toString(), resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
+		swipeRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											swipeRefresh.setRefreshing(false);
+											loadInitial(
+													repository.getOwner(),
+													repository.getName(),
+													pageSize,
+													repository.getPrState().toString(),
+													resultLimit);
+											adapter.notifyDataChanged();
+										},
+										200));
 
 		adapter = new PullRequestsAdapter(getContext(), prList);
-		adapter.setLoadMoreListener(() -> fragmentPullRequestsBinding.recyclerView.post(() -> {
-
-			if(prList.size() == resultLimit || pageSize == resultLimit) {
-				int page = (prList.size() + resultLimit) / resultLimit;
-				loadMore(repository.getOwner(), repository.getName(), page, repository.getPrState().toString(), resultLimit);
-			}
-
-		}));
+		adapter.setLoadMoreListener(
+				() ->
+						fragmentPullRequestsBinding.recyclerView.post(
+								() -> {
+									if (prList.size() == resultLimit || pageSize == resultLimit) {
+										int page = (prList.size() + resultLimit) / resultLimit;
+										loadMore(
+												repository.getOwner(),
+												repository.getName(),
+												page,
+												repository.getPrState().toString(),
+												resultLimit);
+									}
+								}));
 
 		fragmentPullRequestsBinding.recyclerView.setHasFixedSize(true);
 		fragmentPullRequestsBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
 		fragmentPullRequestsBinding.recyclerView.setAdapter(adapter);
 
-		((RepoDetailActivity) requireActivity()).setFragmentRefreshListenerPr(prState -> {
+		((RepoDetailActivity) requireActivity())
+				.setFragmentRefreshListenerPr(
+						prState -> {
+							if (prState.equals("closed")) {
+								menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
+							} else {
+								menu.getItem(1).setIcon(R.drawable.ic_filter);
+							}
 
-			if(prState.equals("closed")) {
-				menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
-			}
-			else {
-				menu.getItem(1).setIcon(R.drawable.ic_filter);
-			}
+							prList.clear();
 
-			prList.clear();
+							adapter = new PullRequestsAdapter(context, prList);
+							adapter.setLoadMoreListener(
+									() ->
+											fragmentPullRequestsBinding.recyclerView.post(
+													() -> {
+														if (prList.size() == resultLimit
+																|| pageSize == resultLimit) {
+															int page =
+																	(prList.size() + resultLimit)
+																			/ resultLimit;
+															loadMore(
+																	repository.getOwner(),
+																	repository.getName(),
+																	page,
+																	repository
+																			.getPrState()
+																			.toString(),
+																	resultLimit);
+														}
+													}));
 
-			adapter = new PullRequestsAdapter(context, prList);
-			adapter.setLoadMoreListener(() -> fragmentPullRequestsBinding.recyclerView.post(() -> {
+							fragmentPullRequestsBinding.progressBar.setVisibility(View.VISIBLE);
+							fragmentPullRequestsBinding.noData.setVisibility(View.GONE);
 
-				if(prList.size() == resultLimit || pageSize == resultLimit) {
-					int page = (prList.size() + resultLimit) / resultLimit;
-					loadMore(repository.getOwner(), repository.getName(), page, repository.getPrState().toString(), resultLimit);
-				}
+							loadInitial(
+									repository.getOwner(),
+									repository.getName(),
+									pageSize,
+									prState,
+									resultLimit);
+							fragmentPullRequestsBinding.recyclerView.setAdapter(adapter);
+						});
 
-			}));
-
-			fragmentPullRequestsBinding.progressBar.setVisibility(View.VISIBLE);
-			fragmentPullRequestsBinding.noData.setVisibility(View.GONE);
-
-			loadInitial(repository.getOwner(), repository.getName(), pageSize, prState, resultLimit);
-			fragmentPullRequestsBinding.recyclerView.setAdapter(adapter);
-		});
-
-		loadInitial(repository.getOwner(), repository.getName(), pageSize, repository.getPrState().toString(), resultLimit);
+		loadInitial(
+				repository.getOwner(),
+				repository.getName(),
+				pageSize,
+				repository.getPrState().toString(),
+				resultLimit);
 
 		return fragmentPullRequestsBinding.getRoot();
 	}
@@ -128,94 +167,105 @@ public class PullRequestsFragment extends Fragment {
 
 		super.onResume();
 
-		if(resumePullRequests) {
-			loadInitial(repository.getOwner(), repository.getName(), pageSize, repository.getPrState().toString(), resultLimit);
+		if (resumePullRequests) {
+			loadInitial(
+					repository.getOwner(),
+					repository.getName(),
+					pageSize,
+					repository.getPrState().toString(),
+					resultLimit);
 			resumePullRequests = false;
 		}
 	}
 
-	private void loadInitial(String repoOwner, String repoName, int page, String prState, int resultLimit) {
+	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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<PullRequest>> call, @NonNull Response<List<PullRequest>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<PullRequest>> call,
+							@NonNull Response<List<PullRequest>> response) {
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					assert response.body() != null;
-					if(response.body().size() > 0) {
-						prList.clear();
-						prList.addAll(response.body());
-						adapter.notifyDataChanged();
-						fragmentPullRequestsBinding.noData.setVisibility(View.GONE);
+							assert response.body() != null;
+							if (response.body().size() > 0) {
+								prList.clear();
+								prList.addAll(response.body());
+								adapter.notifyDataChanged();
+								fragmentPullRequestsBinding.noData.setVisibility(View.GONE);
+							} else {
+								prList.clear();
+								adapter.notifyDataChanged();
+								fragmentPullRequestsBinding.noData.setVisibility(View.VISIBLE);
+							}
+							fragmentPullRequestsBinding.progressBar.setVisibility(View.GONE);
+						} else if (response.code() == 404) {
+							fragmentPullRequestsBinding.noData.setVisibility(View.VISIBLE);
+							fragmentPullRequestsBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Log.i(TAG, String.valueOf(response.code()));
+						}
+						Log.i(TAG, String.valueOf(response.code()));
 					}
-					else {
-						prList.clear();
-						adapter.notifyDataChanged();
-						fragmentPullRequestsBinding.noData.setVisibility(View.VISIBLE);
-					}
-					fragmentPullRequestsBinding.progressBar.setVisibility(View.GONE);
-				}
-				else if(response.code() == 404) {
-					fragmentPullRequestsBinding.noData.setVisibility(View.VISIBLE);
-					fragmentPullRequestsBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Log.i(TAG, String.valueOf(response.code()));
-				}
-				Log.i(TAG, String.valueOf(response.code()));
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<PullRequest>> call, @NonNull Throwable t) {
-
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<PullRequest>> call, @NonNull Throwable t) {}
+				});
 	}
 
-	private void loadMore(String repoOwner, String repoName, int page, String prState, int resultLimit) {
+	private void loadMore(
+			String repoOwner, String repoName, int page, String prState, int resultLimit) {
 
 		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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<PullRequest>> call, @NonNull Response<List<PullRequest>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<PullRequest>> call,
+							@NonNull Response<List<PullRequest>> response) {
 
-				if(response.code() == 200) {
+						if (response.code() == 200) {
 
-					//remove loading view
-					prList.remove(prList.size() - 1);
-					List<PullRequest> result = response.body();
+							// remove loading view
+							prList.remove(prList.size() - 1);
+							List<PullRequest> result = response.body();
 
-					assert result != null;
-					if(result.size() > 0) {
-						pageSize = result.size();
-						prList.addAll(result);
+							assert result != null;
+							if (result.size() > 0) {
+								pageSize = result.size();
+								prList.addAll(result);
+							} else {
+								Toasty.info(context, getString(R.string.noMoreData));
+								adapter.setMoreDataAvailable(false);
+							}
+							adapter.notifyDataChanged();
+							fragmentPullRequestsBinding.progressBar.setVisibility(View.GONE);
+						} else {
+							Log.e(TAG, String.valueOf(response.code()));
+						}
 					}
-					else {
-						Toasty.info(context, getString(R.string.noMoreData));
-						adapter.setMoreDataAvailable(false);
-					}
-					adapter.notifyDataChanged();
-					fragmentPullRequestsBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Log.e(TAG, String.valueOf(response.code()));
-				}
 
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<PullRequest>> call, @NonNull Throwable t) {
-
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<PullRequest>> call, @NonNull Throwable t) {}
+				});
 	}
 
 	@Override
@@ -226,45 +276,47 @@ public class PullRequestsFragment extends Fragment {
 		inflater.inflate(R.menu.filter_menu_pr, menu);
 		super.onCreateOptionsMenu(menu, inflater);
 
-		if(repository.getPrState().toString().equals("closed")) {
+		if (repository.getPrState().toString().equals("closed")) {
 			menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
-		}
-		else {
+		} else {
 			menu.getItem(1).setIcon(R.drawable.ic_filter);
 		}
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				filter(newText);
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						filter(newText);
+						return false;
+					}
+				});
 	}
 
 	private void filter(String text) {
 
 		List<PullRequest> arr = new ArrayList<>();
 
-		for(PullRequest d : prList) {
-			if(d == null || d.getTitle() == null || d.getBody() == null) {
+		for (PullRequest d : prList) {
+			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);
 			}
 		}
 		adapter.updateList(arr);
 	}
-
 }
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 8076ca70..eb1e2fae 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java
@@ -20,20 +20,6 @@ import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import org.gitnex.tea4j.v2.auth.ApiKeyAuth;
-import org.gitnex.tea4j.v2.models.Release;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.BaseActivity;
-import org.mian.gitnex.activities.RepoDetailActivity;
-import org.mian.gitnex.adapters.ReleasesAdapter;
-import org.mian.gitnex.adapters.TagsAdapter;
-import org.mian.gitnex.databinding.FragmentReleasesBinding;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.Constants;
-import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
-import org.mian.gitnex.notifications.Notifications;
-import org.mian.gitnex.viewmodels.ReleasesViewModel;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.security.KeyManagementException;
@@ -49,11 +35,24 @@ import okhttp3.Callback;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import org.gitnex.tea4j.v2.auth.ApiKeyAuth;
+import org.gitnex.tea4j.v2.models.Release;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.BaseActivity;
+import org.mian.gitnex.activities.RepoDetailActivity;
+import org.mian.gitnex.adapters.ReleasesAdapter;
+import org.mian.gitnex.adapters.TagsAdapter;
+import org.mian.gitnex.databinding.FragmentReleasesBinding;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.Constants;
+import org.mian.gitnex.helpers.contexts.RepositoryContext;
+import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
+import org.mian.gitnex.notifications.Notifications;
+import org.mian.gitnex.viewmodels.ReleasesViewModel;
 
 /**
  * @author M M Arif
  */
-
 public class ReleasesFragment extends Fragment {
 
 	private ReleasesViewModel releasesViewModel;
@@ -67,8 +66,7 @@ public class ReleasesFragment extends Fragment {
 
 	public static String currentDownloadUrl = null;
 
-	public ReleasesFragment() {
-	}
+	public ReleasesFragment() {}
 
 	public static ReleasesFragment newInstance(RepositoryContext repository) {
 		ReleasesFragment fragment = new ReleasesFragment();
@@ -84,44 +82,59 @@ public class ReleasesFragment extends Fragment {
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		fragmentReleasesBinding = FragmentReleasesBinding.inflate(inflater, container, false);
 		releasesViewModel = new ViewModelProvider(this).get(ReleasesViewModel.class);
 
 		fragmentReleasesBinding.recyclerView.setHasFixedSize(true);
-		fragmentReleasesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		fragmentReleasesBinding.recyclerView.setLayoutManager(
+				new LinearLayoutManager(getContext()));
 
-		fragmentReleasesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			fragmentReleasesBinding.pullToRefresh.setRefreshing(false);
-			if(repository.isReleasesViewTypeIsTag()) {
-				releasesViewModel.loadTagsList(repository.getOwner(), repository.getName(), getContext());
-			}
-			else {
-				releasesViewModel.loadReleasesList(repository.getOwner(), repository.getName(), getContext());
-			}
-			fragmentReleasesBinding.progressBar.setVisibility(View.VISIBLE);
-
-		}, 50));
+		fragmentReleasesBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											fragmentReleasesBinding.pullToRefresh.setRefreshing(
+													false);
+											if (repository.isReleasesViewTypeIsTag()) {
+												releasesViewModel.loadTagsList(
+														repository.getOwner(),
+														repository.getName(),
+														getContext());
+											} else {
+												releasesViewModel.loadReleasesList(
+														repository.getOwner(),
+														repository.getName(),
+														getContext());
+											}
+											fragmentReleasesBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										},
+										50));
 
 		fetchDataAsync(repository.getOwner(), repository.getName());
 
 		setHasOptionsMenu(true);
-		((RepoDetailActivity) requireActivity()).setFragmentRefreshListenerReleases(type -> {
-			if(type != null) {
-				repository.setReleasesViewTypeIsTag(type.equals("tags"));
-			}
-			page = 1;
-			pageReleases = 1;
-			if(repository.isReleasesViewTypeIsTag()) {
-				releasesViewModel.loadTagsList(repository.getOwner(), repository.getName(), getContext());
-			}
-			else {
-				releasesViewModel.loadReleasesList(repository.getOwner(), repository.getName(), getContext());
-			}
-			fragmentReleasesBinding.progressBar.setVisibility(View.VISIBLE);
-		});
+		((RepoDetailActivity) requireActivity())
+				.setFragmentRefreshListenerReleases(
+						type -> {
+							if (type != null) {
+								repository.setReleasesViewTypeIsTag(type.equals("tags"));
+							}
+							page = 1;
+							pageReleases = 1;
+							if (repository.isReleasesViewTypeIsTag()) {
+								releasesViewModel.loadTagsList(
+										repository.getOwner(), repository.getName(), getContext());
+							} else {
+								releasesViewModel.loadReleasesList(
+										repository.getOwner(), repository.getName(), getContext());
+							}
+							fragmentReleasesBinding.progressBar.setVisibility(View.VISIBLE);
+						});
 
 		return fragmentReleasesBinding.getRoot();
 	}
@@ -130,78 +143,116 @@ public class ReleasesFragment extends Fragment {
 
 		ReleasesViewModel releasesModel = new ViewModelProvider(this).get(ReleasesViewModel.class);
 
-		releasesModel.getReleasesList(owner, repo, getContext()).observe(getViewLifecycleOwner(), releasesListMain -> {
-			if(!repository.isReleasesViewTypeIsTag()) {
-				adapter = new ReleasesAdapter(getContext(), releasesListMain, this::requestFileDownload, repository.getOwner(), repository.getName(), fragmentReleasesBinding);
-				adapter.setLoadMoreListener(new ReleasesAdapter.OnLoadMoreListener() {
+		releasesModel
+				.getReleasesList(owner, repo, getContext())
+				.observe(
+						getViewLifecycleOwner(),
+						releasesListMain -> {
+							if (!repository.isReleasesViewTypeIsTag()) {
+								adapter =
+										new ReleasesAdapter(
+												getContext(),
+												releasesListMain,
+												this::requestFileDownload,
+												repository.getOwner(),
+												repository.getName(),
+												fragmentReleasesBinding);
+								adapter.setLoadMoreListener(
+										new ReleasesAdapter.OnLoadMoreListener() {
 
-					@Override
-					public void onLoadMore() {
-						pageReleases += 1;
-						releasesViewModel.loadMoreReleases(owner, repo, pageReleases, getContext(), adapter);
-						fragmentReleasesBinding.progressBar.setVisibility(View.VISIBLE);
-					}
+											@Override
+											public void onLoadMore() {
+												pageReleases += 1;
+												releasesViewModel.loadMoreReleases(
+														owner,
+														repo,
+														pageReleases,
+														getContext(),
+														adapter);
+												fragmentReleasesBinding.progressBar.setVisibility(
+														View.VISIBLE);
+											}
 
-					@Override
-					public void onLoadFinished() {
-						fragmentReleasesBinding.progressBar.setVisibility(View.GONE);
-					}
-				});
-				if(adapter.getItemCount() > 0) {
-					fragmentReleasesBinding.recyclerView.setAdapter(adapter);
-					if(releasesListMain != null && releaseTag != null) {
-						int index = getReleaseIndex(releaseTag, releasesListMain);
-						releaseTag = null;
-						if(index != -1) {
-							fragmentReleasesBinding.recyclerView.scrollToPosition(index);
-						}
-					}
-					fragmentReleasesBinding.noDataReleases.setVisibility(View.GONE);
-				}
-				else {
-					adapter.notifyDataChanged();
-					fragmentReleasesBinding.recyclerView.setAdapter(adapter);
-					fragmentReleasesBinding.noDataReleases.setVisibility(View.VISIBLE);
-				}
-				fragmentReleasesBinding.progressBar.setVisibility(View.GONE);
-			}
-		});
+											@Override
+											public void onLoadFinished() {
+												fragmentReleasesBinding.progressBar.setVisibility(
+														View.GONE);
+											}
+										});
+								if (adapter.getItemCount() > 0) {
+									fragmentReleasesBinding.recyclerView.setAdapter(adapter);
+									if (releasesListMain != null && releaseTag != null) {
+										int index = getReleaseIndex(releaseTag, releasesListMain);
+										releaseTag = null;
+										if (index != -1) {
+											fragmentReleasesBinding.recyclerView.scrollToPosition(
+													index);
+										}
+									}
+									fragmentReleasesBinding.noDataReleases.setVisibility(View.GONE);
+								} else {
+									adapter.notifyDataChanged();
+									fragmentReleasesBinding.recyclerView.setAdapter(adapter);
+									fragmentReleasesBinding.noDataReleases.setVisibility(
+											View.VISIBLE);
+								}
+								fragmentReleasesBinding.progressBar.setVisibility(View.GONE);
+							}
+						});
 
-		releasesModel.getTagsList(owner, repo, getContext()).observe(getViewLifecycleOwner(), tagList -> {
-			if(repository.isReleasesViewTypeIsTag()) {
-				tagsAdapter = new TagsAdapter(getContext(), tagList, owner, repo, this::requestFileDownload, fragmentReleasesBinding);
-				tagsAdapter.setLoadMoreListener(new TagsAdapter.OnLoadMoreListener() {
+		releasesModel
+				.getTagsList(owner, repo, getContext())
+				.observe(
+						getViewLifecycleOwner(),
+						tagList -> {
+							if (repository.isReleasesViewTypeIsTag()) {
+								tagsAdapter =
+										new TagsAdapter(
+												getContext(),
+												tagList,
+												owner,
+												repo,
+												this::requestFileDownload,
+												fragmentReleasesBinding);
+								tagsAdapter.setLoadMoreListener(
+										new TagsAdapter.OnLoadMoreListener() {
 
-					@Override
-					public void onLoadMore() {
-						page += 1;
-						releasesViewModel.loadMoreTags(owner, repo, page, getContext(), tagsAdapter);
-						fragmentReleasesBinding.progressBar.setVisibility(View.VISIBLE);
-					}
-
-					@Override
-					public void onLoadFinished() {
-						fragmentReleasesBinding.progressBar.setVisibility(View.GONE);
-					}
-				});
-				if(tagsAdapter.getItemCount() > 0) {
-					fragmentReleasesBinding.recyclerView.setAdapter(tagsAdapter);
-					fragmentReleasesBinding.noDataReleases.setVisibility(View.GONE);
-				}
-				else {
-					tagsAdapter.notifyDataChanged();
-					fragmentReleasesBinding.recyclerView.setAdapter(tagsAdapter);
-					fragmentReleasesBinding.noDataReleases.setVisibility(View.VISIBLE);
-				}
-				fragmentReleasesBinding.progressBar.setVisibility(View.GONE);
-			}
-		});
+											@Override
+											public void onLoadMore() {
+												page += 1;
+												releasesViewModel.loadMoreTags(
+														owner,
+														repo,
+														page,
+														getContext(),
+														tagsAdapter);
+												fragmentReleasesBinding.progressBar.setVisibility(
+														View.VISIBLE);
+											}
 
+											@Override
+											public void onLoadFinished() {
+												fragmentReleasesBinding.progressBar.setVisibility(
+														View.GONE);
+											}
+										});
+								if (tagsAdapter.getItemCount() > 0) {
+									fragmentReleasesBinding.recyclerView.setAdapter(tagsAdapter);
+									fragmentReleasesBinding.noDataReleases.setVisibility(View.GONE);
+								} else {
+									tagsAdapter.notifyDataChanged();
+									fragmentReleasesBinding.recyclerView.setAdapter(tagsAdapter);
+									fragmentReleasesBinding.noDataReleases.setVisibility(
+											View.VISIBLE);
+								}
+								fragmentReleasesBinding.progressBar.setVisibility(View.GONE);
+							}
+						});
 	}
 
 	private static int getReleaseIndex(String tag, List<Release> releases) {
-		for(Release release : releases) {
-			if(release.getTagName().equals(tag)) {
+		for (Release release : releases) {
+			if (release.getTagName().equals(tag)) {
 				return releases.indexOf(release);
 			}
 		}
@@ -210,7 +261,7 @@ public class ReleasesFragment extends Fragment {
 
 	@Override
 	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-		if(!((BaseActivity) requireActivity()).getAccount().requiresVersion("1.15.0")) {
+		if (!((BaseActivity) requireActivity()).getAccount().requiresVersion("1.15.0")) {
 			return;
 		}
 		inflater.inflate(R.menu.filter_menu_releases, menu);
@@ -227,63 +278,144 @@ public class ReleasesFragment extends Fragment {
 		downloadLauncher.launch(intent);
 	}
 
-	ActivityResultLauncher<Intent> downloadLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+	ActivityResultLauncher<Intent> downloadLauncher =
+			registerForActivityResult(
+					new ActivityResultContracts.StartActivityForResult(),
+					result -> {
+						if (result.getResultCode() == Activity.RESULT_OK
+								&& result.getData() != null) {
 
-		if(result.getResultCode() == Activity.RESULT_OK && result.getData() != null) {
+							try {
 
-			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);
 
-				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());
 
-				int notificationId = Notifications.uniqueNotificationId(requireContext());
+								NotificationManager notificationManager =
+										(NotificationManager)
+												requireContext()
+														.getSystemService(
+																Context.NOTIFICATION_SERVICE);
+								notificationManager.notify(notificationId, builder.build());
 
-				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());
 
-				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();
 
-				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() {
 
-				okHttpClient.newCall(new Request.Builder().url(currentDownloadUrl).build()).enqueue(new Callback() {
+													@Override
+													public void onFailure(
+															@NonNull Call call,
+															@NonNull IOException e) {
 
-					@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());
+													}
 
-						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 {
 
-					@Override
-					public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
+														if (!response.isSuccessful()
+																|| response.body() == null) {
+															onFailure(call, new IOException());
+															return;
+														}
 
-						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);
+							}
 						}
-
-						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 991c07a4..e8ed1828 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
@@ -11,6 +11,9 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.io.IOException;
+import java.util.Locale;
+import okhttp3.ResponseBody;
 import org.apache.commons.io.FileUtils;
 import org.gitnex.tea4j.v2.models.Organization;
 import org.gitnex.tea4j.v2.models.Repository;
@@ -32,9 +35,6 @@ import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.io.IOException;
-import java.util.Locale;
-import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -42,7 +42,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class RepoInfoFragment extends Fragment {
 
 	private Context ctx;
@@ -52,8 +51,7 @@ public class RepoInfoFragment extends Fragment {
 
 	private RepositoryContext repository;
 
-	public RepoInfoFragment() {
-	}
+	public RepoInfoFragment() {}
 
 	public static RepoInfoFragment newInstance(RepositoryContext repository) {
 		RepoInfoFragment fragment = new RepoInfoFragment();
@@ -68,7 +66,8 @@ public class RepoInfoFragment extends Fragment {
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		binding = FragmentRepoInfoBinding.inflate(inflater, container, false);
 		TinyDB tinyDb = TinyDB.getInstance(getContext());
@@ -82,41 +81,46 @@ public class RepoInfoFragment extends Fragment {
 
 		setRepoInfo(locale, tinyDb.getString("dateFormat", "pretty"));
 
-		if(isExpandViewVisible()) {
+		if (isExpandViewVisible()) {
 			toggleExpandView();
 		}
 
-		if(!isExpandViewMetaVisible()) {
+		if (!isExpandViewMetaVisible()) {
 			toggleExpandViewMeta();
 		}
 
 		binding.fileContentsFrameHeader.setOnClickListener(v1 -> toggleExpandView());
 		binding.repoMetaFrameHeader.setOnClickListener(v12 -> toggleExpandViewMeta());
 
-		binding.repoMetaStarsFrame.setOnClickListener(metaStars -> ctx.startActivity(repository.getIntent(ctx, RepoStargazersActivity.class)));
+		binding.repoMetaStarsFrame.setOnClickListener(
+				metaStars ->
+						ctx.startActivity(repository.getIntent(ctx, RepoStargazersActivity.class)));
 
-		binding.repoMetaWatchersFrame.setOnClickListener(metaWatchers -> ctx.startActivity(repository.getIntent(ctx, RepoWatchersActivity.class)));
+		binding.repoMetaWatchersFrame.setOnClickListener(
+				metaWatchers ->
+						ctx.startActivity(repository.getIntent(ctx, RepoWatchersActivity.class)));
 
-		binding.repoMetaForksFrame.setOnClickListener(metaForks -> ctx.startActivity(repository.getIntent(ctx, RepoForksActivity.class)));
+		binding.repoMetaForksFrame.setOnClickListener(
+				metaForks -> ctx.startActivity(repository.getIntent(ctx, RepoForksActivity.class)));
 
-		binding.repoMetaPullRequestsFrame.setOnClickListener(metaPR -> ((RepoDetailActivity) requireActivity()).viewPager.setCurrentItem(3));
+		binding.repoMetaPullRequestsFrame.setOnClickListener(
+				metaPR -> ((RepoDetailActivity) requireActivity()).viewPager.setCurrentItem(3));
 
 		return binding.getRoot();
 	}
 
 	private void toggleExpandView() {
 
-		if(binding.repoFileContents.getVisibility() == View.GONE) {
+		if (binding.repoFileContents.getVisibility() == View.GONE) {
 			binding.repoFilenameExpandCollapse.setImageResource(R.drawable.ic_chevron_up);
 			binding.repoFileContents.setVisibility(View.VISIBLE);
-			//Animation slide_down = AnimationUtils.loadAnimation(getContext(), R.anim.slide_down);
-			//binding.fileContentsFrame.startAnimation(slide_down);
-		}
-		else {
+			// Animation slide_down = AnimationUtils.loadAnimation(getContext(), R.anim.slide_down);
+			// binding.fileContentsFrame.startAnimation(slide_down);
+		} else {
 			binding.repoFilenameExpandCollapse.setImageResource(R.drawable.ic_chevron_down);
 			binding.repoFileContents.setVisibility(View.GONE);
-			//Animation slide_up = AnimationUtils.loadAnimation(getContext(), R.anim.slide_up);
-			//binding.fileContentsFrame.startAnimation(slide_up);
+			// Animation slide_up = AnimationUtils.loadAnimation(getContext(), R.anim.slide_up);
+			// binding.fileContentsFrame.startAnimation(slide_up);
 		}
 	}
 
@@ -126,17 +130,16 @@ public class RepoInfoFragment extends Fragment {
 
 	private void toggleExpandViewMeta() {
 
-		if(binding.repoMetaFrame.getVisibility() == View.GONE) {
+		if (binding.repoMetaFrame.getVisibility() == View.GONE) {
 			binding.repoMetaDataExpandCollapse.setImageResource(R.drawable.ic_chevron_up);
 			binding.repoMetaFrame.setVisibility(View.VISIBLE);
-			//Animation slide_down = AnimationUtils.loadAnimation(getContext(), R.anim.slide_down);
-			//binding.repoMetaFrame.startAnimation(slide_down);
-		}
-		else {
+			// Animation slide_down = AnimationUtils.loadAnimation(getContext(), R.anim.slide_down);
+			// binding.repoMetaFrame.startAnimation(slide_down);
+		} else {
 			binding.repoMetaDataExpandCollapse.setImageResource(R.drawable.ic_chevron_down);
 			binding.repoMetaFrame.setVisibility(View.GONE);
-			//Animation slide_up = AnimationUtils.loadAnimation(getContext(), R.anim.slide_up);
-			//binding.repoMetaFrame.startAnimation(slide_up);
+			// Animation slide_up = AnimationUtils.loadAnimation(getContext(), R.anim.slide_up);
+			// binding.repoMetaFrame.startAnimation(slide_up);
 		}
 	}
 
@@ -147,186 +150,249 @@ public class RepoInfoFragment extends Fragment {
 	private void setRepoInfo(Locale locale, final String timeFormat) {
 		Repository repoInfo = repository.getRepository();
 
-		if(isAdded()) {
+		if (isAdded()) {
 			assert repoInfo != null;
 			binding.repoMetaOwner.setText(repoInfo.getOwner().getLogin());
-			binding.repoMetaOwner.setOnClickListener((v) -> RetrofitClient.getApiInterface(ctx).orgGet(repository.getOwner()).enqueue(new Callback<>() {
+			binding.repoMetaOwner.setOnClickListener(
+					(v) ->
+							RetrofitClient.getApiInterface(ctx)
+									.orgGet(repository.getOwner())
+									.enqueue(
+											new Callback<>() {
 
-				@Override
-				public void onResponse(@NotNull Call<Organization> call, @NotNull Response<Organization> response) {
-					Intent intent = new Intent(ctx, response.isSuccessful() ? OrganizationDetailActivity.class : ProfileActivity.class);
-					intent.putExtra(response.isSuccessful() ? "orgName" : "username", repository.getOwner());
-					intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-					startActivity(intent);
-				}
+												@Override
+												public void onResponse(
+														@NotNull Call<Organization> call,
+														@NotNull Response<Organization> response) {
+													Intent intent =
+															new Intent(
+																	ctx,
+																	response.isSuccessful()
+																			? OrganizationDetailActivity
+																					.class
+																			: ProfileActivity
+																					.class);
+													intent.putExtra(
+															response.isSuccessful()
+																	? "orgName"
+																	: "username",
+															repository.getOwner());
+													intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+													startActivity(intent);
+												}
 
-				@Override
-				public void onFailure(@NotNull Call<Organization> call, @NotNull Throwable t) {
-				}
-			}));
+												@Override
+												public void onFailure(
+														@NotNull Call<Organization> call,
+														@NotNull Throwable t) {}
+											}));
 			binding.repoMetaName.setText(repoInfo.getName());
 
-			if(!repoInfo.getDescription().isEmpty()) {
+			if (!repoInfo.getDescription().isEmpty()) {
 				Markdown.render(ctx, repoInfo.getDescription(), binding.repoMetaDescription);
-			}
-			else {
+			} else {
 				binding.repoMetaDescription.setText(getString(R.string.noDataDescription));
 			}
 
 			binding.repoMetaStars.setText(String.valueOf(repoInfo.getStarsCount()));
 
-			if(repoInfo.getOpenPrCounter() != null) {
+			if (repoInfo.getOpenPrCounter() != null) {
 				binding.repoMetaPullRequests.setText(String.valueOf(repoInfo.getOpenPrCounter()));
-			}
-			else {
+			} else {
 				binding.repoMetaPullRequestsFrame.setVisibility(View.GONE);
 			}
 
 			binding.repoMetaForks.setText(String.valueOf(repoInfo.getForksCount()));
 			binding.repoMetaWatchers.setText(String.valueOf(repoInfo.getWatchersCount()));
-			binding.repoMetaSize.setText(FileUtils.byteCountToDisplaySize(repoInfo.getSize() * 1024));
+			binding.repoMetaSize.setText(
+					FileUtils.byteCountToDisplaySize(repoInfo.getSize() * 1024));
 
-			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.setText(
+					TimeHelper.formatTime(repoInfo.getCreatedAt(), locale, timeFormat, ctx));
+			if (timeFormat.equals("pretty")) {
+				binding.repoMetaCreatedAt.setOnClickListener(
+						new ClickListener(
+								TimeHelper.customDateFormatForToastDateFormat(
+										repoInfo.getCreatedAt()),
+								ctx));
 			}
 
-			String repoMetaUpdatedAt = TimeHelper.formatTime(repoInfo.getUpdatedAt(), locale, timeFormat, ctx);
+			String repoMetaUpdatedAt =
+					TimeHelper.formatTime(repoInfo.getUpdatedAt(), locale, timeFormat, ctx);
 
-			String website = (repoInfo.getWebsite().isEmpty()) ? getResources().getString(R.string.noDataWebsite) : repoInfo.getWebsite();
+			String website =
+					(repoInfo.getWebsite().isEmpty())
+							? getResources().getString(R.string.noDataWebsite)
+							: repoInfo.getWebsite();
 			binding.repoMetaWebsite.setText(website);
 			binding.repoMetaWebsite.setLinksClickable(false);
-			binding.websiteFrame.setOnClickListener((v) -> {
-				if(!repoInfo.getWebsite().isEmpty()) {
-					AppUtil.openUrlInBrowser(requireContext(), repoInfo.getWebsite());
-				}
-			});
+			binding.websiteFrame.setOnClickListener(
+					(v) -> {
+						if (!repoInfo.getWebsite().isEmpty()) {
+							AppUtil.openUrlInBrowser(requireContext(), repoInfo.getWebsite());
+						}
+					});
 
-			binding.repoAdditionalButton.setOnClickListener(v -> {
+			binding.repoAdditionalButton.setOnClickListener(
+					v -> {
+						View view =
+								LayoutInflater.from(ctx)
+										.inflate(R.layout.layout_repo_more_info, null);
 
-				View view = LayoutInflater.from(ctx).inflate(R.layout.layout_repo_more_info, null);
+						TextView defaultBranchHeader = view.findViewById(R.id.defaultBranchHeader);
+						TextView defaultBranchContent =
+								view.findViewById(R.id.defaultBranchContent);
 
-				TextView defaultBranchHeader = view.findViewById(R.id.defaultBranchHeader);
-				TextView defaultBranchContent = view.findViewById(R.id.defaultBranchContent);
+						TextView lastUpdatedHeader = view.findViewById(R.id.lastUpdatedHeader);
+						TextView lastUpdatedContent = view.findViewById(R.id.lastUpdatedContent);
 
-				TextView lastUpdatedHeader = view.findViewById(R.id.lastUpdatedHeader);
-				TextView lastUpdatedContent = view.findViewById(R.id.lastUpdatedContent);
+						TextView sshUrlHeader = view.findViewById(R.id.sshUrlHeader);
+						TextView sshUrlContent = view.findViewById(R.id.sshUrlContent);
 
-				TextView sshUrlHeader = view.findViewById(R.id.sshUrlHeader);
-				TextView sshUrlContent = view.findViewById(R.id.sshUrlContent);
+						TextView cloneUrlHeader = view.findViewById(R.id.cloneUrlHeader);
+						TextView cloneUrlContent = view.findViewById(R.id.cloneUrlContent);
 
-				TextView cloneUrlHeader = view.findViewById(R.id.cloneUrlHeader);
-				TextView cloneUrlContent = view.findViewById(R.id.cloneUrlContent);
+						TextView repoUrlHeader = view.findViewById(R.id.repoUrlHeader);
+						TextView repoUrlContent = view.findViewById(R.id.repoUrlContent);
 
-				TextView repoUrlHeader = view.findViewById(R.id.repoUrlHeader);
-				TextView repoUrlContent = view.findViewById(R.id.repoUrlContent);
+						defaultBranchHeader.setText(getString(R.string.infoTabRepoDefaultBranch));
+						defaultBranchContent.setText(repoInfo.getDefaultBranch());
 
-				defaultBranchHeader.setText(getString(R.string.infoTabRepoDefaultBranch));
-				defaultBranchContent.setText(repoInfo.getDefaultBranch());
+						lastUpdatedHeader.setText(getString(R.string.infoTabRepoUpdatedAt));
+						lastUpdatedContent.setText(repoMetaUpdatedAt);
 
-				lastUpdatedHeader.setText(getString(R.string.infoTabRepoUpdatedAt));
-				lastUpdatedContent.setText(repoMetaUpdatedAt);
+						sshUrlHeader.setText(getString(R.string.infoTabRepoSshUrl));
+						sshUrlContent.setText(repoInfo.getSshUrl());
 
-				sshUrlHeader.setText(getString(R.string.infoTabRepoSshUrl));
-				sshUrlContent.setText(repoInfo.getSshUrl());
+						cloneUrlHeader.setText(getString(R.string.infoTabRepoCloneUrl));
+						cloneUrlContent.setText(repoInfo.getCloneUrl());
 
-				cloneUrlHeader.setText(getString(R.string.infoTabRepoCloneUrl));
-				cloneUrlContent.setText(repoInfo.getCloneUrl());
+						repoUrlHeader.setText(getString(R.string.infoTabRepoRepoUrl));
+						repoUrlContent.setText(repoInfo.getHtmlUrl());
 
-				repoUrlHeader.setText(getString(R.string.infoTabRepoRepoUrl));
-				repoUrlContent.setText(repoInfo.getHtmlUrl());
+						MaterialAlertDialogBuilder materialAlertDialogBuilder =
+								new MaterialAlertDialogBuilder(ctx)
+										.setTitle(R.string.infoMoreInformation)
+										.setView(view)
+										.setNeutralButton(getString(R.string.close), null);
 
+						materialAlertDialogBuilder.create().show();
+					});
 
-				MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx).setTitle(R.string.infoMoreInformation).setView(view).setNeutralButton(getString(R.string.close), null);
-
-				materialAlertDialogBuilder.create().show();
-			});
-
-			if(repoInfo.isArchived()) {
+			if (repoInfo.isArchived()) {
 				binding.repoIsArchived.setVisibility(View.VISIBLE);
-			}
-			else {
+			} else {
 				binding.repoIsArchived.setVisibility(View.GONE);
 			}
 
-			if(repoInfo.isFork()) {
+			if (repoInfo.isFork()) {
 				binding.repoForkFrame.setVisibility(View.VISIBLE);
-				binding.repoForkFrame.setOnClickListener((v) -> {
-					Intent parent = new RepositoryContext(repoInfo.getParent(), requireContext()).getIntent(requireContext(), RepoDetailActivity.class);
-					startActivity(parent);
-				});
-				binding.repoFork.setText(getString(R.string.repoForkOf, repoInfo.getParent().getFullName()));
-			}
-			else {
+				binding.repoForkFrame.setOnClickListener(
+						(v) -> {
+							Intent parent =
+									new RepositoryContext(repoInfo.getParent(), requireContext())
+											.getIntent(requireContext(), RepoDetailActivity.class);
+							startActivity(parent);
+						});
+				binding.repoFork.setText(
+						getString(R.string.repoForkOf, repoInfo.getParent().getFullName()));
+			} else {
 				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);
-
 		}
 	}
 
-	private void getFileContents(final String owner, String repo, final String filename, final String defBranch) {
+	private void getFileContents(
+			final String owner, String repo, final String filename, final String defBranch) {
 
-		Call<ResponseBody> call = RetrofitClient.getWebInterface(getContext()).getFileContents(owner, repo, defBranch, filename);
+		Call<ResponseBody> call =
+				RetrofitClient.getWebInterface(getContext())
+						.getFileContents(owner, repo, defBranch, filename);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<ResponseBody> call,
+							@NonNull retrofit2.Response<ResponseBody> response) {
 
-				if(isAdded()) {
+						if (isAdded()) {
 
-					switch(response.code()) {
+							switch (response.code()) {
+								case 200:
+									assert response.body() != null;
+									new Thread(
+													() -> {
+														try {
+															Markdown.render(
+																	ctx,
+																	response.body().string(),
+																	binding.repoFileContents,
+																	repository);
+														} catch (IOException e) {
+															requireActivity()
+																	.runOnUiThread(
+																			() -> {
+																				Toasty.error(
+																						ctx,
+																						ctx
+																								.getString(
+																										R
+																												.string
+																												.genericError));
+																				binding
+																						.fileContentsFrameHeader
+																						.setVisibility(
+																								View
+																										.GONE);
+																				binding
+																						.fileContentsFrame
+																						.setVisibility(
+																								View
+																										.GONE);
+																			});
+														}
+													})
+											.start();
+									break;
 
-						case 200:
-							assert response.body() != null;
-							new Thread(() -> {
-								try {
-									Markdown.render(ctx, response.body().string(), binding.repoFileContents, repository);
-								}
-								catch(IOException e) {
-									requireActivity().runOnUiThread(() -> {
-										Toasty.error(ctx, ctx.getString(R.string.genericError));
-										binding.fileContentsFrameHeader.setVisibility(View.GONE);
-										binding.fileContentsFrame.setVisibility(View.GONE);
-									});
-								}
-							}).start();
-							break;
+								case 401:
+									AlertDialogs.authorizationTokenRevokedDialog(ctx);
+									break;
 
-						case 401:
-							AlertDialogs.authorizationTokenRevokedDialog(ctx);
-							break;
+								case 403:
+									Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+									binding.fileContentsFrameHeader.setVisibility(View.GONE);
+									binding.fileContentsFrame.setVisibility(View.GONE);
+									break;
 
-						case 403:
-							Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-							binding.fileContentsFrameHeader.setVisibility(View.GONE);
-							binding.fileContentsFrame.setVisibility(View.GONE);
-							break;
-
-						case 404:
-							binding.fileContentsFrameHeader.setVisibility(View.GONE);
-							binding.fileContentsFrame.setVisibility(View.GONE);
-							break;
-
-						default:
-							Toasty.error(getContext(), getString(R.string.genericError));
-							binding.fileContentsFrameHeader.setVisibility(View.GONE);
-							binding.fileContentsFrame.setVisibility(View.GONE);
-							break;
+								case 404:
+									binding.fileContentsFrameHeader.setVisibility(View.GONE);
+									binding.fileContentsFrame.setVisibility(View.GONE);
+									break;
 
+								default:
+									Toasty.error(getContext(), getString(R.string.genericError));
+									binding.fileContentsFrameHeader.setVisibility(View.GONE);
+									binding.fileContentsFrame.setVisibility(View.GONE);
+									break;
+							}
+						}
 					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
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 20a031f3..02bc985b 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java
@@ -26,7 +26,6 @@ import org.mian.gitnex.viewmodels.RepositoriesViewModel;
 /**
  * @author M M Arif
  */
-
 public class RepositoriesFragment extends Fragment {
 
 	private RepositoriesViewModel repositoriesViewModel;
@@ -36,33 +35,44 @@ public class RepositoriesFragment extends Fragment {
 	private int resultLimit;
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		fragmentRepositoriesBinding = FragmentRepositoriesBinding.inflate(inflater, container, false);
+		fragmentRepositoriesBinding =
+				FragmentRepositoriesBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
-		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navRepos));
+		((MainActivity) requireActivity())
+				.setActionBarTitle(getResources().getString(R.string.navRepos));
 		repositoriesViewModel = new ViewModelProvider(this).get(RepositoriesViewModel.class);
 
 		resultLimit = Constants.getCurrentResultLimit(getContext());
 
-		fragmentRepositoriesBinding.addNewRepo.setOnClickListener(view -> {
-			Intent intent = new Intent(view.getContext(), CreateRepoActivity.class);
-			startActivity(intent);
-		});
+		fragmentRepositoriesBinding.addNewRepo.setOnClickListener(
+				view -> {
+					Intent intent = new Intent(view.getContext(), CreateRepoActivity.class);
+					startActivity(intent);
+				});
 
 		fragmentRepositoriesBinding.recyclerView.setHasFixedSize(true);
-		fragmentRepositoriesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		fragmentRepositoriesBinding.recyclerView.setLayoutManager(
+				new LinearLayoutManager(getContext()));
 
 		fragmentRepositoriesBinding.recyclerView.setPadding(0, 0, 0, 220);
 		fragmentRepositoriesBinding.recyclerView.setClipToPadding(false);
 
-		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			page = 1;
-			fragmentRepositoriesBinding.pullToRefresh.setRefreshing(false);
-			fetchDataAsync();
-			fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
-		}, 50));
+		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											page = 1;
+											fragmentRepositoriesBinding.pullToRefresh.setRefreshing(
+													false);
+											fetchDataAsync();
+											fragmentRepositoriesBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										},
+										50));
 
 		fetchDataAsync();
 
@@ -71,45 +81,57 @@ public class RepositoriesFragment extends Fragment {
 
 	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);
+										}
 
-					page += 1;
-					repositoriesViewModel.loadMoreRepos(page, resultLimit, null, "repos", null, getContext(), adapter);
-					fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
-				}
+										@Override
+										public void onLoadFinished() {
 
-				@Override
-				public void onLoadFinished() {
+											fragmentRepositoriesBinding.progressBar.setVisibility(
+													View.GONE);
+										}
+									});
 
-					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);
+							}
 
-			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);
-		});
+							fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	@Override
 	public void onResume() {
 		super.onResume();
 
-		if(MainActivity.reloadRepos) {
+		if (MainActivity.reloadRepos) {
 			page = 1;
 			fetchDataAsync();
 			MainActivity.reloadRepos = false;
@@ -123,24 +145,25 @@ public class RepositoriesFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				if(fragmentRepositoriesBinding.recyclerView.getAdapter() != null) {
-					adapter.getFilter().filter(newText);
-				}
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						if (fragmentRepositoriesBinding.recyclerView.getAdapter() != null) {
+							adapter.getFilter().filter(newText);
+						}
+						return false;
+					}
+				});
 	}
-
 }
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 5d465314..0d2787b4 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
@@ -29,7 +29,6 @@ import org.mian.gitnex.helpers.AppUtil;
 /**
  * @author M M Arif
  */
-
 public class SettingsFragment extends Fragment {
 
 	public static boolean refreshParent = false;
@@ -37,35 +36,47 @@ public class SettingsFragment extends Fragment {
 	private Context ctx;
 	private MaterialAlertDialogBuilder materialAlertDialogBuilder;
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		FragmentSettingsBinding fragmentSettingsBinding = FragmentSettingsBinding.inflate(inflater, container, false);
+		FragmentSettingsBinding fragmentSettingsBinding =
+				FragmentSettingsBinding.inflate(inflater, container, false);
 
 		ctx = getContext();
-		materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
-		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navSettings));
+		((MainActivity) requireActivity())
+				.setActionBarTitle(getResources().getString(R.string.navSettings));
 
-		if(((BaseActivity) requireActivity()).getAccount().requiresVersion("1.12.3")) {
+		if (((BaseActivity) requireActivity()).getAccount().requiresVersion("1.12.3")) {
 
 			fragmentSettingsBinding.notificationsFrame.setVisibility(View.VISIBLE);
 		}
 
-		fragmentSettingsBinding.generalFrame.setOnClickListener(generalFrameCall -> startActivity(new Intent(ctx, SettingsGeneralActivity.class)));
+		fragmentSettingsBinding.generalFrame.setOnClickListener(
+				generalFrameCall -> startActivity(new Intent(ctx, SettingsGeneralActivity.class)));
 
-		fragmentSettingsBinding.appearanceFrame.setOnClickListener(v1 -> startActivity(new Intent(ctx, SettingsAppearanceActivity.class)));
+		fragmentSettingsBinding.appearanceFrame.setOnClickListener(
+				v1 -> startActivity(new Intent(ctx, SettingsAppearanceActivity.class)));
 
-		fragmentSettingsBinding.draftsFrame.setOnClickListener(v1 -> startActivity(new Intent(ctx, SettingsDraftsActivity.class)));
+		fragmentSettingsBinding.draftsFrame.setOnClickListener(
+				v1 -> startActivity(new Intent(ctx, SettingsDraftsActivity.class)));
 
-		fragmentSettingsBinding.securityFrame.setOnClickListener(v1 -> startActivity(new Intent(ctx, SettingsSecurityActivity.class)));
+		fragmentSettingsBinding.securityFrame.setOnClickListener(
+				v1 -> startActivity(new Intent(ctx, SettingsSecurityActivity.class)));
 
-		fragmentSettingsBinding.notificationsFrame.setOnClickListener(v1 -> startActivity(new Intent(ctx, SettingsNotificationsActivity.class)));
+		fragmentSettingsBinding.notificationsFrame.setOnClickListener(
+				v1 -> startActivity(new Intent(ctx, SettingsNotificationsActivity.class)));
 
-		fragmentSettingsBinding.languagesFrame.setOnClickListener(v1 -> startActivity(new Intent(ctx, SettingsTranslationActivity.class)));
+		fragmentSettingsBinding.languagesFrame.setOnClickListener(
+				v1 -> startActivity(new Intent(ctx, SettingsTranslationActivity.class)));
 
-		fragmentSettingsBinding.reportsFrame.setOnClickListener(v1 -> startActivity(new Intent(ctx, SettingsReportsActivity.class)));
+		fragmentSettingsBinding.reportsFrame.setOnClickListener(
+				v1 -> startActivity(new Intent(ctx, SettingsReportsActivity.class)));
 
 		fragmentSettingsBinding.rateAppFrame.setOnClickListener(rateApp -> rateThisApp());
 
@@ -76,31 +87,47 @@ public class SettingsFragment extends Fragment {
 
 	public void showAboutAppDialog() {
 
-		CustomAboutDialogBinding aboutAppDialogBinding = CustomAboutDialogBinding.inflate(LayoutInflater.from(ctx));
+		CustomAboutDialogBinding aboutAppDialogBinding =
+				CustomAboutDialogBinding.inflate(LayoutInflater.from(ctx));
 		View view = aboutAppDialogBinding.getRoot();
 
 		materialAlertDialogBuilder.setView(view);
 
-		aboutAppDialogBinding.appVersionBuild.setText(getString(R.string.appVersionBuild, AppUtil.getAppVersion(ctx), AppUtil.getAppBuildNo(ctx)));
-		aboutAppDialogBinding.userServerVersion.setText(((BaseActivity) requireActivity()).getAccount().getServerVersion().toString());
+		aboutAppDialogBinding.appVersionBuild.setText(
+				getString(
+						R.string.appVersionBuild,
+						AppUtil.getAppVersion(ctx),
+						AppUtil.getAppBuildNo(ctx)));
+		aboutAppDialogBinding.userServerVersion.setText(
+				((BaseActivity) requireActivity()).getAccount().getServerVersion().toString());
 
-		aboutAppDialogBinding.donationLinkPatreon.setOnClickListener(v12 -> {
-			AppUtil.openUrlInBrowser(requireContext(), getResources().getString(R.string.supportLinkPatreon));
-		});
+		aboutAppDialogBinding.donationLinkPatreon.setOnClickListener(
+				v12 -> {
+					AppUtil.openUrlInBrowser(
+							requireContext(),
+							getResources().getString(R.string.supportLinkPatreon));
+				});
 
-		aboutAppDialogBinding.donationLinkBuyMeaCoffee.setOnClickListener(v11 -> {
-			AppUtil.openUrlInBrowser(requireContext(), getResources().getString(R.string.supportLinkBuyMeaCoffee));
-		});
+		aboutAppDialogBinding.donationLinkBuyMeaCoffee.setOnClickListener(
+				v11 -> {
+					AppUtil.openUrlInBrowser(
+							requireContext(),
+							getResources().getString(R.string.supportLinkBuyMeaCoffee));
+				});
 
-		aboutAppDialogBinding.translateLink.setOnClickListener(v13 -> {
-			AppUtil.openUrlInBrowser(requireContext(), getResources().getString(R.string.crowdInLink));
-		});
+		aboutAppDialogBinding.translateLink.setOnClickListener(
+				v13 -> {
+					AppUtil.openUrlInBrowser(
+							requireContext(), getResources().getString(R.string.crowdInLink));
+				});
 
-		aboutAppDialogBinding.appWebsite.setOnClickListener(v14 -> {
-			AppUtil.openUrlInBrowser(requireContext(), getResources().getString(R.string.appWebsiteLink));
-		});
+		aboutAppDialogBinding.appWebsite.setOnClickListener(
+				v14 -> {
+					AppUtil.openUrlInBrowser(
+							requireContext(), getResources().getString(R.string.appWebsiteLink));
+				});
 
-		if(AppUtil.isPro(requireContext())) {
+		if (AppUtil.isPro(requireContext())) {
 			aboutAppDialogBinding.supportHeader.setVisibility(View.GONE);
 			aboutAppDialogBinding.donationLinkPatreon.setVisibility(View.GONE);
 			aboutAppDialogBinding.donationLinkBuyMeaCoffee.setVisibility(View.GONE);
@@ -112,10 +139,18 @@ public class SettingsFragment extends Fragment {
 	public void rateThisApp() {
 
 		try {
-			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(
+									"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())));
 		}
 	}
 
@@ -123,11 +158,10 @@ public class SettingsFragment extends Fragment {
 	public void onResume() {
 		super.onResume();
 
-		if(refreshParent) {
+		if (refreshParent) {
 			requireActivity().recreate();
 			requireActivity().overridePendingTransition(0, 0);
 			refreshParent = false;
 		}
 	}
-
 }
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 6886e838..7b59fb6d 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java
@@ -26,7 +26,6 @@ import org.mian.gitnex.viewmodels.RepositoriesViewModel;
 /**
  * @author M M Arif
  */
-
 public class StarredRepositoriesFragment extends Fragment {
 
 	private RepositoriesViewModel repositoriesViewModel;
@@ -36,33 +35,44 @@ public class StarredRepositoriesFragment extends Fragment {
 	private int resultLimit;
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		fragmentRepositoriesBinding = FragmentRepositoriesBinding.inflate(inflater, container, false);
+		fragmentRepositoriesBinding =
+				FragmentRepositoriesBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
-		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navStarredRepos));
+		((MainActivity) requireActivity())
+				.setActionBarTitle(getResources().getString(R.string.navStarredRepos));
 		repositoriesViewModel = new ViewModelProvider(this).get(RepositoriesViewModel.class);
 
 		resultLimit = Constants.getCurrentResultLimit(getContext());
 
-		fragmentRepositoriesBinding.addNewRepo.setOnClickListener(view -> {
-			Intent intent = new Intent(view.getContext(), CreateRepoActivity.class);
-			startActivity(intent);
-		});
+		fragmentRepositoriesBinding.addNewRepo.setOnClickListener(
+				view -> {
+					Intent intent = new Intent(view.getContext(), CreateRepoActivity.class);
+					startActivity(intent);
+				});
 
 		fragmentRepositoriesBinding.recyclerView.setHasFixedSize(true);
-		fragmentRepositoriesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		fragmentRepositoriesBinding.recyclerView.setLayoutManager(
+				new LinearLayoutManager(getContext()));
 
 		fragmentRepositoriesBinding.recyclerView.setPadding(0, 0, 0, 220);
 		fragmentRepositoriesBinding.recyclerView.setClipToPadding(false);
 
-		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			page = 1;
-			fragmentRepositoriesBinding.pullToRefresh.setRefreshing(false);
-			fetchDataAsync();
-			fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
-		}, 50));
+		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											page = 1;
+											fragmentRepositoriesBinding.pullToRefresh.setRefreshing(
+													false);
+											fetchDataAsync();
+											fragmentRepositoriesBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										},
+										50));
 
 		fetchDataAsync();
 
@@ -71,38 +81,50 @@ public class StarredRepositoriesFragment extends Fragment {
 
 	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);
+										}
 
-					page += 1;
-					repositoriesViewModel.loadMoreRepos(page, resultLimit, "", "starredRepos", null, getContext(), adapter);
-					fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
-				}
+										@Override
+										public void onLoadFinished() {
 
-				@Override
-				public void onLoadFinished() {
+											fragmentRepositoriesBinding.progressBar.setVisibility(
+													View.GONE);
+										}
+									});
 
-					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);
+							}
 
-			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);
-		});
+							fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
+						});
 	}
 
 	@Override
@@ -112,37 +134,36 @@ public class StarredRepositoriesFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
-
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				if(fragmentRepositoriesBinding.recyclerView.getAdapter() != null) {
-					adapter.getFilter().filter(newText);
-				}
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						if (fragmentRepositoriesBinding.recyclerView.getAdapter() != null) {
+							adapter.getFilter().filter(newText);
+						}
+						return false;
+					}
+				});
 	}
 
 	@Override
 	public void onResume() {
 		super.onResume();
 
-		if(MainActivity.reloadRepos) {
+		if (MainActivity.reloadRepos) {
 			page = 1;
 			fetchDataAsync();
 			MainActivity.reloadRepos = false;
 		}
-
 	}
-
 }
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 93dba59f..a67e62b2 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/WikiFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/WikiFragment.java
@@ -19,7 +19,6 @@ import org.mian.gitnex.viewmodels.WikiViewModel;
 /**
  * @author M M Arif
  */
-
 public class WikiFragment extends Fragment {
 
 	public static boolean resumeWiki = false;
@@ -44,7 +43,8 @@ public class WikiFragment extends Fragment {
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		fragmentWikiBinding = FragmentWikiBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
@@ -56,13 +56,19 @@ public class WikiFragment extends Fragment {
 		fragmentWikiBinding.recyclerView.setHasFixedSize(true);
 		fragmentWikiBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-		fragmentWikiBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			page = 1;
-			fragmentWikiBinding.pullToRefresh.setRefreshing(false);
-			fetchDataAsync(repository.getOwner(), repository.getName());
-			fragmentWikiBinding.progressBar.setVisibility(View.VISIBLE);
-		}, 50));
+		fragmentWikiBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											page = 1;
+											fragmentWikiBinding.pullToRefresh.setRefreshing(false);
+											fetchDataAsync(
+													repository.getOwner(), repository.getName());
+											fragmentWikiBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										},
+										50));
 
 		fetchDataAsync(repository.getOwner(), repository.getName());
 
@@ -72,7 +78,7 @@ public class WikiFragment extends Fragment {
 	@Override
 	public void onResume() {
 		super.onResume();
-		if(resumeWiki) {
+		if (resumeWiki) {
 			page = 1;
 			fetchDataAsync(repository.getOwner(), repository.getName());
 			resumeWiki = false;
@@ -81,38 +87,55 @@ public class WikiFragment extends Fragment {
 
 	private void fetchDataAsync(String owner, String repo) {
 
-		wikiViewModel.getWiki(owner, repo, page, resultLimit, getContext(), fragmentWikiBinding).observe(getViewLifecycleOwner(), wikiListMain -> {
+		wikiViewModel
+				.getWiki(owner, repo, page, resultLimit, getContext(), fragmentWikiBinding)
+				.observe(
+						getViewLifecycleOwner(),
+						wikiListMain -> {
+							adapter =
+									new WikiListAdapter(
+											wikiListMain,
+											getContext(),
+											owner,
+											repo,
+											fragmentWikiBinding);
+							adapter.setLoadMoreListener(
+									new WikiListAdapter.OnLoadMoreListener() {
 
-			adapter = new WikiListAdapter(wikiListMain, getContext(), owner, repo, fragmentWikiBinding);
-			adapter.setLoadMoreListener(new WikiListAdapter.OnLoadMoreListener() {
+										@Override
+										public void onLoadMore() {
 
-				@Override
-				public void onLoadMore() {
+											page += 1;
+											wikiViewModel.loadMoreWiki(
+													repository.getOwner(),
+													repository.getName(),
+													page,
+													resultLimit,
+													getContext(),
+													fragmentWikiBinding,
+													adapter);
+											fragmentWikiBinding.progressBar.setVisibility(
+													View.VISIBLE);
+										}
 
-					page += 1;
-					wikiViewModel.loadMoreWiki(repository.getOwner(), repository.getName(), page, resultLimit, getContext(), fragmentWikiBinding, adapter);
-					fragmentWikiBinding.progressBar.setVisibility(View.VISIBLE);
-				}
+										@Override
+										public void onLoadFinished() {
 
-				@Override
-				public void onLoadFinished() {
+											fragmentWikiBinding.progressBar.setVisibility(
+													View.GONE);
+										}
+									});
 
-					fragmentWikiBinding.progressBar.setVisibility(View.GONE);
-				}
-			});
+							if (adapter.getItemCount() > 0) {
+								fragmentWikiBinding.recyclerView.setAdapter(adapter);
+								fragmentWikiBinding.noData.setVisibility(View.GONE);
+							} else {
+								adapter.notifyDataChanged();
+								fragmentWikiBinding.recyclerView.setAdapter(adapter);
+								fragmentWikiBinding.noData.setVisibility(View.VISIBLE);
+							}
 
-			if(adapter.getItemCount() > 0) {
-				fragmentWikiBinding.recyclerView.setAdapter(adapter);
-				fragmentWikiBinding.noData.setVisibility(View.GONE);
-			}
-			else {
-				adapter.notifyDataChanged();
-				fragmentWikiBinding.recyclerView.setAdapter(adapter);
-				fragmentWikiBinding.noData.setVisibility(View.VISIBLE);
-			}
-
-			fragmentWikiBinding.progressBar.setVisibility(View.GONE);
-		});
+							fragmentWikiBinding.progressBar.setVisibility(View.GONE);
+						});
 	}
-
 }
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 67c41eeb..ac3f3ca1 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
@@ -7,6 +7,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import java.util.Locale;
+import jp.wasabeef.picasso.transformations.BlurTransformation;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
@@ -20,15 +22,12 @@ import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.Locale;
-import jp.wasabeef.picasso.transformations.BlurTransformation;
 import retrofit2.Call;
 import retrofit2.Callback;
 
 /**
  * @author M M Arif
  */
-
 public class DetailFragment extends Fragment {
 
 	private static final String usernameBundle = "";
@@ -38,8 +37,7 @@ public class DetailFragment extends Fragment {
 	private FragmentProfileDetailBinding binding;
 	private String username;
 
-	public DetailFragment() {
-	}
+	public DetailFragment() {}
 
 	public static DetailFragment newInstance(String username) {
 		DetailFragment fragment = new DetailFragment();
@@ -52,13 +50,14 @@ public class DetailFragment extends Fragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		if(getArguments() != null) {
+		if (getArguments() != null) {
 			username = getArguments().getString(usernameBundle);
 		}
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(
+			@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		binding = FragmentProfileDetailBinding.inflate(inflater, container, false);
 		context = getContext();
@@ -74,81 +73,121 @@ public class DetailFragment extends Fragment {
 
 		Call<User> call = RetrofitClient.getApiInterface(context).userGet(username);
 
-		call.enqueue(new Callback<User>() {
+		call.enqueue(
+				new Callback<User>() {
 
-			@Override
-			public void onResponse(@NonNull Call<User> call, @NonNull retrofit2.Response<User> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<User> call, @NonNull retrofit2.Response<User> response) {
 
-				if(response.isSuccessful() && response.body() != null) {
+						if (response.isSuccessful() && response.body() != null) {
 
-					switch(response.code()) {
-						case 200:
-							String username = !response.body().getFullName().isEmpty() ? response.body().getFullName() : response.body().getLogin();
-							String email = !response.body().getEmail().isEmpty() ? response.body().getEmail() : "";
+							switch (response.code()) {
+								case 200:
+									String username =
+											!response.body().getFullName().isEmpty()
+													? response.body().getFullName()
+													: response.body().getLogin();
+									String email =
+											!response.body().getEmail().isEmpty()
+													? response.body().getEmail()
+													: "";
 
-							int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-							String timeFormat = tinyDb.getString("dateFormat", "pretty");
+									int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+									String timeFormat = tinyDb.getString("dateFormat", "pretty");
 
-							binding.userFullName.setText(username);
-							binding.userLogin.setText(getString(R.string.usernameWithAt, response.body().getLogin()));
-							binding.userEmail.setText(email);
+									binding.userFullName.setText(username);
+									binding.userLogin.setText(
+											getString(
+													R.string.usernameWithAt,
+													response.body().getLogin()));
+									binding.userEmail.setText(email);
 
-							String[] userLanguageCodes = response.body().getLanguage().split("-");
+									String[] userLanguageCodes =
+											response.body().getLanguage().split("-");
 
-							if(userLanguageCodes.length >= 2) {
-								Locale locale = new Locale(userLanguageCodes[0], userLanguageCodes[1]);
-								binding.userLang.setText(locale.getDisplayLanguage());
-							}
-							else {
-								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)
-								.centerCrop().into(binding.userAvatar);
-
-							PicassoService.getInstance(context).get().load(response.body().getAvatarUrl()).transform(new BlurTransformation(context))
-								.into(binding.userAvatarBackground, new com.squareup.picasso.Callback() {
-
-									@Override
-									public void onSuccess() {
-										int invertedColor = new ColorInverter().getImageViewContrastColor(binding.userAvatarBackground);
-
-										binding.userFullName.setTextColor(invertedColor);
-										binding.userLogin.setTextColor(invertedColor);
+									if (userLanguageCodes.length >= 2) {
+										Locale locale =
+												new Locale(
+														userLanguageCodes[0], userLanguageCodes[1]);
+										binding.userLang.setText(locale.getDisplayLanguage());
+									} else {
+										binding.userLang.setText(locale.getDisplayLanguage());
 									}
 
-									@Override
-									public void onError(Exception e) {
+									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))
+											.into(
+													binding.userAvatarBackground,
+													new com.squareup.picasso.Callback() {
+
+														@Override
+														public void onSuccess() {
+															int invertedColor =
+																	new ColorInverter()
+																			.getImageViewContrastColor(
+																					binding.userAvatarBackground);
+
+															binding.userFullName.setTextColor(
+																	invertedColor);
+															binding.userLogin.setTextColor(
+																	invertedColor);
+														}
+
+														@Override
+														public void onError(Exception e) {}
+													});
+
+									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));
 									}
-								});
+									break;
 
-							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));
+								case 401:
+									AlertDialogs.authorizationTokenRevokedDialog(context);
+									break;
+
+								case 403:
+									Toasty.error(
+											context, context.getString(R.string.authorizeError));
+									break;
+
+								default:
+									Toasty.error(context, getString(R.string.genericError));
+									break;
 							}
-							break;
-
-						case 401:
-							AlertDialogs.authorizationTokenRevokedDialog(context);
-							break;
-
-						case 403:
-							Toasty.error(context, context.getString(R.string.authorizeError));
-							break;
-
-						default:
-							Toasty.error(context, getString(R.string.genericError));
-							break;
+						}
+						binding.progressBar.setVisibility(View.GONE);
 					}
-				}
-				binding.progressBar.setVisibility(View.GONE);
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {
-				Toasty.error(context, context.getResources().getString(R.string.genericError));
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<User> call, @NonNull Throwable t) {
+						Toasty.error(
+								context, context.getResources().getString(R.string.genericError));
+					}
+				});
 	}
-
 }
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 8f283871..689b3035 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
@@ -15,6 +15,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.UsersAdapter;
@@ -24,8 +26,6 @@ import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.SnackBar;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -33,7 +33,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class FollowersFragment extends Fragment {
 
 	private static final String usernameBundle = "";
@@ -45,8 +44,7 @@ public class FollowersFragment extends Fragment {
 	private int resultLimit;
 	private String username;
 
-	public FollowersFragment() {
-	}
+	public FollowersFragment() {}
 
 	public static FollowersFragment newInstance(String username) {
 		FollowersFragment fragment = new FollowersFragment();
@@ -59,38 +57,52 @@ public class FollowersFragment extends Fragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		if(getArguments() != null) {
+		if (getArguments() != null) {
 			username = getArguments().getString(usernameBundle);
 		}
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		fragmentProfileFollowersFollowingBinding = FragmentProfileFollowersFollowingBinding.inflate(inflater, container, false);
+		fragmentProfileFollowersFollowingBinding =
+				FragmentProfileFollowersFollowingBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
 		context = getContext();
 
 		resultLimit = Constants.getCurrentResultLimit(context);
 		usersList = new ArrayList<>();
 
-		fragmentProfileFollowersFollowingBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-			fragmentProfileFollowersFollowingBinding.pullToRefresh.setRefreshing(false);
-			loadInitial(username, resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
+		fragmentProfileFollowersFollowingBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											fragmentProfileFollowersFollowingBinding.pullToRefresh
+													.setRefreshing(false);
+											loadInitial(username, resultLimit);
+											adapter.notifyDataChanged();
+										},
+										200));
 
 		adapter = new UsersAdapter(usersList, context);
-		adapter.setLoadMoreListener(() -> fragmentProfileFollowersFollowingBinding.recyclerView.post(() -> {
-			if(usersList.size() == resultLimit || pageSize == resultLimit) {
-				int page = (usersList.size() + resultLimit) / resultLimit;
-				loadMore(username, page, resultLimit);
-			}
-		}));
+		adapter.setLoadMoreListener(
+				() ->
+						fragmentProfileFollowersFollowingBinding.recyclerView.post(
+								() -> {
+									if (usersList.size() == resultLimit
+											|| pageSize == resultLimit) {
+										int page = (usersList.size() + resultLimit) / resultLimit;
+										loadMore(username, page, resultLimit);
+									}
+								}));
 
 		fragmentProfileFollowersFollowingBinding.recyclerView.setHasFixedSize(true);
-		fragmentProfileFollowersFollowingBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
+		fragmentProfileFollowersFollowingBinding.recyclerView.setLayoutManager(
+				new LinearLayoutManager(context));
 		fragmentProfileFollowersFollowingBinding.recyclerView.setAdapter(adapter);
 
 		loadInitial(username, resultLimit);
@@ -100,113 +112,133 @@ public class FollowersFragment extends Fragment {
 
 	private void loadInitial(String username, int resultLimit) {
 
-		Call<List<User>> call = RetrofitClient.getApiInterface(context).userListFollowers(username, 1, resultLimit);
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(context).userListFollowers(username, 1, resultLimit);
 
-		call.enqueue(new Callback<List<User>>() {
+		call.enqueue(
+				new Callback<List<User>>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					switch(response.code()) {
-						case 200:
-							assert response.body() != null;
-							if(response.body().size() > 0) {
-								usersList.clear();
-								usersList.addAll(response.body());
-								adapter.notifyDataChanged();
-								fragmentProfileFollowersFollowingBinding.noData.setVisibility(View.GONE);
+							switch (response.code()) {
+								case 200:
+									assert response.body() != null;
+									if (response.body().size() > 0) {
+										usersList.clear();
+										usersList.addAll(response.body());
+										adapter.notifyDataChanged();
+										fragmentProfileFollowersFollowingBinding.noData
+												.setVisibility(View.GONE);
+									} else {
+										usersList.clear();
+										adapter.notifyDataChanged();
+										fragmentProfileFollowersFollowingBinding.noData
+												.setVisibility(View.VISIBLE);
+									}
+									fragmentProfileFollowersFollowingBinding.progressBar
+											.setVisibility(View.GONE);
+									break;
+
+								case 401:
+									AlertDialogs.authorizationTokenRevokedDialog(context);
+									break;
+
+								case 403:
+									Toasty.error(
+											context, context.getString(R.string.authorizeError));
+									break;
+
+								case 404:
+									fragmentProfileFollowersFollowingBinding.noData.setVisibility(
+											View.VISIBLE);
+									fragmentProfileFollowersFollowingBinding.progressBar
+											.setVisibility(View.GONE);
+									break;
+
+								default:
+									Toasty.error(context, getString(R.string.genericError));
+									break;
 							}
-							else {
-								usersList.clear();
-								adapter.notifyDataChanged();
-								fragmentProfileFollowersFollowingBinding.noData.setVisibility(View.VISIBLE);
-							}
-							fragmentProfileFollowersFollowingBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						case 401:
-							AlertDialogs.authorizationTokenRevokedDialog(context);
-							break;
-
-						case 403:
-							Toasty.error(context, context.getString(R.string.authorizeError));
-							break;
-
-						case 404:
-							fragmentProfileFollowersFollowingBinding.noData.setVisibility(View.VISIBLE);
-							fragmentProfileFollowersFollowingBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						default:
-							Toasty.error(context, getString(R.string.genericError));
-							break;
+						}
 					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
-				Toasty.error(context, getString(R.string.genericError));
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
+						Toasty.error(context, getString(R.string.genericError));
+					}
+				});
 	}
 
 	private void loadMore(String username, int page, int resultLimit) {
 
 		fragmentProfileFollowersFollowingBinding.progressBar.setVisibility(View.VISIBLE);
 
-		Call<List<User>> call = RetrofitClient.getApiInterface(context).userListFollowers(username, page, resultLimit);
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(context)
+						.userListFollowers(username, page, resultLimit);
 
-		call.enqueue(new Callback<List<User>>() {
+		call.enqueue(
+				new Callback<List<User>>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					switch(response.code()) {
-						case 200:
-							List<User> result = response.body();
-							assert result != null;
-							if(result.size() > 0) {
-								pageSize = result.size();
-								usersList.addAll(result);
+							switch (response.code()) {
+								case 200:
+									List<User> result = response.body();
+									assert result != null;
+									if (result.size() > 0) {
+										pageSize = result.size();
+										usersList.addAll(result);
+									} else {
+										SnackBar.info(
+												context,
+												fragmentProfileFollowersFollowingBinding.getRoot(),
+												getString(R.string.noMoreData));
+										adapter.setMoreDataAvailable(false);
+									}
+									adapter.notifyDataChanged();
+									fragmentProfileFollowersFollowingBinding.progressBar
+											.setVisibility(View.GONE);
+									break;
+
+								case 401:
+									AlertDialogs.authorizationTokenRevokedDialog(context);
+									break;
+
+								case 403:
+									Toasty.error(
+											context, context.getString(R.string.authorizeError));
+									break;
+
+								case 404:
+									fragmentProfileFollowersFollowingBinding.noData.setVisibility(
+											View.VISIBLE);
+									fragmentProfileFollowersFollowingBinding.progressBar
+											.setVisibility(View.GONE);
+									break;
+
+								default:
+									Toasty.error(context, getString(R.string.genericError));
+									break;
 							}
-							else {
-								SnackBar.info(context, fragmentProfileFollowersFollowingBinding.getRoot(), getString(R.string.noMoreData));
-								adapter.setMoreDataAvailable(false);
-							}
-							adapter.notifyDataChanged();
-							fragmentProfileFollowersFollowingBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						case 401:
-							AlertDialogs.authorizationTokenRevokedDialog(context);
-							break;
-
-						case 403:
-							Toasty.error(context, context.getString(R.string.authorizeError));
-							break;
-
-						case 404:
-							fragmentProfileFollowersFollowingBinding.noData.setVisibility(View.VISIBLE);
-							fragmentProfileFollowersFollowingBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						default:
-							Toasty.error(context, getString(R.string.genericError));
-							break;
+						}
 					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
-				Toasty.error(context, getString(R.string.genericError));
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
+						Toasty.error(context, getString(R.string.genericError));
+					}
+				});
 	}
 
 	@Override
@@ -216,37 +248,39 @@ public class FollowersFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				filter(newText);
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						filter(newText);
+						return false;
+					}
+				});
 	}
 
 	private void filter(String text) {
 
 		List<User> arr = new ArrayList<>();
 
-		for(User d : usersList) {
-			if(d == null || d.getLogin() == null || d.getFullName() == null) {
+		for (User d : usersList) {
+			if (d == null || d.getLogin() == null || d.getFullName() == null) {
 				continue;
 			}
-			if(d.getLogin().toLowerCase().contains(text) || d.getFullName().toLowerCase().contains(text)) {
+			if (d.getLogin().toLowerCase().contains(text)
+					|| d.getFullName().toLowerCase().contains(text)) {
 				arr.add(d);
 			}
 		}
 		adapter.updateList(arr);
 	}
-
 }
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 e74e545a..cdfe8aa3 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
@@ -15,6 +15,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.UsersAdapter;
@@ -24,8 +26,6 @@ import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.SnackBar;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -33,7 +33,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class FollowingFragment extends Fragment {
 
 	private static final String usernameBundle = "";
@@ -45,8 +44,7 @@ public class FollowingFragment extends Fragment {
 	private int resultLimit;
 	private String username;
 
-	public FollowingFragment() {
-	}
+	public FollowingFragment() {}
 
 	public static FollowingFragment newInstance(String username) {
 		FollowingFragment fragment = new FollowingFragment();
@@ -59,38 +57,52 @@ public class FollowingFragment extends Fragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		if(getArguments() != null) {
+		if (getArguments() != null) {
 			username = getArguments().getString(usernameBundle);
 		}
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		fragmentProfileFollowersFollowingBinding = FragmentProfileFollowersFollowingBinding.inflate(inflater, container, false);
+		fragmentProfileFollowersFollowingBinding =
+				FragmentProfileFollowersFollowingBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
 		context = getContext();
 
 		resultLimit = Constants.getCurrentResultLimit(context);
 		usersList = new ArrayList<>();
 
-		fragmentProfileFollowersFollowingBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-			fragmentProfileFollowersFollowingBinding.pullToRefresh.setRefreshing(false);
-			loadInitial(username, resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
+		fragmentProfileFollowersFollowingBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											fragmentProfileFollowersFollowingBinding.pullToRefresh
+													.setRefreshing(false);
+											loadInitial(username, resultLimit);
+											adapter.notifyDataChanged();
+										},
+										200));
 
 		adapter = new UsersAdapter(usersList, context);
-		adapter.setLoadMoreListener(() -> fragmentProfileFollowersFollowingBinding.recyclerView.post(() -> {
-			if(usersList.size() == resultLimit || pageSize == resultLimit) {
-				int page = (usersList.size() + resultLimit) / resultLimit;
-				loadMore(username, page, resultLimit);
-			}
-		}));
+		adapter.setLoadMoreListener(
+				() ->
+						fragmentProfileFollowersFollowingBinding.recyclerView.post(
+								() -> {
+									if (usersList.size() == resultLimit
+											|| pageSize == resultLimit) {
+										int page = (usersList.size() + resultLimit) / resultLimit;
+										loadMore(username, page, resultLimit);
+									}
+								}));
 
 		fragmentProfileFollowersFollowingBinding.recyclerView.setHasFixedSize(true);
-		fragmentProfileFollowersFollowingBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
+		fragmentProfileFollowersFollowingBinding.recyclerView.setLayoutManager(
+				new LinearLayoutManager(context));
 		fragmentProfileFollowersFollowingBinding.recyclerView.setAdapter(adapter);
 
 		loadInitial(username, resultLimit);
@@ -100,113 +112,133 @@ public class FollowingFragment extends Fragment {
 
 	private void loadInitial(String username, int resultLimit) {
 
-		Call<List<User>> call = RetrofitClient.getApiInterface(context).userListFollowing(username, 1, resultLimit);
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(context).userListFollowing(username, 1, resultLimit);
 
-		call.enqueue(new Callback<List<User>>() {
+		call.enqueue(
+				new Callback<List<User>>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					switch(response.code()) {
-						case 200:
-							assert response.body() != null;
-							if(response.body().size() > 0) {
-								usersList.clear();
-								usersList.addAll(response.body());
-								adapter.notifyDataChanged();
-								fragmentProfileFollowersFollowingBinding.noData.setVisibility(View.GONE);
+							switch (response.code()) {
+								case 200:
+									assert response.body() != null;
+									if (response.body().size() > 0) {
+										usersList.clear();
+										usersList.addAll(response.body());
+										adapter.notifyDataChanged();
+										fragmentProfileFollowersFollowingBinding.noData
+												.setVisibility(View.GONE);
+									} else {
+										usersList.clear();
+										adapter.notifyDataChanged();
+										fragmentProfileFollowersFollowingBinding.noData
+												.setVisibility(View.VISIBLE);
+									}
+									fragmentProfileFollowersFollowingBinding.progressBar
+											.setVisibility(View.GONE);
+									break;
+
+								case 401:
+									AlertDialogs.authorizationTokenRevokedDialog(context);
+									break;
+
+								case 403:
+									Toasty.error(
+											context, context.getString(R.string.authorizeError));
+									break;
+
+								case 404:
+									fragmentProfileFollowersFollowingBinding.noData.setVisibility(
+											View.VISIBLE);
+									fragmentProfileFollowersFollowingBinding.progressBar
+											.setVisibility(View.GONE);
+									break;
+
+								default:
+									Toasty.error(context, getString(R.string.genericError));
+									break;
 							}
-							else {
-								usersList.clear();
-								adapter.notifyDataChanged();
-								fragmentProfileFollowersFollowingBinding.noData.setVisibility(View.VISIBLE);
-							}
-							fragmentProfileFollowersFollowingBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						case 401:
-							AlertDialogs.authorizationTokenRevokedDialog(context);
-							break;
-
-						case 403:
-							Toasty.error(context, context.getString(R.string.authorizeError));
-							break;
-
-						case 404:
-							fragmentProfileFollowersFollowingBinding.noData.setVisibility(View.VISIBLE);
-							fragmentProfileFollowersFollowingBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						default:
-							Toasty.error(context, getString(R.string.genericError));
-							break;
+						}
 					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
-				Toasty.error(context, getString(R.string.genericError));
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
+						Toasty.error(context, getString(R.string.genericError));
+					}
+				});
 	}
 
 	private void loadMore(String username, int page, int resultLimit) {
 
 		fragmentProfileFollowersFollowingBinding.progressBar.setVisibility(View.VISIBLE);
 
-		Call<List<User>> call = RetrofitClient.getApiInterface(context).userListFollowing(username, page, resultLimit);
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(context)
+						.userListFollowing(username, page, resultLimit);
 
-		call.enqueue(new Callback<List<User>>() {
+		call.enqueue(
+				new Callback<List<User>>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					switch(response.code()) {
-						case 200:
-							List<User> result = response.body();
-							assert result != null;
-							if(result.size() > 0) {
-								pageSize = result.size();
-								usersList.addAll(result);
+							switch (response.code()) {
+								case 200:
+									List<User> result = response.body();
+									assert result != null;
+									if (result.size() > 0) {
+										pageSize = result.size();
+										usersList.addAll(result);
+									} else {
+										SnackBar.info(
+												context,
+												fragmentProfileFollowersFollowingBinding.getRoot(),
+												getString(R.string.noMoreData));
+										adapter.setMoreDataAvailable(false);
+									}
+									adapter.notifyDataChanged();
+									fragmentProfileFollowersFollowingBinding.progressBar
+											.setVisibility(View.GONE);
+									break;
+
+								case 401:
+									AlertDialogs.authorizationTokenRevokedDialog(context);
+									break;
+
+								case 403:
+									Toasty.error(
+											context, context.getString(R.string.authorizeError));
+									break;
+
+								case 404:
+									fragmentProfileFollowersFollowingBinding.noData.setVisibility(
+											View.VISIBLE);
+									fragmentProfileFollowersFollowingBinding.progressBar
+											.setVisibility(View.GONE);
+									break;
+
+								default:
+									Toasty.error(context, getString(R.string.genericError));
+									break;
 							}
-							else {
-								SnackBar.info(context, fragmentProfileFollowersFollowingBinding.getRoot(), getString(R.string.noMoreData));
-								adapter.setMoreDataAvailable(false);
-							}
-							adapter.notifyDataChanged();
-							fragmentProfileFollowersFollowingBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						case 401:
-							AlertDialogs.authorizationTokenRevokedDialog(context);
-							break;
-
-						case 403:
-							Toasty.error(context, context.getString(R.string.authorizeError));
-							break;
-
-						case 404:
-							fragmentProfileFollowersFollowingBinding.noData.setVisibility(View.VISIBLE);
-							fragmentProfileFollowersFollowingBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						default:
-							Toasty.error(context, getString(R.string.genericError));
-							break;
+						}
 					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
-				Toasty.error(context, getString(R.string.genericError));
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
+						Toasty.error(context, getString(R.string.genericError));
+					}
+				});
 	}
 
 	@Override
@@ -216,37 +248,39 @@ public class FollowingFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				filter(newText);
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						filter(newText);
+						return false;
+					}
+				});
 	}
 
 	private void filter(String text) {
 
 		List<User> arr = new ArrayList<>();
 
-		for(User d : usersList) {
-			if(d == null || d.getLogin() == null || d.getFullName() == null) {
+		for (User d : usersList) {
+			if (d == null || d.getLogin() == null || d.getFullName() == null) {
 				continue;
 			}
-			if(d.getLogin().toLowerCase().contains(text) || d.getFullName().toLowerCase().contains(text)) {
+			if (d.getLogin().toLowerCase().contains(text)
+					|| d.getFullName().toLowerCase().contains(text)) {
 				arr.add(d);
 			}
 		}
 		adapter.updateList(arr);
 	}
-
 }
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 45ee9fbe..ead6ebd9 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
@@ -15,6 +15,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Organization;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.OrganizationsListAdapter;
@@ -24,8 +26,6 @@ import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.SnackBar;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -33,7 +33,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class OrganizationsFragment extends Fragment {
 
 	private static final String usernameBundle = "";
@@ -45,8 +44,7 @@ public class OrganizationsFragment extends Fragment {
 	private int resultLimit;
 	private String username;
 
-	public OrganizationsFragment() {
-	}
+	public OrganizationsFragment() {}
 
 	public static OrganizationsFragment newInstance(String username) {
 		OrganizationsFragment fragment = new OrganizationsFragment();
@@ -59,16 +57,19 @@ public class OrganizationsFragment extends Fragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		if(getArguments() != null) {
+		if (getArguments() != null) {
 			username = getArguments().getString(usernameBundle);
 		}
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		fragmentOrganizationsBinding = FragmentOrganizationsBinding.inflate(inflater, container, false);
+		fragmentOrganizationsBinding =
+				FragmentOrganizationsBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
 		context = getContext();
 
@@ -77,28 +78,40 @@ public class OrganizationsFragment extends Fragment {
 
 		fragmentOrganizationsBinding.addNewOrganization.setVisibility(View.GONE);
 
-		fragmentOrganizationsBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-			fragmentOrganizationsBinding.pullToRefresh.setRefreshing(false);
-			loadInitial(username, resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
+		fragmentOrganizationsBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											fragmentOrganizationsBinding.pullToRefresh
+													.setRefreshing(false);
+											loadInitial(username, resultLimit);
+											adapter.notifyDataChanged();
+										},
+										200));
 
 		adapter = new OrganizationsListAdapter(context, organizationsList);
-		adapter.setLoadMoreListener(new OrganizationsListAdapter.OnLoadMoreListener() {
+		adapter.setLoadMoreListener(
+				new OrganizationsListAdapter.OnLoadMoreListener() {
 
-			@Override
-			protected void onLoadMore() {
-				fragmentOrganizationsBinding.recyclerView.post(() -> {
-					if(organizationsList.size() == resultLimit || pageSize == resultLimit) {
-						int page = (organizationsList.size() + resultLimit) / resultLimit;
-						loadMore(username, page, resultLimit);
+					@Override
+					protected void onLoadMore() {
+						fragmentOrganizationsBinding.recyclerView.post(
+								() -> {
+									if (organizationsList.size() == resultLimit
+											|| pageSize == resultLimit) {
+										int page =
+												(organizationsList.size() + resultLimit)
+														/ resultLimit;
+										loadMore(username, page, resultLimit);
+									}
+								});
 					}
 				});
-			}
-		});
 
 		fragmentOrganizationsBinding.recyclerView.setHasFixedSize(true);
-		fragmentOrganizationsBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
+		fragmentOrganizationsBinding.recyclerView.setLayoutManager(
+				new LinearLayoutManager(context));
 		fragmentOrganizationsBinding.recyclerView.setAdapter(adapter);
 
 		loadInitial(username, resultLimit);
@@ -108,113 +121,135 @@ public class OrganizationsFragment extends Fragment {
 
 	private void loadInitial(String username, int resultLimit) {
 
-		Call<List<Organization>> call = RetrofitClient.getApiInterface(context).orgListUserOrgs(username, 1, resultLimit);
+		Call<List<Organization>> call =
+				RetrofitClient.getApiInterface(context).orgListUserOrgs(username, 1, resultLimit);
 
-		call.enqueue(new Callback<List<Organization>>() {
+		call.enqueue(
+				new Callback<List<Organization>>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Organization>> call, @NonNull Response<List<Organization>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Organization>> call,
+							@NonNull Response<List<Organization>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					switch(response.code()) {
-						case 200:
-							assert response.body() != null;
-							if(response.body().size() > 0) {
-								organizationsList.clear();
-								organizationsList.addAll(response.body());
-								adapter.notifyDataChanged();
-								fragmentOrganizationsBinding.noDataOrg.setVisibility(View.GONE);
+							switch (response.code()) {
+								case 200:
+									assert response.body() != null;
+									if (response.body().size() > 0) {
+										organizationsList.clear();
+										organizationsList.addAll(response.body());
+										adapter.notifyDataChanged();
+										fragmentOrganizationsBinding.noDataOrg.setVisibility(
+												View.GONE);
+									} else {
+										organizationsList.clear();
+										adapter.notifyDataChanged();
+										fragmentOrganizationsBinding.noDataOrg.setVisibility(
+												View.VISIBLE);
+									}
+									fragmentOrganizationsBinding.progressBar.setVisibility(
+											View.GONE);
+									break;
+
+								case 401:
+									AlertDialogs.authorizationTokenRevokedDialog(context);
+									break;
+
+								case 403:
+									Toasty.error(
+											context, context.getString(R.string.authorizeError));
+									break;
+
+								case 404:
+									fragmentOrganizationsBinding.noDataOrg.setVisibility(
+											View.VISIBLE);
+									fragmentOrganizationsBinding.progressBar.setVisibility(
+											View.GONE);
+									break;
+
+								default:
+									Toasty.error(context, getString(R.string.genericError));
+									break;
 							}
-							else {
-								organizationsList.clear();
-								adapter.notifyDataChanged();
-								fragmentOrganizationsBinding.noDataOrg.setVisibility(View.VISIBLE);
-							}
-							fragmentOrganizationsBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						case 401:
-							AlertDialogs.authorizationTokenRevokedDialog(context);
-							break;
-
-						case 403:
-							Toasty.error(context, context.getString(R.string.authorizeError));
-							break;
-
-						case 404:
-							fragmentOrganizationsBinding.noDataOrg.setVisibility(View.VISIBLE);
-							fragmentOrganizationsBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						default:
-							Toasty.error(context, getString(R.string.genericError));
-							break;
+						}
 					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
-				Toasty.error(context, getString(R.string.genericError));
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
+						Toasty.error(context, getString(R.string.genericError));
+					}
+				});
 	}
 
 	private void loadMore(String username, int page, int resultLimit) {
 
 		fragmentOrganizationsBinding.progressBar.setVisibility(View.VISIBLE);
 
-		Call<List<Organization>> call = RetrofitClient.getApiInterface(context).orgListUserOrgs(username, page, resultLimit);
+		Call<List<Organization>> call =
+				RetrofitClient.getApiInterface(context)
+						.orgListUserOrgs(username, page, resultLimit);
 
-		call.enqueue(new Callback<List<Organization>>() {
+		call.enqueue(
+				new Callback<List<Organization>>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Organization>> call, @NonNull Response<List<Organization>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Organization>> call,
+							@NonNull Response<List<Organization>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					switch(response.code()) {
-						case 200:
-							List<Organization> result = response.body();
-							assert result != null;
-							if(result.size() > 0) {
-								pageSize = result.size();
-								organizationsList.addAll(result);
+							switch (response.code()) {
+								case 200:
+									List<Organization> result = response.body();
+									assert result != null;
+									if (result.size() > 0) {
+										pageSize = result.size();
+										organizationsList.addAll(result);
+									} else {
+										SnackBar.info(
+												context,
+												fragmentOrganizationsBinding.getRoot(),
+												getString(R.string.noMoreData));
+										adapter.setMoreDataAvailable(false);
+									}
+									adapter.notifyDataChanged();
+									fragmentOrganizationsBinding.progressBar.setVisibility(
+											View.GONE);
+									break;
+
+								case 401:
+									AlertDialogs.authorizationTokenRevokedDialog(context);
+									break;
+
+								case 403:
+									Toasty.error(
+											context, context.getString(R.string.authorizeError));
+									break;
+
+								case 404:
+									fragmentOrganizationsBinding.noDataOrg.setVisibility(
+											View.VISIBLE);
+									fragmentOrganizationsBinding.progressBar.setVisibility(
+											View.GONE);
+									break;
+
+								default:
+									Toasty.error(context, getString(R.string.genericError));
+									break;
 							}
-							else {
-								SnackBar.info(context, fragmentOrganizationsBinding.getRoot(), getString(R.string.noMoreData));
-								adapter.setMoreDataAvailable(false);
-							}
-							adapter.notifyDataChanged();
-							fragmentOrganizationsBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						case 401:
-							AlertDialogs.authorizationTokenRevokedDialog(context);
-							break;
-
-						case 403:
-							Toasty.error(context, context.getString(R.string.authorizeError));
-							break;
-
-						case 404:
-							fragmentOrganizationsBinding.noDataOrg.setVisibility(View.VISIBLE);
-							fragmentOrganizationsBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						default:
-							Toasty.error(context, getString(R.string.genericError));
-							break;
+						}
 					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
-				Toasty.error(context, getString(R.string.genericError));
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
+						Toasty.error(context, getString(R.string.genericError));
+					}
+				});
 	}
 
 	@Override
@@ -224,37 +259,39 @@ public class OrganizationsFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				filter(newText);
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						filter(newText);
+						return false;
+					}
+				});
 	}
 
 	private void filter(String text) {
 
 		List<Organization> arr = new ArrayList<>();
 
-		for(Organization d : organizationsList) {
-			if(d == null || d.getUsername() == null || d.getDescription() == null) {
+		for (Organization d : organizationsList) {
+			if (d == null || d.getUsername() == null || d.getDescription() == null) {
 				continue;
 			}
-			if(d.getUsername().toLowerCase().contains(text) || d.getDescription().toLowerCase().contains(text)) {
+			if (d.getUsername().toLowerCase().contains(text)
+					|| d.getDescription().toLowerCase().contains(text)) {
 				arr.add(d);
 			}
 		}
 		adapter.updateList(arr);
 	}
-
 }
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 6f9c1d7d..89b259eb 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
@@ -15,6 +15,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Repository;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.ReposListAdapter;
@@ -24,8 +26,6 @@ import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.SnackBar;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -33,7 +33,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class RepositoriesFragment extends Fragment {
 
 	private static final String usernameBundle = "";
@@ -45,8 +44,7 @@ public class RepositoriesFragment extends Fragment {
 	private int resultLimit;
 	private String username;
 
-	public RepositoriesFragment() {
-	}
+	public RepositoriesFragment() {}
 
 	public static RepositoriesFragment newInstance(String username) {
 		RepositoriesFragment fragment = new RepositoriesFragment();
@@ -59,16 +57,19 @@ public class RepositoriesFragment extends Fragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		if(getArguments() != null) {
+		if (getArguments() != null) {
 			username = getArguments().getString(usernameBundle);
 		}
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		fragmentRepositoriesBinding = FragmentRepositoriesBinding.inflate(inflater, container, false);
+		fragmentRepositoriesBinding =
+				FragmentRepositoriesBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
 		context = getContext();
 
@@ -77,31 +78,38 @@ public class RepositoriesFragment extends Fragment {
 
 		fragmentRepositoriesBinding.addNewRepo.setVisibility(View.GONE);
 
-		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-			fragmentRepositoriesBinding.pullToRefresh.setRefreshing(false);
-			loadInitial(username, resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
+		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											fragmentRepositoriesBinding.pullToRefresh.setRefreshing(
+													false);
+											loadInitial(username, resultLimit);
+											adapter.notifyDataChanged();
+										},
+										200));
 
 		adapter = new ReposListAdapter(reposList, context);
 		adapter.isUserOrg = true;
-		adapter.setLoadMoreListener(new ReposListAdapter.OnLoadMoreListener() {
+		adapter.setLoadMoreListener(
+				new ReposListAdapter.OnLoadMoreListener() {
 
-			@Override
-			public void onLoadMore() {
-				fragmentRepositoriesBinding.recyclerView.post(() -> {
-					if(reposList.size() == resultLimit || pageSize == resultLimit) {
-						int page = (reposList.size() + resultLimit) / resultLimit;
-						loadMore(username, page, resultLimit);
+					@Override
+					public void onLoadMore() {
+						fragmentRepositoriesBinding.recyclerView.post(
+								() -> {
+									if (reposList.size() == resultLimit
+											|| pageSize == resultLimit) {
+										int page = (reposList.size() + resultLimit) / resultLimit;
+										loadMore(username, page, resultLimit);
+									}
+								});
 					}
+
+					@Override
+					public void onLoadFinished() {}
 				});
-			}
-
-			@Override
-			public void onLoadFinished() {
-
-			}
-		});
 
 		fragmentRepositoriesBinding.recyclerView.setHasFixedSize(true);
 		fragmentRepositoriesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
@@ -114,113 +122,131 @@ public class RepositoriesFragment extends Fragment {
 
 	private void loadInitial(String username, int resultLimit) {
 
-		Call<List<Repository>> call = RetrofitClient.getApiInterface(context).userListRepos(username, 1, resultLimit);
+		Call<List<Repository>> call =
+				RetrofitClient.getApiInterface(context).userListRepos(username, 1, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Repository>> call, @NonNull Response<List<Repository>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Repository>> call,
+							@NonNull Response<List<Repository>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					switch(response.code()) {
-						case 200:
-							assert response.body() != null;
-							if(response.body().size() > 0) {
-								reposList.clear();
-								reposList.addAll(response.body());
-								adapter.notifyDataChanged();
-								fragmentRepositoriesBinding.noData.setVisibility(View.GONE);
+							switch (response.code()) {
+								case 200:
+									assert response.body() != null;
+									if (response.body().size() > 0) {
+										reposList.clear();
+										reposList.addAll(response.body());
+										adapter.notifyDataChanged();
+										fragmentRepositoriesBinding.noData.setVisibility(View.GONE);
+									} else {
+										reposList.clear();
+										adapter.notifyDataChanged();
+										fragmentRepositoriesBinding.noData.setVisibility(
+												View.VISIBLE);
+									}
+									fragmentRepositoriesBinding.progressBar.setVisibility(
+											View.GONE);
+									break;
+
+								case 401:
+									AlertDialogs.authorizationTokenRevokedDialog(context);
+									break;
+
+								case 403:
+									Toasty.error(
+											context, context.getString(R.string.authorizeError));
+									break;
+
+								case 404:
+									fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
+									fragmentRepositoriesBinding.progressBar.setVisibility(
+											View.GONE);
+									break;
+
+								default:
+									Toasty.error(context, getString(R.string.genericError));
+									break;
 							}
-							else {
-								reposList.clear();
-								adapter.notifyDataChanged();
-								fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
-							}
-							fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						case 401:
-							AlertDialogs.authorizationTokenRevokedDialog(context);
-							break;
-
-						case 403:
-							Toasty.error(context, context.getString(R.string.authorizeError));
-							break;
-
-						case 404:
-							fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
-							fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						default:
-							Toasty.error(context, getString(R.string.genericError));
-							break;
+						}
 					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
-				Toasty.error(context, getString(R.string.genericError));
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
+						Toasty.error(context, getString(R.string.genericError));
+					}
+				});
 	}
 
 	private void loadMore(String username, int page, int resultLimit) {
 
 		fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
 
-		Call<List<Repository>> call = RetrofitClient.getApiInterface(context).userListRepos(username, page, resultLimit);
+		Call<List<Repository>> call =
+				RetrofitClient.getApiInterface(context).userListRepos(username, page, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Repository>> call, @NonNull Response<List<Repository>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Repository>> call,
+							@NonNull Response<List<Repository>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					switch(response.code()) {
-						case 200:
-							List<Repository> result = response.body();
-							assert result != null;
-							if(result.size() > 0) {
-								pageSize = result.size();
-								reposList.addAll(result);
+							switch (response.code()) {
+								case 200:
+									List<Repository> result = response.body();
+									assert result != null;
+									if (result.size() > 0) {
+										pageSize = result.size();
+										reposList.addAll(result);
+									} else {
+										SnackBar.info(
+												context,
+												fragmentRepositoriesBinding.getRoot(),
+												getString(R.string.noMoreData));
+										adapter.setMoreDataAvailable(false);
+									}
+									adapter.notifyDataChanged();
+									fragmentRepositoriesBinding.progressBar.setVisibility(
+											View.GONE);
+									break;
+
+								case 401:
+									AlertDialogs.authorizationTokenRevokedDialog(context);
+									break;
+
+								case 403:
+									Toasty.error(
+											context, context.getString(R.string.authorizeError));
+									break;
+
+								case 404:
+									fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
+									fragmentRepositoriesBinding.progressBar.setVisibility(
+											View.GONE);
+									break;
+
+								default:
+									Toasty.error(context, getString(R.string.genericError));
+									break;
 							}
-							else {
-								SnackBar.info(context, fragmentRepositoriesBinding.getRoot(), getString(R.string.noMoreData));
-								adapter.setMoreDataAvailable(false);
-							}
-							adapter.notifyDataChanged();
-							fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						case 401:
-							AlertDialogs.authorizationTokenRevokedDialog(context);
-							break;
-
-						case 403:
-							Toasty.error(context, context.getString(R.string.authorizeError));
-							break;
-
-						case 404:
-							fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
-							fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						default:
-							Toasty.error(context, getString(R.string.genericError));
-							break;
+						}
 					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
-				Toasty.error(context, getString(R.string.genericError));
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
+						Toasty.error(context, getString(R.string.genericError));
+					}
+				});
 	}
 
 	@Override
@@ -230,37 +256,39 @@ public class RepositoriesFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				filter(newText);
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						filter(newText);
+						return false;
+					}
+				});
 	}
 
 	private void filter(String text) {
 
 		List<Repository> arr = new ArrayList<>();
 
-		for(Repository d : reposList) {
-			if(d == null || d.getFullName() == null || d.getDescription() == null) {
+		for (Repository d : reposList) {
+			if (d == null || d.getFullName() == null || d.getDescription() == null) {
 				continue;
 			}
-			if(d.getFullName().toLowerCase().contains(text) || d.getDescription().toLowerCase().contains(text)) {
+			if (d.getFullName().toLowerCase().contains(text)
+					|| d.getDescription().toLowerCase().contains(text)) {
 				arr.add(d);
 			}
 		}
 		adapter.updateList(arr);
 	}
-
 }
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 3fddb3dd..d82ec000 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
@@ -15,6 +15,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import java.util.ArrayList;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Repository;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.ReposListAdapter;
@@ -24,8 +26,6 @@ import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.SnackBar;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -33,7 +33,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class StarredRepositoriesFragment extends Fragment {
 
 	private static final String usernameBundle = "";
@@ -45,8 +44,7 @@ public class StarredRepositoriesFragment extends Fragment {
 	private int resultLimit;
 	private String username;
 
-	public StarredRepositoriesFragment() {
-	}
+	public StarredRepositoriesFragment() {}
 
 	public static StarredRepositoriesFragment newInstance(String username) {
 		StarredRepositoriesFragment fragment = new StarredRepositoriesFragment();
@@ -59,16 +57,20 @@ public class StarredRepositoriesFragment extends Fragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		if(getArguments() != null) {
+		if (getArguments() != null) {
 			username = getArguments().getString(usernameBundle);
 		}
 	}
 
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	@Nullable @Override
+	public View onCreateView(
+			@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
-		fragmentRepositoriesBinding = org.mian.gitnex.databinding.FragmentRepositoriesBinding.inflate(inflater, container, false);
+		fragmentRepositoriesBinding =
+				org.mian.gitnex.databinding.FragmentRepositoriesBinding.inflate(
+						inflater, container, false);
 		setHasOptionsMenu(true);
 		context = getContext();
 
@@ -77,30 +79,37 @@ public class StarredRepositoriesFragment extends Fragment {
 
 		fragmentRepositoriesBinding.addNewRepo.setVisibility(View.GONE);
 
-		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-			fragmentRepositoriesBinding.pullToRefresh.setRefreshing(false);
-			loadInitial(username, resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
+		fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											fragmentRepositoriesBinding.pullToRefresh.setRefreshing(
+													false);
+											loadInitial(username, resultLimit);
+											adapter.notifyDataChanged();
+										},
+										200));
 
 		adapter = new ReposListAdapter(reposList, context);
-		adapter.setLoadMoreListener(new ReposListAdapter.OnLoadMoreListener() {
+		adapter.setLoadMoreListener(
+				new ReposListAdapter.OnLoadMoreListener() {
 
-			@Override
-			public void onLoadMore() {
-				fragmentRepositoriesBinding.recyclerView.post(() -> {
-					if(reposList.size() == resultLimit || pageSize == resultLimit) {
-						int page = (reposList.size() + resultLimit) / resultLimit;
-						loadMore(username, page, resultLimit);
+					@Override
+					public void onLoadMore() {
+						fragmentRepositoriesBinding.recyclerView.post(
+								() -> {
+									if (reposList.size() == resultLimit
+											|| pageSize == resultLimit) {
+										int page = (reposList.size() + resultLimit) / resultLimit;
+										loadMore(username, page, resultLimit);
+									}
+								});
 					}
+
+					@Override
+					public void onLoadFinished() {}
 				});
-			}
-
-			@Override
-			public void onLoadFinished() {
-
-			}
-		});
 
 		fragmentRepositoriesBinding.recyclerView.setHasFixedSize(true);
 		fragmentRepositoriesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
@@ -113,113 +122,132 @@ public class StarredRepositoriesFragment extends Fragment {
 
 	private void loadInitial(String username, int resultLimit) {
 
-		Call<List<Repository>> call = RetrofitClient.getApiInterface(context).userListStarred(username, 1, resultLimit);
+		Call<List<Repository>> call =
+				RetrofitClient.getApiInterface(context).userListStarred(username, 1, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Repository>> call, @NonNull Response<List<Repository>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Repository>> call,
+							@NonNull Response<List<Repository>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					switch(response.code()) {
-						case 200:
-							assert response.body() != null;
-							if(response.body().size() > 0) {
-								reposList.clear();
-								reposList.addAll(response.body());
-								adapter.notifyDataChanged();
-								fragmentRepositoriesBinding.noData.setVisibility(View.GONE);
+							switch (response.code()) {
+								case 200:
+									assert response.body() != null;
+									if (response.body().size() > 0) {
+										reposList.clear();
+										reposList.addAll(response.body());
+										adapter.notifyDataChanged();
+										fragmentRepositoriesBinding.noData.setVisibility(View.GONE);
+									} else {
+										reposList.clear();
+										adapter.notifyDataChanged();
+										fragmentRepositoriesBinding.noData.setVisibility(
+												View.VISIBLE);
+									}
+									fragmentRepositoriesBinding.progressBar.setVisibility(
+											View.GONE);
+									break;
+
+								case 401:
+									AlertDialogs.authorizationTokenRevokedDialog(context);
+									break;
+
+								case 403:
+									Toasty.error(
+											context, context.getString(R.string.authorizeError));
+									break;
+
+								case 404:
+									fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
+									fragmentRepositoriesBinding.progressBar.setVisibility(
+											View.GONE);
+									break;
+
+								default:
+									Toasty.error(context, getString(R.string.genericError));
+									break;
 							}
-							else {
-								reposList.clear();
-								adapter.notifyDataChanged();
-								fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
-							}
-							fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						case 401:
-							AlertDialogs.authorizationTokenRevokedDialog(context);
-							break;
-
-						case 403:
-							Toasty.error(context, context.getString(R.string.authorizeError));
-							break;
-
-						case 404:
-							fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
-							fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						default:
-							Toasty.error(context, getString(R.string.genericError));
-							break;
+						}
 					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
-				Toasty.error(context, getString(R.string.genericError));
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
+						Toasty.error(context, getString(R.string.genericError));
+					}
+				});
 	}
 
 	private void loadMore(String username, int page, int resultLimit) {
 
 		fragmentRepositoriesBinding.progressBar.setVisibility(View.VISIBLE);
 
-		Call<List<Repository>> call = RetrofitClient.getApiInterface(context).userListStarred(username, page, resultLimit);
+		Call<List<Repository>> call =
+				RetrofitClient.getApiInterface(context)
+						.userListStarred(username, page, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Repository>> call, @NonNull Response<List<Repository>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Repository>> call,
+							@NonNull Response<List<Repository>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					switch(response.code()) {
-						case 200:
-							List<Repository> result = response.body();
-							assert result != null;
-							if(result.size() > 0) {
-								pageSize = result.size();
-								reposList.addAll(result);
+							switch (response.code()) {
+								case 200:
+									List<Repository> result = response.body();
+									assert result != null;
+									if (result.size() > 0) {
+										pageSize = result.size();
+										reposList.addAll(result);
+									} else {
+										SnackBar.info(
+												context,
+												fragmentRepositoriesBinding.getRoot(),
+												getString(R.string.noMoreData));
+										adapter.setMoreDataAvailable(false);
+									}
+									adapter.notifyDataChanged();
+									fragmentRepositoriesBinding.progressBar.setVisibility(
+											View.GONE);
+									break;
+
+								case 401:
+									AlertDialogs.authorizationTokenRevokedDialog(context);
+									break;
+
+								case 403:
+									Toasty.error(
+											context, context.getString(R.string.authorizeError));
+									break;
+
+								case 404:
+									fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
+									fragmentRepositoriesBinding.progressBar.setVisibility(
+											View.GONE);
+									break;
+
+								default:
+									Toasty.error(context, getString(R.string.genericError));
+									break;
 							}
-							else {
-								SnackBar.info(context, fragmentRepositoriesBinding.getRoot(), getString(R.string.noMoreData));
-								adapter.setMoreDataAvailable(false);
-							}
-							adapter.notifyDataChanged();
-							fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						case 401:
-							AlertDialogs.authorizationTokenRevokedDialog(context);
-							break;
-
-						case 403:
-							Toasty.error(context, context.getString(R.string.authorizeError));
-							break;
-
-						case 404:
-							fragmentRepositoriesBinding.noData.setVisibility(View.VISIBLE);
-							fragmentRepositoriesBinding.progressBar.setVisibility(View.GONE);
-							break;
-
-						default:
-							Toasty.error(context, getString(R.string.genericError));
-							break;
+						}
 					}
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
-				Toasty.error(context, getString(R.string.genericError));
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
+						Toasty.error(context, getString(R.string.genericError));
+					}
+				});
 	}
 
 	@Override
@@ -229,37 +257,39 @@ public class StarredRepositoriesFragment extends Fragment {
 		super.onCreateOptionsMenu(menu, inflater);
 
 		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		androidx.appcompat.widget.SearchView searchView =
+				(androidx.appcompat.widget.SearchView) searchItem.getActionView();
 		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+		searchView.setOnQueryTextListener(
+				new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-				return false;
-			}
+					@Override
+					public boolean onQueryTextSubmit(String query) {
+						return false;
+					}
 
-			@Override
-			public boolean onQueryTextChange(String newText) {
-				filter(newText);
-				return false;
-			}
-		});
+					@Override
+					public boolean onQueryTextChange(String newText) {
+						filter(newText);
+						return false;
+					}
+				});
 	}
 
 	private void filter(String text) {
 
 		List<Repository> arr = new ArrayList<>();
 
-		for(Repository d : reposList) {
-			if(d == null || d.getFullName() == null || d.getDescription() == null) {
+		for (Repository d : reposList) {
+			if (d == null || d.getFullName() == null || d.getDescription() == null) {
 				continue;
 			}
-			if(d.getFullName().toLowerCase().contains(text) || d.getDescription().toLowerCase().contains(text)) {
+			if (d.getFullName().toLowerCase().contains(text)
+					|| d.getDescription().toLowerCase().contains(text)) {
 				arr.add(d);
 			}
 		}
 		adapter.updateList(arr);
 	}
-
 }
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 4176a273..ff436b71 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
@@ -17,96 +17,174 @@ import org.mian.gitnex.helpers.contexts.RepositoryContext;
 /**
  * @author M M Arif
  */
-
 public class AlertDialogs {
 
 	private static MaterialAlertDialogBuilder materialAlertDialogBuilder;
 
 	public static void authorizationTokenRevokedDialog(final Context context) {
 
-		materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(
+						context, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
-		materialAlertDialogBuilder.setTitle(R.string.alertDialogTokenRevokedTitle).setMessage(R.string.alertDialogTokenRevokedMessage).setCancelable(true).setNeutralButton(R.string.cancelButton, null)
-			.setPositiveButton(R.string.navLogout, (dialog, which) -> AppUtil.logout(context)).show();
+		materialAlertDialogBuilder
+				.setTitle(R.string.alertDialogTokenRevokedTitle)
+				.setMessage(R.string.alertDialogTokenRevokedMessage)
+				.setCancelable(true)
+				.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) {
 
-		materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(
+						context, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
-		materialAlertDialogBuilder.setTitle(context.getString(R.string.deleteGenericTitle, labelTitle)).setMessage(R.string.labelDeleteMessage).setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> {
-
-			Intent intent = new Intent(context, CreateLabelActivity.class);
-			intent.putExtra("labelId", labelId);
-			intent.putExtra("labelAction", "delete");
-			intent.putExtra("type", type);
-			intent.putExtra("orgName", orgName);
-			intent.putExtra(RepositoryContext.INTENT_EXTRA, repository);
-			context.startActivity(intent);
-		}).setNeutralButton(R.string.cancelButton, null).show();
+		materialAlertDialogBuilder
+				.setTitle(context.getString(R.string.deleteGenericTitle, labelTitle))
+				.setMessage(R.string.labelDeleteMessage)
+				.setPositiveButton(
+						R.string.menuDeleteText,
+						(dialog, whichButton) -> {
+							Intent intent = new Intent(context, CreateLabelActivity.class);
+							intent.putExtra("labelId", labelId);
+							intent.putExtra("labelAction", "delete");
+							intent.putExtra("type", type);
+							intent.putExtra("orgName", orgName);
+							intent.putExtra(RepositoryContext.INTENT_EXTRA, repository);
+							context.startActivity(intent);
+						})
+				.setNeutralButton(R.string.cancelButton, null)
+				.show();
 	}
 
-	public static void collaboratorRemoveDialog(final Context context, final String userNameMain, RepositoryContext repository) {
+	public static void collaboratorRemoveDialog(
+			final Context context, final String userNameMain, RepositoryContext repository) {
 
-		materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(
+						context, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
-		materialAlertDialogBuilder.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();
+		materialAlertDialogBuilder
+				.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) {
+	public static void addMemberDialog(
+			final Context context, final String userNameMain, int teamId) {
 
-		materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(
+						context, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
-		materialAlertDialogBuilder.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();
+		materialAlertDialogBuilder
+				.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) {
+	public static void removeMemberDialog(
+			final Context context, final String userNameMain, int teamId) {
 
-		materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(
+						context, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
-		materialAlertDialogBuilder.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();
+		materialAlertDialogBuilder
+				.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) {
+	public static void addRepoDialog(
+			final Context context, final String orgName, String repo, int teamId, String teamName) {
 
-		materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(
+						context, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
-		materialAlertDialogBuilder.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();
+		materialAlertDialogBuilder
+				.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) {
+	public static void removeRepoDialog(
+			final Context context, final String orgName, String repo, int teamId, String teamName) {
 
-		materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(
+						context, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
-		materialAlertDialogBuilder.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();
+		materialAlertDialogBuilder
+				.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();
 	}
 
-	public static void selectPullUpdateStrategy(Context context, String repoOwner, String repo, String issueNumber) {
+	public static void selectPullUpdateStrategy(
+			Context context, String repoOwner, String repo, String issueNumber) {
 
-		materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(
+						context, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
-		CustomPrUpdateStrategyDialogBinding binding = CustomPrUpdateStrategyDialogBinding.inflate(LayoutInflater.from(context));
+		CustomPrUpdateStrategyDialogBinding binding =
+				CustomPrUpdateStrategyDialogBinding.inflate(LayoutInflater.from(context));
 
 		View view = binding.getRoot();
 		materialAlertDialogBuilder.setView(view);
 
 		AlertDialog dialog = materialAlertDialogBuilder.show();
 
-		binding.updatePullMerge.setOnClickListener((v) -> {
-			PullRequestActions.updatePr(context, repoOwner, repo, issueNumber, false);
-			dialog.dismiss();
-		});
-		binding.updatePullRebase.setOnClickListener((v) -> {
-			PullRequestActions.updatePr(context, repoOwner, repo, issueNumber, true);
-			dialog.dismiss();
-		});
+		binding.updatePullMerge.setOnClickListener(
+				(v) -> {
+					PullRequestActions.updatePr(context, repoOwner, repo, issueNumber, false);
+					dialog.dismiss();
+				});
+		binding.updatePullRebase.setOnClickListener(
+				(v) -> {
+					PullRequestActions.updatePr(context, repoOwner, repo, issueNumber, true);
+					dialog.dismiss();
+				});
 	}
-
 }
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 c1ea2005..f74139e6 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/AppUtil.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/AppUtil.java
@@ -23,13 +23,6 @@ import androidx.annotation.ColorInt;
 import androidx.browser.customtabs.CustomTabColorSchemeParams;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.core.content.pm.PackageInfoCompat;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.LoginActivity;
-import org.mian.gitnex.activities.MainActivity;
-import org.mian.gitnex.core.MainApplication;
-import org.mian.gitnex.database.api.BaseApi;
-import org.mian.gitnex.database.api.UserAccountsApi;
-import org.mian.gitnex.database.models.UserAccount;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -48,34 +41,141 @@ import java.util.Locale;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.LoginActivity;
+import org.mian.gitnex.activities.MainActivity;
+import org.mian.gitnex.core.MainApplication;
+import org.mian.gitnex.database.api.BaseApi;
+import org.mian.gitnex.database.api.UserAccountsApi;
+import org.mian.gitnex.database.models.UserAccount;
 
 /**
  * @author M M Arif
  */
-
 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);
+				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() {
-	}
+	private AppUtil() {}
 
 	public static void logout(Context ctx) {
 		TinyDB tinyDB = TinyDB.getInstance(ctx);
@@ -84,19 +184,17 @@ public class AppUtil {
 		assert api != null;
 
 		api.logout(tinyDB.getInt("currentActiveAccountId"));
-		if(api.getCount() >= 1) {
+		if (api.getCount() >= 1) {
 			switchToAccount(ctx, api.loggedInUserAccounts().get(0));
-			if(ctx instanceof MainActivity) {
+			if (ctx instanceof MainActivity) {
 				((Activity) ctx).recreate();
-			}
-			else { // if it's not a MainActivity, open MainActivity instead of current one
+			} else { // if it's not a MainActivity, open MainActivity instead of current one
 				((Activity) ctx).finish();
 				Intent intent = new Intent(ctx, MainActivity.class);
 				intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
 				ctx.startActivity(intent);
 			}
-		}
-		else {
+		} else {
 			tinyDB.putInt("currentActiveAccountId", -2);
 			((Activity) ctx).finish();
 			Intent intent = new Intent(ctx, LoginActivity.class);
@@ -107,11 +205,11 @@ public class AppUtil {
 
 	public static FileType getFileType(String extension) {
 
-		if(extension != null && !extension.isEmpty()) {
-			for(String[] testExtensions : extensions.keySet()) {
-				for(String testExtension : testExtensions) {
+		if (extension != null && !extension.isEmpty()) {
+			for (String[] testExtensions : extensions.keySet()) {
+				for (String testExtension : testExtensions) {
 
-					if(testExtension.equalsIgnoreCase(extension)) {
+					if (testExtension.equalsIgnoreCase(extension)) {
 						return extensions.get(testExtensions);
 					}
 				}
@@ -125,7 +223,12 @@ 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;
@@ -138,21 +241,21 @@ public class AppUtil {
 
 		progressListener.onActionStarted();
 
-		while((read = inputStream.read(buffer)) != -1) {
+		while ((read = inputStream.read(buffer)) != -1) {
 
 			outputStream.write(buffer, 0, read);
 			stepCount++;
 
-			if(stepCount == stepsPerPercent) {
+			if (stepCount == stepsPerPercent) {
 				percent++;
-				if(percent <= 100) {
+				if (percent <= 100) {
 					progressListener.onProgressChanged(percent);
 				}
 				stepCount = 0;
 			}
 		}
 
-		if(percent < 100) {
+		if (percent < 100) {
 			progressListener.onProgressChanged((short) 100);
 		}
 
@@ -162,10 +265,10 @@ public class AppUtil {
 	public static int getAppBuildNo(Context context) {
 
 		try {
-			PackageInfo packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+			PackageInfo packageInfo =
+					context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
 			return (int) PackageInfoCompat.getLongVersionCode(packageInfo);
-		}
-		catch(PackageManager.NameNotFoundException e) {
+		} catch (PackageManager.NameNotFoundException e) {
 			throw new RuntimeException("Could not get package name: " + e);
 		}
 	}
@@ -173,10 +276,10 @@ public class AppUtil {
 	public static String getAppVersion(Context context) {
 
 		try {
-			PackageInfo packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+			PackageInfo packageInfo =
+					context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
 			return packageInfo.versionName;
-		}
-		catch(PackageManager.NameNotFoundException e) {
+		} catch (PackageManager.NameNotFoundException e) {
 			throw new RuntimeException("Could not get package name: " + e);
 		}
 	}
@@ -193,7 +296,8 @@ public class AppUtil {
 		return str.matches("^[\\w .-]+$");
 	}
 
-	public static Boolean checkStringsWithAlphaNumericDashDotUnderscore(String str) { // [a-zA-Z0-9-_]
+	public static Boolean checkStringsWithAlphaNumericDashDotUnderscore(
+			String str) { // [a-zA-Z0-9-_]
 		return str.matches("^[\\w.-]+$");
 	}
 
@@ -218,10 +322,9 @@ public class AppUtil {
 		TinyDB tinyDB = TinyDB.getInstance(context);
 		Locale locale = new Locale(tinyDB.getString("locale"));
 
-		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
 			return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", locale).format(date);
-		}
-		else {
+		} else {
 			return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", locale).format(date);
 		}
 	}
@@ -243,18 +346,16 @@ public class AppUtil {
 		final String day = parts[2];
 
 		String sMonth;
-		if(Integer.parseInt(month) < 10) {
+		if (Integer.parseInt(month) < 10) {
 			sMonth = "0" + month;
-		}
-		else {
+		} else {
 			sMonth = month;
 		}
 
 		String sDay;
-		if(Integer.parseInt(day) < 10) {
+		if (Integer.parseInt(day) < 10) {
 			sDay = "0" + day;
-		}
-		else {
+		} else {
 			sDay = day;
 		}
 
@@ -269,18 +370,16 @@ public class AppUtil {
 		int mSeconds = c.get(Calendar.SECOND);
 
 		String sMin;
-		if((mMinute) < 10) {
+		if ((mMinute) < 10) {
 			sMin = "0" + mMinute;
-		}
-		else {
+		} else {
 			sMin = String.valueOf(mMinute);
 		}
 
 		String sSec;
-		if((mSeconds) < 10) {
+		if ((mSeconds) < 10) {
 			sSec = "0" + mSeconds;
-		}
-		else {
+		} else {
 			sSec = String.valueOf(mSeconds);
 		}
 
@@ -290,7 +389,7 @@ public class AppUtil {
 	public static String encodeBase64(String str) {
 
 		String base64Str = str;
-		if(!str.equals("")) {
+		if (!str.equals("")) {
 			byte[] data = str.getBytes(StandardCharsets.UTF_8);
 			base64Str = Base64.encodeToString(data, Base64.DEFAULT);
 		}
@@ -301,7 +400,7 @@ public class AppUtil {
 	public static String decodeBase64(String str) {
 
 		String base64Str = str;
-		if(!str.equals("")) {
+		if (!str.equals("")) {
 			byte[] data = Base64.decode(base64Str, Base64.DEFAULT);
 			base64Str = new String(data, StandardCharsets.UTF_8);
 		}
@@ -311,11 +410,10 @@ public class AppUtil {
 
 	public static String getLastCharactersOfWord(String str, int count) {
 		return str.substring(str.length() - count);
-
 	}
 
 	public static void setMultiVisibility(int visibility, View... views) {
-		for(View view : views) {
+		for (View view : views) {
 			view.setVisibility(visibility);
 		}
 	}
@@ -330,7 +428,7 @@ public class AppUtil {
 
 	public static long getLineCount(String s) {
 
-		if(s.length() < 1) {
+		if (s.length() < 1) {
 			return 0;
 		}
 
@@ -339,15 +437,16 @@ public class AppUtil {
 		Pattern pattern = Pattern.compile("(\r\n|\n)");
 		Matcher matcher = pattern.matcher(s);
 
-		while(matcher.find())
-			lines++;
+		while (matcher.find()) lines++;
 
 		return lines;
 	}
 
 	public static void copyToClipboard(Context ctx, CharSequence data, String message) {
 
-		ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
+		ClipboardManager clipboard =
+				(ClipboardManager)
+						Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
 		assert clipboard != null;
 
 		ClipData clip = ClipData.newPlainText(data, data);
@@ -357,11 +456,13 @@ public class AppUtil {
 	}
 
 	public static boolean switchToAccount(Context context, UserAccount userAccount) {
-		return ((MainApplication) context.getApplicationContext()).switchToAccount(userAccount, false);
+		return ((MainApplication) context.getApplicationContext())
+				.switchToAccount(userAccount, false);
 	}
 
 	public static boolean switchToAccount(Context context, UserAccount userAccount, boolean tmp) {
-		return ((MainApplication) context.getApplicationContext()).switchToAccount(userAccount, tmp);
+		return ((MainApplication) context.getApplicationContext())
+				.switchToAccount(userAccount, tmp);
 	}
 
 	public static void sharingIntent(Context ctx, String url) {
@@ -376,18 +477,27 @@ public class AppUtil {
 	private static Intent wrapBrowserIntent(Context context, Intent intent) {
 
 		final PackageManager pm = context.getPackageManager();
-		final List<ResolveInfo> activities = pm.queryIntentActivities(new Intent(intent).setData(intent.getData().buildUpon().authority("example.com").scheme("https").build()), PackageManager.MATCH_ALL);
+		final List<ResolveInfo> activities =
+				pm.queryIntentActivities(
+						new Intent(intent)
+								.setData(
+										intent.getData()
+												.buildUpon()
+												.authority("example.com")
+												.scheme("https")
+												.build()),
+						PackageManager.MATCH_ALL);
 		final ArrayList<Intent> chooserIntents = new ArrayList<>();
 		final String ourPackageName = context.getPackageName();
 
 		Collections.sort(activities, new ResolveInfo.DisplayNameComparator(pm));
 
-		for(ResolveInfo resInfo : activities) {
+		for (ResolveInfo resInfo : activities) {
 			ActivityInfo info = resInfo.activityInfo;
-			if(!info.enabled || !info.exported) {
+			if (!info.enabled || !info.exported) {
 				continue;
 			}
-			if(info.packageName.equals(ourPackageName)) {
+			if (info.packageName.equals(ourPackageName)) {
 				continue;
 			}
 
@@ -397,12 +507,12 @@ public class AppUtil {
 			chooserIntents.add(targetIntent);
 		}
 
-		if(chooserIntents.isEmpty()) {
+		if (chooserIntents.isEmpty()) {
 			return null;
 		}
 
 		final Intent lastIntent = chooserIntents.remove(chooserIntents.size() - 1);
-		if(chooserIntents.isEmpty()) {
+		if (chooserIntents.isEmpty()) {
 			return lastIntent;
 		}
 
@@ -417,27 +527,35 @@ public class AppUtil {
 		TinyDB tinyDB = TinyDB.getInstance(context);
 
 		Intent i;
-		if(tinyDB.getBoolean("useCustomTabs")) {
-			i = 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().intent;
+		if (tinyDB.getBoolean("useCustomTabs")) {
+			i =
+					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()
+							.intent;
 			i.setData(Uri.parse(url));
-		}
-		else {
+		} else {
 			i = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
 			i.addCategory(Intent.CATEGORY_BROWSABLE);
 		}
 		try {
 			Intent browserIntent = wrapBrowserIntent(context, i);
-			if(browserIntent == null) {
+			if (browserIntent == null) {
 				Toasty.error(context, context.getString(R.string.genericError));
 			}
 			context.startActivity(browserIntent);
-		}
-		catch(ActivityNotFoundException e) {
+		} catch (ActivityNotFoundException e) {
 			Toasty.error(context, context.getString(R.string.browserOpenFailed));
-		}
-		catch(Exception e) {
+		} catch (Exception e) {
 			Toasty.error(context, context.getString(R.string.genericError));
 		}
 	}
@@ -445,7 +563,7 @@ public class AppUtil {
 	public static Uri getUriFromGitUrl(String url) {
 		Uri uri = Uri.parse(url);
 		String host = uri.getHost();
-		if(host != null && !host.contains(":")) {
+		if (host != null && !host.contains(":")) {
 			return uri;
 		}
 		// must be a Git SSH URL now (old rcp standard)
@@ -454,7 +572,7 @@ public class AppUtil {
 
 	public static String getUriFromSSHUrl(String url) {
 		String[] urlParts = url.split("://");
-		if(urlParts.length > 1) {
+		if (urlParts.length > 1) {
 			url = urlParts[1];
 		}
 		return "https://" + url.replace(":", "/");
@@ -463,46 +581,47 @@ public class AppUtil {
 	public static Uri changeScheme(Uri origin, String scheme) {
 		String raw = origin.toString();
 		int schemeIndex = raw.indexOf("://");
-		if(schemeIndex >= 0) {
+		if (schemeIndex >= 0) {
 			raw = raw.substring(schemeIndex);
 		}
 		return Uri.parse(scheme + raw);
 	}
 
 	public static Typeface getTypeface(Context context) {
-		if(typeface == null) {
-			switch(TinyDB.getInstance(context).getInt("customFontId", -1)) {
+		if (typeface == null) {
+			switch (TinyDB.getInstance(context).getInt("customFontId", -1)) {
 				case 0:
 					typeface = Typeface.createFromAsset(context.getAssets(), "fonts/roboto.ttf");
 					break;
 				case 2:
-					typeface = Typeface.createFromAsset(context.getAssets(), "fonts/sourcecodeproregular.ttf");
+					typeface =
+							Typeface.createFromAsset(
+									context.getAssets(), "fonts/sourcecodeproregular.ttf");
 					break;
 				default:
-					typeface = Typeface.createFromAsset(context.getAssets(), "fonts/manroperegular.ttf");
+					typeface =
+							Typeface.createFromAsset(
+									context.getAssets(), "fonts/manroperegular.ttf");
 					break;
 			}
 		}
 		return typeface;
 	}
 
-	/**
-	 * Pretty number format
-	 * Example, 1200 = 1.2k
-	 */
+	/** Pretty number format Example, 1200 = 1.2k */
 	public static String numberFormatter(Number number) {
 
 		char[] suffix = {' ', 'k', 'M', 'B', 'T'};
 		long numValue = number.longValue();
 		int value = (int) Math.floor(Math.log10(numValue));
 		int base = value / 3;
-		if(value >= 3 && base < suffix.length) {
-			return new DecimalFormat("#0.0").format(numValue / Math.pow(10, base * 3)) + suffix[base];
+		if (value >= 3 && base < suffix.length) {
+			return new DecimalFormat("#0.0").format(numValue / Math.pow(10, base * 3))
+					+ suffix[base];
 		}
-		if(base >= suffix.length) {
+		if (base >= suffix.length) {
 			return new DecimalFormat("#0").format(numValue / Math.pow(10, base * 2)) + suffix[4];
-		}
-		else {
+		} else {
 			return new DecimalFormat("#,##0").format(numValue);
 		}
 	}
@@ -524,15 +643,22 @@ public class AppUtil {
 		return (http.getResponseCode());
 	}
 
-	public enum FileType {IMAGE, AUDIO, VIDEO, DOCUMENT, TEXT, EXECUTABLE, FONT, UNKNOWN}
+	public enum FileType {
+		IMAGE,
+		AUDIO,
+		VIDEO,
+		DOCUMENT,
+		TEXT,
+		EXECUTABLE,
+		FONT,
+		UNKNOWN
+	}
 
 	public interface ProgressListener {
 
-		default void onActionStarted() {
-		}
+		default void onActionStarted() {}
 
-		default void onActionFinished() {
-		}
+		default void onActionFinished() {}
 
 		void onProgressChanged(short progress);
 	}
diff --git a/app/src/main/java/org/mian/gitnex/helpers/ChangeLog.java b/app/src/main/java/org/mian/gitnex/helpers/ChangeLog.java
index d412e8fe..1e94058b 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/ChangeLog.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/ChangeLog.java
@@ -7,20 +7,19 @@ import android.content.res.XmlResourceParser;
 import android.util.Log;
 import androidx.core.text.HtmlCompat;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.io.IOException;
+import java.util.Objects;
 import org.mian.gitnex.R;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
-import java.io.IOException;
-import java.util.Objects;
 
 /**
  * @author M M Arif
  */
-
 public class ChangeLog {
 
-	static final private String TAG = "ChangeLog";
-	static final private String CHANGELOG_XML_NODE = "changelog";
+	private static final String TAG = "ChangeLog";
+	private static final String CHANGELOG_XML_NODE = "changelog";
 
 	private final Activity changelogActivity;
 
@@ -28,49 +27,45 @@ public class ChangeLog {
 		changelogActivity = context;
 	}
 
-	private String ParseReleaseTag(XmlResourceParser aXml) throws XmlPullParserException, IOException {
+	private String ParseReleaseTag(XmlResourceParser aXml)
+			throws XmlPullParserException, IOException {
 
-		StringBuilder strBuilder = new StringBuilder(aXml.getAttributeValue(null, "version") + "<br>");
+		StringBuilder strBuilder =
+				new StringBuilder(aXml.getAttributeValue(null, "version") + "<br>");
 		int eventType = aXml.getEventType();
 
-		while((eventType != XmlPullParser.END_TAG) || (aXml.getName().equals("change"))) {
+		while ((eventType != XmlPullParser.END_TAG) || (aXml.getName().equals("change"))) {
 
-			if((eventType == XmlPullParser.START_TAG) && (aXml.getName().equals("change"))) {
+			if ((eventType == XmlPullParser.START_TAG) && (aXml.getName().equals("change"))) {
 				eventType = aXml.next();
 				strBuilder.append(aXml.getText()).append("<br>");
 			}
 			eventType = aXml.next();
-
 		}
 		strBuilder.append("<br>");
 
 		return strBuilder.toString();
-
 	}
 
 	private String getChangelog(int resId, Resources res) {
 
 		StringBuilder strBuilder = new StringBuilder();
-		try(XmlResourceParser xml = res.getXml(resId)) {
+		try (XmlResourceParser xml = res.getXml(resId)) {
 
 			int eventType = xml.getEventType();
-			while(eventType != XmlPullParser.END_DOCUMENT) {
+			while (eventType != XmlPullParser.END_DOCUMENT) {
 
-				if((eventType == XmlPullParser.START_TAG) && (xml.getName().equals("release"))) {
+				if ((eventType == XmlPullParser.START_TAG) && (xml.getName().equals("release"))) {
 					strBuilder.append(ParseReleaseTag(xml));
-
 				}
 				eventType = xml.next();
-
 			}
 
-		}
-		catch(XmlPullParserException | IOException e) {
+		} catch (XmlPullParserException | IOException e) {
 			Log.e(TAG, Objects.requireNonNull(e.getMessage()));
 		}
 
 		return strBuilder.toString();
-
 	}
 
 	public void showDialog() {
@@ -80,8 +75,7 @@ public class ChangeLog {
 
 		try {
 			res = changelogActivity.getPackageManager().getResourcesForApplication(packageName);
-		}
-		catch(PackageManager.NameNotFoundException e) {
+		} catch (PackageManager.NameNotFoundException e) {
 			Log.e(TAG, Objects.requireNonNull(e.getMessage()));
 		}
 
@@ -90,10 +84,16 @@ public class ChangeLog {
 
 		String changelogMessage = getChangelog(resId, res);
 
-		MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(changelogActivity).setTitle(R.string.changelogTitle)
-			.setMessage(HtmlCompat.fromHtml("<small>" + changelogMessage + "</small>", HtmlCompat.FROM_HTML_MODE_LEGACY)).setCancelable(false).setNeutralButton(R.string.close, null);
+		MaterialAlertDialogBuilder materialAlertDialogBuilder =
+				new MaterialAlertDialogBuilder(changelogActivity)
+						.setTitle(R.string.changelogTitle)
+						.setMessage(
+								HtmlCompat.fromHtml(
+										"<small>" + changelogMessage + "</small>",
+										HtmlCompat.FROM_HTML_MODE_LEGACY))
+						.setCancelable(false)
+						.setNeutralButton(R.string.close, null);
 
 		materialAlertDialogBuilder.create().show();
 	}
-
 }
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 1260b811..7ab579c5 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/ClickListener.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/ClickListener.java
@@ -10,7 +10,6 @@ import org.mian.gitnex.R;
 /**
  * @author M M Arif
  */
-
 public class ClickListener implements View.OnClickListener {
 
 	private final String infoText;
@@ -26,7 +25,9 @@ public class ClickListener implements View.OnClickListener {
 	public void onClick(View v) {
 
 		LayoutInflater inflater1 = LayoutInflater.from(mCtx);
-		View layout = inflater1.inflate(R.layout.custom_toast_info, v.findViewById(R.id.custom_toast_container));
+		View layout =
+				inflater1.inflate(
+						R.layout.custom_toast_info, v.findViewById(R.id.custom_toast_container));
 
 		TextView text = layout.findViewById(R.id.toastText);
 		text.setText(infoText);
@@ -35,7 +36,5 @@ public class ClickListener implements View.OnClickListener {
 		toast.setDuration(Toast.LENGTH_LONG);
 		toast.setView(layout);
 		toast.show();
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/ColorInverter.java b/app/src/main/java/org/mian/gitnex/helpers/ColorInverter.java
index e721cc5b..d1bf70e8 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/ColorInverter.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/ColorInverter.java
@@ -10,16 +10,23 @@ import androidx.annotation.NonNull;
 /**
  * @author M M Arif
  */
-
 public class ColorInverter {
 
 	@ColorInt
 	public int getContrastColor(@ColorInt int color) {
 
-		double a = 1 - (0.2126 * Color.red(color) + 0.7152 * Color.green(color) + 0.0722 * Color.blue(color)) / 255;
+		double a =
+				1
+						- (0.2126 * Color.red(color)
+										+ 0.7152 * Color.green(color)
+										+ 0.0722 * Color.blue(color))
+								/ 255;
 
-		int d = (a < 0.30) ? 30 : // almost black
-			255; // white
+		int d =
+				(a < 0.30)
+						? 30
+						: // almost black
+						255; // white
 
 		return Color.rgb(d, d, d);
 	}
@@ -30,8 +37,8 @@ public class ColorInverter {
 		int colorSum = 0;
 		int divisionValue = 0;
 
-		for(int height = 0; height < bitmap.getHeight(); height += 10) {
-			for(int width = 0; width < bitmap.getWidth(); width += 10) {
+		for (int height = 0; height < bitmap.getHeight(); height += 10) {
+			for (int width = 0; width < bitmap.getWidth(); width += 10) {
 
 				colorSum += bitmap.getPixel(width, height);
 				divisionValue++;
@@ -40,7 +47,6 @@ public class ColorInverter {
 
 		// Calculate average color
 		return getContrastColor(colorSum / divisionValue);
-
 	}
 
 	@ColorInt
@@ -48,5 +54,4 @@ public class ColorInverter {
 
 		return getBitmapContrastColor(((BitmapDrawable) imageView.getDrawable()).getBitmap());
 	}
-
 }
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 feb67d9b..1936d67c 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/Constants.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/Constants.java
@@ -6,7 +6,6 @@ import org.mian.gitnex.activities.BaseActivity;
 /**
  * @author M M Arif
  */
-
 public class Constants {
 
 	// issues variables
@@ -27,13 +26,15 @@ public class Constants {
 	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"};
+	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();
+		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 43ff1de5..f07a3947 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/FileDiffView.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/FileDiffView.java
@@ -1,15 +1,14 @@
 package org.mian.gitnex.helpers;
 
 import androidx.annotation.NonNull;
-import org.jetbrains.annotations.NotNull;
 import java.io.Serializable;
 import java.util.List;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author M M Arif
  * @author 6543
  */
-
 public class FileDiffView implements Serializable {
 
 	private final String fileNewName;
@@ -19,7 +18,12 @@ public class FileDiffView implements Serializable {
 	private final Stats stats;
 	private final List<Content> contents;
 
-	public FileDiffView(String oldName, String newName, String diffType, String fileInfo, List<Content> fileContents) {
+	public FileDiffView(
+			String oldName,
+			String newName,
+			String diffType,
+			String fileInfo,
+			List<Content> fileContents) {
 
 		this.fileNewName = newName.trim();
 		this.fileOldName = oldName.trim();
@@ -27,18 +31,17 @@ public class FileDiffView implements Serializable {
 		this.fileInfo = fileInfo;
 		this.contents = fileContents;
 		this.stats = new Stats(0, 0);
-		if(fileContents != null) {
-			for(Content content : this.contents) {
+		if (fileContents != null) {
+			for (Content content : this.contents) {
 				stats.lineAdded += content.lineAdded;
 				stats.lineRemoved += content.lineRemoved;
 			}
 		}
-
 	}
 
 	public String getFileName() {
 
-		if(fileOldName.length() != 0 && !fileOldName.equals(fileNewName)) {
+		if (fileOldName.length() != 0 && !fileOldName.equals(fileNewName)) {
 			return fileOldName + " -> " + fileNewName;
 		}
 		return fileNewName;
@@ -51,26 +54,25 @@ public class FileDiffView implements Serializable {
 
 	public String getFileInfo() {
 
-		if(diffType.equals("binary")) {
+		if (diffType.equals("binary")) {
 			return diffType + " " + fileInfo;
 		}
 
-		if(fileInfo.equals("change") && this.stats != null) {
+		if (fileInfo.equals("change") && this.stats != null) {
 			return this.stats.toString();
 		}
 
 		return fileInfo;
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public String toString() {
 
 		StringBuilder raw = new StringBuilder();
-		if(this.contents != null) {
-			for(Content c : this.contents) {
+		if (this.contents != null) {
+			for (Content c : this.contents) {
 				raw.append(c.getRaw());
-				if(!c.getRaw().endsWith("\n")) {
+				if (!c.getRaw().endsWith("\n")) {
 					raw.append("\n");
 				}
 			}
@@ -104,13 +106,11 @@ public class FileDiffView implements Serializable {
 			return lineRemoved;
 		}
 
-		@NotNull
-		@Override
+		@NotNull @Override
 		public String toString() {
 
 			return "+" + this.lineAdded + ", -" + this.lineRemoved;
 		}
-
 	}
 
 	public static class Content implements Serializable {
@@ -159,7 +159,5 @@ public class FileDiffView implements Serializable {
 
 			return this.newLineStart;
 		}
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/FilesData.java b/app/src/main/java/org/mian/gitnex/helpers/FilesData.java
index bac39079..b62bec32 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/FilesData.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/FilesData.java
@@ -3,18 +3,15 @@ package org.mian.gitnex.helpers;
 /**
  * @author M M Arif
  */
-
 public class FilesData {
 
 	public static int returnOnlyNumberFileSize(String fileSize) {
 
 		final int i = Integer.parseInt(fileSize.substring(0, fileSize.indexOf(" ")));
-		if(fileSize.substring(fileSize.lastIndexOf(" ") + 1).equals("GB")) {
+		if (fileSize.substring(fileSize.lastIndexOf(" ") + 1).equals("GB")) {
 			return i * 1000;
-		}
-		else {
+		} else {
 			return i;
 		}
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/FontsOverride.java b/app/src/main/java/org/mian/gitnex/helpers/FontsOverride.java
index 2de56717..2afa0304 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/FontsOverride.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/FontsOverride.java
@@ -9,13 +9,12 @@ import java.util.Objects;
 /**
  * @author M M Arif
  */
-
 public class FontsOverride {
 
 	public static void setDefaultFont(Context context) {
 		final Typeface regular = AppUtil.getTypeface(context);
 
-		for(String field : new String[]{"DEFAULT", "MONOSPACE", "SERIF", "SANS_SERIF"}) {
+		for (String field : new String[] {"DEFAULT", "MONOSPACE", "SERIF", "SANS_SERIF"}) {
 			replaceFont(field, regular);
 		}
 	}
@@ -28,13 +27,9 @@ public class FontsOverride {
 			staticField.setAccessible(true);
 			staticField.set(null, newTypeface);
 
-		}
-		catch(NoSuchFieldException | IllegalAccessException e) {
+		} catch (NoSuchFieldException | IllegalAccessException e) {
 
 			Log.e("replaceFont", Objects.requireNonNull(e.getMessage()));
-
 		}
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/Images.java b/app/src/main/java/org/mian/gitnex/helpers/Images.java
index 28deedb4..9d4d49c3 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/Images.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/Images.java
@@ -6,40 +6,45 @@ import android.graphics.BitmapFactory;
 /**
  * @author M M Arif
  */
-
 public class Images {
 
 	public static Bitmap scaleImage(byte[] imageData, int sizeLimit) {
 
 		Bitmap original = BitmapFactory.decodeByteArray(imageData, 0, imageData.length);
-		if(original == null) {
+		if (original == null) {
 			return null; // something went wrong
 		}
 
-		if(original.getHeight() > sizeLimit && original.getWidth() <= original.getHeight()) {
+		if (original.getHeight() > sizeLimit && original.getWidth() <= original.getHeight()) {
 
 			double reductionPercentage = (double) sizeLimit / original.getHeight();
 
-			Bitmap scaled = Bitmap.createScaledBitmap(original, (int) (reductionPercentage * original.getWidth()), sizeLimit, false);
+			Bitmap scaled =
+					Bitmap.createScaledBitmap(
+							original,
+							(int) (reductionPercentage * original.getWidth()),
+							sizeLimit,
+							false);
 			original.recycle();
 
 			return scaled;
 
-		}
-		else if(original.getWidth() > sizeLimit && original.getHeight() < original.getWidth()) {
+		} else if (original.getWidth() > sizeLimit && original.getHeight() < original.getWidth()) {
 
 			double reductionPercentage = (double) sizeLimit / original.getWidth();
 
-			Bitmap scaled = Bitmap.createScaledBitmap(original, sizeLimit, (int) (reductionPercentage * original.getHeight()), false);
+			Bitmap scaled =
+					Bitmap.createScaledBitmap(
+							original,
+							sizeLimit,
+							(int) (reductionPercentage * original.getHeight()),
+							false);
 			original.recycle();
 
 			return scaled;
-
 		}
 
 		// Image size does not exceed bounds.
 		return original;
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/LabelWidthCalculator.java b/app/src/main/java/org/mian/gitnex/helpers/LabelWidthCalculator.java
index b1ba73da..459fb4a5 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/LabelWidthCalculator.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/LabelWidthCalculator.java
@@ -7,10 +7,10 @@ import android.graphics.Typeface;
 /**
  * @author M M Arif
  */
-
 public class LabelWidthCalculator {
 
-	public static int calculateLabelWidth(String text, Typeface typeface, int textSize, int paddingLeftRight) {
+	public static int calculateLabelWidth(
+			String text, Typeface typeface, int textSize, int paddingLeftRight) {
 
 		Paint paint = new Paint();
 		Rect rect = new Rect();
@@ -20,7 +20,5 @@ public class LabelWidthCalculator {
 		paint.getTextBounds(text, 0, text.length(), rect);
 
 		return rect.width() + (paddingLeftRight * 2);
-
 	}
-
 }
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 8453b4ac..d90278d9 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/Markdown.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/Markdown.java
@@ -9,32 +9,6 @@ import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import org.commonmark.ext.gfm.tables.TableBlock;
-import org.commonmark.node.AbstractVisitor;
-import org.commonmark.node.FencedCodeBlock;
-import org.commonmark.node.Image;
-import org.commonmark.node.Link;
-import org.commonmark.node.Node;
-import org.commonmark.node.Text;
-import org.commonmark.parser.InlineParserFactory;
-import org.commonmark.parser.Parser;
-import org.commonmark.parser.PostProcessor;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.BaseActivity;
-import org.mian.gitnex.activities.CommitDetailActivity;
-import org.mian.gitnex.activities.IssueDetailActivity;
-import org.mian.gitnex.activities.ProfileActivity;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.core.MainGrammarLocator;
-import org.mian.gitnex.helpers.contexts.IssueContext;
-import org.mian.gitnex.helpers.contexts.RepositoryContext;
-import java.util.Objects;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import de.qwerty287.markwonprism4j.Prism4jTheme;
 import de.qwerty287.markwonprism4j.Prism4jThemeDarkula;
 import de.qwerty287.markwonprism4j.Prism4jThemeDefault;
@@ -60,6 +34,32 @@ import io.noties.markwon.recycler.SimpleEntry;
 import io.noties.markwon.recycler.table.TableEntry;
 import io.noties.markwon.recycler.table.TableEntryPlugin;
 import io.noties.prism4j.Prism4j;
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.commonmark.ext.gfm.tables.TableBlock;
+import org.commonmark.node.AbstractVisitor;
+import org.commonmark.node.FencedCodeBlock;
+import org.commonmark.node.Image;
+import org.commonmark.node.Link;
+import org.commonmark.node.Node;
+import org.commonmark.node.Text;
+import org.commonmark.parser.InlineParserFactory;
+import org.commonmark.parser.Parser;
+import org.commonmark.parser.PostProcessor;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.BaseActivity;
+import org.mian.gitnex.activities.CommitDetailActivity;
+import org.mian.gitnex.activities.IssueDetailActivity;
+import org.mian.gitnex.activities.ProfileActivity;
+import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.core.MainGrammarLocator;
+import org.mian.gitnex.helpers.contexts.IssueContext;
+import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import stormpot.Allocator;
 import stormpot.BlazePool;
 import stormpot.Config;
@@ -71,7 +71,6 @@ import stormpot.Timeout;
 /**
  * @author opyale
  */
-
 public class Markdown {
 
 	private static final int MAX_OBJECT_POOL_SIZE = 45;
@@ -79,30 +78,34 @@ 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;
 
 	static {
-
 		Config<Renderer> config = new Config<>();
 
 		config.setBackgroundExpirationEnabled(true);
 		config.setPreciseLeakDetectionEnabled(true);
 		config.setSize(MAX_OBJECT_POOL_SIZE);
-		config.setAllocator(new Allocator<Renderer>() {
+		config.setAllocator(
+				new Allocator<Renderer>() {
 
-			@Override
-			public Renderer allocate(Slot slot) {
-				return new Renderer(slot);
-			}
+					@Override
+					public Renderer allocate(Slot slot) {
+						return new Renderer(slot);
+					}
 
-			@Override
-			public void deallocate(Renderer poolable) {
-			}
-
-		});
+					@Override
+					public void deallocate(Renderer poolable) {}
+				});
 
 		rendererPool = new BlazePool<>(config);
 
@@ -111,23 +114,20 @@ public class Markdown {
 		configRv.setBackgroundExpirationEnabled(true);
 		configRv.setPreciseLeakDetectionEnabled(true);
 		configRv.setSize(MAX_OBJECT_POOL_SIZE);
-		configRv.setAllocator(new Allocator<RecyclerViewRenderer>() {
+		configRv.setAllocator(
+				new Allocator<RecyclerViewRenderer>() {
 
-			@Override
-			public RecyclerViewRenderer allocate(Slot slot) {
+					@Override
+					public RecyclerViewRenderer allocate(Slot slot) {
 
-				return new RecyclerViewRenderer(slot);
-			}
+						return new RecyclerViewRenderer(slot);
+					}
 
-			@Override
-			public void deallocate(RecyclerViewRenderer poolable) {
-
-			}
-
-		});
+					@Override
+					public void deallocate(RecyclerViewRenderer poolable) {}
+				});
 
 		rvRendererPool = new BlazePool<>(configRv);
-
 	}
 
 	public static void render(Context context, String markdown, TextView textView) {
@@ -135,26 +135,28 @@ public class Markdown {
 		try {
 			Renderer renderer = rendererPool.claim(OBJECT_POOL_CLAIM_TIMEOUT);
 
-			if(renderer != null) {
+			if (renderer != null) {
 				renderer.setParameters(context, markdown, textView);
 				executorService.execute(renderer);
 			}
-		}
-		catch(InterruptedException ignored) {
+		} catch (InterruptedException ignored) {
 		}
 	}
 
-	public static void render(Context context, String markdown, RecyclerView recyclerView, RepositoryContext repository) {
+	public static void render(
+			Context context,
+			String markdown,
+			RecyclerView recyclerView,
+			RepositoryContext repository) {
 
 		try {
 			RecyclerViewRenderer renderer = rvRendererPool.claim(OBJECT_POOL_CLAIM_TIMEOUT);
 
-			if(renderer != null) {
+			if (renderer != null) {
 				renderer.setParameters(context, markdown, recyclerView, repository);
 				executorService.execute(renderer);
 			}
-		}
-		catch(InterruptedException ignored) {
+		} catch (InterruptedException ignored) {
 		}
 	}
 
@@ -175,41 +177,89 @@ 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;
+										private Typeface tf;
 
-					@Override
-					public void beforeSetText(@NonNull TextView textView, @NonNull Spanned markdown) {
+										@Override
+										public void beforeSetText(
+												@NonNull TextView textView,
+												@NonNull Spanned markdown) {
 
-						if(tf == null) {
-							tf = AppUtil.getTypeface(textView.getContext());
-						}
-						textView.setTypeface(tf);
-						super.beforeSetText(textView, markdown);
-					}
+											if (tf == null) {
+												tf = AppUtil.getTypeface(textView.getContext());
+											}
+											textView.setTypeface(tf);
+											super.beforeSetText(textView, markdown);
+										}
 
-					@Override
-					public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
+										@Override
+										public void configureTheme(
+												@NonNull MarkwonTheme.Builder builder) {
 
-						builder.codeBlockTypeface(Typeface.createFromAsset(context.getAssets(), "fonts/sourcecodeproregular.ttf"));
-						builder.codeBlockMargin((int) (context.getResources().getDisplayMetrics().density * 10));
-						builder.blockMargin((int) (context.getResources().getDisplayMetrics().density * 10));
-						builder.codeTextSize((int) (context.getResources().getDisplayMetrics().scaledDensity * 13));
-						builder.codeTypeface(Typeface.createFromAsset(context.getAssets(), "fonts/sourcecodeproregular.ttf"));
-						builder.linkColor(ResourcesCompat.getColor(context.getResources(), R.color.lightBlue, null));
+											builder.codeBlockTypeface(
+													Typeface.createFromAsset(
+															context.getAssets(),
+															"fonts/sourcecodeproregular.ttf"));
+											builder.codeBlockMargin(
+													(int)
+															(context.getResources()
+																			.getDisplayMetrics()
+																			.density
+																	* 10));
+											builder.blockMargin(
+													(int)
+															(context.getResources()
+																			.getDisplayMetrics()
+																			.density
+																	* 10));
+											builder.codeTextSize(
+													(int)
+															(context.getResources()
+																			.getDisplayMetrics()
+																			.scaledDensity
+																	* 13));
+											builder.codeTypeface(
+													Typeface.createFromAsset(
+															context.getAssets(),
+															"fonts/sourcecodeproregular.ttf"));
+											builder.linkColor(
+													ResourcesCompat.getColor(
+															context.getResources(),
+															R.color.lightBlue,
+															null));
 
-						if(tf == null) {
-							tf = AppUtil.getTypeface(context);
-						}
-						builder.headingTypeface(tf);
-					}
-				});
+											if (tf == null) {
+												tf = AppUtil.getTypeface(context);
+											}
+											builder.headingTypeface(tf);
+										}
+									});
 
 			markwon = builder.build();
 		}
@@ -226,7 +276,7 @@ public class Markdown {
 			Objects.requireNonNull(markdown);
 			Objects.requireNonNull(textView);
 
-			if(markwon == null) {
+			if (markwon == null) {
 				setup();
 			}
 
@@ -251,7 +301,6 @@ public class Markdown {
 
 			slot.expire(this);
 		}
-
 	}
 
 	private static class RecyclerViewRenderer implements Runnable, Poolable {
@@ -278,128 +327,232 @@ public class Markdown {
 			Objects.requireNonNull(context);
 			Objects.requireNonNull(repository);
 
-			if(linkPostProcessor == null) {
-				linkPostProcessor = new LinkPostProcessor(context.getString(R.string.commentButtonText));
+			if (linkPostProcessor == null) {
+				linkPostProcessor =
+						new LinkPostProcessor(context.getString(R.string.commentButtonText));
 				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;
+										private final Context context =
+												RecyclerViewRenderer.this.context;
+										private Typeface tf;
 
-					@Override
-					public void beforeSetText(@NonNull TextView textView, @NonNull Spanned markdown) {
+										@Override
+										public void beforeSetText(
+												@NonNull TextView textView,
+												@NonNull Spanned markdown) {
 
-						if(tf == null) {
-							tf = AppUtil.getTypeface(context);
-						}
-						textView.setTypeface(tf);
-						super.beforeSetText(textView, markdown);
-					}
+											if (tf == null) {
+												tf = AppUtil.getTypeface(context);
+											}
+											textView.setTypeface(tf);
+											super.beforeSetText(textView, markdown);
+										}
 
-					@Override
-					public void configureParser(@NonNull Parser.Builder builder) {
+										@Override
+										public void configureParser(
+												@NonNull Parser.Builder builder) {
 
-						builder.inlineParserFactory(inlineParserFactory);
-						builder.postProcessor(linkPostProcessor);
-					}
+											builder.inlineParserFactory(inlineParserFactory);
+											builder.postProcessor(linkPostProcessor);
+										}
 
-					@Override
-					public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
+										@Override
+										public void configureTheme(
+												@NonNull MarkwonTheme.Builder builder) {
 
-						builder.codeBlockTypeface(Typeface.createFromAsset(context.getAssets(), "fonts/sourcecodeproregular.ttf"));
-						builder.codeBlockMargin((int) (context.getResources().getDisplayMetrics().density * 10));
-						builder.blockMargin((int) (context.getResources().getDisplayMetrics().density * 10));
-						builder.codeTextSize((int) (context.getResources().getDisplayMetrics().scaledDensity * 13));
-						builder.codeTypeface(Typeface.createFromAsset(context.getAssets(), "fonts/sourcecodeproregular.ttf"));
-						builder.linkColor(ResourcesCompat.getColor(context.getResources(), R.color.lightBlue, null));
+											builder.codeBlockTypeface(
+													Typeface.createFromAsset(
+															context.getAssets(),
+															"fonts/sourcecodeproregular.ttf"));
+											builder.codeBlockMargin(
+													(int)
+															(context.getResources()
+																			.getDisplayMetrics()
+																			.density
+																	* 10));
+											builder.blockMargin(
+													(int)
+															(context.getResources()
+																			.getDisplayMetrics()
+																			.density
+																	* 10));
+											builder.codeTextSize(
+													(int)
+															(context.getResources()
+																			.getDisplayMetrics()
+																			.scaledDensity
+																	* 13));
+											builder.codeTypeface(
+													Typeface.createFromAsset(
+															context.getAssets(),
+															"fonts/sourcecodeproregular.ttf"));
+											builder.linkColor(
+													ResourcesCompat.getColor(
+															context.getResources(),
+															R.color.lightBlue,
+															null));
 
-						if(tf == null) {
-							tf = AppUtil.getTypeface(context);
-						}
-						builder.headingTypeface(Typeface.create(tf, Typeface.BOLD));
-					}
+											if (tf == null) {
+												tf = AppUtil.getTypeface(context);
+											}
+											builder.headingTypeface(
+													Typeface.create(tf, Typeface.BOLD));
+										}
 
-					@Override
-					public void configureConfiguration(@NonNull MarkwonConfiguration.Builder builder) {
-						builder.linkResolver((view, link) -> {
-							RepositoryContext repoLocal = linkPostProcessor.repository;
-							if(link.startsWith("gitnexuser://")) {
-								Intent i = new Intent(view.getContext(), ProfileActivity.class);
-								i.putExtra("username", link.substring(13));
-								view.getContext().startActivity(i);
-							}
-							else if(link.startsWith("gitnexissue://")) {
-								link = link.substring(14); // remove gitnexissue://
-								String index;
-								if(link.contains("/")) {
-									index = link.split("#")[1];
-								}
-								else {
-									index = link.substring(1);
-								}
-								String[] repo;
-								if(link.contains("/")) {
-									repo = link.split("#")[0].split("/");
-								}
-								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);
+										@Override
+										public void configureConfiguration(
+												@NonNull MarkwonConfiguration.Builder builder) {
+											builder.linkResolver(
+													(view, link) -> {
+														RepositoryContext repoLocal =
+																linkPostProcessor.repository;
+														if (link.startsWith("gitnexuser://")) {
+															Intent i =
+																	new Intent(
+																			view.getContext(),
+																			ProfileActivity.class);
+															i.putExtra(
+																	"username", link.substring(13));
+															view.getContext().startActivity(i);
+														} else if (link.startsWith(
+																"gitnexissue://")) {
+															link = link.substring(14); // remove
+															// gitnexissue://
+															String index;
+															if (link.contains("/")) {
+																index = link.split("#")[1];
+															} else {
+																index = link.substring(1);
+															}
+															String[] repo;
+															if (link.contains("/")) {
+																repo =
+																		link.split("#")[0].split(
+																				"/");
+															} 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);
 
-								if(link.contains("/")) {
-									i.putExtra("openedFromLink", "true");
-								}
+															if (link.contains("/")) {
+																i.putExtra(
+																		"openedFromLink", "true");
+															}
 
-								view.getContext().startActivity(i);
-							}
-							else if(link.startsWith("gitnexcommit://")) {
-								link = link.substring(15);
-								Intent i = repoLocal.getIntent(view.getContext(), CommitDetailActivity.class);
-								String sha;
-								if(link.contains("/")) {
-									sha = link.split("/")[2];
-								}
-								else {
-									sha = link.substring(1);
-								}
+															view.getContext().startActivity(i);
+														} else if (link.startsWith(
+																"gitnexcommit://")) {
+															link = link.substring(15);
+															Intent i =
+																	repoLocal.getIntent(
+																			view.getContext(),
+																			CommitDetailActivity
+																					.class);
+															String sha;
+															if (link.contains("/")) {
+																sha = link.split("/")[2];
+															} else {
+																sha = link.substring(1);
+															}
 
-								i.putExtra("sha", sha);
-								view.getContext().startActivity(i);
-							}
-							else {
-								AppUtil.openUrlInBrowser(view.getContext(), link);
-							}
-						});
-						super.configureConfiguration(builder);
-					}
-				});
+															i.putExtra("sha", sha);
+															view.getContext().startActivity(i);
+														} else {
+															AppUtil.openUrlInBrowser(
+																	view.getContext(), link);
+														}
+													});
+											super.configureConfiguration(builder);
+										}
+									});
 
 			markwon = builder.build();
 		}
 
 		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)))
-				.include(FencedCodeBlock.class, SimpleEntry.create(R.layout.custom_markdown_code_block, R.id.textCodeBlock)).build();
+			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();
 		}
 
-		public void setParameters(Context context, String markdown, RecyclerView recyclerView, RepositoryContext repository) {
+		public void setParameters(
+				Context context,
+				String markdown,
+				RecyclerView recyclerView,
+				RepositoryContext repository) {
 
 			this.context = context;
 			this.markdown = markdown;
 			this.recyclerView = recyclerView;
 			this.repository = repository;
-			if(linkPostProcessor != null) {
+			if (linkPostProcessor != null) {
 				linkPostProcessor.repository = repository;
 			}
 		}
@@ -412,7 +565,7 @@ public class Markdown {
 			Objects.requireNonNull(recyclerView);
 			Objects.requireNonNull(repository);
 
-			if(markwon == null) {
+			if (markwon == null) {
 				setup();
 			}
 
@@ -421,23 +574,25 @@ public class Markdown {
 			RecyclerView localReference = recyclerView;
 			String localMd = markdown;
 			MarkwonAdapter localAdapter = adapter;
-			localReference.post(() -> {
-				localReference.setLayoutManager(new LinearLayoutManager(context) {
+			localReference.post(
+					() -> {
+						localReference.setLayoutManager(
+								new LinearLayoutManager(context) {
 
-					@Override
-					public boolean canScrollVertically() {
+									@Override
+									public boolean canScrollVertically() {
 
-						return false; // disable RecyclerView scrolling, handeled by seperate ScrollViews
-					}
-				});
-				localReference.setAdapter(localAdapter);
+										return false; // disable RecyclerView scrolling, handeled by
+										// seperate ScrollViews
+									}
+								});
+						localReference.setAdapter(localAdapter);
 
-				localAdapter.setMarkdown(markwon, localMd);
-				localAdapter.notifyDataSetChanged();
-			});
+						localAdapter.setMarkdown(markwon, localMd);
+						localAdapter.notifyDataSetChanged();
+					});
 
 			release();
-
 		}
 
 		@Override
@@ -450,7 +605,6 @@ public class Markdown {
 			repository = null;
 
 			slot.release(this);
-
 		}
 
 		public void expire() {
@@ -472,14 +626,13 @@ public class Markdown {
 			protected Node parse() {
 
 				final String id = match(RE);
-				if(id != null) {
+				if (id != null) {
 					Link link = new Link("gitnexissue://" + id, null);
 					link.appendChild(text(id));
 					return link;
 				}
 				return null;
 			}
-
 		}
 
 		private static class UserInlineProcessor extends InlineProcessor {
@@ -496,14 +649,14 @@ public class Markdown {
 			protected Node parse() {
 
 				final String user = match(RE);
-				if(user != null) {
-					final Link link = new Link("gitnexuser://" + user.substring(1 /* remove @ */), null);
+				if (user != null) {
+					final Link link =
+							new Link("gitnexuser://" + user.substring(1 /* remove @ */), null);
 					link.appendChild(text(user));
 					return link;
 				}
 				return null;
 			}
-
 		}
 
 		private class LinkPostProcessor implements PostProcessor {
@@ -528,8 +681,12 @@ public class Markdown {
 
 			private void init() {
 
-				String instanceUrl = ((BaseActivity) context).getAccount().getAccount().getInstanceUrl();
-				instanceUrl = instanceUrl.substring(0, instanceUrl.lastIndexOf("api/v1/")).replaceAll("\\.", "\\.");
+				String instanceUrl =
+						((BaseActivity) context).getAccount().getAccount().getInstanceUrl();
+				instanceUrl =
+						instanceUrl
+								.substring(0, instanceUrl.lastIndexOf("api/v1/"))
+								.replaceAll("\\.", "\\.");
 				this.instanceUrl = instanceUrl;
 			}
 
@@ -549,43 +706,54 @@ 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);
+				final Pattern patternCommit =
+						Pattern.compile(
+								instanceUrl + "([^/]+/[^/]+)/commit/([a-z0-9_]+)(?!`|\\)|\\S+)",
+								Pattern.MULTILINE);
 				final Matcher matcherCommit = patternCommit.matcher(literal);
 
 				int foundAt = 0;
-				for(int i = 0; i < literal.length(); i++) {
+				for (int i = 0; i < literal.length(); i++) {
 					int issueStart = literal.length();
-					if(matcherIssue.find(i)) {
+					if (matcherIssue.find(i)) {
 						issueStart = matcherIssue.start();
 						foundAny = true;
 					}
 
 					int commitStart = literal.length();
-					if(matcherCommit.find(i)) {
+					if (matcherCommit.find(i)) {
 						commitStart = matcherCommit.start();
 						foundAny = true;
 					}
 
-					if(commitStart < issueStart) {
+					if (commitStart < issueStart) {
 						// next one is a commit
-						if(matcherCommit.start() > i) {
-							lastNode = insertNode(new Text(literal.substring(foundAt, matcherCommit.start())), lastNode);
+						if (matcherCommit.start() > i) {
+							lastNode =
+									insertNode(
+											new Text(
+													literal.substring(
+															foundAt, matcherCommit.start())),
+											lastNode);
 						}
 						String shortSha = matcherCommit.group(2);
-						if(shortSha == null) {
+						if (shortSha == null) {
 							return;
 						}
-						if(shortSha.length() > 10) {
+						if (shortSha.length() > 10) {
 							shortSha = shortSha.substring(0, 10);
 						}
 						String text;
-						if(matcherCommit.group(1).equals(repository.getFullName())) {
+						if (matcherCommit.group(1).equals(repository.getFullName())) {
 							text = shortSha;
-						}
-						else {
+						} else {
 							text = matcherCommit.group(1) + "/" + shortSha;
 						}
 						Text contentNode = new Text(text);
@@ -594,18 +762,19 @@ public class Markdown {
 						lastNode = insertNode(linkNode, lastNode);
 
 						i = matcherCommit.start();
-					}
-					else if(issueStart < literal.length()) {
+					} else if (issueStart < literal.length()) {
 						// next one is an issue/comment
-						if(matcherIssue.start() > i) {
-							lastNode = insertNode(new Text(literal.substring(i, matcherIssue.start())), lastNode);
+						if (matcherIssue.start() > i) {
+							lastNode =
+									insertNode(
+											new Text(literal.substring(i, matcherIssue.start())),
+											lastNode);
 						}
 
 						String text;
-						if(matcherIssue.group(1).equals(repository.getFullName())) {
+						if (matcherIssue.group(1).equals(repository.getFullName())) {
 							text = "#" + matcherIssue.group(2);
-						}
-						else {
+						} else {
 							text = matcherIssue.group(1) + "#" + matcherIssue.group(2);
 						}
 						Text contentNode = new Text(text);
@@ -614,7 +783,7 @@ public class Markdown {
 						lastNode = insertNode(linkNode, lastNode);
 
 						String anchor = matcherIssue.group(3);
-						if(anchor != null && anchor.startsWith("issuecomment-")) {
+						if (anchor != null && anchor.startsWith("issuecomment-")) {
 							// comment
 
 							// insert space
@@ -634,16 +803,19 @@ public class Markdown {
 					matcherIssue.reset();
 				}
 
-				if(foundAny) {
+				if (foundAny) {
 					textNode.unlink();
 				}
 			}
 
 			private void linkifyImage(Image node) {
 
-				final Matcher patternAttachments = Pattern.compile("(/attachments/\\S+)", Pattern.MULTILINE).matcher(node.getDestination());
-				if(patternAttachments.matches()) {
-					node.setDestination(instanceUrl + repository.getFullName() + patternAttachments.group(1));
+				final Matcher patternAttachments =
+						Pattern.compile("(/attachments/\\S+)", Pattern.MULTILINE)
+								.matcher(node.getDestination());
+				if (patternAttachments.matches()) {
+					node.setDestination(
+							instanceUrl + repository.getFullName() + patternAttachments.group(1));
 				}
 			}
 
@@ -669,15 +841,11 @@ public class Markdown {
 				@Override
 				public void visit(Text text) {
 
-					if(inLink == 0) {
+					if (inLink == 0) {
 						link(text);
 					}
 				}
-
 			}
-
 		}
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/MergePullRequestSpinner.java b/app/src/main/java/org/mian/gitnex/helpers/MergePullRequestSpinner.java
index 51c7fe25..a400a8a9 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/MergePullRequestSpinner.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/MergePullRequestSpinner.java
@@ -5,7 +5,6 @@ import java.io.Serializable;
 /**
  * @author M M Arif
  */
-
 public class MergePullRequestSpinner implements Serializable {
 
 	private String id;
@@ -16,7 +15,6 @@ public class MergePullRequestSpinner implements Serializable {
 		this.mergerMethod = mergerMethod;
 	}
 
-
 	public String getId() {
 		return id;
 	}
@@ -41,14 +39,12 @@ public class MergePullRequestSpinner implements Serializable {
 	@Override
 	public boolean equals(Object obj) {
 
-		if(obj instanceof MergePullRequestSpinner) {
+		if (obj instanceof MergePullRequestSpinner) {
 
 			MergePullRequestSpinner spinner = (MergePullRequestSpinner) obj;
 			return spinner.getMergerMethod().equals(mergerMethod) && spinner.getId().equals(id);
-
 		}
 
 		return false;
 	}
-
 }
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 e4dc47e3..fa323f77 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/NetworkStatusObserver.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/NetworkStatusObserver.java
@@ -25,73 +25,77 @@ public class NetworkStatusObserver {
 
 	private NetworkStatusObserver(Context context) {
 
-		ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+		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() {
+		cm.requestNetwork(
+				networkRequest,
+				new ConnectivityManager.NetworkCallback() {
 
-			@Override
-			public void onAvailable(@NonNull Network network) {
-				hasNetworkConnection.set(true);
-				networkStatusChanged();
-				checkInitialized();
-			}
-
-			@Override
-			public void onLost(@NonNull Network network) {
-				hasNetworkConnection.set(false);
-				networkStatusChanged();
-				checkInitialized();
-			}
-
-			private void checkInitialized() {
-
-				if(!hasInitialized) {
-					hasInitialized = true;
-					synchronized(mutex) {
-						mutex.notify();
+					@Override
+					public void onAvailable(@NonNull Network network) {
+						hasNetworkConnection.set(true);
+						networkStatusChanged();
+						checkInitialized();
 					}
-				}
-			}
 
-		});
+					@Override
+					public void onLost(@NonNull Network network) {
+						hasNetworkConnection.set(false);
+						networkStatusChanged();
+						checkInitialized();
+					}
 
-		synchronized(mutex) {
+					private void checkInitialized() {
+
+						if (!hasInitialized) {
+							hasInitialized = true;
+							synchronized (mutex) {
+								mutex.notify();
+							}
+						}
+					}
+				});
+
+		synchronized (mutex) {
 			try {
 				// This is actually not the recommended way to do this, but there
 				// is no other option besides upgrading to API level 26
 				// in order to use the built-in timeout functionality of {@code requestNetwork()}
 				// which in turn gives us access to {@code onUnavailable()} .
 				mutex.wait(5);
-			}
-			catch(InterruptedException ignored) {
+			} catch (InterruptedException ignored) {
 			}
 		}
 
-		if(!hasInitialized) {
+		if (!hasInitialized) {
 			hasInitialized = true;
 		}
 	}
 
 	public static NetworkStatusObserver getInstance(Context context) {
 
-		if(networkStatusObserver == null) {
-			synchronized(NetworkStatusObserver.class) {
-				if(networkStatusObserver == null) {
+		if (networkStatusObserver == null) {
+			synchronized (NetworkStatusObserver.class) {
+				if (networkStatusObserver == null) {
 					networkStatusObserver = new NetworkStatusObserver(context);
 				}
 			}
 		}
 
 		return networkStatusObserver;
-
 	}
 
 	private void networkStatusChanged() {
 		boolean hasNetworkConnection = hasNetworkConnection();
 
-		for(NetworkStatusListener networkStatusListener : networkStatusListeners) {
+		for (NetworkStatusListener networkStatusListener : networkStatusListeners) {
 			networkStatusListener.onNetworkStatusChanged(hasNetworkConnection);
 		}
 	}
@@ -112,7 +116,5 @@ public class NetworkStatusObserver {
 	public interface NetworkStatusListener {
 
 		void onNetworkStatusChanged(boolean hasNetworkConnection);
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/ParseDiff.java b/app/src/main/java/org/mian/gitnex/helpers/ParseDiff.java
index 0db62b6c..951af4cc 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/ParseDiff.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/ParseDiff.java
@@ -9,26 +9,24 @@ import java.util.regex.Pattern;
 /**
  * @author 6543
  */
-
 public class ParseDiff {
 
 	private static String[] getFileNames(String raw) {
 
 		String[] lines2 = raw.split(" b/");
-		if(lines2.length < 2) {
+		if (lines2.length < 2) {
 			return new String[1];
 		}
 		String oldName = lines2[0];
 		String newName = lines2[1].split("\\n")[0];
-		return new String[]{oldName, newName};
+		return new String[] {oldName, newName};
 	}
 
 	private static String getFileInfo(String raw) {
 
-		if(raw.contains("\ndeleted file mode \\d+\n")) {
+		if (raw.contains("\ndeleted file mode \\d+\n")) {
 			return "delete";
-		}
-		else if(raw.contains("\nnew file mode \\d+\n")) {
+		} else if (raw.contains("\nnew file mode \\d+\n")) {
 			return "new";
 		}
 		return "change";
@@ -43,18 +41,15 @@ public class ParseDiff {
 		Matcher rmMatcher = rmPattern.matcher(raw);
 		Matcher addMatcher = addPattern.matcher(raw);
 
-		if(raw.startsWith("+")) {
+		if (raw.startsWith("+")) {
 			add++;
-		}
-		else if(raw.startsWith("-")) {
+		} else if (raw.startsWith("-")) {
 			rm++;
 		}
-		while(rmMatcher.find())
-			rm++;
-		while(addMatcher.find())
-			add++;
+		while (rmMatcher.find()) rm++;
+		while (addMatcher.find()) add++;
 
-		return new int[]{rm, add};
+		return new int[] {rm, add};
 	}
 
 	public static List<FileDiffView> getFileDiffViewArray(String raw) {
@@ -62,59 +57,66 @@ public class ParseDiff {
 		String[] lines = raw.split("(^|\\n)diff --git a/");
 		List<FileDiffView> fileContentsArray;
 
-		if(lines.length > 1) {
+		if (lines.length > 1) {
 			fileContentsArray = new ArrayList<>(lines.length);
 
 			// for each file in diff
-			for(int i = 1; i < lines.length; i++) {
+			for (int i = 1; i < lines.length; i++) {
 
 				// check if it is a binary file
-				if(lines[i].contains("\nBinary files a/")) {
+				if (lines[i].contains("\nBinary files a/")) {
 					String[] fileNames = getFileNames(lines[i]);
-					if(fileNames.length != 2) {
+					if (fileNames.length != 2) {
 						continue;
 					}
-					fileContentsArray.add(new FileDiffView(fileNames[0], fileNames[1], "binary", "", null));
+					fileContentsArray.add(
+							new FileDiffView(fileNames[0], fileNames[1], "binary", "", null));
 				}
 
 				// check if it is a binary patch
-				else if(lines[i].contains("\nGIT binary patch\n")) {
+				else if (lines[i].contains("\nGIT binary patch\n")) {
 					String[] fileNames = getFileNames(lines[i]);
-					if(fileNames.length != 2) {
+					if (fileNames.length != 2) {
 						continue;
 					}
 
 					String[] tmp = lines[i].split("literal \\d+\\n");
 					String rawContent = "";
-					if(tmp.length >= 2) {
+					if (tmp.length >= 2) {
 						rawContent = tmp[1].replace("\n", "");
 					}
 
 					List<FileDiffView.Content> contents = new ArrayList<>();
 					contents.add(new FileDiffView.Content(rawContent));
-					fileContentsArray.add(new FileDiffView(fileNames[0], fileNames[1], "binary", getFileInfo(lines[i]), contents));
+					fileContentsArray.add(
+							new FileDiffView(
+									fileNames[0],
+									fileNames[1],
+									"binary",
+									getFileInfo(lines[i]),
+									contents));
 				}
 
 				// check if it is normal diff
-				else if(lines[i].contains("\n@@ -")) {
+				else if (lines[i].contains("\n@@ -")) {
 					String[] fileNames = getFileNames(lines[i]);
-					if(fileNames.length != 2) {
+					if (fileNames.length != 2) {
 						continue;
 					}
 					String[] rawDiffs = lines[i].split("\n@@ -");
-					if(rawDiffs.length <= 1) {
+					if (rawDiffs.length <= 1) {
 						continue;
 					}
 					List<FileDiffView.Content> contents = new ArrayList<>();
 					// parse each section starting with "@@" at line beginning
-					for(int j = 1; j < rawDiffs.length; j++) {
+					for (int j = 1; j < rawDiffs.length; j++) {
 						// remove stats info (ending with @@)
 						// raw diff is the whole raw diff without any diff meta info's
 						String[] rawDiff = rawDiffs[j].split("^\\d+(,\\d+)? \\+\\d+(,\\d+)? @@");
-						if(rawDiff.length <= 1) {
+						if (rawDiff.length <= 1) {
 							continue;
 						}
-						if(rawDiff[1].startsWith("\n")) {
+						if (rawDiff[1].startsWith("\n")) {
 							rawDiff[1] = rawDiff[1].substring(1);
 						}
 
@@ -124,35 +126,46 @@ public class ParseDiff {
 						// parse "-1,2 +2,3" and "-1 -3" and so on
 						int oldStart = 0, newStart = 0;
 						String[] diffPos = statsLine.split(" \\+");
-						if(diffPos.length == 2) {
+						if (diffPos.length == 2) {
 							oldStart = Integer.parseInt(diffPos[0].split(",")[0]);
 							newStart = Integer.parseInt(diffPos[1].split(",")[0]);
-
 						}
 
 						// get stat
 						int[] stats = countRemoveAdd(rawDiff[1]);
 
-						contents.add(new FileDiffView.Content(rawDiff[1], oldStart, newStart, stats[0], stats[1]));
+						contents.add(
+								new FileDiffView.Content(
+										rawDiff[1], oldStart, newStart, stats[0], stats[1]));
 					}
-					fileContentsArray.add(new FileDiffView(fileNames[0], fileNames[1], "diff", getFileInfo(lines[i]), contents));
+					fileContentsArray.add(
+							new FileDiffView(
+									fileNames[0],
+									fileNames[1],
+									"diff",
+									getFileInfo(lines[i]),
+									contents));
 				}
 
 				// a rename
-				else if(lines[i].contains("\nrename from")) {
+				else if (lines[i].contains("\nrename from")) {
 					String[] lines2 = lines[i].split("\\nrename (from|to )");
-					if(lines2.length != 3) {
+					if (lines2.length != 3) {
 						continue;
 					}
-					fileContentsArray.add(new FileDiffView(lines2[1], lines2[2].split("\\n")[0], "rename", "rename", null));
+					fileContentsArray.add(
+							new FileDiffView(
+									lines2[1],
+									lines2[2].split("\\n")[0],
+									"rename",
+									"rename",
+									null));
 				}
 			}
-		}
-		else {
+		} else {
 			fileContentsArray = Collections.emptyList();
 		}
 
 		return fileContentsArray;
 	}
-
 }
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 acfbb666..eba4f38b 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/Path.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/Path.java
@@ -11,7 +11,6 @@ import java.util.StringJoiner;
 /**
  * @author opyale
  */
-
 public class Path {
 
 	private final List<String> segments;
@@ -21,57 +20,54 @@ public class Path {
 
 		this.segments = new ArrayList<>(Arrays.asList(segments));
 		this.onChangedListeners = new ArrayList<>();
-
 	}
 
 	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));
-
+		return new Path(
+				Arrays.stream(parsed_segments)
+						.filter(s -> !s.trim().isEmpty())
+						.toArray(String[]::new));
 	}
 
 	public Path addListener(Runnable onChangedListener) {
 
 		onChangedListeners.add(onChangedListener);
 		return this;
-
 	}
 
 	public Path removeListener(Runnable onChangedListener) {
 
 		onChangedListeners.remove(onChangedListener);
 		return this;
-
 	}
 
 	private void pathChanged() {
 
-		for(Runnable onChangedListener : onChangedListeners) {
+		for (Runnable onChangedListener : onChangedListeners) {
 			onChangedListener.run();
 		}
 	}
 
 	public Path add(String segment) {
 
-		if(segment != null && !segment.trim().isEmpty()) {
+		if (segment != null && !segment.trim().isEmpty()) {
 
 			try {
 				segments.add(URLEncoder.encode(segment, "UTF-8"));
-			}
-			catch(UnsupportedEncodingException ignored) {
+			} catch (UnsupportedEncodingException ignored) {
 			}
 		}
 
 		pathChanged();
 		return this;
-
 	}
 
 	public Path addWithoutEncoding(String segment) {
 
-		if(segment != null && !segment.trim().isEmpty()) {
+		if (segment != null && !segment.trim().isEmpty()) {
 			segments.add(segment);
 		}
 
@@ -90,17 +86,14 @@ public class Path {
 
 		pathChanged();
 		return this;
-
 	}
 
 	public Path pop(int count) {
 
-		for(int i = 0; i < count; i++)
-			segments.remove(segments.size() - 1);
+		for (int i = 0; i < count; i++) segments.remove(segments.size() - 1);
 
 		pathChanged();
 		return this;
-
 	}
 
 	public Path remove(int index) {
@@ -109,7 +102,6 @@ public class Path {
 		pathChanged();
 
 		return this;
-
 	}
 
 	public Path clear() {
@@ -118,25 +110,20 @@ public class Path {
 		pathChanged();
 
 		return this;
-
 	}
 
 	public String[] segments() {
 
-		return segments.toArray(new String[]{});
+		return segments.toArray(new String[] {});
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public String toString() {
 
 		StringJoiner stringJoiner = new StringJoiner("/");
 
-		for(String segment : segments)
-			stringJoiner.add(segment);
+		for (String segment : segments) stringJoiner.add(segment);
 
 		return stringJoiner.toString();
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/PathsHelper.java b/app/src/main/java/org/mian/gitnex/helpers/PathsHelper.java
index e480ac84..6f55e5bb 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/PathsHelper.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/PathsHelper.java
@@ -3,35 +3,30 @@ package org.mian.gitnex.helpers;
 /**
  * @author opyale
  */
-
 public class PathsHelper {
 
 	public static String join(String... paths) {
 
 		StringBuilder stringBuilder = new StringBuilder();
 
-		for(String path : paths) {
+		for (String path : paths) {
 
-			if(path != null && !path.isEmpty()) {
+			if (path != null && !path.isEmpty()) {
 
-				if(!path.startsWith("/")) {
+				if (!path.startsWith("/")) {
 
 					stringBuilder.append("/");
 				}
 
-				if(path.endsWith("/")) {
+				if (path.endsWith("/")) {
 
 					path = path.substring(0, path.lastIndexOf("/"));
 				}
 
 				stringBuilder.append(path);
-
 			}
-
 		}
 
 		return stringBuilder.append("/").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 da04e186..81346add 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java
@@ -5,7 +5,6 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.util.Log;
 import com.squareup.picasso.Cache;
-import org.mian.gitnex.R;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -16,15 +15,16 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
+import org.mian.gitnex.R;
 
 /**
  * @author opyale
  */
-
 public class PicassoCache implements Cache {
 
 	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 static final int COMPRESSION_QUALITY =
+			50; // 0 = high compression (low file size) | 100 = no compression
 	private static final String CACHE_MAP_FILE = "cacheMap";
 	private final String TAG = "PicassoCache";
 	private final int CACHE_SIZE;
@@ -36,12 +36,19 @@ public class PicassoCache implements Cache {
 
 		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;
 
-		if(cacheMapExists(cachePath)) {
+		if (cacheMapExists(cachePath)) {
 
 			cacheMap.putAll(loadCacheMap());
 		}
@@ -52,9 +59,11 @@ public class PicassoCache implements Cache {
 
 		try {
 
-			if(cacheMap.containsKey(key)) {
+			if (cacheMap.containsKey(key)) {
 
-				FileInputStream fileInputStream = new FileInputStream(new File(cachePath, Objects.requireNonNull(cacheMap.get(key))));
+				FileInputStream fileInputStream =
+						new FileInputStream(
+								new File(cachePath, Objects.requireNonNull(cacheMap.get(key))));
 
 				Bitmap bitmap = BitmapFactory.decodeStream(fileInputStream);
 				fileInputStream.close();
@@ -62,8 +71,7 @@ public class PicassoCache implements Cache {
 				return bitmap;
 			}
 
-		}
-		catch(IOException e) {
+		} catch (IOException e) {
 
 			Log.e(TAG, e.toString());
 		}
@@ -88,13 +96,10 @@ public class PicassoCache implements Cache {
 			cacheMap.put(key, uuid);
 			saveCacheMap(cacheMap);
 
-		}
-		catch(IOException e) {
+		} catch (IOException e) {
 
 			Log.e(TAG, e.toString());
-
 		}
-
 	}
 
 	@Override
@@ -102,21 +107,18 @@ public class PicassoCache implements Cache {
 
 		int currentSize = 0;
 
-		for(String key : cacheMap.keySet()) {
+		for (String key : cacheMap.keySet()) {
 
 			currentSize += new File(cachePath, Objects.requireNonNull(cacheMap.get(key))).length();
-
 		}
 
 		return currentSize;
-
 	}
 
 	@Override
 	public int maxSize() {
 
 		return CACHE_SIZE;
-
 	}
 
 	@Override
@@ -124,80 +126,71 @@ public class PicassoCache implements Cache {
 
 		File[] files = cachePath.listFiles();
 
-		if(files != null) {
+		if (files != null) {
 
-			for(File file : files) {
+			for (File file : files) {
 
 				//noinspection ResultOfMethodCallIgnored
 				file.delete();
-
 			}
-
 		}
-
 	}
 
 	@Override
 	public void clearKeyUri(String keyPrefix) {
 
-		for(String key : cacheMap.keySet()) {
+		for (String key : cacheMap.keySet()) {
 
 			int len = Math.min(keyPrefix.length(), key.length());
 			boolean match = true;
 
-			for(int i = 0; i < len; i++) {
+			for (int i = 0; i < len; i++) {
 
-				if(key.charAt(i) != keyPrefix.charAt(i)) {
+				if (key.charAt(i) != keyPrefix.charAt(i)) {
 
 					match = false;
 					break;
 				}
-
 			}
 
-			if(match) {
+			if (match) {
 
 				//noinspection ResultOfMethodCallIgnored
 				new File(cachePath, Objects.requireNonNull(cacheMap.get(key))).delete();
 				cacheMap.remove(key);
-
 			}
-
 		}
-
 	}
 
 	private String generateRandomFilename() {
 
 		return UUID.randomUUID().toString();
-
 	}
 
 	private void saveCacheMap(Map<String, String> cacheMap) throws IOException {
 
-		ObjectOutputStream objectOutputStream = new ObjectOutputStream(new FileOutputStream(new File(cachePath, CACHE_MAP_FILE), false));
+		ObjectOutputStream objectOutputStream =
+				new ObjectOutputStream(
+						new FileOutputStream(new File(cachePath, CACHE_MAP_FILE), false));
 
 		objectOutputStream.writeObject(cacheMap);
 		objectOutputStream.flush();
 		objectOutputStream.close();
-
 	}
 
 	private Map<String, String> loadCacheMap() throws IOException, ClassNotFoundException {
 
-		ObjectInputStream objectInputStream = new ObjectInputStream(new FileInputStream(new File(cachePath, CACHE_MAP_FILE)));
+		ObjectInputStream objectInputStream =
+				new ObjectInputStream(new FileInputStream(new File(cachePath, CACHE_MAP_FILE)));
 
 		Map<String, String> map = (HashMap<String, String>) objectInputStream.readObject();
 		objectInputStream.close();
 
 		return map;
-
 	}
 
 	private boolean cacheMapExists(File cachePath) {
 
 		return new File(cachePath, CACHE_MAP_FILE).exists();
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/RecyclerViewEmptySupport.java b/app/src/main/java/org/mian/gitnex/helpers/RecyclerViewEmptySupport.java
index e13df38f..ce5f9ee3 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/RecyclerViewEmptySupport.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/RecyclerViewEmptySupport.java
@@ -8,29 +8,28 @@ import androidx.recyclerview.widget.RecyclerView;
 /**
  * @author com.github.abumoallim, modified by M M Arif
  */
-
 public class RecyclerViewEmptySupport extends RecyclerView {
 
 	private View emptyView;
 
-	final private AdapterDataObserver observer = new AdapterDataObserver() {
+	private final AdapterDataObserver observer =
+			new AdapterDataObserver() {
 
-		@Override
-		public void onChanged() {
-			checkIfEmpty();
-		}
+				@Override
+				public void onChanged() {
+					checkIfEmpty();
+				}
 
-		@Override
-		public void onItemRangeInserted(int positionStart, int itemCount) {
-			checkIfEmpty();
-		}
+				@Override
+				public void onItemRangeInserted(int positionStart, int itemCount) {
+					checkIfEmpty();
+				}
 
-		@Override
-		public void onItemRangeRemoved(int positionStart, int itemCount) {
-			checkIfEmpty();
-		}
-
-	};
+				@Override
+				public void onItemRangeRemoved(int positionStart, int itemCount) {
+					checkIfEmpty();
+				}
+			};
 
 	public RecyclerViewEmptySupport(Context context) {
 		super(context);
@@ -46,33 +45,30 @@ public class RecyclerViewEmptySupport extends RecyclerView {
 
 	void checkIfEmpty() {
 
-		if(emptyView != null && getAdapter() != null) {
+		if (emptyView != null && getAdapter() != null) {
 			final boolean emptyViewVisible = getAdapter().getItemCount() == 0;
 			emptyView.setVisibility(emptyViewVisible ? VISIBLE : GONE);
 			setVisibility(emptyViewVisible ? GONE : VISIBLE);
 		}
-
 	}
 
 	@Override
 	public void setAdapter(Adapter adapter) {
 
 		final Adapter<?> oldAdapter = getAdapter();
-		if(oldAdapter != null) {
+		if (oldAdapter != null) {
 			oldAdapter.unregisterAdapterDataObserver(observer);
 		}
 		super.setAdapter(adapter);
-		if(adapter != null) {
+		if (adapter != null) {
 			adapter.registerAdapterDataObserver(observer);
 		}
 
 		checkIfEmpty();
-
 	}
 
 	public void setEmptyView(View emptyView) {
 		this.emptyView = emptyView;
 		checkIfEmpty();
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/RoundedTransformation.java b/app/src/main/java/org/mian/gitnex/helpers/RoundedTransformation.java
index f5528494..da685b21 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/RoundedTransformation.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/RoundedTransformation.java
@@ -10,7 +10,6 @@ import android.graphics.Shader;
 /**
  * @author M M Arif
  */
-
 public class RoundedTransformation implements com.squareup.picasso.Transformation {
 
 	private final int radius;
@@ -29,11 +28,16 @@ public class RoundedTransformation implements com.squareup.picasso.Transformatio
 		paint.setAntiAlias(true);
 		paint.setShader(new BitmapShader(source, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP));
 
-		Bitmap output = Bitmap.createBitmap(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888);
+		Bitmap output =
+				Bitmap.createBitmap(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888);
 		Canvas canvas = new Canvas(output);
-		canvas.drawRoundRect(new RectF(margin, margin, source.getWidth() - margin, source.getHeight() - margin), radius, radius, paint);
+		canvas.drawRoundRect(
+				new RectF(margin, margin, source.getWidth() - margin, source.getHeight() - margin),
+				radius,
+				radius,
+				paint);
 
-		if(source != output) {
+		if (source != output) {
 			source.recycle();
 		}
 
@@ -44,5 +48,4 @@ public class RoundedTransformation implements com.squareup.picasso.Transformatio
 	public String key() {
 		return "rounded";
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/SimpleCallback.java b/app/src/main/java/org/mian/gitnex/helpers/SimpleCallback.java
index b121170c..37a79bbc 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/SimpleCallback.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/SimpleCallback.java
@@ -12,7 +12,6 @@ import retrofit2.Response;
 /**
  * @author opyale
  */
-
 public interface SimpleCallback<T> extends Callback<T> {
 
 	void onFinished(@NonNull Call<T> call, @NonNull Optional<Response<T>> optionalResponse);
@@ -24,7 +23,9 @@ public interface SimpleCallback<T> extends Callback<T> {
 	default void onFailure(@NonNull Call<T> call, @NonNull Throwable throwable) {
 		onFinished(call, Optional.empty());
 
-		Log.e(call.request().url().pathSegments().stream().collect(Collectors.joining(File.pathSeparator)), throwable.toString());
+		Log.e(
+				call.request().url().pathSegments().stream()
+						.collect(Collectors.joining(File.pathSeparator)),
+				throwable.toString());
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/SnackBar.java b/app/src/main/java/org/mian/gitnex/helpers/SnackBar.java
index d9e333b9..5c093c5b 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/SnackBar.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/SnackBar.java
@@ -9,7 +9,6 @@ import org.mian.gitnex.R;
 /**
  * @author M M Arif
  */
-
 public class SnackBar {
 
 	public static void info(Context context, View view, String message) {
@@ -43,5 +42,4 @@ public class SnackBar {
 		textView.setTextColor(context.getColor(R.color.darkRed));
 		snackBar.show();
 	}
-
 }
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 181891a8..1fdac369 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java
@@ -1,8 +1,6 @@
 package org.mian.gitnex.helpers;
 
 import android.content.Context;
-import org.mian.gitnex.R;
-import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -11,62 +9,73 @@ import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
+import org.mian.gitnex.R;
+import org.ocpsoft.prettytime.PrettyTime;
 
 /**
  * @author M M Arif
  */
-
 public class TimeHelper {
 
 	public static String customDateFormatForToast(String customDate) {
 
 		String[] parts = customDate.split("\\+");
 		String part1 = parts[0] + "Z";
-		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ENGLISH);
+		SimpleDateFormat formatter =
+				new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ENGLISH);
 		Date createdTime = null;
 
 		try {
 			createdTime = formatter.parse(part1);
-		}
-		catch(ParseException ignored) {
+		} catch (ParseException ignored) {
 		}
 
 		assert createdTime != null;
 
 		return customDateFormatForToastDateFormat(createdTime);
-
 	}
 
 	public static String formatTime(Date date, Locale locale, String timeFormat, Context context) {
 
-		if(date != null) {
-			switch(timeFormat) {
-
-				case "pretty": {
-					PrettyTime prettyTime = new PrettyTime(locale);
-					return prettyTime.format(date);
-				}
-				case "normal": {
-					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);
-					return formatter.format(date);
-				}
-
+		if (date != null) {
+			switch (timeFormat) {
+				case "pretty":
+					{
+						PrettyTime prettyTime = new PrettyTime(locale);
+						return prettyTime.format(date);
+					}
+				case "normal":
+					{
+						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);
+						return formatter.format(date);
+					}
 			}
 		}
 
 		return "";
-
 	}
 
 	public static String customDateFormatForToastDateFormat(Date customDate) {
 
 		DateFormat format = DateFormat.getDateTimeInstance();
 		return format.format(customDate);
-
 	}
 
 	public static boolean timeBetweenHours(int fromHour, int toHour, int fromMinute, int toMinute) {
@@ -81,21 +90,18 @@ public class TimeHelper {
 		to.set(Calendar.HOUR_OF_DAY, toHour);
 		to.set(Calendar.MINUTE, toMinute);
 
-		if(to.before(from)) {
-			if(cal.after(to)) {
+		if (to.before(from)) {
+			if (cal.after(to)) {
 				to.add(Calendar.DATE, 1);
-			}
-			else {
+			} else {
 				from.add(Calendar.DATE, -1);
 			}
 		}
 
 		return cal.after(from) && cal.before(to);
-
 	}
 
 	public static Date parseIso8601(String iso8601) {
 		return Date.from(Instant.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(iso8601)));
 	}
-
 }
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 284f356e..751604f5 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/TinyDB.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/TinyDB.java
@@ -20,21 +20,22 @@ public class TinyDB {
 	private final SharedPreferences preferences;
 
 	private TinyDB(Context appContext) {
-		preferences = appContext.getSharedPreferences(appContext.getPackageName() + "_preferences", Context.MODE_PRIVATE);
+		preferences =
+				appContext.getSharedPreferences(
+						appContext.getPackageName() + "_preferences", Context.MODE_PRIVATE);
 	}
 
 	public static synchronized TinyDB getInstance(Context context) {
 
-		if(tinyDB == null) {
-			synchronized(TinyDB.class) {
-				if(tinyDB == null) {
+		if (tinyDB == null) {
+			synchronized (TinyDB.class) {
+				if (tinyDB == null) {
 					tinyDB = new TinyDB(context);
 				}
 			}
 		}
 
 		return tinyDB;
-
 	}
 
 	/**
@@ -54,7 +55,8 @@ public class TinyDB {
 	public static boolean isExternalStorageReadable() {
 		String state = Environment.getExternalStorageState();
 
-		return Environment.MEDIA_MOUNTED.equals(state) || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state);
+		return Environment.MEDIA_MOUNTED.equals(state)
+				|| Environment.MEDIA_MOUNTED_READ_ONLY.equals(state);
 	}
 
 	// Getters
@@ -62,7 +64,7 @@ public class TinyDB {
 	/**
 	 * Saves 'theBitmap' into 'fullPath'
 	 *
-	 * @param fullPath  full path of the image file e.g. "Images/MeAtLunch.png"
+	 * @param fullPath full path of the image file e.g. "Images/MeAtLunch.png"
 	 * @param theBitmap the image you want to save as a Bitmap
 	 * @return true if image was saved, false otherwise
 	 */
@@ -74,11 +76,11 @@ public class TinyDB {
 	 * Saves the Bitmap as a PNG file at path 'fullPath'
 	 *
 	 * @param fullPath path of the image file
-	 * @param bitmap   the image as a Bitmap
+	 * @param bitmap the image as a Bitmap
 	 * @return true if it successfully saved, false otherwise
 	 */
 	private boolean saveBitmap(String fullPath, Bitmap bitmap) {
-		if(fullPath == null || bitmap == null) {
+		if (fullPath == null || bitmap == null) {
 			return false;
 		}
 
@@ -88,16 +90,15 @@ public class TinyDB {
 
 		File imageFile = new File(fullPath);
 
-		if(imageFile.exists()) {
-			if(!imageFile.delete()) {
+		if (imageFile.exists()) {
+			if (!imageFile.delete()) {
 				return false;
 			}
 		}
 
 		try {
 			fileCreated = imageFile.createNewFile();
-		}
-		catch(IOException e) {
+		} catch (IOException e) {
 			e.printStackTrace();
 		}
 
@@ -106,18 +107,15 @@ public class TinyDB {
 			out = new FileOutputStream(imageFile);
 			bitmapCompressed = bitmap.compress(CompressFormat.PNG, 100, out);
 
-		}
-		catch(Exception e) {
+		} catch (Exception e) {
 			e.printStackTrace();
-		}
-		finally {
-			if(out != null) {
+		} finally {
+			if (out != null) {
 				try {
 					out.flush();
 					out.close();
 					streamClosed = true;
-				}
-				catch(IOException e) {
+				} catch (IOException e) {
 					e.printStackTrace();
 				}
 			}
@@ -143,7 +141,7 @@ public class TinyDB {
 	/**
 	 * Get long value from SharedPreferences at 'key'. If key not found, return 'defaultValue'
 	 *
-	 * @param key          SharedPreferences key
+	 * @param key SharedPreferences key
 	 * @param defaultValue long value returned if key was not found
 	 * @return long value at 'key' or 'defaultValue' if key not found
 	 */
@@ -198,7 +196,7 @@ public class TinyDB {
 	/**
 	 * Put int value into SharedPreferences with 'key' and save
 	 *
-	 * @param key   SharedPreferences key
+	 * @param key SharedPreferences key
 	 * @param value int value to be added
 	 */
 	public void putInt(String key, int value) {
@@ -209,7 +207,7 @@ public class TinyDB {
 	/**
 	 * Put long value into SharedPreferences with 'key' and save
 	 *
-	 * @param key   SharedPreferences key
+	 * @param key SharedPreferences key
 	 * @param value long value to be added
 	 */
 	public void putLong(String key, long value) {
@@ -220,7 +218,7 @@ public class TinyDB {
 	/**
 	 * Put float value into SharedPreferences with 'key' and save
 	 *
-	 * @param key   SharedPreferences key
+	 * @param key SharedPreferences key
 	 * @param value float value to be added
 	 */
 	public void putFloat(String key, float value) {
@@ -231,7 +229,7 @@ public class TinyDB {
 	/**
 	 * Put String value into SharedPreferences with 'key' and save
 	 *
-	 * @param key   SharedPreferences key
+	 * @param key SharedPreferences key
 	 * @param value String value to be added
 	 */
 	public void putString(String key, String value) {
@@ -243,7 +241,7 @@ public class TinyDB {
 	/**
 	 * Put boolean value into SharedPreferences with 'key' and save
 	 *
-	 * @param key   SharedPreferences key
+	 * @param key SharedPreferences key
 	 * @param value boolean value to be added
 	 */
 	public void putBoolean(String key, boolean value) {
@@ -270,9 +268,7 @@ public class TinyDB {
 		return new File(path).delete();
 	}
 
-	/**
-	 * Clear SharedPreferences (remove everything)
-	 */
+	/** Clear SharedPreferences (remove everything) */
 	public void clear() {
 		preferences.edit().clear().apply();
 	}
@@ -291,7 +287,8 @@ public class TinyDB {
 	 *
 	 * @param listener listener object of OnSharedPreferenceChangeListener
 	 */
-	public void registerOnSharedPreferenceChangeListener(SharedPreferences.OnSharedPreferenceChangeListener listener) {
+	public void registerOnSharedPreferenceChangeListener(
+			SharedPreferences.OnSharedPreferenceChangeListener listener) {
 
 		preferences.registerOnSharedPreferenceChangeListener(listener);
 	}
@@ -301,31 +298,33 @@ public class TinyDB {
 	 *
 	 * @param listener listener object of OnSharedPreferenceChangeListener to be unregistered
 	 */
-	public void unregisterOnSharedPreferenceChangeListener(SharedPreferences.OnSharedPreferenceChangeListener listener) {
+	public void unregisterOnSharedPreferenceChangeListener(
+			SharedPreferences.OnSharedPreferenceChangeListener listener) {
 
 		preferences.unregisterOnSharedPreferenceChangeListener(listener);
 	}
 
 	/**
-	 * null keys would corrupt the shared pref file and make them unreadable this is a preventive measure
+	 * null keys would corrupt the shared pref file and make them unreadable this is a preventive
+	 * measure
 	 *
 	 * @param key the pref key
 	 */
 	public void checkForNullKey(String key) {
-		if(key == null) {
+		if (key == null) {
 			throw new NullPointerException();
 		}
 	}
 
 	/**
-	 * null keys would corrupt the shared pref file and make them unreadable this is a preventive measure
+	 * null keys would corrupt the shared pref file and make them unreadable this is a preventive
+	 * measure
 	 *
 	 * @param value the pref key
 	 */
 	public void checkForNullValue(String value) {
-		if(value == null) {
+		if (value == null) {
 			throw new NullPointerException();
 		}
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/Toasty.java b/app/src/main/java/org/mian/gitnex/helpers/Toasty.java
index 33c7164a..24e83c0e 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/Toasty.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/Toasty.java
@@ -10,13 +10,14 @@ import org.mian.gitnex.R;
 /**
  * @author M M Arif
  */
-
 public class Toasty {
 
 	public static void info(Context context, String message) {
 
 		LayoutInflater inflater = LayoutInflater.from(context);
-		View view = inflater.inflate(context.getResources().getLayout(R.layout.custom_toast_info), null);
+		View view =
+				inflater.inflate(
+						context.getResources().getLayout(R.layout.custom_toast_info), null);
 
 		TextView text = view.findViewById(R.id.toastText);
 		text.setText(message);
@@ -25,13 +26,14 @@ public class Toasty {
 		toast.setDuration(Toast.LENGTH_LONG);
 		toast.setView(view);
 		toast.show();
-
 	}
 
 	public static void error(Context context, String message) {
 
 		LayoutInflater inflater = LayoutInflater.from(context);
-		View view = inflater.inflate(context.getResources().getLayout(R.layout.custom_toast_error), null);
+		View view =
+				inflater.inflate(
+						context.getResources().getLayout(R.layout.custom_toast_error), null);
 
 		TextView text = view.findViewById(R.id.toastText);
 		text.setText(message);
@@ -40,13 +42,14 @@ public class Toasty {
 		toast.setDuration(Toast.LENGTH_LONG);
 		toast.setView(view);
 		toast.show();
-
 	}
 
 	public static void warning(Context context, String message) {
 
 		LayoutInflater inflater = LayoutInflater.from(context);
-		View view = inflater.inflate(context.getResources().getLayout(R.layout.custom_toast_warning), null);
+		View view =
+				inflater.inflate(
+						context.getResources().getLayout(R.layout.custom_toast_warning), null);
 
 		TextView text = view.findViewById(R.id.toastText);
 		text.setText(message);
@@ -55,13 +58,14 @@ public class Toasty {
 		toast.setDuration(Toast.LENGTH_LONG);
 		toast.setView(view);
 		toast.show();
-
 	}
 
 	public static void success(Context context, String message) {
 
 		LayoutInflater inflater = LayoutInflater.from(context);
-		View view = inflater.inflate(context.getResources().getLayout(R.layout.custom_toast_success), null);
+		View view =
+				inflater.inflate(
+						context.getResources().getLayout(R.layout.custom_toast_success), null);
 
 		TextView text = view.findViewById(R.id.toastText);
 		text.setText(message);
@@ -70,7 +74,5 @@ public class Toasty {
 		toast.setDuration(Toast.LENGTH_LONG);
 		toast.setView(view);
 		toast.show();
-
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/UrlHelper.java b/app/src/main/java/org/mian/gitnex/helpers/UrlHelper.java
index 2404d7fa..926b6c25 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/UrlHelper.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/UrlHelper.java
@@ -6,7 +6,6 @@ import java.net.URISyntaxException;
 /**
  * @author M M Arif
  */
-
 public class UrlHelper {
 
 	public static String cleanUrl(String url) {
@@ -14,8 +13,7 @@ public class UrlHelper {
 		URI uri = null;
 		try {
 			uri = new URI(url);
-		}
-		catch(URISyntaxException e) {
+		} catch (URISyntaxException e) {
 			e.printStackTrace();
 		}
 
@@ -25,23 +23,19 @@ public class UrlHelper {
 		int urlPort = uri.getPort();
 
 		String urlFinal = null;
-		if(urlPort > 0) {
+		if (urlPort > 0) {
 			urlFinal = urlProtocol + "://" + urlHost + ":" + urlPort;
-		}
-		else if(urlProtocol != null) {
+		} else if (urlProtocol != null) {
 			urlFinal = urlProtocol + "://" + urlHost;
-		}
-		else {
+		} else {
 			urlFinal = urlHost;
 		}
 
 		return urlFinal;
-
 	}
 
 	public static String fixScheme(String url, String scheme) {
 
 		return !url.matches("^(http|https)://.+$") ? scheme + "://" + url : url;
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/Version.java b/app/src/main/java/org/mian/gitnex/helpers/Version.java
index 2b75b5ed..1ec83d61 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/Version.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/Version.java
@@ -10,7 +10,6 @@ import java.util.regex.Pattern;
 /**
  * @author 6543
  */
-
 public class Version {
 
 	// the raw String
@@ -23,7 +22,6 @@ public class Version {
 
 		raw = value;
 		this.init();
-
 	}
 
 	/**
@@ -34,16 +32,17 @@ public class Version {
 	 */
 	public static boolean valid(String value) {
 
-		if(value == null) {
+		if (value == null) {
 			return false;
 		}
-		final Pattern patternValid = Pattern.compile("^[v,V]?(\\d+)+(\\.(\\d+))*([_,\\-,+][\\w,\\d,_,\\-,+]*)?$");
+		final Pattern patternValid =
+				Pattern.compile("^[v,V]?(\\d+)+(\\.(\\d+))*([_,\\-,+][\\w,\\d,_,\\-,+]*)?$");
 		return value.equals("main") || patternValid.matcher(value).find();
 	}
 
 	/**
-	 * init parse and store values for other functions of an Version instance
-	 * it use the raw variable as base
+	 * init parse and store values for other functions of an Version instance it use the raw
+	 * variable as base
 	 *
 	 * @return if parse was successfully
 	 */
@@ -51,34 +50,33 @@ public class Version {
 
 		final Pattern patternNumberDotNumber = Pattern.compile("^\\d+(\\.(\\d)+)*");
 
-		if(raw.isEmpty()) {
+		if (raw.isEmpty()) {
 			raw = "0";
 		}
 
-		if(!valid(raw)) {
+		if (!valid(raw)) {
 			throw new IllegalArgumentException("Invalid version format: " + raw);
 		}
-		if(raw.equals("main")) {
+		if (raw.equals("main")) {
 			dev = true;
 			values = new ArrayList<>();
 			return;
 		}
 
-		if(raw.charAt(0) == 'v' || raw.charAt(0) == 'V') {
+		if (raw.charAt(0) == 'v' || raw.charAt(0) == 'V') {
 			raw = raw.substring(1);
 		}
 
 		values = new ArrayList<>();
 		Matcher match = patternNumberDotNumber.matcher(raw);
-		if(!match.find()) {
+		if (!match.find()) {
 			dev = true;
 			values = new ArrayList<>();
 			return;
 		}
-		for(String i : match.group().split("\\.")) {
+		for (String i : match.group().split("\\.")) {
 			values.add(Integer.parseInt(i));
 		}
-
 	}
 
 	/**
@@ -90,7 +88,6 @@ public class Version {
 	public boolean equal(String value) {
 
 		return this.equal(new Version(value));
-
 	}
 
 	/**
@@ -101,21 +98,19 @@ public class Version {
 	 */
 	public boolean equal(@NonNull Version v) {
 
-		if(dev || v.dev) { // equal if raw is equal
+		if (dev || v.dev) { // equal if raw is equal
 			return Objects.equals(raw, v.raw);
 		}
 
 		int rounds = Math.min(this.values.size(), v.values.size());
-		for(int i = 0; i < rounds; i++) {
-			if(!Objects.equals(this.values.get(i), v.values.get(i))) {
+		for (int i = 0; i < rounds; i++) {
+			if (!Objects.equals(this.values.get(i), v.values.get(i))) {
 				return false;
 			}
 		}
 		return true;
-
 	}
 
-
 	/**
 	 * less return true if version is less
 	 *
@@ -125,7 +120,6 @@ public class Version {
 	public boolean less(String value) {
 
 		return this.less(new Version(value));
-
 	}
 
 	/**
@@ -137,10 +131,8 @@ public class Version {
 	public boolean less(@NonNull Version v) {
 
 		return v.higher(this);
-
 	}
 
-
 	/**
 	 * higher return true if version is higher
 	 *
@@ -150,7 +142,6 @@ public class Version {
 	public boolean higher(String value) {
 
 		return this.higher(new Version(value));
-
 	}
 
 	/**
@@ -161,31 +152,27 @@ public class Version {
 	 */
 	public boolean higher(@NonNull Version v) {
 
-		if(dev) {
+		if (dev) {
 			return !v.dev;
-		}
-		else if(v.dev) {
+		} else if (v.dev) {
 			return false;
 		}
 
 		int rounds = Math.min(this.values.size(), v.values.size());
-		for(int i = 0; i < rounds; i++) {
-			if(i + 1 == rounds) {
-				if(this.values.get(i) <= v.values.get(i)) {
+		for (int i = 0; i < rounds; i++) {
+			if (i + 1 == rounds) {
+				if (this.values.get(i) <= v.values.get(i)) {
 					return false;
 				}
-			}
-			else {
-				if(this.values.get(i) < v.values.get(i)) {
+			} else {
+				if (this.values.get(i) < v.values.get(i)) {
 					return false;
-				}
-				else if(this.values.get(i) > v.values.get(i)) {
+				} else if (this.values.get(i) > v.values.get(i)) {
 					return true;
 				}
 			}
 		}
 		return true;
-
 	}
 
 	/**
@@ -197,7 +184,6 @@ public class Version {
 	public boolean lessOrEqual(String value) {
 
 		return this.lessOrEqual(new Version(value));
-
 	}
 
 	/**
@@ -209,10 +195,8 @@ public class Version {
 	public boolean lessOrEqual(@NonNull Version v) {
 
 		return v.higherOrEqual(this);
-
 	}
 
-
 	/**
 	 * higherOrEqual return true if version is higher or equal
 	 *
@@ -222,7 +206,6 @@ public class Version {
 	public boolean higherOrEqual(String value) {
 
 		return this.higherOrEqual(new Version(value));
-
 	}
 
 	/**
@@ -233,29 +216,24 @@ public class Version {
 	 */
 	public boolean higherOrEqual(@NonNull Version v) {
 
-		if(dev || v.dev) { // if one is a dev version, only true if both are dev
+		if (dev || v.dev) { // if one is a dev version, only true if both are dev
 			return v.dev && dev;
 		}
 
 		int rounds = Math.min(this.values.size(), v.values.size());
-		for(int i = 0; i < rounds; i++) {
-			if(this.values.get(i) > v.values.get(i)) {
+		for (int i = 0; i < rounds; i++) {
+			if (this.values.get(i) > v.values.get(i)) {
 				return true;
-			}
-			else if(this.values.get(i) < v.values.get(i)) {
+			} else if (this.values.get(i) < v.values.get(i)) {
 				return false;
 			}
-
 		}
 		return true;
-
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public String toString() {
 
 		return raw;
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/CustomCodeViewAdapter.java b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/CustomCodeViewAdapter.java
index 22c26e42..10bd1937 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/CustomCodeViewAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/CustomCodeViewAdapter.java
@@ -8,14 +8,13 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import com.amrdeveloper.codeview.Code;
 import com.amrdeveloper.codeview.CodeViewAdapter;
-import org.mian.gitnex.R;
 import java.util.List;
+import org.mian.gitnex.R;
 
 /**
  * @author AmrDeveloper
  * @author M M Arif
  */
-
 public class CustomCodeViewAdapter extends CodeViewAdapter {
 
 	private final LayoutInflater layoutInflater;
@@ -27,14 +26,14 @@ public class CustomCodeViewAdapter extends CodeViewAdapter {
 
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
-		if(convertView == null) {
+		if (convertView == null) {
 			convertView = layoutInflater.inflate(R.layout.list_items_autocomplete, parent, false);
 		}
 
-		//ImageView codeType = convertView.findViewById(R.id.code_type);
+		// ImageView codeType = convertView.findViewById(R.id.code_type);
 		TextView codeTitle = convertView.findViewById(R.id.code_title);
 		Code currentCode = (Code) getItem(position);
-		if(currentCode != null) {
+		if (currentCode != null) {
 			codeTitle.setText(currentCode.getCodeTitle());
 			/*if (currentCode instanceof Snippet) {
 				//codeType.setImageResource(R.drawable.ic_snippet);
@@ -45,5 +44,4 @@ public class CustomCodeViewAdapter extends CodeViewAdapter {
 
 		return convertView;
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/LanguageManager.java b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/LanguageManager.java
index d37915b0..aeb70de5 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/LanguageManager.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/LanguageManager.java
@@ -3,22 +3,21 @@ package org.mian.gitnex.helpers.codeeditor;
 import android.content.Context;
 import com.amrdeveloper.codeview.Code;
 import com.amrdeveloper.codeview.CodeView;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import org.mian.gitnex.helpers.codeeditor.languages.GoLanguage;
 import org.mian.gitnex.helpers.codeeditor.languages.HtmlLanguage;
 import org.mian.gitnex.helpers.codeeditor.languages.JavaLanguage;
 import org.mian.gitnex.helpers.codeeditor.languages.PhpLanguage;
 import org.mian.gitnex.helpers.codeeditor.languages.PythonLanguage;
 import org.mian.gitnex.helpers.codeeditor.languages.XmlLanguage;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
 /**
  * @author AmrDeveloper
  * @author M M Arif
  */
-
 public class LanguageManager {
 
 	private final Context context;
@@ -31,13 +30,13 @@ public class LanguageManager {
 
 	public void applyTheme(LanguageName language, ThemeName theme) {
 
-		if(theme == ThemeName.FIVE_COLOR) {
+		if (theme == ThemeName.FIVE_COLOR) {
 			applyFiveColorsDarkTheme(language);
 		}
 	}
 
 	public String[] getLanguageKeywords(LanguageName language) {
-		switch(language) {
+		switch (language) {
 			case JAVA:
 				return JavaLanguage.getKeywords(context);
 			case PY:
@@ -51,12 +50,12 @@ public class LanguageManager {
 			case HTML:
 				return HtmlLanguage.getKeywords(context);
 			default:
-				return new String[]{};
+				return new String[] {};
 		}
 	}
 
 	public List<Code> getLanguageCodeList(LanguageName language) {
-		switch(language) {
+		switch (language) {
 			case JAVA:
 				return JavaLanguage.getCodeList(context);
 			case PY:
@@ -75,7 +74,7 @@ public class LanguageManager {
 	}
 
 	public Set<Character> getLanguageIndentationStarts(LanguageName language) {
-		switch(language) {
+		switch (language) {
 			case JAVA:
 				return JavaLanguage.getIndentationStarts();
 			case PY:
@@ -94,7 +93,7 @@ public class LanguageManager {
 	}
 
 	public Set<Character> getLanguageIndentationEnds(LanguageName language) {
-		switch(language) {
+		switch (language) {
 			case JAVA:
 				return JavaLanguage.getIndentationEnds();
 			case PY:
@@ -113,7 +112,7 @@ public class LanguageManager {
 	}
 
 	private void applyFiveColorsDarkTheme(LanguageName language) {
-		switch(language) {
+		switch (language) {
 			case JAVA:
 				JavaLanguage.applyFiveColorsDarkTheme(context, codeView);
 				break;
@@ -134,5 +133,4 @@ public class LanguageManager {
 				break;
 		}
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/LanguageName.java b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/LanguageName.java
index eba0fd96..b1cd9047 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/LanguageName.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/LanguageName.java
@@ -4,7 +4,6 @@ package org.mian.gitnex.helpers.codeeditor;
  * @author AmrDeveloper
  * @author M M Arif
  */
-
 public enum LanguageName {
 	UNKNOWN, // no language is specified or app currently does not support the mentioned language
 	JAVA, // java
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 325854a4..363faa24 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
@@ -9,41 +9,40 @@ import android.widget.EditText;
  * @author AmrDeveloper
  * @author M M Arif
  */
-
 public class SourcePositionListener {
 
 	@FunctionalInterface
 	public interface OnPositionChanged {
 
 		void onPositionChange(int line, int column);
-
 	}
 
 	private OnPositionChanged onPositionChanged;
 
 	public SourcePositionListener(EditText editText) {
-		View.AccessibilityDelegate viewAccessibility = new View.AccessibilityDelegate() {
+		View.AccessibilityDelegate viewAccessibility =
+				new View.AccessibilityDelegate() {
 
-			@Override
-			public void sendAccessibilityEvent(View host, int eventType) {
-				super.sendAccessibilityEvent(host, eventType);
-				if(eventType == AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED && onPositionChanged != null) {
-					int selectionStart = editText.getSelectionStart();
-					Layout layout = editText.getLayout();
-					if(layout == null) {
-						return;
+					@Override
+					public void sendAccessibilityEvent(View host, int eventType) {
+						super.sendAccessibilityEvent(host, eventType);
+						if (eventType == AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED
+								&& onPositionChanged != null) {
+							int selectionStart = editText.getSelectionStart();
+							Layout layout = editText.getLayout();
+							if (layout == null) {
+								return;
+							}
+							int line = editText.getLayout().getLineForOffset(selectionStart);
+							int column = selectionStart - editText.getLayout().getLineStart(line);
+							onPositionChanged.onPositionChange(line + 1, column + 1);
+						}
 					}
-					int line = editText.getLayout().getLineForOffset(selectionStart);
-					int column = selectionStart - editText.getLayout().getLineStart(line);
-					onPositionChanged.onPositionChange(line + 1, column + 1);
-				}
-			}
-		};
+				};
 		editText.setAccessibilityDelegate(viewAccessibility);
 	}
 
 	public void setOnPositionChanged(OnPositionChanged listener) {
 		onPositionChanged = listener;
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/ThemeName.java b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/ThemeName.java
index ee63fcb6..8c148dd5 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/ThemeName.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/ThemeName.java
@@ -4,7 +4,6 @@ package org.mian.gitnex.helpers.codeeditor;
  * @author AmrDeveloper
  * @author M M Arif
  */
-
 public enum ThemeName {
 	FIVE_COLOR
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/GoLanguage.java b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/GoLanguage.java
index d610f71d..c6b0f71a 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/GoLanguage.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/GoLanguage.java
@@ -5,36 +5,42 @@ import android.content.res.Resources;
 import com.amrdeveloper.codeview.Code;
 import com.amrdeveloper.codeview.CodeView;
 import com.amrdeveloper.codeview.Keyword;
-import org.mian.gitnex.R;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
+import org.mian.gitnex.R;
 
 /**
  * @author AmrDeveloper
  * @author M M Arif
  */
-
 public class GoLanguage {
 
-	//Language Keywords
-	private static final Pattern PATTERN_KEYWORDS = Pattern.compile(
-		"\\b(break|default|func|interface|case|defer|" + "go|map|struct|chan|else|goto|package|switch|const" + "|fallthrough|if|range|type|continue|for|import|return|var|" + "string|true|false|new|nil|byte|bool|int|int8|int16|int32|int64)\\b");
+	// Language Keywords
+	private static final Pattern PATTERN_KEYWORDS =
+			Pattern.compile(
+					"\\b(break|default|func|interface|case|defer|"
+							+ "go|map|struct|chan|else|goto|package|switch|const"
+							+ "|fallthrough|if|range|type|continue|for|import|return|var|"
+							+ "string|true|false|new|nil|byte|bool|int|int8|int16|int32|int64)\\b");
 
-	//Brackets and Colons
+	// Brackets and Colons
 	private static final Pattern PATTERN_BUILTINS = Pattern.compile("[,:;[->]{}()]");
 
-	//Data
+	// Data
 	private static final Pattern PATTERN_NUMBERS = Pattern.compile("\\b(\\d*[.]?\\d+)\\b");
 	private static final Pattern PATTERN_CHAR = Pattern.compile("['](.*?)[']");
 	private static final Pattern PATTERN_STRING = Pattern.compile("[\"](.*?)[\"]");
 	private static final Pattern PATTERN_HEX = Pattern.compile("0x[0-9a-fA-F]+");
 	private static final Pattern PATTERN_SINGLE_LINE_COMMENT = Pattern.compile("//[^\\n]*");
-	private static final Pattern PATTERN_MULTI_LINE_COMMENT = Pattern.compile("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/");
+	private static final Pattern PATTERN_MULTI_LINE_COMMENT =
+			Pattern.compile("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/");
 	private static final Pattern PATTERN_ATTRIBUTE = Pattern.compile("\\.[a-zA-Z0-9_]+");
-	private static final Pattern PATTERN_OPERATION = Pattern.compile(":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
+	private static final Pattern PATTERN_OPERATION =
+			Pattern.compile(
+					":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
 
 	public static void applyFiveColorsDarkTheme(Context context, CodeView codeView) {
 		codeView.resetSyntaxPatternList();
@@ -42,22 +48,30 @@ public class GoLanguage {
 
 		Resources resources = context.getResources();
 
-		//View Background
+		// View Background
 		codeView.setBackgroundColor(resources.getColor(R.color.five_dark_black, null));
 
-		//Syntax Colors
+		// Syntax Colors
 		codeView.addSyntaxPattern(PATTERN_HEX, resources.getColor(R.color.five_dark_purple, null));
 		codeView.addSyntaxPattern(PATTERN_CHAR, resources.getColor(R.color.five_dark_yellow, null));
-		codeView.addSyntaxPattern(PATTERN_STRING, resources.getColor(R.color.five_dark_yellow, null));
-		codeView.addSyntaxPattern(PATTERN_NUMBERS, resources.getColor(R.color.five_dark_purple, null));
-		codeView.addSyntaxPattern(PATTERN_KEYWORDS, resources.getColor(R.color.five_dark_purple, null));
-		codeView.addSyntaxPattern(PATTERN_BUILTINS, resources.getColor(R.color.five_dark_white, null));
-		codeView.addSyntaxPattern(PATTERN_SINGLE_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
-		codeView.addSyntaxPattern(PATTERN_MULTI_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
-		codeView.addSyntaxPattern(PATTERN_ATTRIBUTE, resources.getColor(R.color.five_dark_blue, null));
-		codeView.addSyntaxPattern(PATTERN_OPERATION, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_STRING, resources.getColor(R.color.five_dark_yellow, null));
+		codeView.addSyntaxPattern(
+				PATTERN_NUMBERS, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_KEYWORDS, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_BUILTINS, resources.getColor(R.color.five_dark_white, null));
+		codeView.addSyntaxPattern(
+				PATTERN_SINGLE_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
+		codeView.addSyntaxPattern(
+				PATTERN_MULTI_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
+		codeView.addSyntaxPattern(
+				PATTERN_ATTRIBUTE, resources.getColor(R.color.five_dark_blue, null));
+		codeView.addSyntaxPattern(
+				PATTERN_OPERATION, resources.getColor(R.color.five_dark_purple, null));
 
-		//Default Color
+		// Default Color
 		codeView.setTextColor(resources.getColor(R.color.five_dark_white, null));
 
 		codeView.reHighlightSyntax();
@@ -70,7 +84,7 @@ public class GoLanguage {
 	public static List<Code> getCodeList(Context context) {
 		List<Code> codeList = new ArrayList<>();
 		String[] keywords = getKeywords(context);
-		for(String keyword : keywords) {
+		for (String keyword : keywords) {
 			codeList.add(new Keyword(keyword));
 		}
 		return codeList;
@@ -95,5 +109,4 @@ public class GoLanguage {
 	public static String getCommentEnd() {
 		return "";
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/HtmlLanguage.java b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/HtmlLanguage.java
index cd419f5f..504a92ca 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/HtmlLanguage.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/HtmlLanguage.java
@@ -5,35 +5,41 @@ import android.content.res.Resources;
 import com.amrdeveloper.codeview.Code;
 import com.amrdeveloper.codeview.CodeView;
 import com.amrdeveloper.codeview.Keyword;
-import org.mian.gitnex.R;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
+import org.mian.gitnex.R;
 
 /**
  * @author M M Arif
  */
-
 public class HtmlLanguage {
 
-	//Language Keywords
-	private static final Pattern PATTERN_KEYWORDS = Pattern.compile(
-		"\\b(<html|<DOCTYPE|<head|<title|<body|<style|<script|src|href" + "<h1|<h2|<h3|<h4|<h5|<h6|<br|<hr|<section|<header|<footer|<select|<img|<embed|<iframe|<div|<p|code|strong|small|template|" + "input|form|textarea|button|option|label|fieldset|legend|datalist|frame|map|area|canvas|picture|svg|audio|source|track|video|" + "link|nav|ul|ol|li|table|caption|th|tr|td|thead|tbody|tfooter|col|span|main|article|aside|meta|base|noscript|object|param|)\\b");
+	// Language Keywords
+	private static final Pattern PATTERN_KEYWORDS =
+			Pattern.compile(
+					"\\b(<html|<DOCTYPE|<head|<title|<body|<style|<script|src|href"
+							+ "<h1|<h2|<h3|<h4|<h5|<h6|<br|<hr|<section|<header|<footer|<select|<img|<embed|<iframe|<div|<p|code|strong|small|template|"
+							+ "input|form|textarea|button|option|label|fieldset|legend|datalist|frame|map|area|canvas|picture|svg|audio|source|track|video|"
+							+ "link|nav|ul|ol|li|table|caption|th|tr|td|thead|tbody|tfooter|col|span|main|article|aside|meta|base|noscript|object|param|)\\b");
 
-	//Brackets and Colons
+	// Brackets and Colons
 	private static final Pattern PATTERN_BUILTINS = Pattern.compile("[,:;[->]{}()]");
 
-	//Data
+	// Data
 	private static final Pattern PATTERN_NUMBERS = Pattern.compile("\\b(\\d*[.]?\\d+)\\b");
 	private static final Pattern PATTERN_CHAR = Pattern.compile("['](.*?)[']");
 	private static final Pattern PATTERN_STRING = Pattern.compile("[\"](.*?)[\"]");
 	private static final Pattern PATTERN_HEX = Pattern.compile("0x[0-9a-fA-F]+");
 	private static final Pattern PATTERN_SINGLE_LINE_COMMENT = Pattern.compile("//[^\\n]*");
-	private static final Pattern PATTERN_MULTI_LINE_COMMENT = Pattern.compile("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/");
+	private static final Pattern PATTERN_MULTI_LINE_COMMENT =
+			Pattern.compile("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/");
 	private static final Pattern PATTERN_ATTRIBUTE = Pattern.compile("\\.[a-zA-Z0-9_]+");
-	private static final Pattern PATTERN_OPERATION = Pattern.compile(":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
+	private static final Pattern PATTERN_OPERATION =
+			Pattern.compile(
+					":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
 
 	public static void applyFiveColorsDarkTheme(Context context, CodeView codeView) {
 		codeView.resetSyntaxPatternList();
@@ -41,22 +47,30 @@ public class HtmlLanguage {
 
 		Resources resources = context.getResources();
 
-		//View Background
+		// View Background
 		codeView.setBackgroundColor(resources.getColor(R.color.five_dark_black, null));
 
-		//Syntax Colors
+		// Syntax Colors
 		codeView.addSyntaxPattern(PATTERN_HEX, resources.getColor(R.color.five_dark_purple, null));
 		codeView.addSyntaxPattern(PATTERN_CHAR, resources.getColor(R.color.five_dark_yellow, null));
-		codeView.addSyntaxPattern(PATTERN_STRING, resources.getColor(R.color.five_dark_yellow, null));
-		codeView.addSyntaxPattern(PATTERN_NUMBERS, resources.getColor(R.color.five_dark_purple, null));
-		codeView.addSyntaxPattern(PATTERN_KEYWORDS, resources.getColor(R.color.five_dark_purple, null));
-		codeView.addSyntaxPattern(PATTERN_BUILTINS, resources.getColor(R.color.five_dark_white, null));
-		codeView.addSyntaxPattern(PATTERN_SINGLE_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
-		codeView.addSyntaxPattern(PATTERN_MULTI_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
-		codeView.addSyntaxPattern(PATTERN_ATTRIBUTE, resources.getColor(R.color.five_dark_blue, null));
-		codeView.addSyntaxPattern(PATTERN_OPERATION, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_STRING, resources.getColor(R.color.five_dark_yellow, null));
+		codeView.addSyntaxPattern(
+				PATTERN_NUMBERS, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_KEYWORDS, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_BUILTINS, resources.getColor(R.color.five_dark_white, null));
+		codeView.addSyntaxPattern(
+				PATTERN_SINGLE_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
+		codeView.addSyntaxPattern(
+				PATTERN_MULTI_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
+		codeView.addSyntaxPattern(
+				PATTERN_ATTRIBUTE, resources.getColor(R.color.five_dark_blue, null));
+		codeView.addSyntaxPattern(
+				PATTERN_OPERATION, resources.getColor(R.color.five_dark_purple, null));
 
-		//Default Color
+		// Default Color
 		codeView.setTextColor(resources.getColor(R.color.five_dark_white, null));
 
 		codeView.reHighlightSyntax();
@@ -69,7 +83,7 @@ public class HtmlLanguage {
 	public static List<Code> getCodeList(Context context) {
 		List<Code> codeList = new ArrayList<>();
 		String[] keywords = getKeywords(context);
-		for(String keyword : keywords) {
+		for (String keyword : keywords) {
 			codeList.add(new Keyword(keyword));
 		}
 		return codeList;
@@ -94,5 +108,4 @@ public class HtmlLanguage {
 	public static String getCommentEnd() {
 		return "";
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/JavaLanguage.java b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/JavaLanguage.java
index 16b2b2c8..a77e2d3d 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/JavaLanguage.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/JavaLanguage.java
@@ -5,29 +5,38 @@ import android.content.res.Resources;
 import com.amrdeveloper.codeview.Code;
 import com.amrdeveloper.codeview.CodeView;
 import com.amrdeveloper.codeview.Keyword;
-import org.mian.gitnex.R;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
+import org.mian.gitnex.R;
 
 /**
  * @author AmrDeveloper
  * @author M M Arif
  */
-
 public class JavaLanguage {
 
-	//Language Keywords
-	private static final Pattern PATTERN_KEYWORDS = Pattern.compile(
-		"\\b(abstract|boolean|break|byte|case|catch" + "|char|class|continue|default|do|double|else" + "|enum|extends|final|finally|float|for|if" + "|implements|import|instanceof|int|interface" + "|long|native|new|null|package|private|protected" + "|public|return|short|static|strictfp|super|switch" + "|synchronized|this|throw|transient|try|void|volatile|while)\\b");
+	// Language Keywords
+	private static final Pattern PATTERN_KEYWORDS =
+			Pattern.compile(
+					"\\b(abstract|boolean|break|byte|case|catch"
+							+ "|char|class|continue|default|do|double|else"
+							+ "|enum|extends|final|finally|float|for|if"
+							+ "|implements|import|instanceof|int|interface"
+							+ "|long|native|new|null|package|private|protected"
+							+ "|public|return|short|static|strictfp|super|switch"
+							+ "|synchronized|this|throw|transient|try|void|volatile|while)\\b");
 
 	private static final Pattern PATTERN_BUILTINS = Pattern.compile("[,:;[->]{}()]");
 	private static final Pattern PATTERN_SINGLE_LINE_COMMENT = Pattern.compile("//[^\\n]*");
-	private static final Pattern PATTERN_MULTI_LINE_COMMENT = Pattern.compile("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/");
+	private static final Pattern PATTERN_MULTI_LINE_COMMENT =
+			Pattern.compile("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/");
 	private static final Pattern PATTERN_ATTRIBUTE = Pattern.compile("\\.[a-zA-Z0-9_]+");
-	private static final Pattern PATTERN_OPERATION = Pattern.compile(":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
+	private static final Pattern PATTERN_OPERATION =
+			Pattern.compile(
+					":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
 	private static final Pattern PATTERN_GENERIC = Pattern.compile("<[a-zA-Z0-9,<>]+>");
 	private static final Pattern PATTERN_ANNOTATION = Pattern.compile("@.[a-zA-Z0-9]+");
 	private static final Pattern PATTERN_TODO_COMMENT = Pattern.compile("//TODO[^\n]*");
@@ -42,24 +51,34 @@ public class JavaLanguage {
 
 		Resources resources = context.getResources();
 
-		//View Background
+		// View Background
 		codeView.setBackgroundColor(resources.getColor(R.color.five_dark_black, null));
 
-		//Syntax Colors
+		// Syntax Colors
 		codeView.addSyntaxPattern(PATTERN_HEX, resources.getColor(R.color.five_dark_purple, null));
 		codeView.addSyntaxPattern(PATTERN_CHAR, resources.getColor(R.color.five_dark_yellow, null));
-		codeView.addSyntaxPattern(PATTERN_STRING, resources.getColor(R.color.five_dark_yellow, null));
-		codeView.addSyntaxPattern(PATTERN_NUMBERS, resources.getColor(R.color.five_dark_purple, null));
-		codeView.addSyntaxPattern(PATTERN_KEYWORDS, resources.getColor(R.color.five_dark_purple, null));
-		codeView.addSyntaxPattern(PATTERN_BUILTINS, resources.getColor(R.color.five_dark_white, null));
-		codeView.addSyntaxPattern(PATTERN_SINGLE_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
-		codeView.addSyntaxPattern(PATTERN_MULTI_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
-		codeView.addSyntaxPattern(PATTERN_ANNOTATION, resources.getColor(R.color.five_dark_purple, null));
-		codeView.addSyntaxPattern(PATTERN_ATTRIBUTE, resources.getColor(R.color.five_dark_blue, null));
-		codeView.addSyntaxPattern(PATTERN_GENERIC, resources.getColor(R.color.five_dark_purple, null));
-		codeView.addSyntaxPattern(PATTERN_OPERATION, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_STRING, resources.getColor(R.color.five_dark_yellow, null));
+		codeView.addSyntaxPattern(
+				PATTERN_NUMBERS, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_KEYWORDS, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_BUILTINS, resources.getColor(R.color.five_dark_white, null));
+		codeView.addSyntaxPattern(
+				PATTERN_SINGLE_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
+		codeView.addSyntaxPattern(
+				PATTERN_MULTI_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
+		codeView.addSyntaxPattern(
+				PATTERN_ANNOTATION, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_ATTRIBUTE, resources.getColor(R.color.five_dark_blue, null));
+		codeView.addSyntaxPattern(
+				PATTERN_GENERIC, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_OPERATION, resources.getColor(R.color.five_dark_purple, null));
 
-		//Default Color
+		// Default Color
 		codeView.setTextColor(resources.getColor(R.color.five_dark_white, null));
 
 		codeView.addSyntaxPattern(PATTERN_TODO_COMMENT, resources.getColor(R.color.gold, null));
@@ -74,7 +93,7 @@ public class JavaLanguage {
 	public static List<Code> getCodeList(Context context) {
 		List<Code> codeList = new ArrayList<>();
 		String[] keywords = getKeywords(context);
-		for(String keyword : keywords) {
+		for (String keyword : keywords) {
 			codeList.add(new Keyword(keyword));
 		}
 		return codeList;
@@ -99,5 +118,4 @@ public class JavaLanguage {
 	public static String getCommentEnd() {
 		return "";
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/PhpLanguage.java b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/PhpLanguage.java
index 131bdbd4..08df1cc6 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/PhpLanguage.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/PhpLanguage.java
@@ -5,35 +5,43 @@ import android.content.res.Resources;
 import com.amrdeveloper.codeview.Code;
 import com.amrdeveloper.codeview.CodeView;
 import com.amrdeveloper.codeview.Keyword;
-import org.mian.gitnex.R;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
+import org.mian.gitnex.R;
 
 /**
  * @author M M Arif
  */
-
 public class PhpLanguage {
 
-	//Language Keywords
-	private static final Pattern PATTERN_KEYWORDS = Pattern.compile(
-		"\\b(<?php|__construct|var_dump|define|echo|var|float|" + "int|bool|false|true|function|private|public|protected|interface|return|copy|struct|abstract|extends|" + "trait|static|namespace|implements|__set|__get|unlink|this|try|catch|Throwable|Exception|pdo|" + "str_replace|form|date|abs|min|max|strtotime|mktime|" + "foreach|require_once|include_once|hash|array|range|break|continue|preg_match|preg_match_all|preg_replace|" + "throw|new|and|or|if|else|elseif|switch|case|default|match|require|include|goto|do|while|for|map|)\\b");
+	// Language Keywords
+	private static final Pattern PATTERN_KEYWORDS =
+			Pattern.compile(
+					"\\b(<?php|__construct|var_dump|define|echo|var|float|"
+							+ "int|bool|false|true|function|private|public|protected|interface|return|copy|struct|abstract|extends|"
+							+ "trait|static|namespace|implements|__set|__get|unlink|this|try|catch|Throwable|Exception|pdo|"
+							+ "str_replace|form|date|abs|min|max|strtotime|mktime|"
+							+ "foreach|require_once|include_once|hash|array|range|break|continue|preg_match|preg_match_all|preg_replace|"
+							+ "throw|new|and|or|if|else|elseif|switch|case|default|match|require|include|goto|do|while|for|map|)\\b");
 
-	//Brackets and Colons
+	// Brackets and Colons
 	private static final Pattern PATTERN_BUILTINS = Pattern.compile("[,:;[->]{}()]");
 
-	//Data
+	// Data
 	private static final Pattern PATTERN_NUMBERS = Pattern.compile("\\b(\\d*[.]?\\d+)\\b");
 	private static final Pattern PATTERN_CHAR = Pattern.compile("['](.*?)[']");
 	private static final Pattern PATTERN_STRING = Pattern.compile("[\"](.*?)[\"]");
 	private static final Pattern PATTERN_HEX = Pattern.compile("0x[0-9a-fA-F]+");
 	private static final Pattern PATTERN_SINGLE_LINE_COMMENT = Pattern.compile("//[^\\n]*");
-	private static final Pattern PATTERN_MULTI_LINE_COMMENT = Pattern.compile("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/");
+	private static final Pattern PATTERN_MULTI_LINE_COMMENT =
+			Pattern.compile("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/");
 	private static final Pattern PATTERN_ATTRIBUTE = Pattern.compile("\\.[a-zA-Z0-9_]+");
-	private static final Pattern PATTERN_OPERATION = Pattern.compile(":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
+	private static final Pattern PATTERN_OPERATION =
+			Pattern.compile(
+					":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
 
 	public static void applyFiveColorsDarkTheme(Context context, CodeView codeView) {
 		codeView.resetSyntaxPatternList();
@@ -41,22 +49,30 @@ public class PhpLanguage {
 
 		Resources resources = context.getResources();
 
-		//View Background
+		// View Background
 		codeView.setBackgroundColor(resources.getColor(R.color.five_dark_black, null));
 
-		//Syntax Colors
+		// Syntax Colors
 		codeView.addSyntaxPattern(PATTERN_HEX, resources.getColor(R.color.five_dark_purple, null));
 		codeView.addSyntaxPattern(PATTERN_CHAR, resources.getColor(R.color.five_dark_yellow, null));
-		codeView.addSyntaxPattern(PATTERN_STRING, resources.getColor(R.color.five_dark_yellow, null));
-		codeView.addSyntaxPattern(PATTERN_NUMBERS, resources.getColor(R.color.five_dark_purple, null));
-		codeView.addSyntaxPattern(PATTERN_KEYWORDS, resources.getColor(R.color.five_dark_purple, null));
-		codeView.addSyntaxPattern(PATTERN_BUILTINS, resources.getColor(R.color.five_dark_white, null));
-		codeView.addSyntaxPattern(PATTERN_SINGLE_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
-		codeView.addSyntaxPattern(PATTERN_MULTI_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
-		codeView.addSyntaxPattern(PATTERN_ATTRIBUTE, resources.getColor(R.color.five_dark_blue, null));
-		codeView.addSyntaxPattern(PATTERN_OPERATION, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_STRING, resources.getColor(R.color.five_dark_yellow, null));
+		codeView.addSyntaxPattern(
+				PATTERN_NUMBERS, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_KEYWORDS, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_BUILTINS, resources.getColor(R.color.five_dark_white, null));
+		codeView.addSyntaxPattern(
+				PATTERN_SINGLE_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
+		codeView.addSyntaxPattern(
+				PATTERN_MULTI_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
+		codeView.addSyntaxPattern(
+				PATTERN_ATTRIBUTE, resources.getColor(R.color.five_dark_blue, null));
+		codeView.addSyntaxPattern(
+				PATTERN_OPERATION, resources.getColor(R.color.five_dark_purple, null));
 
-		//Default Color
+		// Default Color
 		codeView.setTextColor(resources.getColor(R.color.five_dark_white, null));
 
 		codeView.reHighlightSyntax();
@@ -69,7 +85,7 @@ public class PhpLanguage {
 	public static List<Code> getCodeList(Context context) {
 		List<Code> codeList = new ArrayList<>();
 		String[] keywords = getKeywords(context);
-		for(String keyword : keywords) {
+		for (String keyword : keywords) {
 			codeList.add(new Keyword(keyword));
 		}
 		return codeList;
@@ -94,5 +110,4 @@ public class PhpLanguage {
 	public static String getCommentEnd() {
 		return "";
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/PythonLanguage.java b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/PythonLanguage.java
index 3f810c38..b5e8539a 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/PythonLanguage.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/PythonLanguage.java
@@ -5,35 +5,40 @@ import android.content.res.Resources;
 import com.amrdeveloper.codeview.Code;
 import com.amrdeveloper.codeview.CodeView;
 import com.amrdeveloper.codeview.Keyword;
-import org.mian.gitnex.R;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
+import org.mian.gitnex.R;
 
 /**
  * @author AmrDeveloper
  * @author M M Arif
  */
-
 public class PythonLanguage {
 
-	//Language Keywords
-	private static final Pattern PATTERN_KEYWORDS = Pattern.compile(
-		"\\b(False|await|else|import|pass|None|break|except|in|raise" + "|True|class|finally|is|return|and|continue|for|lambda" + "|try|as|def|from|nonlocal|while|assert|del|global|not" + "|with|async|elif|if|or|yield)\\b");
+	// Language Keywords
+	private static final Pattern PATTERN_KEYWORDS =
+			Pattern.compile(
+					"\\b(False|await|else|import|pass|None|break|except|in|raise"
+							+ "|True|class|finally|is|return|and|continue|for|lambda"
+							+ "|try|as|def|from|nonlocal|while|assert|del|global|not"
+							+ "|with|async|elif|if|or|yield)\\b");
 
-	//Brackets and Colons
+	// Brackets and Colons
 	private static final Pattern PATTERN_BUILTINS = Pattern.compile("[,:;[->]{}()]");
 
-	//Data
+	// Data
 	private static final Pattern PATTERN_NUMBERS = Pattern.compile("\\b(\\d*[.]?\\d+)\\b");
 	private static final Pattern PATTERN_CHAR = Pattern.compile("['](.*?)[']");
 	private static final Pattern PATTERN_STRING = Pattern.compile("[\"](.*?)[\"]");
 	private static final Pattern PATTERN_HEX = Pattern.compile("0x[0-9a-fA-F]+");
 	private static final Pattern PATTERN_TODO_COMMENT = Pattern.compile("#TODO[^\n]*");
 	private static final Pattern PATTERN_ATTRIBUTE = Pattern.compile("\\.[a-zA-Z0-9_]+");
-	private static final Pattern PATTERN_OPERATION = Pattern.compile(":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
+	private static final Pattern PATTERN_OPERATION =
+			Pattern.compile(
+					":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
 	private static final Pattern PATTERN_HASH_COMMENT = Pattern.compile("#(?!TODO )[^\\n]*");
 
 	public static void applyFiveColorsDarkTheme(Context context, CodeView codeView) {
@@ -42,21 +47,28 @@ public class PythonLanguage {
 
 		Resources resources = context.getResources();
 
-		//View Background
+		// View Background
 		codeView.setBackgroundColor(resources.getColor(R.color.five_dark_black, null));
 
-		//Syntax Colors
+		// Syntax Colors
 		codeView.addSyntaxPattern(PATTERN_HEX, resources.getColor(R.color.five_dark_purple, null));
 		codeView.addSyntaxPattern(PATTERN_CHAR, resources.getColor(R.color.five_dark_yellow, null));
-		codeView.addSyntaxPattern(PATTERN_STRING, resources.getColor(R.color.five_dark_yellow, null));
-		codeView.addSyntaxPattern(PATTERN_NUMBERS, resources.getColor(R.color.five_dark_purple, null));
-		codeView.addSyntaxPattern(PATTERN_KEYWORDS, resources.getColor(R.color.five_dark_purple, null));
-		codeView.addSyntaxPattern(PATTERN_BUILTINS, resources.getColor(R.color.five_dark_white, null));
-		codeView.addSyntaxPattern(PATTERN_HASH_COMMENT, resources.getColor(R.color.five_dark_grey, null));
-		codeView.addSyntaxPattern(PATTERN_ATTRIBUTE, resources.getColor(R.color.five_dark_blue, null));
-		codeView.addSyntaxPattern(PATTERN_OPERATION, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_STRING, resources.getColor(R.color.five_dark_yellow, null));
+		codeView.addSyntaxPattern(
+				PATTERN_NUMBERS, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_KEYWORDS, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_BUILTINS, resources.getColor(R.color.five_dark_white, null));
+		codeView.addSyntaxPattern(
+				PATTERN_HASH_COMMENT, resources.getColor(R.color.five_dark_grey, null));
+		codeView.addSyntaxPattern(
+				PATTERN_ATTRIBUTE, resources.getColor(R.color.five_dark_blue, null));
+		codeView.addSyntaxPattern(
+				PATTERN_OPERATION, resources.getColor(R.color.five_dark_purple, null));
 
-		//Default Color
+		// Default Color
 		codeView.setTextColor(resources.getColor(R.color.five_dark_white, null));
 
 		codeView.addSyntaxPattern(PATTERN_TODO_COMMENT, resources.getColor(R.color.gold, null));
@@ -71,7 +83,7 @@ public class PythonLanguage {
 	public static List<Code> getCodeList(Context context) {
 		List<Code> codeList = new ArrayList<>();
 		String[] keywords = getKeywords(context);
-		for(String keyword : keywords) {
+		for (String keyword : keywords) {
 			codeList.add(new Keyword(keyword));
 		}
 		return codeList;
@@ -94,5 +106,4 @@ public class PythonLanguage {
 	public static String getCommentEnd() {
 		return "";
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/XmlLanguage.java b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/XmlLanguage.java
index 8e762847..a3e7bbaf 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/XmlLanguage.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/languages/XmlLanguage.java
@@ -5,34 +5,37 @@ import android.content.res.Resources;
 import com.amrdeveloper.codeview.Code;
 import com.amrdeveloper.codeview.CodeView;
 import com.amrdeveloper.codeview.Keyword;
-import org.mian.gitnex.R;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
+import org.mian.gitnex.R;
 
 /**
  * @author M M Arif
  */
-
 public class XmlLanguage {
 
-	//Language Keywords
-	private static final Pattern PATTERN_KEYWORDS = Pattern.compile("\\b(<xml|version|encoding)\\b");
+	// Language Keywords
+	private static final Pattern PATTERN_KEYWORDS =
+			Pattern.compile("\\b(<xml|version|encoding)\\b");
 
-	//Brackets and Colons
+	// Brackets and Colons
 	private static final Pattern PATTERN_BUILTINS = Pattern.compile("[,:;[->]{}()]");
 
-	//Data
+	// Data
 	private static final Pattern PATTERN_NUMBERS = Pattern.compile("\\b(\\d*[.]?\\d+)\\b");
 	private static final Pattern PATTERN_CHAR = Pattern.compile("['](.*?)[']");
 	private static final Pattern PATTERN_STRING = Pattern.compile("[\"](.*?)[\"]");
 	private static final Pattern PATTERN_HEX = Pattern.compile("0x[0-9a-fA-F]+");
 	private static final Pattern PATTERN_SINGLE_LINE_COMMENT = Pattern.compile("//[^\\n]*");
-	private static final Pattern PATTERN_MULTI_LINE_COMMENT = Pattern.compile("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/");
+	private static final Pattern PATTERN_MULTI_LINE_COMMENT =
+			Pattern.compile("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/");
 	private static final Pattern PATTERN_ATTRIBUTE = Pattern.compile("\\.[a-zA-Z0-9_]+");
-	private static final Pattern PATTERN_OPERATION = Pattern.compile(":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
+	private static final Pattern PATTERN_OPERATION =
+			Pattern.compile(
+					":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
 
 	public static void applyFiveColorsDarkTheme(Context context, CodeView codeView) {
 		codeView.resetSyntaxPatternList();
@@ -40,22 +43,30 @@ public class XmlLanguage {
 
 		Resources resources = context.getResources();
 
-		//View Background
+		// View Background
 		codeView.setBackgroundColor(resources.getColor(R.color.five_dark_black, null));
 
-		//Syntax Colors
+		// Syntax Colors
 		codeView.addSyntaxPattern(PATTERN_HEX, resources.getColor(R.color.five_dark_purple, null));
 		codeView.addSyntaxPattern(PATTERN_CHAR, resources.getColor(R.color.five_dark_yellow, null));
-		codeView.addSyntaxPattern(PATTERN_STRING, resources.getColor(R.color.five_dark_yellow, null));
-		codeView.addSyntaxPattern(PATTERN_NUMBERS, resources.getColor(R.color.five_dark_purple, null));
-		codeView.addSyntaxPattern(PATTERN_KEYWORDS, resources.getColor(R.color.five_dark_purple, null));
-		codeView.addSyntaxPattern(PATTERN_BUILTINS, resources.getColor(R.color.five_dark_white, null));
-		codeView.addSyntaxPattern(PATTERN_SINGLE_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
-		codeView.addSyntaxPattern(PATTERN_MULTI_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
-		codeView.addSyntaxPattern(PATTERN_ATTRIBUTE, resources.getColor(R.color.five_dark_blue, null));
-		codeView.addSyntaxPattern(PATTERN_OPERATION, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_STRING, resources.getColor(R.color.five_dark_yellow, null));
+		codeView.addSyntaxPattern(
+				PATTERN_NUMBERS, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_KEYWORDS, resources.getColor(R.color.five_dark_purple, null));
+		codeView.addSyntaxPattern(
+				PATTERN_BUILTINS, resources.getColor(R.color.five_dark_white, null));
+		codeView.addSyntaxPattern(
+				PATTERN_SINGLE_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
+		codeView.addSyntaxPattern(
+				PATTERN_MULTI_LINE_COMMENT, resources.getColor(R.color.five_dark_grey, null));
+		codeView.addSyntaxPattern(
+				PATTERN_ATTRIBUTE, resources.getColor(R.color.five_dark_blue, null));
+		codeView.addSyntaxPattern(
+				PATTERN_OPERATION, resources.getColor(R.color.five_dark_purple, null));
 
-		//Default Color
+		// Default Color
 		codeView.setTextColor(resources.getColor(R.color.five_dark_white, null));
 
 		codeView.reHighlightSyntax();
@@ -68,7 +79,7 @@ public class XmlLanguage {
 	public static List<Code> getCodeList(Context context) {
 		List<Code> codeList = new ArrayList<>();
 		String[] keywords = getKeywords(context);
-		for(String keyword : keywords) {
+		for (String keyword : keywords) {
 			codeList.add(new Keyword(keyword));
 		}
 		return codeList;
@@ -93,5 +104,4 @@ public class XmlLanguage {
 	public static String getCommentEnd() {
 		return "";
 	}
-
 }
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 9c350f4b..f6da3b87 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
@@ -1,14 +1,14 @@
 package org.mian.gitnex.helpers.contexts;
 
 import android.content.Context;
-import org.gitnex.tea4j.v2.models.User;
-import org.mian.gitnex.database.api.UserAccountsApi;
-import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.helpers.Version;
 import java.io.File;
 import java.io.Serializable;
 import java.util.Objects;
 import okhttp3.Credentials;
+import org.gitnex.tea4j.v2.models.User;
+import org.mian.gitnex.database.api.UserAccountsApi;
+import org.mian.gitnex.database.models.UserAccount;
+import org.mian.gitnex.helpers.Version;
 
 /**
  * @author qwerty287
@@ -23,7 +23,9 @@ public class AccountContext implements Serializable {
 	}
 
 	public static AccountContext fromId(int id, Context context) {
-		return new AccountContext(Objects.requireNonNull(UserAccountsApi.getInstance(context, UserAccountsApi.class)).getAccountById(id));
+		return new AccountContext(
+				Objects.requireNonNull(UserAccountsApi.getInstance(context, UserAccountsApi.class))
+						.getAccountById(id));
 	}
 
 	public UserAccount getAccount() {
@@ -71,7 +73,9 @@ public class AccountContext implements Serializable {
 	}
 
 	public String getFullName() {
-		return userInfo != null ? !userInfo.getFullName().equals("") ? userInfo.getFullName() : userInfo.getLogin() : account.getUserName();
+		return userInfo != null
+				? !userInfo.getFullName().equals("") ? userInfo.getFullName() : userInfo.getLogin()
+				: account.getUserName();
 	}
 
 	public File getCacheDir(Context context) {
@@ -85,5 +89,4 @@ public class AccountContext implements Serializable {
 		assert account.getAccountName() != null;
 		return new File(context.getCacheDir() + "/picasso_cache/", account.getAccountName());
 	}
-
 }
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 fc1811c2..418f28bf 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
@@ -3,11 +3,11 @@ package org.mian.gitnex.helpers.contexts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import java.io.Serializable;
 import org.gitnex.tea4j.v2.models.Issue;
 import org.gitnex.tea4j.v2.models.PullRequest;
 import org.gitnex.tea4j.v2.models.Repository;
 import org.mian.gitnex.activities.BaseActivity;
-import java.io.Serializable;
 
 /**
  * @author qwerty287
@@ -48,7 +48,8 @@ public class IssueContext implements Serializable {
 		this.repository = repository;
 	}
 
-	public IssueContext(Issue issue, PullRequest pullRequest, Repository repository, Context context) {
+	public IssueContext(
+			Issue issue, PullRequest pullRequest, Repository repository, Context context) {
 		this.issue = issue;
 		this.issueType = issue.getPullRequest() == null ? "Issue" : "Pull";
 		this.pullRequest = pullRequest;
@@ -87,7 +88,7 @@ public class IssueContext implements Serializable {
 
 	public void setIssue(Issue issue) {
 		this.issue = issue;
-		if(issue != null) {
+		if (issue != null) {
 			this.issueType = issue.getPullRequest() == null ? "Issue" : "Pull";
 		}
 	}
@@ -116,7 +117,10 @@ public class IssueContext implements Serializable {
 
 	public int getIssueIndex() {
 
-		return Math.toIntExact(issueIndex != 0 ? issueIndex : issue != null ? issue.getNumber() : pullRequest.getNumber());
+		return Math.toIntExact(
+				issueIndex != 0
+						? issueIndex
+						: issue != null ? issue.getNumber() : pullRequest.getNumber());
 	}
 
 	public boolean isSubscribed() {
@@ -135,13 +139,15 @@ public class IssueContext implements Serializable {
 	}
 
 	public boolean prIsFork() {
-		if(pullRequest.getHead().getRepo() != null) {
-			return !pullRequest.getHead().getRepo().getFullName().equals(getRepository().getFullName());
-		}
-		else {
+		if (pullRequest.getHead().getRepo() != null) {
+			return !pullRequest
+					.getHead()
+					.getRepo()
+					.getFullName()
+					.equals(getRepository().getFullName());
+		} else {
 			// PR was done from a deleted fork
 			return true;
 		}
 	}
-
 }
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 d76f55a4..c86d798f 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
@@ -4,6 +4,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
+import java.io.Serializable;
+import java.util.Objects;
 import org.gitnex.tea4j.v2.models.Permission;
 import org.mian.gitnex.activities.BaseActivity;
 import org.mian.gitnex.database.api.BaseApi;
@@ -11,8 +13,6 @@ import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.TinyDB;
-import java.io.Serializable;
-import java.util.Objects;
 
 /**
  * @author qwerty287
@@ -93,7 +93,7 @@ public class RepositoryContext implements Serializable {
 
 	public void setRepository(org.gitnex.tea4j.v2.models.Repository repository) {
 		this.repository = repository;
-		if(!repository.getFullName().equalsIgnoreCase(getFullName())) {
+		if (!repository.getFullName().equalsIgnoreCase(getFullName())) {
 			throw new IllegalArgumentException("repo does not match owner and name");
 		}
 	}
@@ -191,13 +191,17 @@ public class RepositoryContext implements Serializable {
 	}
 
 	public Repository loadRepositoryModel(Context context) {
-		repositoryModel = Objects.requireNonNull(BaseApi.getInstance(context, RepositoriesApi.class)).fetchRepositoryById(repositoryId);
+		repositoryModel =
+				Objects.requireNonNull(BaseApi.getInstance(context, RepositoriesApi.class))
+						.fetchRepositoryById(repositoryId);
 		return repositoryModel;
 	}
 
 	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());
 		}
@@ -223,32 +227,35 @@ public class RepositoryContext implements Serializable {
 		RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
 
 		assert repositoryData != null;
-		Repository getMostVisitedValue = repositoryData.getRepository(currentActiveAccountId, getOwner(), getName());
+		Repository getMostVisitedValue =
+				repositoryData.getRepository(currentActiveAccountId, getOwner(), getName());
 
-		if(getMostVisitedValue == null) {
-			long id = repositoryData.insertRepository(currentActiveAccountId, getOwner(), getName(), 1);
+		if (getMostVisitedValue == null) {
+			long id =
+					repositoryData.insertRepository(
+							currentActiveAccountId, getOwner(), getName(), 1);
 			setRepositoryId((int) id);
 			return (int) id;
-		}
-		else {
-			Repository data = repositoryData.getRepository(currentActiveAccountId, getOwner(), getName());
+		} else {
+			Repository data =
+					repositoryData.getRepository(currentActiveAccountId, getOwner(), getName());
 			setRepositoryId(data.getRepositoryId());
-			repositoryData.updateRepositoryMostVisited(getMostVisitedValue.getMostVisited() + 1, data.getRepositoryId());
+			repositoryData.updateRepositoryMostVisited(
+					getMostVisitedValue.getMostVisited() + 1, data.getRepositoryId());
 			return data.getRepositoryId();
 		}
 	}
 
 	public enum State {
-		OPEN, CLOSED;
+		OPEN,
+		CLOSED;
 
-		@NonNull
-		@Override
+		@NonNull @Override
 		public String toString() {
-			if(this == OPEN) {
+			if (this == OPEN) {
 				return "open";
 			}
 			return "closed";
 		}
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/helpers/ssl/MTMDecision.java b/app/src/main/java/org/mian/gitnex/helpers/ssl/MTMDecision.java
index 5414f56d..f963e6fe 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/ssl/MTMDecision.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/ssl/MTMDecision.java
@@ -3,13 +3,11 @@ package org.mian.gitnex.helpers.ssl;
 /**
  * @author Georg Lukas, modified by opyale
  */
-
 class MTMDecision {
 
-	final static int DECISION_INVALID = 0;
-	final static int DECISION_ABORT = 1;
-	final static int DECISION_ALWAYS = 2;
+	static final int DECISION_INVALID = 0;
+	static final int DECISION_ABORT = 1;
+	static final int DECISION_ALWAYS = 2;
 
 	int state = DECISION_INVALID;
-
 }
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 fc2fd5ad..bde77d76 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
@@ -10,8 +10,6 @@ import android.util.Base64;
 import android.util.SparseArray;
 import androidx.core.app.NotificationCompat;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.BaseActivity;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -38,16 +36,17 @@ import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.BaseActivity;
 
 /**
  * @author Georg Lukas, modified by opyale
  */
-
 public class MemorizingTrustManager implements X509TrustManager {
 
-	public final static String KEYSTORE_NAME = "keystore";
-	public final static String KEYSTORE_KEY = "keystore";
-	private final static int NOTIFICATION_ID = 100509;
+	public static final String KEYSTORE_NAME = "keystore";
+	public static final String KEYSTORE_KEY = "keystore";
+	private static final int NOTIFICATION_ID = 100509;
 	private final SparseArray<MTMDecision> openDecisions = new SparseArray<>();
 	private final X509TrustManager defaultTrustManager;
 	private Context context;
@@ -58,18 +57,18 @@ public class MemorizingTrustManager implements X509TrustManager {
 	private X509TrustManager appTrustManager;
 
 	/**
-	 * Creates an instance of the MemorizingTrustManager class that falls back to a custom TrustManager.
-	 * <p>
-	 * You need to supply the application context. This has to be one of:
-	 * - Application
-	 * - Activity
-	 * - Service
-	 * <p>
-	 * The context is used for file management, to display the dialog /
-	 * notification and for obtaining translated strings.
+	 * Creates an instance of the MemorizingTrustManager class that falls back to a custom
+	 * TrustManager.
 	 *
-	 * @param m                   Context for the application.
-	 * @param defaultTrustManager Delegate trust management to this TM. If null, the user must accept every certificate.
+	 * <p>You need to supply the application context. This has to be one of: - Application -
+	 * Activity - Service
+	 *
+	 * <p>The context is used for file management, to display the dialog / notification and for
+	 * obtaining translated strings.
+	 *
+	 * @param m Context for the application.
+	 * @param defaultTrustManager Delegate trust management to this TM. If null, the user must
+	 *     accept every certificate.
 	 */
 	public MemorizingTrustManager(Context m, X509TrustManager defaultTrustManager) {
 
@@ -80,14 +79,12 @@ public class MemorizingTrustManager implements X509TrustManager {
 
 	/**
 	 * Creates an instance of the MemorizingTrustManager class using the system X509TrustManager.
-	 * <p>
-	 * You need to supply the application context. This has to be one of:
-	 * - Application
-	 * - Activity
-	 * - Service
-	 * <p>
-	 * The context is used for file management, to display the dialog /
-	 * notification and for obtaining translated strings.
+	 *
+	 * <p>You need to supply the application context. This has to be one of: - Application -
+	 * Activity - Service
+	 *
+	 * <p>The context is used for file management, to display the dialog / notification and for
+	 * obtaining translated strings.
 	 *
 	 * @param m Context for the application.
 	 */
@@ -99,11 +96,10 @@ public class MemorizingTrustManager implements X509TrustManager {
 	}
 
 	/**
-	 * Returns a X509TrustManager list containing a new instance of
-	 * TrustManagerFactory.
-	 * <p>
-	 * This function is meant for convenience only. You can use it
-	 * as follows to integrate TrustManagerFactory for HTTPS sockets:
+	 * Returns a X509TrustManager list containing a new instance of TrustManagerFactory.
+	 *
+	 * <p>This function is meant for convenience only. You can use it as follows to integrate
+	 * TrustManagerFactory for HTTPS sockets:
 	 *
 	 * <pre>
 	 *     SSLContext sc = SSLContext.getInstance("TLS");
@@ -116,17 +112,17 @@ public class MemorizingTrustManager implements X509TrustManager {
 	 */
 	public static X509TrustManager[] getInstanceList(Context c) {
 
-		return new X509TrustManager[]{new MemorizingTrustManager(c)};
+		return new X509TrustManager[] {new MemorizingTrustManager(c)};
 	}
 
 	private static boolean isExpiredException(Throwable e) {
 
 		do {
-			if(e instanceof CertificateExpiredException) {
+			if (e instanceof CertificateExpiredException) {
 				return true;
 			}
 			e = e.getCause();
-		} while(e != null);
+		} while (e != null);
 
 		return false;
 	}
@@ -134,12 +130,12 @@ public class MemorizingTrustManager implements X509TrustManager {
 	private static boolean isPathException(Throwable e) {
 
 		do {
-			if(e instanceof CertPathValidatorException) {
+			if (e instanceof CertPathValidatorException) {
 				return true;
 			}
 
 			e = e.getCause();
-		} while(e != null);
+		} while (e != null);
 
 		return false;
 	}
@@ -148,9 +144,9 @@ public class MemorizingTrustManager implements X509TrustManager {
 
 		StringBuilder si = new StringBuilder();
 
-		for(int i = 0; i < data.length; i++) {
+		for (int i = 0; i < data.length; i++) {
 			si.append(String.format("%02x", data[i]));
-			if(i < data.length - 1) {
+			if (i < data.length - 1) {
 				si.append(":");
 			}
 		}
@@ -164,32 +160,41 @@ public class MemorizingTrustManager implements X509TrustManager {
 			MessageDigest md = MessageDigest.getInstance(digest);
 			md.update(cert.getEncoded());
 			return hexString(md.digest());
-		}
-		catch(CertificateEncodingException | NoSuchAlgorithmException e) {
+		} 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.
+	 * 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) {
+	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) {
+			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) {
+		} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
 			throw new IllegalStateException(e);
 		}
 	}
@@ -197,7 +202,8 @@ public class MemorizingTrustManager implements X509TrustManager {
 	private void init(Context m) {
 
 		context = m;
-		notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+		notificationManager =
+				(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
 		keyStoreStorage = m.getSharedPreferences(KEYSTORE_NAME, Context.MODE_PRIVATE);
 		appKeyStore = loadAppKeyStore();
@@ -212,8 +218,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 
 		try {
 			return appKeyStore.aliases();
-		}
-		catch(KeyStoreException e) {
+		} catch (KeyStoreException e) {
 			// this should never happen, however...
 			throw new RuntimeException(e);
 		}
@@ -229,8 +234,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 
 		try {
 			return appKeyStore.getCertificate(alias);
-		}
-		catch(KeyStoreException e) {
+		} catch (KeyStoreException e) {
 			// this should never happen, however...
 			throw new RuntimeException(e);
 		}
@@ -239,12 +243,9 @@ public class MemorizingTrustManager implements X509TrustManager {
 	/**
 	 * Removes the given certificate from MTMs key store.
 	 *
-	 * <p>
-	 * <b>WARNING</b>: this does not immediately invalidate the certificate. It is
-	 * well possible that (a) data is transmitted over still existing connections or
-	 * (b) new connections are created using TLS renegotiation, without a new cert
-	 * check.
-	 * </p>
+	 * <p><b>WARNING</b>: this does not immediately invalidate the certificate. It is well possible
+	 * that (a) data is transmitted over still existing connections or (b) new connections are
+	 * created using TLS renegotiation, without a new cert check.
 	 *
 	 * @param alias the certificate's alias as returned by {@link #getCertificates()}.
 	 * @throws KeyStoreException if the certificate could not be deleted.
@@ -258,16 +259,16 @@ public class MemorizingTrustManager implements X509TrustManager {
 	/**
 	 * Creates a new hostname verifier supporting user interaction.
 	 *
-	 * <p>This method creates a new {@link HostnameVerifier} that is bound to
-	 * the given instance of {@link MemorizingTrustManager}, and leverages an
-	 * existing {@link HostnameVerifier}. The returned verifier performs the
-	 * following steps, returning as soon as one of them succeeds:
+	 * <p>This method creates a new {@link HostnameVerifier} that is bound to the given instance of
+	 * {@link MemorizingTrustManager}, and leverages an existing {@link HostnameVerifier}. The
+	 * returned verifier performs the following steps, returning as soon as one of them succeeds:
 	 * /p>
+	 *
 	 * <ol>
-	 * <li>Success, if the wrapped defaultVerifier accepts the certificate.</li>
-	 * <li>Success, if the server certificate is stored in the keystore under the given hostname.</li>
-	 * <li>Ask the user and return accordingly.</li>
-	 * <li>Failure on exception.</li>
+	 *   <li>Success, if the wrapped defaultVerifier accepts the certificate.
+	 *   <li>Success, if the server certificate is stored in the keystore under the given hostname.
+	 *   <li>Ask the user and return accordingly.
+	 *   <li>Failure on exception.
 	 * </ol>
 	 *
 	 * @param defaultVerifier the {@link HostnameVerifier} that should perform the actual check
@@ -276,7 +277,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 	 */
 	public HostnameVerifier wrapHostnameVerifier(final HostnameVerifier defaultVerifier) {
 
-		if(defaultVerifier == null) {
+		if (defaultVerifier == null) {
 			throw new IllegalArgumentException("The default verifier may not be null");
 		}
 
@@ -288,13 +289,12 @@ public class MemorizingTrustManager implements X509TrustManager {
 		try {
 			TrustManagerFactory tmf = TrustManagerFactory.getInstance("X509");
 			tmf.init(ks);
-			for(TrustManager t : tmf.getTrustManagers()) {
-				if(t instanceof X509TrustManager) {
+			for (TrustManager t : tmf.getTrustManagers()) {
+				if (t instanceof X509TrustManager) {
 					return (X509TrustManager) t;
 				}
 			}
-		}
-		catch(Exception e) {
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 
@@ -307,29 +307,27 @@ public class MemorizingTrustManager implements X509TrustManager {
 
 		try {
 			keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-		}
-		catch(KeyStoreException e) {
+		} catch (KeyStoreException e) {
 			e.printStackTrace();
 			return null;
 		}
 
 		try {
 			keyStore.load(null, null);
-		}
-		catch(NoSuchAlgorithmException | CertificateException | IOException e) {
+		} catch (NoSuchAlgorithmException | CertificateException | IOException e) {
 			e.printStackTrace();
 		}
 
 		String keystore = keyStoreStorage.getString(KEYSTORE_KEY, null);
 
-		if(keystore != null) {
-			ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64.decode(keystore, Base64.DEFAULT));
+		if (keystore != null) {
+			ByteArrayInputStream inputStream =
+					new ByteArrayInputStream(Base64.decode(keystore, Base64.DEFAULT));
 
 			try {
 				keyStore.load(inputStream, "MTM".toCharArray());
 				inputStream.close();
-			}
-			catch(Exception e) {
+			} catch (Exception e) {
 				e.printStackTrace();
 			}
 		}
@@ -341,8 +339,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 
 		try {
 			appKeyStore.setCertificateEntry(alias, cert);
-		}
-		catch(KeyStoreException e) {
+		} catch (KeyStoreException e) {
 			e.printStackTrace();
 			return;
 		}
@@ -367,9 +364,14 @@ public class MemorizingTrustManager implements X509TrustManager {
 			byteArrayOutputStream.flush();
 			byteArrayOutputStream.close();
 
-			keyStoreStorage.edit().putString(KEYSTORE_KEY, Base64.encodeToString(byteArrayOutputStream.toByteArray(), Base64.DEFAULT)).apply();
-		}
-		catch(Exception e) {
+			keyStoreStorage
+					.edit()
+					.putString(
+							KEYSTORE_KEY,
+							Base64.encodeToString(
+									byteArrayOutputStream.toByteArray(), Base64.DEFAULT))
+					.apply();
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
@@ -379,51 +381,49 @@ public class MemorizingTrustManager implements X509TrustManager {
 
 		try {
 			return appKeyStore.getCertificateAlias(cert) != null;
-		}
-		catch(KeyStoreException e) {
+		} catch (KeyStoreException e) {
 			return false;
 		}
 	}
 
-	private void checkCertTrusted(X509Certificate[] chain, String authType, boolean isServer) throws CertificateException {
+	private void checkCertTrusted(X509Certificate[] chain, String authType, boolean isServer)
+			throws CertificateException {
 		try {
 
-			if(isServer) {
+			if (isServer) {
 				appTrustManager.checkServerTrusted(chain, authType);
-			}
-			else {
+			} else {
 				appTrustManager.checkClientTrusted(chain, authType);
 			}
-		}
-		catch(CertificateException ae) {
+		} catch (CertificateException ae) {
 			// if the cert is stored in our appTrustManager, we ignore expiredness
-			if(isExpiredException(ae) || isCertKnown(chain[0])) {
+			if (isExpiredException(ae) || isCertKnown(chain[0])) {
 				return;
 			}
 
 			try {
-				if(defaultTrustManager == null) {
+				if (defaultTrustManager == null) {
 					throw ae;
 				}
-				if(isServer) {
+				if (isServer) {
 					defaultTrustManager.checkServerTrusted(chain, authType);
-				}
-				else {
+				} else {
 					defaultTrustManager.checkClientTrusted(chain, authType);
 				}
-			}
-			catch(CertificateException e) {
+			} catch (CertificateException e) {
 				interactCert(chain, authType, e);
 			}
 		}
 	}
 
-	public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+	public void checkClientTrusted(X509Certificate[] chain, String authType)
+			throws CertificateException {
 
 		checkCertTrusted(chain, authType, false);
 	}
 
-	public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+	public void checkServerTrusted(X509Certificate[] chain, String authType)
+			throws CertificateException {
 
 		checkCertTrusted(chain, authType, true);
 	}
@@ -436,7 +436,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 	private int createDecisionId(MTMDecision d) {
 
 		int myId;
-		synchronized(openDecisions) {
+		synchronized (openDecisions) {
 			myId = decisionId;
 			openDecisions.put(myId, d);
 			decisionId += 1;
@@ -446,10 +446,24 @@ public class MemorizingTrustManager implements X509TrustManager {
 
 	private void certDetails(StringBuilder stringBuilder, X509Certificate c) {
 
-		SimpleDateFormat validityDateFormatter = new SimpleDateFormat("yyyy-MM-dd", context.getResources().getConfiguration().locale);
+		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) {
@@ -457,15 +471,13 @@ public class MemorizingTrustManager implements X509TrustManager {
 		Throwable e = cause;
 		StringBuilder stringBuilder = new StringBuilder();
 
-		if(isPathException(e)) {
+		if (isPathException(e)) {
 			stringBuilder.append(context.getString(R.string.mtmTrustAnchor));
-		}
-		else if(isExpiredException(e)) {
+		} else if (isExpiredException(e)) {
 			stringBuilder.append(context.getString(R.string.mtmCertExpired));
-		}
-		else {
+		} else {
 			// get to the cause
-			while(e.getCause() != null) {
+			while (e.getCause() != null) {
 				e = e.getCause();
 			}
 
@@ -477,7 +489,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 		stringBuilder.append("\n\n");
 		stringBuilder.append(context.getString(R.string.mtmCertDetails));
 
-		for(X509Certificate c : chain) {
+		for (X509Certificate c : chain) {
 			certDetails(stringBuilder, c);
 		}
 
@@ -494,14 +506,13 @@ public class MemorizingTrustManager implements X509TrustManager {
 		try {
 			Collection<List<?>> sans = cert.getSubjectAlternativeNames();
 
-			if(sans == null) {
+			if (sans == null) {
 				stringBuilder.append(cert.getSubjectDN());
 				stringBuilder.append("\n");
-			}
-			else {
-				for(List<?> altName : sans) {
+			} else {
+				for (List<?> altName : sans) {
 					Object name = altName.get(1);
-					if(name instanceof String) {
+					if (name instanceof String) {
 						stringBuilder.append("[");
 						stringBuilder.append(altName.get(0));
 						stringBuilder.append("] ");
@@ -510,8 +521,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 					}
 				}
 			}
-		}
-		catch(CertificateParsingException e) {
+		} catch (CertificateParsingException e) {
 			e.printStackTrace();
 			stringBuilder.append("<Parsing error: ");
 			stringBuilder.append(e.getLocalizedMessage());
@@ -531,8 +541,15 @@ public class MemorizingTrustManager implements X509TrustManager {
 		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());
 	}
@@ -541,40 +558,61 @@ public class MemorizingTrustManager implements X509TrustManager {
 		MTMDecision choice = new MTMDecision();
 		final int myId = createDecisionId(choice);
 
-		((BaseActivity) context).runOnUiThread(() -> {
+		((BaseActivity) context)
+				.runOnUiThread(
+						() -> {
+							MaterialAlertDialogBuilder materialAlertDialogBuilder =
+									new MaterialAlertDialogBuilder(context)
+											.setTitle(titleId)
+											.setMessage(message)
+											.setPositiveButton(
+													R.string.mtmDecisionAlways,
+													(dialog, which) ->
+															interactResult(
+																	myId,
+																	MTMDecision.DECISION_ALWAYS))
+											.setNeutralButton(
+													R.string.mtmDecisionAbort,
+													(dialog, which) ->
+															interactResult(
+																	myId,
+																	MTMDecision.DECISION_ABORT))
+											.setOnCancelListener(
+													dialog ->
+															interactResult(
+																	myId,
+																	MTMDecision.DECISION_ABORT));
 
-			MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context).setTitle(titleId).setMessage(message)
-				.setPositiveButton(R.string.mtmDecisionAlways, (dialog, which) -> interactResult(myId, MTMDecision.DECISION_ALWAYS))
-				.setNeutralButton(R.string.mtmDecisionAbort, (dialog, which) -> interactResult(myId, MTMDecision.DECISION_ABORT)).setOnCancelListener(dialog -> interactResult(myId, MTMDecision.DECISION_ABORT));
-
-			materialAlertDialogBuilder.create().show();
-		});
+							materialAlertDialogBuilder.create().show();
+						});
 
 		try {
-			synchronized(choice) {
+			synchronized (choice) {
 				choice.wait();
 			}
-		}
-		catch(InterruptedException e) {
+		} catch (InterruptedException e) {
 			e.printStackTrace();
 		}
 
 		return choice.state;
 	}
 
-	private void interactCert(final X509Certificate[] chain, String authType, CertificateException cause) throws CertificateException {
+	private void interactCert(
+			final X509Certificate[] chain, String authType, CertificateException cause)
+			throws CertificateException {
 
-		if(interact(certChainMessage(chain, cause), R.string.mtmAcceptCert) == MTMDecision.DECISION_ALWAYS) {
+		if (interact(certChainMessage(chain, cause), R.string.mtmAcceptCert)
+				== MTMDecision.DECISION_ALWAYS) {
 			storeCert(chain[0]); // only store the server cert, not the whole chain
-		}
-		else {
+		} else {
 			throw (cause);
 		}
 	}
 
 	private boolean interactHostname(X509Certificate cert, String hostname) {
 
-		if(interact(hostNameMessage(cert, hostname), R.string.mtmAcceptServerName) == MTMDecision.DECISION_ALWAYS) {
+		if (interact(hostNameMessage(cert, hostname), R.string.mtmAcceptServerName)
+				== MTMDecision.DECISION_ALWAYS) {
 			storeCert(hostname, cert);
 			return true;
 		}
@@ -586,16 +624,16 @@ public class MemorizingTrustManager implements X509TrustManager {
 
 		MTMDecision d;
 
-		synchronized(openDecisions) {
+		synchronized (openDecisions) {
 			d = openDecisions.get(decisionId);
 			openDecisions.remove(decisionId);
 		}
 
-		if(d == null) {
+		if (d == null) {
 			return;
 		}
 
-		synchronized(d) {
+		synchronized (d) {
 			d.state = choice;
 			d.notify();
 		}
@@ -613,7 +651,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 		@Override
 		public boolean verify(String hostname, SSLSession session) {
 			// if the default verifier accepts the hostname, we are done
-			if(defaultVerifier.verify(hostname, session)) {
+			if (defaultVerifier.verify(hostname, session)) {
 				return true;
 			}
 
@@ -621,19 +659,15 @@ public class MemorizingTrustManager implements X509TrustManager {
 			try {
 				X509Certificate cert = (X509Certificate) session.getPeerCertificates()[0];
 
-				if(cert.equals(appKeyStore.getCertificate(hostname.toLowerCase(Locale.US)))) {
+				if (cert.equals(appKeyStore.getCertificate(hostname.toLowerCase(Locale.US)))) {
 					return true;
-				}
-				else {
+				} else {
 					return interactHostname(cert, hostname);
 				}
-			}
-			catch(Exception e) {
+			} catch (Exception e) {
 				e.printStackTrace();
 				return false;
 			}
 		}
-
 	}
-
 }
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 140cd40a..9a20e9a0 100644
--- a/app/src/main/java/org/mian/gitnex/notifications/Notifications.java
+++ b/app/src/main/java/org/mian/gitnex/notifications/Notifications.java
@@ -10,15 +10,14 @@ import androidx.work.ExistingPeriodicWorkPolicy;
 import androidx.work.NetworkType;
 import androidx.work.PeriodicWorkRequest;
 import androidx.work.WorkManager;
+import java.util.concurrent.TimeUnit;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.TinyDB;
-import java.util.concurrent.TimeUnit;
 
 /**
  * @author opyale
  */
-
 public class Notifications {
 
 	public static int uniqueNotificationId(Context context) {
@@ -26,49 +25,58 @@ public class Notifications {
 		TinyDB tinyDB = TinyDB.getInstance(context);
 
 		int previousNotificationId = tinyDB.getInt("previousNotificationId", 0);
-		int nextPreviousNotificationId = previousNotificationId == Integer.MAX_VALUE ? 0 : previousNotificationId + 1;
+		int nextPreviousNotificationId =
+				previousNotificationId == Integer.MAX_VALUE ? 0 : previousNotificationId + 1;
 
 		tinyDB.putInt("previousNotificationId", nextPreviousNotificationId);
 		return previousNotificationId;
-
 	}
 
 	public static void createChannels(Context context) {
 
 		TinyDB tinyDB = TinyDB.getInstance(context);
-		NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+		NotificationManager notificationManager =
+				(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
-		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
 
 			// Delete old notification channels
-			notificationManager.deleteNotificationChannel(context.getPackageName()); // TODO Can be removed in future versions
+			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);
-			mainChannel.setDescription(context.getString(R.string.mainNotificationChannelDescription));
+			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)) {
+			if (tinyDB.getBoolean("notificationsEnableVibration", true)) {
 				mainChannel.setVibrationPattern(Constants.defaultVibrationPattern);
 				mainChannel.enableVibration(true);
-			}
-			else {
+			} else {
 				mainChannel.enableVibration(false);
 			}
 
-			if(tinyDB.getBoolean("notificationsEnableLights", true)) {
+			if (tinyDB.getBoolean("notificationsEnableLights", true)) {
 				mainChannel.setLightColor(tinyDB.getInt("notificationsLightColor", Color.GREEN));
 				mainChannel.enableLights(true);
-			}
-			else {
+			} else {
 				mainChannel.enableLights(false);
 			}
 
-			NotificationChannel downloadChannel = new NotificationChannel(Constants.downloadNotificationChannelId, context.getString(R.string.fileViewerNotificationChannelName), NotificationManager.IMPORTANCE_LOW);
-			downloadChannel.setDescription(context.getString(R.string.fileViewerNotificationChannelDescription));
+			NotificationChannel downloadChannel =
+					new NotificationChannel(
+							Constants.downloadNotificationChannelId,
+							context.getString(R.string.fileViewerNotificationChannelName),
+							NotificationManager.IMPORTANCE_LOW);
+			downloadChannel.setDescription(
+					context.getString(R.string.fileViewerNotificationChannelDescription));
 
 			notificationManager.createNotificationChannel(mainChannel);
 			notificationManager.createNotificationChannel(downloadChannel);
-
 		}
 	}
 
@@ -81,22 +89,38 @@ public class Notifications {
 
 		TinyDB tinyDB = TinyDB.getInstance(context);
 
-		if(tinyDB.getBoolean("notificationsEnabled", true)) {
+		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) {
+			if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 				constraints.setRequiresDeviceIdle(false);
 			}
 
-			int pollingDelayMinutes = Math.max(tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay), 15);
+			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();
-
-			WorkManager.getInstance(context).enqueueUniquePeriodicWork(Constants.notificationsWorkerId, ExistingPeriodicWorkPolicy.KEEP, periodicWorkRequest);
+			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);
 		}
 	}
-
 }
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 7332c9d2..43c27c21 100644
--- a/app/src/main/java/org/mian/gitnex/notifications/NotificationsWorker.java
+++ b/app/src/main/java/org/mian/gitnex/notifications/NotificationsWorker.java
@@ -11,6 +11,10 @@ import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.gitnex.tea4j.v2.models.NotificationThread;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.MainActivity;
@@ -22,17 +26,12 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Version;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import retrofit2.Call;
 import retrofit2.Response;
 
 /**
  * @author opyale
  */
-
 public class NotificationsWorker extends Worker {
 
 	private final Context context;
@@ -49,110 +48,162 @@ public class NotificationsWorker extends Worker {
 		this.tinyDB = TinyDB.getInstance(context);
 		this.userAccounts = new HashMap<>(userAccountsApi.getCount());
 
-		for(UserAccount userAccount : userAccountsApi.loggedInUserAccounts()) {
+		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")) {
+			// 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")) {
 
 				Map<String, String> userAccountParameters = new HashMap<>();
-				userAccountParameters.put("previousTimestamp", AppUtil.getTimestampFromDate(context, new Date()));
+				userAccountParameters.put(
+						"previousTimestamp", AppUtil.getTimestampFromDate(context, new Date()));
 
 				userAccounts.put(userAccount, userAccountParameters);
 			}
 		}
 	}
 
-	@NonNull
-	@Override
+	@NonNull @Override
 	public Result doWork() {
 		pollingLoops();
 		return Result.success();
 	}
 
-	/**
-	 * Used to bypass the 15-minute limit of {@code WorkManager}.
-	 */
+	/** 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++) {
+		for (int i = 0; i < notificationLoops; i++) {
 			long startPollingTime = System.currentTimeMillis();
 
 			startPolling();
 
 			try {
-				if(notificationLoops > 1 && i < (notificationLoops - 1)) {
+				if (notificationLoops > 1 && i < (notificationLoops - 1)) {
 					Thread.sleep(60000 - (System.currentTimeMillis() - startPollingTime));
 				}
-			}
-			catch(InterruptedException ignored) {
+			} catch (InterruptedException ignored) {
 			}
 		}
 	}
 
 	private void startPolling() {
-		for(UserAccount userAccount : userAccounts.keySet()) {
+		for (UserAccount userAccount : userAccounts.keySet()) {
 			Map<String, String> userAccountParameters = userAccounts.get(userAccount);
 
 			try {
 				assert userAccountParameters != null;
-				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);
+				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();
 
-				if(response.code() == 200 && response.body() != null) {
+				if (response.code() == 200 && response.body() != null) {
 					List<NotificationThread> notificationThreads = response.body();
-					if(!notificationThreads.isEmpty()) {
+					if (!notificationThreads.isEmpty()) {
 						sendNotifications(userAccount, notificationThreads);
 					}
-					userAccountParameters.put("previousTimestamp", AppUtil.getTimestampFromDate(context, new Date()));
+					userAccountParameters.put(
+							"previousTimestamp", AppUtil.getTimestampFromDate(context, new Date()));
 				}
-			}
-			catch(Exception ignored) {
+			} catch (Exception ignored) {
 			}
 		}
 	}
 
-	private void sendNotifications(@NonNull UserAccount userAccount, @NonNull List<NotificationThread> notificationThreads) {
+	private void sendNotifications(
+			@NonNull UserAccount userAccount,
+			@NonNull List<NotificationThread> notificationThreads) {
 
 		PendingIntent pendingIntent = getPendingIntent(userAccount);
 
-		NotificationManagerCompat notificationManagerCompat = NotificationManagerCompat.from(context);
+		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);
 
-		for(NotificationThread notificationThread : notificationThreads) {
+		for (NotificationThread notificationThread : notificationThreads) {
 
 			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 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());
 
-			NotificationCompat.Builder builder1 = getBaseNotificationBuilder().setContentTitle(notificationHeader).setGroup(userAccount.getUserName()).setContentIntent(pendingIntent);
-
-			notificationManagerCompat.notify(Notifications.uniqueNotificationId(context), builder1.build());
+			NotificationCompat.Builder builder1 =
+					getBaseNotificationBuilder()
+							.setContentTitle(notificationHeader)
+							.setGroup(userAccount.getUserName())
+							.setContentIntent(pendingIntent);
 
+			notificationManagerCompat.notify(
+					Notifications.uniqueNotificationId(context), builder1.build());
 		}
 	}
 
 	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)) {
+		if (tinyDB.getBoolean("notificationsEnableLights", true)) {
 			builder.setLights(tinyDB.getInt("notificationsLightColor", Color.GREEN), 1500, 1500);
 		}
 
-		if(tinyDB.getBoolean("notificationsEnableVibration", true)) {
+		if (tinyDB.getBoolean("notificationsEnableVibration", true)) {
 			builder.setVibrate(Constants.defaultVibrationPattern);
-		}
-		else {
+		} else {
 			builder.setVibrate(null);
 		}
 
@@ -167,8 +218,7 @@ public class NotificationsWorker extends Worker {
 		intent.putExtra("switchAccountId", userAccount.getAccountId());
 		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
 
-		return PendingIntent.getActivity(context, userAccount.getAccountId(), intent, PendingIntent.FLAG_UPDATE_CURRENT);
-
+		return PendingIntent.getActivity(
+				context, userAccount.getAccountId(), intent, PendingIntent.FLAG_UPDATE_CURRENT);
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/structs/BottomSheetListener.java b/app/src/main/java/org/mian/gitnex/structs/BottomSheetListener.java
index bcecc134..0038239c 100644
--- a/app/src/main/java/org/mian/gitnex/structs/BottomSheetListener.java
+++ b/app/src/main/java/org/mian/gitnex/structs/BottomSheetListener.java
@@ -7,5 +7,4 @@ package org.mian.gitnex.structs;
 public interface BottomSheetListener {
 
 	void onButtonClicked(String text);
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/structs/FragmentRefreshListener.java b/app/src/main/java/org/mian/gitnex/structs/FragmentRefreshListener.java
index 0b4f94ad..37ca714d 100644
--- a/app/src/main/java/org/mian/gitnex/structs/FragmentRefreshListener.java
+++ b/app/src/main/java/org/mian/gitnex/structs/FragmentRefreshListener.java
@@ -7,5 +7,4 @@ package org.mian.gitnex.structs;
 public interface FragmentRefreshListener {
 
 	void onRefresh(String text);
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/structs/Protocol.java b/app/src/main/java/org/mian/gitnex/structs/Protocol.java
index 58a0c919..f8e3835f 100644
--- a/app/src/main/java/org/mian/gitnex/structs/Protocol.java
+++ b/app/src/main/java/org/mian/gitnex/structs/Protocol.java
@@ -4,4 +4,7 @@ package org.mian.gitnex.structs;
  * @author opyale
  * @author qwerty287
  */
-public enum Protocol {HTTPS, HTTP}
+public enum Protocol {
+	HTTPS,
+	HTTP
+}
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/AdminCronTasksViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/AdminCronTasksViewModel.java
index d90f88c8..813ad45a 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/AdminCronTasksViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/AdminCronTasksViewModel.java
@@ -5,12 +5,12 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Cron;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -18,7 +18,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class AdminCronTasksViewModel extends ViewModel {
 
 	private MutableLiveData<List<Cron>> tasksList;
@@ -35,34 +34,32 @@ public class AdminCronTasksViewModel extends ViewModel {
 
 		Call<List<Cron>> call = RetrofitClient.getApiInterface(ctx).adminCronList(page, limit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Cron>> call, @NonNull Response<List<Cron>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Cron>> call,
+							@NonNull Response<List<Cron>> response) {
 
-				if(response.isSuccessful()) {
-					tasksList.postValue(response.body());
-				}
-				else if(response.code() == 401) {
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else if(response.code() == 403) {
-					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+						if (response.isSuccessful()) {
+							tasksList.postValue(response.body());
+						} else if (response.code() == 401) {
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else if (response.code() == 403) {
+							Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
+							Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Cron>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<Cron>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java
index e657d86b..3e7728f6 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java
@@ -5,12 +5,12 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.AdminGetUsersAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -18,7 +18,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class AdminGetUsersViewModel extends ViewModel {
 
 	private MutableLiveData<List<User>> usersList;
@@ -33,62 +32,67 @@ public class AdminGetUsersViewModel extends ViewModel {
 
 	public void loadUsersList(int page, int resultLimit, Context ctx) {
 
-		Call<List<User>> call = RetrofitClient.getApiInterface(ctx).adminGetAllUsers(page, resultLimit);
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(ctx).adminGetAllUsers(page, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
 
-				if(response.isSuccessful()) {
-					usersList.postValue(response.body());
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+						if (response.isSuccessful()) {
+							usersList.postValue(response.body());
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	public void loadMoreUsersList(int page, int resultLimit, Context ctx, AdminGetUsersAdapter adapter) {
+	public void loadMoreUsersList(
+			int page, int resultLimit, Context ctx, AdminGetUsersAdapter adapter) {
 
-		Call<List<User>> call = RetrofitClient.getApiInterface(ctx).adminGetAllUsers(page, resultLimit);
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(ctx).adminGetAllUsers(page, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					List<User> list = usersList.getValue();
-					assert list != null;
-					assert response.body() != null;
+							List<User> list = usersList.getValue();
+							assert list != null;
+							assert response.body() != null;
 
-					if(response.body().size() != 0) {
-						list.addAll(response.body());
-						adapter.updateList(list);
+							if (response.body().size() != 0) {
+								list.addAll(response.body());
+								adapter.updateList(list);
+							} else {
+								adapter.setMoreDataAvailable(false);
+							}
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
 					}
-					else {
-						adapter.setMoreDataAvailable(false);
+
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
+
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
 					}
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/AdminUnadoptedReposViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/AdminUnadoptedReposViewModel.java
index 4005f157..746ccc65 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/AdminUnadoptedReposViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/AdminUnadoptedReposViewModel.java
@@ -5,13 +5,13 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -20,12 +20,12 @@ import retrofit2.Response;
  * @author M M Arif
  * @author qwerty287
  */
-
 public class AdminUnadoptedReposViewModel extends ViewModel {
 
 	private MutableLiveData<List<String>> tasksList;
 
-	public LiveData<List<String>> getUnadoptedRepos(Context ctx, int page, int limit, String query) {
+	public LiveData<List<String>> getUnadoptedRepos(
+			Context ctx, int page, int limit, String query) {
 
 		tasksList = new MutableLiveData<>();
 		loadRepos(ctx, page, limit, query);
@@ -35,44 +35,44 @@ public class AdminUnadoptedReposViewModel extends ViewModel {
 
 	public void loadRepos(final Context ctx, final int page, int limit, String query) {
 
-		Call<List<String>> call = RetrofitClient.getApiInterface(ctx).adminUnadoptedList(page, limit, query);
+		Call<List<String>> call =
+				RetrofitClient.getApiInterface(ctx).adminUnadoptedList(page, limit, query);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<String>> call, @NonNull Response<List<String>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<String>> call,
+							@NonNull Response<List<String>> response) {
 
-				if(response.isSuccessful()) {
-					if(page <= 1 || tasksList.getValue() == null) {
-						tasksList.postValue(response.body());
+						if (response.isSuccessful()) {
+							if (page <= 1 || tasksList.getValue() == null) {
+								tasksList.postValue(response.body());
+							} else {
+								List<String> repos =
+										new ArrayList<>(
+												Objects.requireNonNull(tasksList.getValue()));
+								assert response.body() != null;
+								repos.addAll(response.body());
+								tasksList.postValue(repos);
+							}
+						} else if (response.code() == 401) {
+							AlertDialogs.authorizationTokenRevokedDialog(ctx);
+						} else if (response.code() == 403) {
+							Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+						} else if (response.code() == 404) {
+							Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
 					}
-					else {
-						List<String> repos = new ArrayList<>(Objects.requireNonNull(tasksList.getValue()));
-						assert response.body() != null;
-						repos.addAll(response.body());
-						tasksList.postValue(repos);
+
+					@Override
+					public void onFailure(@NonNull Call<List<String>> call, @NonNull Throwable t) {
+
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
 					}
-				}
-				else if(response.code() == 401) {
-					AlertDialogs.authorizationTokenRevokedDialog(ctx);
-				}
-				else if(response.code() == 403) {
-					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<String>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/CollaboratorsViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/CollaboratorsViewModel.java
index e9328987..0a0e7404 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/CollaboratorsViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/CollaboratorsViewModel.java
@@ -5,11 +5,11 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -17,7 +17,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class CollaboratorsViewModel extends ViewModel {
 
 	private MutableLiveData<List<User>> collaboratorsList;
@@ -32,27 +31,29 @@ public class CollaboratorsViewModel extends ViewModel {
 
 	private void loadCollaboratorsListList(String owner, String repo, Context ctx) {
 
-		Call<List<User>> call = RetrofitClient.getApiInterface(ctx).repoListCollaborators(owner, repo, null, null);
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(ctx).repoListCollaborators(owner, repo, null, null);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
 
-				if(response.isSuccessful()) {
-					collaboratorsList.postValue(response.body());
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+						if (response.isSuccessful()) {
+							collaboratorsList.postValue(response.body());
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
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 6d1d167d..927a8287 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/FilesViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/FilesViewModel.java
@@ -8,13 +8,13 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.ContentsResponse;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -22,13 +22,18 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 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);
@@ -36,33 +41,54 @@ public class FilesViewModel extends ViewModel {
 		return filesList;
 	}
 
-	private void loadFilesList(String owner, String repo, String ref, final Context ctx, ProgressBar progressBar, TextView noDataFiles) {
+	private void loadFilesList(
+			String owner,
+			String repo,
+			String ref,
+			final Context ctx,
+			ProgressBar progressBar,
+			TextView noDataFiles) {
 
-		Call<List<ContentsResponse>> call = RetrofitClient.getApiInterface(ctx).repoGetContentsList(owner, repo, ref);
+		Call<List<ContentsResponse>> call =
+				RetrofitClient.getApiInterface(ctx).repoGetContentsList(owner, repo, ref);
 
-		call.enqueue(new Callback<>() {
-			@Override
-			public void onResponse(@NonNull Call<List<ContentsResponse>> call, @NonNull Response<List<ContentsResponse>> response) {
+		call.enqueue(
+				new Callback<>() {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<ContentsResponse>> call,
+							@NonNull Response<List<ContentsResponse>> response) {
 
-				if(response.isSuccessful() && response.body() != null && !response.body().isEmpty()) {
-					Collections.sort(response.body(), Comparator.comparing(ContentsResponse::getType));
-					filesList.postValue(response.body());
-				}
-				else {
-					progressBar.setVisibility(View.GONE);
-					noDataFiles.setVisibility(View.VISIBLE);
-				}
-			}
+						if (response.isSuccessful()
+								&& response.body() != null
+								&& !response.body().isEmpty()) {
+							Collections.sort(
+									response.body(),
+									Comparator.comparing(ContentsResponse::getType));
+							filesList.postValue(response.body());
+						} else {
+							progressBar.setVisibility(View.GONE);
+							noDataFiles.setVisibility(View.VISIBLE);
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<ContentsResponse>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(
+							@NonNull Call<List<ContentsResponse>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	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);
@@ -70,30 +96,44 @@ 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);
+		Call<List<ContentsResponse>> call =
+				RetrofitClient.getApiInterface(ctx).repoGetContentsList(owner, repo, filesDir, ref);
 
-		call.enqueue(new Callback<>() {
-			@Override
-			public void onResponse(@NonNull Call<List<ContentsResponse>> call, @NonNull Response<List<ContentsResponse>> response) {
+		call.enqueue(
+				new Callback<>() {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<ContentsResponse>> call,
+							@NonNull Response<List<ContentsResponse>> response) {
 
-				if(response.isSuccessful() && response.body() != null && !response.body().isEmpty()) {
-					Collections.sort(response.body(), Comparator.comparing(ContentsResponse::getType));
-					filesList2.postValue(response.body());
-				}
-				else {
-					progressBar.setVisibility(View.GONE);
-					noDataFiles.setVisibility(View.VISIBLE);
-				}
-			}
+						if (response.isSuccessful()
+								&& response.body() != null
+								&& !response.body().isEmpty()) {
+							Collections.sort(
+									response.body(),
+									Comparator.comparing(ContentsResponse::getType));
+							filesList2.postValue(response.body());
+						} else {
+							progressBar.setVisibility(View.GONE);
+							noDataFiles.setVisibility(View.VISIBLE);
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<ContentsResponse>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(
+							@NonNull Call<List<ContentsResponse>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/IssueCommentsViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/IssueCommentsViewModel.java
index d1e0ac4f..3a24eb7c 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/IssueCommentsViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/IssueCommentsViewModel.java
@@ -5,13 +5,13 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.TimelineComment;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.IssueCommentsAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -19,13 +19,13 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class IssueCommentsViewModel extends ViewModel {
 
 	private MutableLiveData<List<TimelineComment>> issueComments;
 	private int resultLimit;
 
-	public LiveData<List<TimelineComment>> getIssueCommentList(String owner, String repo, int index, Context ctx) {
+	public LiveData<List<TimelineComment>> getIssueCommentList(
+			String owner, String repo, int index, Context ctx) {
 
 		issueComments = new MutableLiveData<>();
 		resultLimit = Constants.getCurrentResultLimit(ctx);
@@ -33,77 +33,93 @@ public class IssueCommentsViewModel extends ViewModel {
 		return issueComments;
 	}
 
-	public void loadIssueComments(String owner, String repo, int index, Context ctx, Runnable onLoadingFinished) {
+	public void loadIssueComments(
+			String owner, String repo, int index, Context ctx, Runnable onLoadingFinished) {
 
-		Call<List<TimelineComment>> call = RetrofitClient.getApiInterface(ctx).issueGetCommentsAndTimeline(owner, repo, (long) index, null, 1, resultLimit, null);
+		Call<List<TimelineComment>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.issueGetCommentsAndTimeline(
+								owner, repo, (long) index, null, 1, resultLimit, null);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<TimelineComment>> call, @NonNull Response<List<TimelineComment>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<TimelineComment>> call,
+							@NonNull Response<List<TimelineComment>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.body() != null) {
+							if (response.body() != null) {
 
-						issueComments.postValue(response.body());
-						if(onLoadingFinished != null) {
-							onLoadingFinished.run();
+								issueComments.postValue(response.body());
+								if (onLoadingFinished != null) {
+									onLoadingFinished.run();
+								}
+							}
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
 						}
 					}
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<TimelineComment>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(
+							@NonNull Call<List<TimelineComment>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	public void loadMoreIssueComments(String owner, String repo, int index, Context ctx, int page, IssueCommentsAdapter adapter) {
+	public void loadMoreIssueComments(
+			String owner,
+			String repo,
+			int index,
+			Context ctx,
+			int page,
+			IssueCommentsAdapter adapter) {
 
-		Call<List<TimelineComment>> call = RetrofitClient.getApiInterface(ctx).issueGetCommentsAndTimeline(owner, repo, (long) index, null, page, resultLimit, null);
+		Call<List<TimelineComment>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.issueGetCommentsAndTimeline(
+								owner, repo, (long) index, null, page, resultLimit, null);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<TimelineComment>> call, @NonNull Response<List<TimelineComment>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<TimelineComment>> call,
+							@NonNull Response<List<TimelineComment>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					if(response.body() != null) {
+							if (response.body() != null) {
 
-						List<TimelineComment> list = issueComments.getValue();
-						assert list != null;
-						assert response.body() != null;
+								List<TimelineComment> list = issueComments.getValue();
+								assert list != null;
+								assert response.body() != null;
 
-						if(response.body().size() != 0) {
-							list.addAll(response.body());
-							adapter.updateList(list);
-						}
-						else {
-							adapter.setMoreDataAvailable(false);
+								if (response.body().size() != 0) {
+									list.addAll(response.body());
+									adapter.updateList(list);
+								} else {
+									adapter.setMoreDataAvailable(false);
+								}
+							} else {
+								adapter.setMoreDataAvailable(false);
+							}
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
 						}
 					}
-					else {
-						adapter.setMoreDataAvailable(false);
-					}
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<TimelineComment>> call, @NonNull Throwable t) {
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+					@Override
+					public void onFailure(
+							@NonNull Call<List<TimelineComment>> call, @NonNull Throwable t) {
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
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 9573b83a..89919793 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java
@@ -5,13 +5,13 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Issue;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.ExploreIssuesAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -19,13 +19,18 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class IssuesViewModel extends ViewModel {
 
 	private MutableLiveData<List<Issue>> issuesList;
 	private int resultLimit;
 
-	public LiveData<List<Issue>> getIssuesList(String searchKeyword, String type, Boolean created, String state, Boolean assignedToMe, Context ctx) {
+	public LiveData<List<Issue>> getIssuesList(
+			String searchKeyword,
+			String type,
+			Boolean created,
+			String state,
+			Boolean assignedToMe,
+			Context ctx) {
 
 		issuesList = new MutableLiveData<>();
 		resultLimit = Constants.getCurrentResultLimit(ctx);
@@ -33,65 +38,117 @@ public class IssuesViewModel extends ViewModel {
 		return issuesList;
 	}
 
-	public void loadIssuesList(String searchKeyword, String type, Boolean created, String state, Boolean assignedToMe, Context ctx) {
+	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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Issue>> call, @NonNull Response<List<Issue>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Issue>> call,
+							@NonNull Response<List<Issue>> response) {
 
-				if(response.isSuccessful()) {
-					issuesList.postValue(response.body());
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+						if (response.isSuccessful()) {
+							issuesList.postValue(response.body());
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Issue>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<Issue>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Issue>> call, @NonNull Response<List<Issue>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Issue>> call,
+							@NonNull Response<List<Issue>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					List<Issue> list = issuesList.getValue();
-					assert list != null;
-					assert response.body() != null;
+							List<Issue> list = issuesList.getValue();
+							assert list != null;
+							assert response.body() != null;
 
-					if(response.body().size() != 0) {
-						list.addAll(response.body());
-						adapter.updateList(list);
+							if (response.body().size() != 0) {
+								list.addAll(response.body());
+								adapter.updateList(list);
+							} else {
+								adapter.setMoreDataAvailable(false);
+							}
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
 					}
-					else {
-						adapter.setMoreDataAvailable(false);
+
+					@Override
+					public void onFailure(@NonNull Call<List<Issue>> call, @NonNull Throwable t) {
+
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
 					}
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Issue>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/LabelsViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/LabelsViewModel.java
index 3b443c64..5bc669d6 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/LabelsViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/LabelsViewModel.java
@@ -5,11 +5,11 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Label;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -17,34 +17,36 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class LabelsViewModel extends ViewModel {
 
 	private static MutableLiveData<List<Label>> labelsList;
 
 	public static void loadLabelsList(String owner, String repo, Context ctx) {
 
-		Call<List<Label>> call = RetrofitClient.getApiInterface(ctx).issueListLabels(owner, repo, null, null);
+		Call<List<Label>> call =
+				RetrofitClient.getApiInterface(ctx).issueListLabels(owner, repo, null, null);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Label>> call, @NonNull Response<List<Label>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Label>> call,
+							@NonNull Response<List<Label>> response) {
 
-				if(response.isSuccessful()) {
-					labelsList.postValue(response.body());
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+						if (response.isSuccessful()) {
+							labelsList.postValue(response.body());
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Label>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<Label>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
 	public LiveData<List<Label>> getLabelsList(String owner, String repo, Context ctx) {
@@ -54,5 +56,4 @@ public class LabelsViewModel extends ViewModel {
 
 		return labelsList;
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/MembersByOrgViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/MembersByOrgViewModel.java
index 1edf2931..c1acd3fa 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/MembersByOrgViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/MembersByOrgViewModel.java
@@ -5,11 +5,11 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -17,7 +17,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class MembersByOrgViewModel extends ViewModel {
 
 	private MutableLiveData<List<User>> membersList;
@@ -32,27 +31,29 @@ public class MembersByOrgViewModel extends ViewModel {
 
 	private void loadMembersList(String owner, Context ctx) {
 
-		Call<List<User>> call = RetrofitClient.getApiInterface(ctx).orgListMembers(owner, null, null);
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(ctx).orgListMembers(owner, null, null);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
 
-				if(response.isSuccessful()) {
-					membersList.postValue(response.body());
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+						if (response.isSuccessful()) {
+							membersList.postValue(response.body());
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
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 bdb34621..afee3e2b 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/MilestonesViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/MilestonesViewModel.java
@@ -5,13 +5,13 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Milestone;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.MilestonesAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -19,13 +19,13 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class MilestonesViewModel extends ViewModel {
 
 	private MutableLiveData<List<Milestone>> milestonesList;
 	private int resultLimit;
 
-	public LiveData<List<Milestone>> getMilestonesList(String repoOwner, String repoName, String milestoneState, Context ctx) {
+	public LiveData<List<Milestone>> getMilestonesList(
+			String repoOwner, String repoName, String milestoneState, Context ctx) {
 
 		milestonesList = new MutableLiveData<>();
 		loadMilestonesList(repoOwner, repoName, milestoneState, ctx);
@@ -33,65 +33,82 @@ public class MilestonesViewModel extends ViewModel {
 		return milestonesList;
 	}
 
-	public void loadMilestonesList(String repoOwner, String repoName, String milestoneState, Context ctx) {
+	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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Milestone>> call, @NonNull Response<List<Milestone>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Milestone>> call,
+							@NonNull Response<List<Milestone>> response) {
 
-				if(response.isSuccessful()) {
-					milestonesList.postValue(response.body());
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+						if (response.isSuccessful()) {
+							milestonesList.postValue(response.body());
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Milestone>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Milestone>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	public void loadMoreMilestones(String repoOwner, String repoName, int page, String milestoneState, Context ctx, MilestonesAdapter adapter) {
+	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<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Milestone>> call, @NonNull Response<List<Milestone>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Milestone>> call,
+							@NonNull Response<List<Milestone>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					List<Milestone> list = milestonesList.getValue();
-					assert list != null;
-					assert response.body() != null;
+							List<Milestone> list = milestonesList.getValue();
+							assert list != null;
+							assert response.body() != null;
 
-					if(response.body().size() != 0) {
-						list.addAll(response.body());
-						adapter.updateList(list);
+							if (response.body().size() != 0) {
+								list.addAll(response.body());
+								adapter.updateList(list);
+							} else {
+								adapter.setMoreDataAvailable(false);
+							}
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
 					}
-					else {
-						adapter.setMoreDataAvailable(false);
+
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Milestone>> call, @NonNull Throwable t) {
+
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
 					}
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Milestone>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/OrganizationLabelsViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/OrganizationLabelsViewModel.java
index 73d39369..944a9ba6 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/OrganizationLabelsViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/OrganizationLabelsViewModel.java
@@ -8,11 +8,11 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Label;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -20,46 +20,49 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class OrganizationLabelsViewModel extends ViewModel {
 
 	private static MutableLiveData<List<Label>> orgLabelsList;
 
-	public static void loadOrgLabelsList(String owner, Context ctx, ProgressBar progressBar, TextView noData) {
+	public static void loadOrgLabelsList(
+			String owner, Context ctx, ProgressBar progressBar, TextView noData) {
 
-		Call<List<Label>> call = RetrofitClient.getApiInterface(ctx).orgListLabels(owner, null, null);
+		Call<List<Label>> call =
+				RetrofitClient.getApiInterface(ctx).orgListLabels(owner, null, null);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Label>> call, @NonNull Response<List<Label>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Label>> call,
+							@NonNull Response<List<Label>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					orgLabelsList.postValue(response.body());
-				}
-				else {
+							orgLabelsList.postValue(response.body());
+						} else {
 
-					progressBar.setVisibility(View.GONE);
-					noData.setVisibility(View.VISIBLE);
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+							progressBar.setVisibility(View.GONE);
+							noData.setVisibility(View.VISIBLE);
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Label>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<Label>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	public LiveData<List<Label>> getOrgLabelsList(String owner, Context ctx, ProgressBar progressBar, TextView noData) {
+	public LiveData<List<Label>> getOrgLabelsList(
+			String owner, Context ctx, ProgressBar progressBar, TextView noData) {
 
 		orgLabelsList = new MutableLiveData<>();
 		loadOrgLabelsList(owner, ctx, progressBar, noData);
 
 		return orgLabelsList;
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/OrganizationsViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/OrganizationsViewModel.java
index 68294acd..306b03c5 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/OrganizationsViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/OrganizationsViewModel.java
@@ -5,12 +5,12 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Organization;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.OrganizationsListAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -18,7 +18,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class OrganizationsViewModel extends ViewModel {
 
 	private MutableLiveData<List<Organization>> orgList;
@@ -33,62 +32,69 @@ public class OrganizationsViewModel extends ViewModel {
 
 	public void loadOrgList(int page, int resultLimit, Context ctx) {
 
-		Call<List<Organization>> call = RetrofitClient.getApiInterface(ctx).orgListCurrentUserOrgs(page, resultLimit);
+		Call<List<Organization>> call =
+				RetrofitClient.getApiInterface(ctx).orgListCurrentUserOrgs(page, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Organization>> call, @NonNull Response<List<Organization>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Organization>> call,
+							@NonNull Response<List<Organization>> response) {
 
-				if(response.isSuccessful()) {
-					orgList.postValue(response.body());
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+						if (response.isSuccessful()) {
+							orgList.postValue(response.body());
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	public void loadMoreOrgList(int page, int resultLimit, Context ctx, OrganizationsListAdapter adapter) {
+	public void loadMoreOrgList(
+			int page, int resultLimit, Context ctx, OrganizationsListAdapter adapter) {
 
-		Call<List<Organization>> call = RetrofitClient.getApiInterface(ctx).orgListCurrentUserOrgs(page, resultLimit);
+		Call<List<Organization>> call =
+				RetrofitClient.getApiInterface(ctx).orgListCurrentUserOrgs(page, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Organization>> call, @NonNull Response<List<Organization>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Organization>> call,
+							@NonNull Response<List<Organization>> response) {
 
-				if(response.isSuccessful()) {
-					List<Organization> list = orgList.getValue();
-					assert list != null;
-					assert response.body() != null;
+						if (response.isSuccessful()) {
+							List<Organization> list = orgList.getValue();
+							assert list != null;
+							assert response.body() != null;
 
-					if(response.body().size() != 0) {
-						list.addAll(response.body());
-						adapter.updateList(list);
+							if (response.body().size() != 0) {
+								list.addAll(response.body());
+								adapter.updateList(list);
+							} else {
+								adapter.setMoreDataAvailable(false);
+							}
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
 					}
-					else {
-						adapter.setMoreDataAvailable(false);
+
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
+
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
 					}
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/ProfileEmailsViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/ProfileEmailsViewModel.java
index d77cef12..c442025e 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/ProfileEmailsViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/ProfileEmailsViewModel.java
@@ -5,11 +5,11 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Email;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -17,7 +17,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class ProfileEmailsViewModel extends ViewModel {
 
 	private MutableLiveData<List<Email>> emailsList;
@@ -34,25 +33,26 @@ public class ProfileEmailsViewModel extends ViewModel {
 
 		Call<List<Email>> call = RetrofitClient.getApiInterface(ctx).userListEmails();
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Email>> call, @NonNull Response<List<Email>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Email>> call,
+							@NonNull Response<List<Email>> response) {
 
-				if(response.isSuccessful()) {
-					emailsList.postValue(response.body());
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+						if (response.isSuccessful()) {
+							emailsList.postValue(response.body());
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Email>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<Email>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
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 2579a2bb..20f336f4 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/ReleasesViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/ReleasesViewModel.java
@@ -5,6 +5,7 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Release;
 import org.gitnex.tea4j.v2.models.Tag;
 import org.mian.gitnex.R;
@@ -13,7 +14,6 @@ import org.mian.gitnex.adapters.TagsAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -21,7 +21,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class ReleasesViewModel extends ViewModel {
 
 	private MutableLiveData<List<Release>> releasesList;
@@ -38,62 +37,70 @@ public class ReleasesViewModel extends ViewModel {
 
 	public void loadReleasesList(String owner, String repo, Context ctx) {
 
-		Call<List<Release>> call = RetrofitClient.getApiInterface(ctx).repoListReleases(owner, repo, null, null, null, 1, resultLimit);
+		Call<List<Release>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoListReleases(owner, repo, null, null, null, 1, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Release>> call, @NonNull Response<List<Release>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Release>> call,
+							@NonNull Response<List<Release>> response) {
 
-				if(response.isSuccessful()) {
-					releasesList.postValue(response.body());
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+						if (response.isSuccessful()) {
+							releasesList.postValue(response.body());
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Release>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<Release>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	public void loadMoreReleases(String owner, String repo, int page, Context ctx, ReleasesAdapter adapter) {
+	public void loadMoreReleases(
+			String owner, String repo, int page, Context ctx, ReleasesAdapter adapter) {
 
-		Call<List<Release>> call = RetrofitClient.getApiInterface(ctx).repoListReleases(owner, repo, null, null, null, page, resultLimit);
+		Call<List<Release>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoListReleases(owner, repo, null, null, null, page, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Release>> call, @NonNull Response<List<Release>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Release>> call,
+							@NonNull Response<List<Release>> response) {
 
-				if(response.isSuccessful()) {
-					List<Release> list = releasesList.getValue();
-					assert list != null;
-					assert response.body() != null;
+						if (response.isSuccessful()) {
+							List<Release> list = releasesList.getValue();
+							assert list != null;
+							assert response.body() != null;
 
-					if(response.body().size() != 0) {
-						list.addAll(response.body());
-						adapter.updateList(list);
+							if (response.body().size() != 0) {
+								list.addAll(response.body());
+								adapter.updateList(list);
+							} else {
+								adapter.setMoreDataAvailable(false);
+							}
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
 					}
-					else {
-						adapter.setMoreDataAvailable(false);
+
+					@Override
+					public void onFailure(@NonNull Call<List<Release>> call, @NonNull Throwable t) {
+
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
 					}
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Release>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
 
 	public LiveData<List<Tag>> getTagsList(String owner, String repo, Context ctx) {
@@ -106,63 +113,66 @@ public class ReleasesViewModel extends ViewModel {
 
 	public void loadTagsList(String owner, String repo, Context ctx) {
 
-		Call<List<Tag>> call = RetrofitClient.getApiInterface(ctx).repoListTags(owner, repo, 1, resultLimit);
+		Call<List<Tag>> call =
+				RetrofitClient.getApiInterface(ctx).repoListTags(owner, repo, 1, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Tag>> call, @NonNull Response<List<Tag>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Tag>> call, @NonNull Response<List<Tag>> response) {
 
-				if(response.isSuccessful()) {
-					tagsList.postValue(response.body());
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+						if (response.isSuccessful()) {
+							tagsList.postValue(response.body());
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Tag>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<Tag>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	public void loadMoreTags(String owner, String repo, int page, Context ctx, TagsAdapter adapter) {
+	public void loadMoreTags(
+			String owner, String repo, int page, Context ctx, TagsAdapter adapter) {
 
-		Call<List<Tag>> call = RetrofitClient.getApiInterface(ctx).repoListTags(owner, repo, page, resultLimit);
+		Call<List<Tag>> call =
+				RetrofitClient.getApiInterface(ctx).repoListTags(owner, repo, page, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Tag>> call, @NonNull Response<List<Tag>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Tag>> call, @NonNull Response<List<Tag>> response) {
 
-				if(response.isSuccessful()) {
+						if (response.isSuccessful()) {
 
-					List<Tag> list = tagsList.getValue();
-					assert list != null;
-					assert response.body() != null;
+							List<Tag> list = tagsList.getValue();
+							assert list != null;
+							assert response.body() != null;
 
-					if(response.body().size() != 0) {
-						list.addAll(response.body());
-						adapter.updateList(list);
+							if (response.body().size() != 0) {
+								list.addAll(response.body());
+								adapter.updateList(list);
+							} else {
+								adapter.setMoreDataAvailable(false);
+							}
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
 					}
-					else {
-						adapter.setMoreDataAvailable(false);
+
+					@Override
+					public void onFailure(@NonNull Call<List<Tag>> call, @NonNull Throwable t) {
+
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
 					}
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Tag>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/RepoStargazersViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/RepoStargazersViewModel.java
index 4340f5ca..749c5134 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/RepoStargazersViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/RepoStargazersViewModel.java
@@ -5,11 +5,11 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -17,7 +17,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class RepoStargazersViewModel extends ViewModel {
 
 	private MutableLiveData<List<User>> stargazersList;
@@ -32,27 +31,30 @@ public class RepoStargazersViewModel extends ViewModel {
 
 	private void loadRepoStargazers(String repoOwner, String repoName, Context ctx) {
 
-		Call<List<User>> call = RetrofitClient.getApiInterface(ctx).repoListStargazers(repoOwner, repoName, null, null);
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoListStargazers(repoOwner, repoName, null, null);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
 
-				if(response.isSuccessful()) {
-					stargazersList.postValue(response.body());
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+						if (response.isSuccessful()) {
+							stargazersList.postValue(response.body());
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/RepoWatchersViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/RepoWatchersViewModel.java
index 42c72a99..c0bc30eb 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/RepoWatchersViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/RepoWatchersViewModel.java
@@ -5,11 +5,11 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -17,7 +17,6 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class RepoWatchersViewModel extends ViewModel {
 
 	private MutableLiveData<List<User>> watchersList;
@@ -32,27 +31,30 @@ public class RepoWatchersViewModel extends ViewModel {
 
 	private void loadRepoWatchers(String repoOwner, String repoName, Context ctx) {
 
-		Call<List<User>> call = RetrofitClient.getApiInterface(ctx).repoListSubscribers(repoOwner, repoName, null, null);
+		Call<List<User>> call =
+				RetrofitClient.getApiInterface(ctx)
+						.repoListSubscribers(repoOwner, repoName, null, null);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<User>> call, @NonNull Response<List<User>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<User>> call,
+							@NonNull Response<List<User>> response) {
 
-				if(response.isSuccessful()) {
-					watchersList.postValue(response.body());
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+						if (response.isSuccessful()) {
+							watchersList.postValue(response.body());
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<User>> call, Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<User>> call, Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/RepositoriesViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/RepositoriesViewModel.java
index 8a2fe402..edc4cd1d 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/RepositoriesViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/RepositoriesViewModel.java
@@ -5,12 +5,12 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Repository;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.ReposListAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -18,12 +18,12 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class RepositoriesViewModel extends ViewModel {
 
 	private MutableLiveData<List<Repository>> reposList;
 
-	public LiveData<List<Repository>> getRepositories(int page, int resultLimit, String userLogin, String type, String orgName, Context ctx) {
+	public LiveData<List<Repository>> getRepositories(
+			int page, int resultLimit, String userLogin, String type, String orgName, Context ctx) {
 
 		reposList = new MutableLiveData<>();
 		loadReposList(page, resultLimit, userLogin, type, orgName, ctx);
@@ -31,103 +31,126 @@ public class RepositoriesViewModel extends ViewModel {
 		return reposList;
 	}
 
-	public void loadReposList(int page, int resultLimit, String userLogin, String type, String orgName, Context ctx) {
+	public void loadReposList(
+			int page, int resultLimit, String userLogin, String type, String orgName, Context ctx) {
 
 		Call<List<Repository>> call;
 
-		switch(type) {
+		switch (type) {
 			case "starredRepos":
-				call = RetrofitClient.getApiInterface(ctx).userCurrentListStarred(page, resultLimit);
+				call =
+						RetrofitClient.getApiInterface(ctx)
+								.userCurrentListStarred(page, resultLimit);
 				break;
 			case "myRepos":
-				call = RetrofitClient.getApiInterface(ctx).userListRepos(userLogin, page, resultLimit);
+				call =
+						RetrofitClient.getApiInterface(ctx)
+								.userListRepos(userLogin, page, resultLimit);
 				break;
 			case "org":
 				call = RetrofitClient.getApiInterface(ctx).orgListRepos(orgName, page, resultLimit);
 				break;
 			case "team":
-				call = RetrofitClient.getApiInterface(ctx).orgListTeamRepos(Long.valueOf(userLogin), page, resultLimit);
+				call =
+						RetrofitClient.getApiInterface(ctx)
+								.orgListTeamRepos(Long.valueOf(userLogin), page, resultLimit);
 				break;
 			default:
 				call = RetrofitClient.getApiInterface(ctx).userCurrentListRepos(page, resultLimit);
 				break;
 		}
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Repository>> call, @NonNull Response<List<Repository>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Repository>> call,
+							@NonNull Response<List<Repository>> response) {
 
-				if(response.isSuccessful()) {
-					if(response.code() == 200) {
-						reposList.postValue(response.body());
+						if (response.isSuccessful()) {
+							if (response.code() == 200) {
+								reposList.postValue(response.body());
+							}
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
 					}
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-
-		});
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
 
-	public void loadMoreRepos(int page, int resultLimit, String userLogin, String type, String orgName, Context ctx, ReposListAdapter adapter) {
+	public void loadMoreRepos(
+			int page,
+			int resultLimit,
+			String userLogin,
+			String type,
+			String orgName,
+			Context ctx,
+			ReposListAdapter adapter) {
 
 		Call<List<Repository>> call;
 
-		switch(type) {
+		switch (type) {
 			case "starredRepos":
-				call = RetrofitClient.getApiInterface(ctx).userCurrentListStarred(page, resultLimit);
+				call =
+						RetrofitClient.getApiInterface(ctx)
+								.userCurrentListStarred(page, resultLimit);
 				break;
 			case "myRepos":
-				call = RetrofitClient.getApiInterface(ctx).userListRepos(userLogin, page, resultLimit);
+				call =
+						RetrofitClient.getApiInterface(ctx)
+								.userListRepos(userLogin, page, resultLimit);
 				break;
 			case "org":
 				call = RetrofitClient.getApiInterface(ctx).orgListRepos(orgName, page, resultLimit);
 				break;
 			case "team":
-				call = RetrofitClient.getApiInterface(ctx).orgListTeamRepos(Long.valueOf(userLogin), page, resultLimit);
+				call =
+						RetrofitClient.getApiInterface(ctx)
+								.orgListTeamRepos(Long.valueOf(userLogin), page, resultLimit);
 				break;
 			default:
 				call = RetrofitClient.getApiInterface(ctx).userCurrentListRepos(page, resultLimit);
 				break;
 		}
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Repository>> call, @NonNull Response<List<Repository>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Repository>> call,
+							@NonNull Response<List<Repository>> response) {
 
-				if(response.isSuccessful()) {
-					List<Repository> list = reposList.getValue();
-					assert list != null;
-					assert response.body() != null;
+						if (response.isSuccessful()) {
+							List<Repository> list = reposList.getValue();
+							assert list != null;
+							assert response.body() != null;
 
-					if(response.body().size() != 0) {
-						list.addAll(response.body());
-						adapter.updateList(list);
+							if (response.body().size() != 0) {
+								list.addAll(response.body());
+								adapter.updateList(list);
+							} else {
+								adapter.setMoreDataAvailable(false);
+							}
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
 					}
-					else {
-						adapter.setMoreDataAvailable(false);
+
+					@Override
+					public void onFailure(
+							@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
+
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
 					}
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Repository>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
-
 }
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/TeamsByOrgViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/TeamsByOrgViewModel.java
index c4d5efee..1a510cd2 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/TeamsByOrgViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/TeamsByOrgViewModel.java
@@ -8,11 +8,11 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.Team;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -20,12 +20,12 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 public class TeamsByOrgViewModel extends ViewModel {
 
 	private MutableLiveData<List<Team>> teamsList;
 
-	public LiveData<List<Team>> getTeamsByOrg(String orgName, Context ctx, TextView noDataTeams, ProgressBar mProgressBar) {
+	public LiveData<List<Team>> getTeamsByOrg(
+			String orgName, Context ctx, TextView noDataTeams, ProgressBar mProgressBar) {
 
 		teamsList = new MutableLiveData<>();
 		loadTeamsByOrgList(orgName, ctx, noDataTeams, mProgressBar);
@@ -33,38 +33,40 @@ public class TeamsByOrgViewModel extends ViewModel {
 		return teamsList;
 	}
 
-	public void loadTeamsByOrgList(String orgName, Context ctx, TextView noDataTeams, ProgressBar mProgressBar) {
+	public void loadTeamsByOrgList(
+			String orgName, Context ctx, TextView noDataTeams, ProgressBar mProgressBar) {
 
-		Call<List<Team>> call = RetrofitClient.getApiInterface(ctx).orgListTeams(orgName, null, null);
+		Call<List<Team>> call =
+				RetrofitClient.getApiInterface(ctx).orgListTeams(orgName, null, null);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<Team>> call, @NonNull Response<List<Team>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<Team>> call,
+							@NonNull Response<List<Team>> response) {
 
-				if(response.isSuccessful()) {
-					teamsList.postValue(response.body());
-				}
-				else if(response.code() == 403) {
-					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-					mProgressBar.setVisibility(View.GONE);
-					noDataTeams.setVisibility(View.GONE);
-				}
-				else {
-					mProgressBar.setVisibility(View.GONE);
-					noDataTeams.setVisibility(View.GONE);
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
+						if (response.isSuccessful()) {
+							teamsList.postValue(response.body());
+						} else if (response.code() == 403) {
+							Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+							mProgressBar.setVisibility(View.GONE);
+							noDataTeams.setVisibility(View.GONE);
+						} else {
+							mProgressBar.setVisibility(View.GONE);
+							noDataTeams.setVisibility(View.GONE);
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+					}
 
-			@Override
-			public void onFailure(@NonNull Call<List<Team>> call, @NonNull Throwable t) {
+					@Override
+					public void onFailure(@NonNull Call<List<Team>> call, @NonNull Throwable t) {
 
-				mProgressBar.setVisibility(View.GONE);
-				noDataTeams.setVisibility(View.GONE);
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+						mProgressBar.setVisibility(View.GONE);
+						noDataTeams.setVisibility(View.GONE);
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
+					}
+				});
 	}
-
 }
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 ce62d97b..c545c1be 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/WikiViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/WikiViewModel.java
@@ -6,6 +6,8 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import java.io.IOException;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.WikiPageMetaData;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -14,8 +16,6 @@ import org.mian.gitnex.adapters.WikiListAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.FragmentWikiBinding;
 import org.mian.gitnex.helpers.Toasty;
-import java.io.IOException;
-import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -23,12 +23,17 @@ import retrofit2.Response;
 /**
  * @author M M Arif
  */
-
 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);
@@ -36,82 +41,98 @@ public class WikiViewModel extends ViewModel {
 		return wikiList;
 	}
 
-	public void loadWikiList(String owner, String repo, int page, int resultLimit, Context ctx, FragmentWikiBinding fragmentWikiBinding) {
+	public void loadWikiList(
+			String owner,
+			String repo,
+			int page,
+			int resultLimit,
+			Context ctx,
+			FragmentWikiBinding fragmentWikiBinding) {
 
 		Call<List<WikiPageMetaData>> call;
 		call = RetrofitClient.getApiInterface(ctx).repoGetWikiPages(owner, repo, page, resultLimit);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<WikiPageMetaData>> call, @NonNull Response<List<WikiPageMetaData>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<WikiPageMetaData>> call,
+							@NonNull Response<List<WikiPageMetaData>> response) {
 
-				if(response.isSuccessful()) {
-					if(response.code() == 200) {
-						wikiList.postValue(response.body());
+						if (response.isSuccessful()) {
+							if (response.code() == 200) {
+								wikiList.postValue(response.body());
+							}
+						} else if (response.code() == 404) {
+							fragmentWikiBinding.progressBar.setVisibility(View.GONE);
+							fragmentWikiBinding.noData.setVisibility(View.VISIBLE);
+							fragmentWikiBinding.recyclerView.setVisibility(View.GONE);
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
+
+						try {
+							if (response.errorBody() != null) {
+								new JSONObject(response.errorBody().string());
+							}
+						} catch (IOException | JSONException e) {
+							fragmentWikiBinding.noData.setText(
+									ctx.getResources().getString(R.string.apiNotFound));
+						}
 					}
-				}
-				else if(response.code() == 404) {
-					fragmentWikiBinding.progressBar.setVisibility(View.GONE);
-					fragmentWikiBinding.noData.setVisibility(View.VISIBLE);
-					fragmentWikiBinding.recyclerView.setVisibility(View.GONE);
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
 
-				try {
-					if(response.errorBody() != null) {
-						new JSONObject(response.errorBody().string());
+					@Override
+					public void onFailure(
+							@NonNull Call<List<WikiPageMetaData>> call, @NonNull Throwable t) {
+
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
 					}
-				}
-				catch(IOException | JSONException e) {
-					fragmentWikiBinding.noData.setText(ctx.getResources().getString(R.string.apiNotFound));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<WikiPageMetaData>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
 
-	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);
 
-		call.enqueue(new Callback<>() {
+		call.enqueue(
+				new Callback<>() {
 
-			@Override
-			public void onResponse(@NonNull Call<List<WikiPageMetaData>> call, @NonNull Response<List<WikiPageMetaData>> response) {
+					@Override
+					public void onResponse(
+							@NonNull Call<List<WikiPageMetaData>> call,
+							@NonNull Response<List<WikiPageMetaData>> response) {
 
-				if(response.isSuccessful()) {
-					List<WikiPageMetaData> list = wikiList.getValue();
-					assert list != null;
-					assert response.body() != null;
+						if (response.isSuccessful()) {
+							List<WikiPageMetaData> list = wikiList.getValue();
+							assert list != null;
+							assert response.body() != null;
 
-					if(response.body().size() != 0) {
-						list.addAll(response.body());
-						adapter.updateList(list);
+							if (response.body().size() != 0) {
+								list.addAll(response.body());
+								adapter.updateList(list);
+							} else {
+								adapter.setMoreDataAvailable(false);
+							}
+						} else {
+							Toasty.error(ctx, ctx.getString(R.string.genericError));
+						}
 					}
-					else {
-						adapter.setMoreDataAvailable(false);
+
+					@Override
+					public void onFailure(
+							@NonNull Call<List<WikiPageMetaData>> call, @NonNull Throwable t) {
+
+						Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
 					}
-				}
-				else {
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<WikiPageMetaData>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
+				});
 	}
-
 }
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 f2964ad5..3dea326f 100644
--- a/app/src/main/java/org/mian/gitnex/views/ReactionList.java
+++ b/app/src/main/java/org/mian/gitnex/views/ReactionList.java
@@ -15,6 +15,12 @@ import com.google.android.material.card.MaterialCardView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.vdurmont.emoji.Emoji;
 import com.vdurmont.emoji.EmojiManager;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import org.gitnex.tea4j.v2.models.Reaction;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
@@ -22,18 +28,11 @@ import org.mian.gitnex.activities.BaseActivity;
 import org.mian.gitnex.adapters.ReactionAuthorsAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AppUtil;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 import retrofit2.Response;
 
 /**
  * @author opyale
  */
-
 @SuppressLint("ViewConstructor")
 public class ReactionList extends HorizontalScrollView {
 
@@ -46,14 +45,18 @@ 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);
 		root.setLayoutParams(layoutParams);
 
 		addView(root);
-		setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+		setLayoutParams(
+				new LinearLayout.LayoutParams(
+						ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
 
 		String loginUid = ((BaseActivity) context).getAccount().getAccount().getUserName();
 		String repoOwner = bundle.getString("repoOwner");
@@ -62,104 +65,154 @@ public class ReactionList extends HorizontalScrollView {
 		int id;
 		ReactionType reactionType;
 
-		if(bundle.containsKey("commentId")) {
+		if (bundle.containsKey("commentId")) {
 			id = bundle.getInt("commentId");
 			reactionType = ReactionType.COMMENT;
-		}
-		else {
+		} else {
 			id = bundle.getInt("issueId");
 			reactionType = ReactionType.ISSUE;
 		}
 
-		new Thread(() -> {
+		new Thread(
+						() -> {
+							try {
 
-			try {
+								Response<List<Reaction>> response = null;
 
-				Response<List<Reaction>> response = null;
+								switch (reactionType) {
+									case ISSUE:
+										response =
+												RetrofitClient.getApiInterface(context)
+														.issueGetIssueReactions(
+																repoOwner, repoName, (long) id,
+																null, null)
+														.execute();
+										break;
 
-				switch(reactionType) {
+									case COMMENT:
+										response =
+												RetrofitClient.getApiInterface(context)
+														.issueGetCommentReactions(
+																repoOwner, repoName, (long) id)
+														.execute();
+										break;
+								}
 
-					case ISSUE:
-						response = RetrofitClient.getApiInterface(context).issueGetIssueReactions(repoOwner, repoName, (long) id, null, null).execute();
-						break;
+								if (response.isSuccessful()
+										&& response.body() != null
+										&& !response.body().isEmpty()) {
 
-					case COMMENT:
-						response = RetrofitClient.getApiInterface(context).issueGetCommentReactions(repoOwner, repoName, (long) id).execute();
-						break;
-				}
+									Map<String, List<Reaction>> sortedReactions = new HashMap<>();
 
-				if(response.isSuccessful() && response.body() != null && !response.body().isEmpty()) {
+									for (Reaction issueReaction : response.body()) {
 
-					Map<String, List<Reaction>> sortedReactions = new HashMap<>();
+										if (sortedReactions.containsKey(
+												issueReaction.getContent())) {
+											sortedReactions
+													.get(issueReaction.getContent())
+													.add(issueReaction);
+										} else {
+											List<Reaction> issueReactions = new ArrayList<>();
+											issueReactions.add(issueReaction);
 
-					for(Reaction issueReaction : response.body()) {
+											sortedReactions.put(
+													issueReaction.getContent(), issueReactions);
+										}
+									}
 
-						if(sortedReactions.containsKey(issueReaction.getContent())) {
-							sortedReactions.get(issueReaction.getContent()).add(issueReaction);
-						}
-						else {
-							List<Reaction> issueReactions = new ArrayList<>();
-							issueReactions.add(issueReaction);
+									for (String content : sortedReactions.keySet()) {
 
-							sortedReactions.put(issueReaction.getContent(), issueReactions);
-						}
-					}
+										List<Reaction> issueReactions =
+												sortedReactions.get(content);
 
-					for(String content : sortedReactions.keySet()) {
+										@SuppressLint("InflateParams")
+										MaterialCardView reactionBadge =
+												(MaterialCardView)
+														LayoutInflater.from(context)
+																.inflate(
+																		R.layout
+																				.layout_reaction_badge,
+																		this,
+																		false);
 
-						List<Reaction> issueReactions = sortedReactions.get(content);
+										for (Reaction issueReaction : issueReactions) {
+											if (issueReaction
+													.getUser()
+													.getLogin()
+													.equals(loginUid)) {
+												reactionBadge.setCardBackgroundColor(
+														AppUtil.getColorFromAttribute(
+																context,
+																R.attr.inputSelectedColor));
+												break;
+											}
+										}
 
-						@SuppressLint("InflateParams") MaterialCardView reactionBadge = (MaterialCardView) LayoutInflater.from(context).inflate(R.layout.layout_reaction_badge, this, false);
+										Emoji emoji = EmojiManager.getForAlias(content);
 
-						for(Reaction issueReaction : issueReactions) {
-							if(issueReaction.getUser().getLogin().equals(loginUid)) {
-								reactionBadge.setCardBackgroundColor(AppUtil.getColorFromAttribute(context, R.attr.inputSelectedColor));
-								break;
+										((TextView) reactionBadge.findViewById(R.id.symbol))
+												.setText(
+														((emoji == null)
+																		? content
+																		: emoji.getUnicode())
+																+ " "
+																+ issueReactions.size());
+
+										reactionBadge.setOnClickListener(
+												v -> {
+													List<User> userData =
+															issueReactions.stream()
+																	.map(Reaction::getUser)
+																	.collect(Collectors.toList());
+
+													ReactionAuthorsAdapter adapter =
+															new ReactionAuthorsAdapter(
+																	context, userData);
+
+													int paddingTop =
+															AppUtil.getPixelsFromDensity(
+																	context, 10);
+
+													RecyclerView recyclerView =
+															new RecyclerView(context);
+													recyclerView.setPadding(0, paddingTop, 0, 0);
+													recyclerView.setLayoutManager(
+															new LinearLayoutManager(context));
+													recyclerView.setAdapter(adapter);
+
+													assert emoji != null;
+													MaterialAlertDialogBuilder
+															materialAlertDialogBuilder =
+																	new MaterialAlertDialogBuilder(
+																					context)
+																			.setTitle(
+																					emoji
+																							.getUnicode())
+																			.setView(recyclerView)
+																			.setNeutralButton(
+																					R.string.close,
+																					null);
+
+													materialAlertDialogBuilder.create().show();
+												});
+
+										root.post(() -> root.addView(reactionBadge));
+										onReactionAddedListener.run();
+									}
+								}
+
+							} catch (IOException ignored) {
 							}
-						}
-
-						Emoji emoji = EmojiManager.getForAlias(content);
-
-						((TextView) reactionBadge.findViewById(R.id.symbol)).setText(((emoji == null) ? content : emoji.getUnicode()) + " " + issueReactions.size());
-
-						reactionBadge.setOnClickListener(v -> {
-
-							List<User> userData = issueReactions.stream().map(Reaction::getUser).collect(Collectors.toList());
-
-							ReactionAuthorsAdapter adapter = new ReactionAuthorsAdapter(context, userData);
-
-							int paddingTop = AppUtil.getPixelsFromDensity(context, 10);
-
-							RecyclerView recyclerView = new RecyclerView(context);
-							recyclerView.setPadding(0, paddingTop, 0, 0);
-							recyclerView.setLayoutManager(new LinearLayoutManager(context));
-							recyclerView.setAdapter(adapter);
-
-							assert emoji != null;
-							MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context).setTitle(emoji.getUnicode()).setView(recyclerView).setNeutralButton(R.string.close, null);
-
-							materialAlertDialogBuilder.create().show();
-
-						});
-
-						root.post(() -> root.addView(reactionBadge));
-						onReactionAddedListener.run();
-
-					}
-				}
-
-			}
-			catch(IOException ignored) {
-			}
-
-		}).start();
-
+						})
+				.start();
 	}
 
 	public void setOnReactionAddedListener(Runnable onReactionAddedListener) {
 		this.onReactionAddedListener = onReactionAddedListener;
 	}
 
-	private enum ReactionType {COMMENT, ISSUE}
-
+	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 d16f44b1..ddefaeb8 100644
--- a/app/src/main/java/org/mian/gitnex/views/ReactionSpinner.java
+++ b/app/src/main/java/org/mian/gitnex/views/ReactionSpinner.java
@@ -13,6 +13,10 @@ import android.widget.TextView;
 import com.google.android.material.card.MaterialCardView;
 import com.vdurmont.emoji.Emoji;
 import com.vdurmont.emoji.EmojiManager;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import org.gitnex.tea4j.v2.models.EditReactionOption;
 import org.gitnex.tea4j.v2.models.GeneralUISettings;
 import org.gitnex.tea4j.v2.models.Reaction;
@@ -21,10 +25,6 @@ import org.mian.gitnex.activities.BaseActivity;
 import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AppUtil;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import retrofit2.Response;
 
 /**
@@ -45,7 +45,9 @@ 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);
@@ -59,146 +61,215 @@ public class ReactionSpinner extends HorizontalScrollView {
 		int id;
 		ReactionType reactionType;
 
-		if(bundle.containsKey("commentId")) {
+		if (bundle.containsKey("commentId")) {
 			id = bundle.getInt("commentId");
 			reactionType = ReactionType.COMMENT;
-		}
-		else {
+		} else {
 			id = bundle.getInt("issueId");
 			reactionType = ReactionType.ISSUE;
 		}
 
-		new Thread(() -> {
-
-			try {
-
-				List<Reaction> allReactions = getReactions(repoOwner, repoName, reactionType, id);
-				List<String> allowedReactions = getAllowedReactions();
-
-				if(!allowedReactions.isEmpty()) {
-					// Show all allowed reactions
-					for(String allowedReaction : allowedReactions) {
-
-						@SuppressLint("InflateParams") MaterialCardView reactionButton = (MaterialCardView) 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));
-
-						ReactionAction reactionAction;
-
-						if(myReaction) {
-							reactionButton.setCardBackgroundColor(AppUtil.getColorFromAttribute(context, R.attr.inputSelectedColor));
-							reactionAction = ReactionAction.REMOVE;
-						}
-						else {
-							reactionAction = ReactionAction.ADD;
-						}
-
-						reactionButton.setOnClickListener(v -> new Thread(() -> {
-
+		new Thread(
+						() -> {
 							try {
-								if(react(repoOwner, repoName, reactionType, reactionAction, new EditReactionOption().content(allowedReaction), id)) {
-									v.post(() -> {
-										IssueDetailActivity.singleIssueUpdate = reactionType == ReactionType.ISSUE;
-										((IssueDetailActivity) context).commentEdited = reactionType == ReactionType.COMMENT;
-										onInteractedListener.run();
-									});
+
+								List<Reaction> allReactions =
+										getReactions(repoOwner, repoName, reactionType, id);
+								List<String> allowedReactions = getAllowedReactions();
+
+								if (!allowedReactions.isEmpty()) {
+									// Show all allowed reactions
+									for (String allowedReaction : allowedReactions) {
+
+										@SuppressLint("InflateParams")
+										MaterialCardView reactionButton =
+												(MaterialCardView)
+														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));
+
+										ReactionAction reactionAction;
+
+										if (myReaction) {
+											reactionButton.setCardBackgroundColor(
+													AppUtil.getColorFromAttribute(
+															context, R.attr.inputSelectedColor));
+											reactionAction = ReactionAction.REMOVE;
+										} else {
+											reactionAction = ReactionAction.ADD;
+										}
+
+										reactionButton.setOnClickListener(
+												v ->
+														new Thread(
+																		() -> {
+																			try {
+																				if (react(
+																						repoOwner,
+																						repoName,
+																						reactionType,
+																						reactionAction,
+																						new EditReactionOption()
+																								.content(
+																										allowedReaction),
+																						id)) {
+																					v.post(
+																							() -> {
+																								IssueDetailActivity
+																												.singleIssueUpdate =
+																										reactionType
+																												== ReactionType
+																														.ISSUE;
+																								((IssueDetailActivity)
+																														context)
+																												.commentEdited =
+																										reactionType
+																												== ReactionType
+																														.COMMENT;
+																								onInteractedListener
+																										.run();
+																							});
+																				}
+																			} catch (
+																					IOException
+																							ignored) {
+																			}
+																		})
+																.start());
+
+										Emoji emoji = EmojiManager.getForAlias(allowedReaction);
+
+										((TextView) reactionButton.findViewById(R.id.symbol))
+												.setText(
+														(emoji == null)
+																? allowedReaction
+																: emoji.getUnicode());
+										root.post(() -> root.addView(reactionButton));
+									}
+
+									this.post(
+											() -> {
+												setLayoutParams(
+														new LinearLayout.LayoutParams(
+																ViewGroup.LayoutParams.MATCH_PARENT,
+																ViewGroup.LayoutParams
+																		.WRAP_CONTENT));
+												addView(root);
+												setVisibility(VISIBLE);
+											});
+
+								} else {
+									this.post(() -> setVisibility(GONE));
 								}
+							} catch (IOException ignored) {
 							}
-							catch(IOException ignored) {
+							if (onLoadingFinishedListener != null) {
+								((Activity) context)
+										.runOnUiThread(() -> onLoadingFinishedListener.run());
 							}
-
-						}).start());
-
-						Emoji emoji = EmojiManager.getForAlias(allowedReaction);
-
-						((TextView) reactionButton.findViewById(R.id.symbol)).setText((emoji == null) ? allowedReaction : emoji.getUnicode());
-						root.post(() -> root.addView(reactionButton));
-
-					}
-
-					this.post(() -> {
-						setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-						addView(root);
-						setVisibility(VISIBLE);
-					});
-
-				}
-				else {
-					this.post(() -> setVisibility(GONE));
-				}
-			}
-			catch(IOException ignored) {
-			}
-			if(onLoadingFinishedListener != null) {
-				((Activity) context).runOnUiThread(() -> onLoadingFinishedListener.run());
-			}
-		}).start();
-
+						})
+				.start();
 	}
 
-	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;
 
-		switch(reactionType) {
-
+		switch (reactionType) {
 			case ISSUE:
-				switch(reactionAction) {
-
+				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;
-
 				}
 				break;
 
 			case COMMENT:
-				switch(reactionAction) {
-
+				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;
-
 				}
 				break;
-
 		}
 
 		return response.isSuccessful();
-
 	}
 
-	private List<Reaction> getReactions(String repoOwner, String repoName, ReactionType reactionType, int id) throws IOException {
+	private List<Reaction> getReactions(
+			String repoOwner, String repoName, ReactionType reactionType, int id)
+			throws IOException {
 
 		Response<List<Reaction>> response = null;
 
-		switch(reactionType) {
-
+		switch (reactionType) {
 			case ISSUE:
-				response = RetrofitClient.getApiInterface(getContext()).issueGetIssueReactions(repoOwner, repoName, (long) id, null, null).execute();
+				response =
+						RetrofitClient.getApiInterface(getContext())
+								.issueGetIssueReactions(repoOwner, repoName, (long) id, null, null)
+								.execute();
 				break;
 
 			case COMMENT:
-				response = RetrofitClient.getApiInterface(getContext()).issueGetCommentReactions(repoOwner, repoName, (long) id).execute();
+				response =
+						RetrofitClient.getApiInterface(getContext())
+								.issueGetCommentReactions(repoOwner, repoName, (long) id)
+								.execute();
 				break;
-
 		}
 
-		if(response.isSuccessful() && response.body() != null) {
+		if (response.isSuccessful() && response.body() != null) {
 			return response.body();
-		}
-		else {
+		} else {
 			return Collections.emptyList();
 		}
 	}
@@ -206,17 +277,17 @@ public class ReactionSpinner extends HorizontalScrollView {
 	// Assumes that there's something wrong when no allowed reactions are returned by the server
 	private List<String> getAllowedReactions() throws IOException {
 
-		if(allowedReactionsCache.isEmpty()) {
+		if (allowedReactionsCache.isEmpty()) {
 
-			Response<GeneralUISettings> response = RetrofitClient.getApiInterface(getContext()).getGeneralUISettings().execute();
+			Response<GeneralUISettings> response =
+					RetrofitClient.getApiInterface(getContext()).getGeneralUISettings().execute();
 
-			if(response.isSuccessful() && response.body() != null) {
+			if (response.isSuccessful() && response.body() != null) {
 				allowedReactionsCache.addAll(response.body().getAllowedReactions());
 			}
 		}
 
 		return allowedReactionsCache;
-
 	}
 
 	public void setOnInteractedListener(Runnable onInteractedListener) {
@@ -227,8 +298,13 @@ public class ReactionSpinner extends HorizontalScrollView {
 		this.onLoadingFinishedListener = onLoadingFinishedListener;
 	}
 
-	private enum ReactionType {COMMENT, ISSUE}
-
-	private enum ReactionAction {REMOVE, ADD}
+	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 d2d5d50e..b6be2e14 100644
--- a/app/src/main/java/org/mian/gitnex/views/SyntaxHighlightedArea.java
+++ b/app/src/main/java/org/mian/gitnex/views/SyntaxHighlightedArea.java
@@ -16,19 +16,18 @@ import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import org.mian.gitnex.R;
-import org.mian.gitnex.core.MainGrammarLocator;
-import org.mian.gitnex.helpers.AppUtil;
 import de.qwerty287.markwonprism4j.Prism4jSyntaxHighlight;
 import de.qwerty287.markwonprism4j.Prism4jTheme;
 import de.qwerty287.markwonprism4j.Prism4jThemeDarkula;
 import de.qwerty287.markwonprism4j.Prism4jThemeDefault;
 import io.noties.prism4j.Prism4j;
+import org.mian.gitnex.R;
+import org.mian.gitnex.core.MainGrammarLocator;
+import org.mian.gitnex.helpers.AppUtil;
 
 /**
  * @author opyale
  */
-
 public class SyntaxHighlightedArea extends LinearLayout {
 
 	private Prism4jTheme prism4jTheme;
@@ -46,19 +45,27 @@ public class SyntaxHighlightedArea extends LinearLayout {
 		setup();
 	}
 
-	public SyntaxHighlightedArea(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+	public SyntaxHighlightedArea(
+			@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
 		setup();
 	}
 
 	public void setup() {
 
-		prism4jTheme = AppUtil.getColorFromAttribute(getContext(), R.attr.isDark) == 1 ? Prism4jThemeDarkula.create() : Prism4jThemeDefault.create();
+		prism4jTheme =
+				AppUtil.getColorFromAttribute(getContext(), R.attr.isDark) == 1
+						? Prism4jThemeDarkula.create()
+						: Prism4jThemeDefault.create();
 
 		sourceView = new TextView(getContext());
 
-		sourceView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-		sourceView.setTypeface(Typeface.createFromAsset(getContext().getAssets(), "fonts/sourcecodeproregular.ttf"));
+		sourceView.setLayoutParams(
+				new ViewGroup.LayoutParams(
+						ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+		sourceView.setTypeface(
+				Typeface.createFromAsset(
+						getContext().getAssets(), "fonts/sourcecodeproregular.ttf"));
 		sourceView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
 		sourceView.setTextColor(prism4jTheme.textColor());
 		sourceView.setTextIsSelectable(true);
@@ -67,13 +74,21 @@ public class SyntaxHighlightedArea extends LinearLayout {
 		sourceView.setPadding(padding, 0, padding, 0);
 
 		HorizontalScrollView horizontalScrollView = new HorizontalScrollView(getContext());
-		horizontalScrollView.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+		horizontalScrollView.setLayoutParams(
+				new LinearLayout.LayoutParams(
+						ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
 		horizontalScrollView.addView(sourceView);
 
 		linesView = new LinesView(getContext());
 
-		linesView.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT));
-		linesView.setPadding(AppUtil.getPixelsFromDensity(getContext(), 3), 0, AppUtil.getPixelsFromDensity(getContext(), 6), 0);
+		linesView.setLayoutParams(
+				new LinearLayout.LayoutParams(
+						ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT));
+		linesView.setPadding(
+				AppUtil.getPixelsFromDensity(getContext(), 3),
+				0,
+				AppUtil.getPixelsFromDensity(getContext(), 6),
+				0);
 
 		linesView.getPaint().setTypeface(sourceView.getTypeface());
 		linesView.getPaint().setTextSize(sourceView.getTextSize());
@@ -86,49 +101,57 @@ public class SyntaxHighlightedArea extends LinearLayout {
 		setBackgroundColor(prism4jTheme.background());
 		addView(linesView);
 		addView(horizontalScrollView);
-
 	}
 
 	public void setContent(@NonNull String source, @NonNull String extension) {
 
-		if(source.length() > 0) {
+		if (source.length() > 0) {
 
-			Thread highlightingThread = new Thread(() -> {
+			Thread highlightingThread =
+					new Thread(
+							() -> {
+								try {
 
-				try {
+									MainGrammarLocator mainGrammarLocator =
+											MainGrammarLocator.getInstance();
 
-					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));
 
-					getActivity().runOnUiThread(() -> sourceView.setText(highlightedSource));
+								} catch (Throwable ignored) {
+									// Fall back to plaintext if something fails
+									getActivity().runOnUiThread(() -> sourceView.setText(source));
+								}
+							});
 
-				}
-				catch(Throwable ignored) {
-					// Fall back to plaintext if something fails
-					getActivity().runOnUiThread(() -> sourceView.setText(source));
-				}
+			Thread lineCountingThread =
+					new Thread(
+							() -> {
+								long lineCount = AppUtil.getLineCount(source);
 
-			});
+								try {
+									highlightingThread.join();
+								} catch (InterruptedException ignored) {
+								}
 
-			Thread lineCountingThread = new Thread(() -> {
-
-				long lineCount = AppUtil.getLineCount(source);
-
-				try {
-					highlightingThread.join();
-				}
-				catch(InterruptedException ignored) {
-				}
-
-				getActivity().runOnUiThread(() -> linesView.setLineCount(lineCount));
-
-			});
+								getActivity()
+										.runOnUiThread(() -> linesView.setLineCount(lineCount));
+							});
 
 			highlightingThread.start();
 			lineCountingThread.start();
-
 		}
 	}
 
@@ -145,12 +168,9 @@ public class SyntaxHighlightedArea extends LinearLayout {
 		private final Paint paint = new Paint();
 		private final Rect textBounds = new Rect();
 
-		@ColorInt
-		private int backgroundColor;
-		@ColorInt
-		private int textColor;
-		@ColorInt
-		private int lineColor;
+		@ColorInt private int backgroundColor;
+		@ColorInt private int textColor;
+		@ColorInt private int lineColor;
 
 		private long lineCount;
 
@@ -190,8 +210,9 @@ public class SyntaxHighlightedArea extends LinearLayout {
 
 			paint.getTextBounds(highestLineNumber, 0, highestLineNumber.length(), textBounds);
 
-			setMeasuredDimension(getPaddingLeft() + textBounds.width() + getPaddingRight(), MeasureSpec.getSize(heightMeasureSpec));
-
+			setMeasuredDimension(
+					getPaddingLeft() + textBounds.width() + getPaddingRight(),
+					MeasureSpec.getSize(heightMeasureSpec));
 		}
 
 		@Override
@@ -208,11 +229,10 @@ public class SyntaxHighlightedArea extends LinearLayout {
 			canvas.save();
 			canvas.translate(getPaddingLeft(), marginTopBottom);
 
-			for(int currentLine = 1; currentLine <= lineCount; currentLine++) {
+			for (int currentLine = 1; currentLine <= lineCount; currentLine++) {
 
 				canvas.drawText(String.valueOf(currentLine), 0, 0, paint);
 				canvas.translate(0, marginTopBottom);
-
 			}
 
 			paint.setColor(lineColor);
@@ -222,9 +242,6 @@ public class SyntaxHighlightedArea extends LinearLayout {
 
 			canvas.restore();
 			canvas.drawLine(dividerX, 0, dividerX, dividerY, paint);
-
 		}
-
 	}
-
 }
diff --git a/app/src/test/java/org/mian/gitnex/helpers/AppUtilTest.java b/app/src/test/java/org/mian/gitnex/helpers/AppUtilTest.java
index 468f0a3a..e311e30d 100644
--- a/app/src/test/java/org/mian/gitnex/helpers/AppUtilTest.java
+++ b/app/src/test/java/org/mian/gitnex/helpers/AppUtilTest.java
@@ -1,8 +1,9 @@
 package org.mian.gitnex.helpers;
 
-import org.junit.Test;
 import static org.junit.Assert.*;
 
+import org.junit.Test;
+
 /**
  * @author qwerty287
  */
@@ -37,11 +38,20 @@ public class AppUtilTest {
 
 	@Test
 	public void parseSSHUrl() {
-		assertEquals("https://git@codeberg.org/gitnex/GitNex", AppUtil.getUriFromSSHUrl("ssh://git@codeberg.org:gitnex/GitNex"));
-		assertEquals("https://codeberg.org/gitnex/GitNex", AppUtil.getUriFromSSHUrl("codeberg.org:gitnex/GitNex"));
-		assertEquals("https://git@codeberg.org/gitnex/GitNex", AppUtil.getUriFromSSHUrl("ssh://git@codeberg.org/gitnex/GitNex"));
-		assertEquals("https://git@codeberg.org/gitnex/GitNex.git", AppUtil.getUriFromSSHUrl("ssh://git@codeberg.org:gitnex/GitNex.git"));
-		assertEquals("https://codeberg.org/gitnex/GitNex.git", AppUtil.getUriFromSSHUrl("codeberg.org:gitnex/GitNex.git"));
+		assertEquals(
+				"https://git@codeberg.org/gitnex/GitNex",
+				AppUtil.getUriFromSSHUrl("ssh://git@codeberg.org:gitnex/GitNex"));
+		assertEquals(
+				"https://codeberg.org/gitnex/GitNex",
+				AppUtil.getUriFromSSHUrl("codeberg.org:gitnex/GitNex"));
+		assertEquals(
+				"https://git@codeberg.org/gitnex/GitNex",
+				AppUtil.getUriFromSSHUrl("ssh://git@codeberg.org/gitnex/GitNex"));
+		assertEquals(
+				"https://git@codeberg.org/gitnex/GitNex.git",
+				AppUtil.getUriFromSSHUrl("ssh://git@codeberg.org:gitnex/GitNex.git"));
+		assertEquals(
+				"https://codeberg.org/gitnex/GitNex.git",
+				AppUtil.getUriFromSSHUrl("codeberg.org:gitnex/GitNex.git"));
 	}
-
 }
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 7907409a..e6c681b9 100644
--- a/app/src/test/java/org/mian/gitnex/helpers/ParseDiffTest.java
+++ b/app/src/test/java/org/mian/gitnex/helpers/ParseDiffTest.java
@@ -1,17 +1,92 @@
 package org.mian.gitnex.helpers;
 
-import org.junit.Test;
-import java.util.List;
 import static org.junit.Assert.*;
 
+import java.util.List;
+import org.junit.Test;
+
 /**
  * @author 6543
  */
-
 public class ParseDiffTest {
 
-	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";
+	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() {
@@ -47,5 +122,4 @@ public class ParseDiffTest {
 		assertEquals(1, parsed.get(3).getFileContents().get(0).getLineAdded());
 		assertEquals(1, parsed.get(3).getFileContents().get(0).getLineRemoved());
 	}
-
 }
diff --git a/app/src/test/java/org/mian/gitnex/helpers/PathsHelperTest.java b/app/src/test/java/org/mian/gitnex/helpers/PathsHelperTest.java
index 8199c49e..bcc4cb54 100644
--- a/app/src/test/java/org/mian/gitnex/helpers/PathsHelperTest.java
+++ b/app/src/test/java/org/mian/gitnex/helpers/PathsHelperTest.java
@@ -1,12 +1,12 @@
 package org.mian.gitnex.helpers;
 
-import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
+import org.junit.Test;
+
 /**
  * @author opyale
  */
-
 public class PathsHelperTest {
 
 	@Test
@@ -15,7 +15,8 @@ public class PathsHelperTest {
 		assertEquals("/test/test/test/test/", PathsHelper.join("test", "/test", "test/", "/test/"));
 		assertEquals("/test/test/test/test/", PathsHelper.join("test", "test", "test", "test"));
 		assertEquals("/test/test/test/test/", PathsHelper.join("/test", "/test", "/test", "/test"));
-		assertEquals("/test/test/test/test/", PathsHelper.join("/test/", "/test/", "test/", "/test/"));
+		assertEquals(
+				"/test/test/test/test/", PathsHelper.join("/test/", "/test/", "test/", "/test/"));
 		assertEquals("/test/test/test/test/", PathsHelper.join("test", "test", "/test", "/test"));
 		assertEquals("/test/test/test/test/", PathsHelper.join("test/", "test", "/test", "/test"));
 
@@ -27,8 +28,5 @@ public class PathsHelperTest {
 		assertEquals("/test/", PathsHelper.join("test/"));
 		assertEquals("/test/", PathsHelper.join("/test/"));
 		assertEquals("/test/", PathsHelper.join("/test"));
-
 	}
-
 }
-
diff --git a/app/src/test/java/org/mian/gitnex/helpers/VersionTest.java b/app/src/test/java/org/mian/gitnex/helpers/VersionTest.java
index 31037e15..1ba83f3f 100644
--- a/app/src/test/java/org/mian/gitnex/helpers/VersionTest.java
+++ b/app/src/test/java/org/mian/gitnex/helpers/VersionTest.java
@@ -1,13 +1,12 @@
 package org.mian.gitnex.helpers;
 
-import org.junit.Test;
-import org.junit.function.ThrowingRunnable;
 import static org.junit.Assert.*;
 
+import org.junit.Test;
+
 /**
  * @author 6543
  */
-
 public class VersionTest {
 
 	@Test
@@ -37,7 +36,6 @@ public class VersionTest {
 		assertFalse(new Version("2.2").equal("2.1.120"));
 		assertFalse(new Version("1.12.3").equal("1.13.0+dev-307-g633f52c22"));
 		assertFalse(new Version("main").equal("1.17.1"));
-
 	}
 
 	@Test
@@ -60,7 +58,6 @@ public class VersionTest {
 		assertFalse(new Version("2.12.0").less("v1.12"));
 		assertFalse(new Version("2").less("1"));
 		assertFalse(new Version("2.2").less("2.1.120"));
-
 	}
 
 	@Test
@@ -81,10 +78,8 @@ public class VersionTest {
 		assertFalse(new Version("2").lessOrEqual("1"));
 		assertFalse(new Version("2.1").lessOrEqual("1.2"));
 		assertFalse(new Version("2.2").lessOrEqual("2.1.120"));
-
 	}
 
-
 	@Test
 	public void higher() {
 
@@ -107,7 +102,6 @@ public class VersionTest {
 		assertFalse(new Version("2.1.120").higher("2.2"));
 		assertFalse(new Version("main").higher("main"));
 		assertFalse(new Version("1.17.0").higher("main"));
-
 	}
 
 	@Test
@@ -128,7 +122,6 @@ public class VersionTest {
 		assertFalse(new Version("1").higherOrEqual("2"));
 		assertFalse(new Version("1.2").higherOrEqual("2.1"));
 		assertFalse(new Version("2.1.120").higherOrEqual("2.2"));
-
 	}
 
 	@Test
@@ -151,5 +144,4 @@ public class VersionTest {
 		assertFalse(Version.valid("version1"));
 		assertFalse(Version.valid(null));
 	}
-
 }