3.3.0 rc release (#734)

Prepare 3.3.0 rc release

Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/734

.gitea/issue_template.md

@@ -20,6 +20,7 @@ _(This step is optional; an example is shown below)_
 
 * The version of **Gitea** you are using: 
 * The version of **GitNex** you are using: 
+* Source of installation(Google play, F-droid, APK): 
 * Phone **OS** version and model: 
 * The type of certificate you are using (self-signed, signed): 
 * How you used to log in (via password or token): 

.gitlab-ci.yml

@@ -48,6 +48,7 @@ latest:
   stage: publish
   only:
     - master
+    - tags
   variables:
     WEBDAV_USERNAME: "GitNexBot"
     PLUGIN_FILE: "signed.apk"

.idea/codeStyles/Project.xml

@@ -19,18 +19,9 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="java.util" withSubpackages="false" static="false" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="io.ktor" withSubpackages="true" static="false" />
         </value>
       </option>
     </JetCodeStyleSettings>
@@ -180,4 +171,4 @@
       </arrangement>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>

README.md

@@ -4,14 +4,14 @@
 
 # GitNex - Android client for Gitea
 
-GitNex is a free, open-source Android client for Git repository management tool Gitea. Gitea is a community managed fork of Gogs, lightweight code hosting solution written in Go.
+GitNex is a free/paid, open-source Android client for Git repository management tool Gitea. Gitea is a community managed fork of Gogs, lightweight code hosting solution written in Go.
 
 GitNex is licensed under GPLv3 License. See the LICENSE file for the full license text. No trackers are used and source code is available here for anyone to audit.
 
 ## Downloads
 [<img alt='Get it on F-droid' src='https://gitlab.com/fdroid/artwork/raw/master/badge/get-it-on.png' height="80"/>](https://f-droid.org/en/packages/org.mian.gitnex/)
-[<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=org.mian.gitnex)
-[<img alt='Download builds and releases' src='assets/apk-badge.png' height="82"/>](https://cloud.swatian.com/s/DN7E5xxtaw4fRbE)
+[<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=org.mian.gitnex.pro)
+[<img alt='Download builds and releases' src='https://codeberg.org/gitnex/GitNex/src/branch/master/assets/apk-badge.png' height="82"/>](https://cloud.swatian.com/s/DN7E5xxtaw4fRbE)
 
 ## Note about Gitea version
 Please make sure that you are on latest stable release or later for better app experience.
@@ -72,15 +72,12 @@ Thanks to all the open source libraries, contributors and donators.
 - Retrofit
 - Gson
 - Okhttp
-- ViHtarb/tooltip
 - Picasso
 - Markwon
 - Prettytime
 - Amulyakhare/textdrawable
 - Vdurmont/emoji-java
-- Abumoallim/android-multi-select-dialog
 - Pes/materialcolorpicker
-- Hendraanggrian/socialview
 - HamidrezaAmz/BreadcrumbsView
 - Chrisbanes/PhotoView
 - Pddstudio/highlightjs-android

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 317
-        versionName "3.2.0-rc1"
+        versionCode 327
+        versionName "3.3.0-rc1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -52,21 +52,20 @@ configurations {
 }
 
 dependencies {
-    def lifecycle_version = '2.3.0-alpha07'
+    def lifecycle_version = '2.3.0-beta01'
     def markwon_version = '4.6.0'
     def work_version = "2.4.0"
     def acra = "5.5.0"
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
-    implementation "com.google.android.material:material:1.3.0-alpha02"
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'com.google.android.material:material:1.3.0-alpha03'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-    testImplementation "junit:junit:4.13"
+    testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    implementation "com.github.vihtarb:tooltip:0.2.0"
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation "com.google.code.gson:gson:2.8.6"
     implementation "com.squareup.picasso:picasso:2.71828"
@@ -75,7 +74,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.retrofit2:converter-scalars:2.9.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
-    implementation 'org.ocpsoft.prettytime:prettytime:4.0.5.Final'
+    implementation 'org.ocpsoft.prettytime:prettytime:4.0.6.Final'
     implementation "com.vdurmont:emoji-java:5.1.1"
     implementation "com.pes.materialcolorpicker:library:1.2.5"
     implementation "io.noties.markwon:core:$markwon_version"
@@ -93,8 +92,6 @@ dependencies {
     implementation "io.noties.markwon:syntax-highlight:$markwon_version"
     implementation "com.caverock:androidsvg:1.4"
     implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.19"
-    implementation "com.hendraanggrian.appcompat:socialview:0.2"
-    implementation "com.hendraanggrian.appcompat:socialview-commons:0.2"
     implementation "com.github.HamidrezaAmz:BreadcrumbsView:0.2.9"
     implementation "commons-io:commons-io:20030203.000550"
     implementation 'org.apache.commons:commons-lang3:3.11'

app/src/main/AndroidManifest.xml

@@ -17,49 +17,79 @@
         android:supportsRtl="true"
         tools:targetApi="n">
 
-        <activity android:name=".activities.MergePullRequestActivity" />
+        <activity
+            android:name=".activities.MergePullRequestActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
             android:name=".activities.FileViewActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.CreateFileActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.RepoWatchersActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.RepoStargazersActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".activities.AdminGetUsersActivity" />
         <activity
-            android:name=".activities.AddRemoveAssigneesActivity"
-            android:theme="@style/Theme.AppCompat.Light.Dialog" />
-        <activity android:name=".activities.CreateReleaseActivity" />
-        <activity android:name=".activities.EditIssueActivity" />
-        <activity android:name=".activities.CreateNewUserActivity" />
+            android:name=".activities.AdminGetUsersActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
-            android:name=".activities.AddRemoveLabelsActivity"
-            android:theme="@style/Theme.AppCompat.Light.Dialog" />
-        <activity android:name=".activities.ProfileEmailActivity" />
-        <activity android:name=".activities.AddCollaboratorToRepositoryActivity" />
-        <activity android:name=".activities.CreateTeamByOrgActivity" />
-        <activity android:name=".activities.OrganizationTeamMembersActivity" />
+            android:name=".activities.CreateReleaseActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.EditIssueActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.CreateNewUserActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.ProfileEmailActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.AddCollaboratorToRepositoryActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.CreateTeamByOrgActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.OrganizationTeamMembersActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
             android:name=".activities.OrganizationDetailActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:label="@string/title_activity_org_detail"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".activities.CreateLabelActivity" />
-        <activity android:name=".activities.CreateIssueActivity" />
-        <activity android:name=".activities.CreateMilestoneActivity" />
-        <activity android:name=".activities.ReplyToIssueActivity" />
+        <activity
+            android:name=".activities.CreateLabelActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.CreateIssueActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.CreateMilestoneActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.ReplyToIssueActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
             android:name=".activities.IssueDetailActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:windowSoftInputMode="adjustNothing" />
         <activity
             android:name=".activities.RepoDetailActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:label="@string/title_activity_repo_detail"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".activities.MainActivity" android:theme="@android:style/Theme.NoTitleBar" android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation">
+        <activity
+            android:name=".activities.MainActivity"
+            android:theme="@android:style/Theme.NoTitleBar"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -68,30 +98,86 @@
         </activity>
         <activity
             android:name=".activities.LoginActivity"
-            android:launchMode="singleTask" android:theme="@android:style/Theme.NoTitleBar"/>
-        <activity android:name=".activities.CreateRepoActivity" />
-        <activity android:name=".activities.CreateOrganizationActivity" />
-        <activity android:name=".activities.OpenRepoInBrowserActivity" />
-        <activity android:name=".activities.FileDiffActivity" />
-        <activity android:name=".activities.CommitsActivity" />
-        <activity android:name=".helpers.ssl.MemorizingActivity" android:theme="@android:style/Theme.Material.Dialog" />
-        <activity android:name=".activities.SettingsAppearanceActivity" />
-        <activity android:name=".activities.SettingsFileViewerActivity" />
-        <activity android:name=".activities.SettingsSecurityActivity" />
-        <activity android:name=".activities.SettingsTranslationActivity" />
-        <activity android:name=".activities.SettingsReportsActivity" />
-        <activity android:name=".activities.AddNewTeamMemberActivity" />
-        <activity android:name=".activities.SettingsDraftsActivity" />
-        <activity android:name=".activities.RepoForksActivity" />
-        <activity android:name=".activities.AddNewAccountActivity" />
-        <activity android:name=".activities.RepositorySettingsActivity" />
-        <activity android:name=".activities.CreatePullRequestActivity" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
+            android:launchMode="singleTask"
+            android:theme="@android:style/Theme.NoTitleBar"/>
+        <activity
+            android:name=".activities.CreateRepoActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.CreateOrganizationActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.OpenRepoInBrowserActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.FileDiffActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.CommitsActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".helpers.ssl.MemorizingActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
+            android:theme="@android:style/Theme.Material.Dialog" />
+        <activity
+            android:name=".activities.SettingsAppearanceActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.SettingsFileViewerActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.SettingsSecurityActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.SettingsTranslationActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.SettingsReportsActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.AddNewTeamMemberActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.SettingsDraftsActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.RepoForksActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.AddNewAccountActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.RepositorySettingsActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.CreatePullRequestActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.SettingsGeneralActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
 
         <!-- Version < 3.0. DeX Mode and Screen Mirroring support -->
         <meta-data android:name="com.samsung.android.keepalive.density" android:value="true"/>
         <!-- Version >= 3.0. DeX Dual Mode support -->
         <meta-data android:name="com.samsung.android.multidisplay.keep_process_alive" android:value="true"/>
 
+        <!-- deep links -->
+        <activity
+            android:name=".activities.DeepLinksActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:launchMode="singleTask">
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" android:host="*" />
+            </intent-filter>
+
+        </activity>
+        <!-- deep links -->
+
     </application>
 
 </manifest>

app/src/main/java/org/mian/gitnex/actions/ActionResult.java

@@ -0,0 +1,80 @@
+package org.mian.gitnex.actions;
+
+import androidx.annotation.NonNull;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author opyale
+ */
+
+public class ActionResult<R> {
+
+	public enum Status { SUCCESS, FAILED }
+
+	private final BlockingQueue<Boolean> blockingQueue;
+	private final List<OnFinishedListener<R>> onFinishedListeners;
+
+	private boolean invalidated = false;
+
+	public ActionResult() {
+
+		blockingQueue = new ArrayBlockingQueue<>(1);
+		onFinishedListeners = new ArrayList<>();
+
+	}
+
+	public void finish(@NonNull Status status) {
+
+		finish(status, null);
+	}
+
+	public void finish(@NonNull Status status, R result) {
+
+		try {
+			if(blockingQueue.poll(5, TimeUnit.SECONDS)) {
+
+				for(OnFinishedListener<R> onFinishedListener : onFinishedListeners)
+					onFinishedListener.onFinished(status, result);
+			}
+
+		} catch (InterruptedException ignored) {}
+
+	}
+
+	public void invalidate() {
+
+		if(invalidated) throw new IllegalStateException("Already invalidated");
+		this.invalidated = true;
+
+	}
+
+	@SafeVarargs
+	public synchronized final void accept(@NonNull OnFinishedListener<R>... onFinishedListeners) {
+
+		invalidate();
+
+		this.blockingQueue.add(true);
+		this.onFinishedListeners.addAll(Arrays.asList(onFinishedListeners));
+
+	}
+
+	public synchronized final void discard() {
+
+		invalidate();
+		this.blockingQueue.add(false);
+
+	}
+
+	public static class None {}
+
+	public interface OnFinishedListener<R> {
+
+		void onFinished(Status status, R result);
+	}
+
+}

app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java

@@ -0,0 +1,122 @@
+package org.mian.gitnex.actions;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.util.Log;
+import android.view.View;
+import androidx.annotation.NonNull;
+import org.mian.gitnex.R;
+import org.mian.gitnex.adapters.AssigneesListAdapter;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.databinding.CustomAssigneesSelectionDialogBinding;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Collaborators;
+import org.mian.gitnex.models.Issues;
+import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class AssigneesActions {
+
+	public static void getCurrentIssueAssignees(Context ctx, String instanceUrl, String loginUid, String instanceToken, String repoOwner, String repoName, int issueIndex, List<String> currentAssignees) {
+
+		Call<Issues> callSingleIssueLabels = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.getIssueByIndex(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
+
+		callSingleIssueLabels.enqueue(new Callback<Issues>() {
+
+			@Override
+			public void onResponse(@NonNull Call<Issues> call, @NonNull retrofit2.Response<Issues> response) {
+
+				if(response.code() == 200) {
+
+					Issues issueAssigneesList = response.body();
+					assert issueAssigneesList != null;
+
+					if (issueAssigneesList.getAssignees() != null) {
+
+						if(issueAssigneesList.getAssignees().size() > 0) {
+
+							for(int i = 0; i < issueAssigneesList.getAssignees().size(); i++) {
+
+								currentAssignees.add(issueAssigneesList.getAssignees().get(i).getLogin());
+							}
+						}
+					}
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", t.toString());
+			}
+
+		});
+	}
+
+	public static void getRepositoryAssignees(Context ctx, String instanceUrl, String instanceToken, String repoOwner, String repoName, List<Collaborators> assigneesList, Dialog dialogAssignees, AssigneesListAdapter assigneesAdapter, CustomAssigneesSelectionDialogBinding assigneesBinding) {
+
+		TinyDB tinyDB = new TinyDB(ctx);
+
+		Call<List<Collaborators>> call = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.getCollaborators(instanceToken, repoOwner, repoName);
+
+		call.enqueue(new Callback<List<Collaborators>>() {
+
+			@Override
+			public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull retrofit2.Response<List<Collaborators>> response) {
+
+				assigneesList.clear();
+				List<Collaborators> assigneesList_ = response.body();
+
+				assigneesBinding.progressBar.setVisibility(View.GONE);
+				assigneesBinding.dialogFrame.setVisibility(View.VISIBLE);
+
+				if (response.code() == 200) {
+
+					assert assigneesList_ != null;
+
+					if(assigneesList_.size() > 0) {
+
+						dialogAssignees.show();
+
+						assigneesList.add(new Collaborators(tinyDB.getString("userFullname"), tinyDB.getString("loginUid"), tinyDB.getString("userAvatar")));
+						assigneesList.addAll(assigneesList_);
+					}
+					else {
+
+						dialogAssignees.dismiss();
+						Toasty.warning(ctx, ctx.getResources().getString(R.string.noAssigneesFound));
+					}
+
+					assigneesBinding.assigneesRecyclerView.setAdapter(assigneesAdapter);
+
+				}
+				else {
+
+					Toasty.error(ctx, ctx.getResources().getString(R.string.genericError));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
+
+				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
+			}
+		});
+
+	}
+
+}

app/src/main/java/org/mian/gitnex/actions/CollaboratorActions.java

@@ -12,8 +12,10 @@ import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.Permission;
+import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
+import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -154,8 +156,55 @@ public class CollaboratorActions {
             public void onFailure(@NonNull Call<Permission> call, @NonNull Throwable t) {
                 Log.e("onFailure", t.toString());
             }
+
         });
 
     }
 
+	public static ActionResult<List<Collaborators>> getCollaborators(Context context) {
+
+		ActionResult<List<Collaborators>> actionResult = new ActionResult<>();
+		TinyDB tinyDb = new TinyDB(context);
+
+		String instanceUrl = tinyDb.getString("instanceUrl");
+		String loginUid = tinyDb.getString("loginUid");
+		String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+		String repoFullName = tinyDb.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		String repoOwner = parts[0];
+		String repoName = parts[1];
+
+		Call<List<Collaborators>> call = RetrofitClient
+			.getInstance(instanceUrl, context)
+			.getApiInterface()
+			.getCollaborators(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName);
+
+		call.enqueue(new Callback<List<Collaborators>>() {
+
+			@Override
+			public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
+
+				if (response.isSuccessful()) {
+
+					assert response.body() != null;
+					actionResult.finish(ActionResult.Status.SUCCESS, response.body());
+				}
+				else {
+
+					actionResult.finish(ActionResult.Status.FAILED);
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
+
+				actionResult.finish(ActionResult.Status.FAILED);
+			}
+		});
+
+		return actionResult;
+
+	}
+
 }

app/src/main/java/org/mian/gitnex/actions/IssueActions.java

@@ -1,11 +1,9 @@
 package org.mian.gitnex.actions;
 
 import android.content.Context;
-import android.util.Log;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ReplyToIssueActivity;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.database.api.DraftsApi;
 import org.mian.gitnex.helpers.AlertDialogs;
@@ -13,6 +11,7 @@ import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.IssueComments;
+import org.mian.gitnex.models.Issues;
 import org.mian.gitnex.models.UpdateIssueState;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -53,8 +52,6 @@ public class IssueActions {
 						DraftsApi draftsApi = new DraftsApi(ctx);
 						draftsApi.deleteSingleDraft((int) draftIdOnCreate);
 
-						((ReplyToIssueActivity) ctx).finish();
-
 					}
 				}
 				else if(response.code() == 401) {
@@ -83,7 +80,7 @@ public class IssueActions {
 			@Override
 			public void onFailure(@NonNull Call<IssueComments> call, @NonNull Throwable t) {
 
-				Log.e("onFailure", t.toString());
+				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
 			}
 		});
 
@@ -157,7 +154,7 @@ public class IssueActions {
 			@Override
 			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
 
-				Log.e("onFailure", t.toString());
+				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
 			}
 		});
 
@@ -217,7 +214,7 @@ public class IssueActions {
 			@Override
 			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-				Toasty.success(ctx, ctx.getString(R.string.unsubscribedSuccessfully));
+				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
 			}
 		});
 
@@ -277,9 +274,69 @@ public class IssueActions {
 			@Override
 			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.unsubscriptionError));
+				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
 			}
 		});
 	}
 
+	public static ActionResult<ActionResult.None> reply(Context context, String comment, int issueIndex) {
+
+		ActionResult<ActionResult.None> actionResult = new ActionResult<>();
+		TinyDB tinyDb = new TinyDB(context);
+
+		String instanceUrl = tinyDb.getString("instanceUrl");
+		String loginUid = tinyDb.getString("loginUid");
+		String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+		String repoFullName = tinyDb.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		String repoOwner = parts[0];
+		String repoName = parts[1];
+
+		Issues issueComment = new Issues(comment);
+
+		Call<Issues> call = RetrofitClient
+			.getInstance(instanceUrl, context)
+			.getApiInterface()
+			.replyCommentToIssue(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueComment);
+
+		call.enqueue(new Callback<Issues>() {
+
+			@Override
+			public void onResponse(@NonNull Call<Issues> call, @NonNull retrofit2.Response<Issues> response) {
+
+				if(response.code() == 201) {
+
+					actionResult.finish(ActionResult.Status.SUCCESS);
+
+					tinyDb.putBoolean("commentPosted", true);
+					tinyDb.putBoolean("resumeIssues", true);
+					tinyDb.putBoolean("resumePullRequests", true);
+
+				}
+				else if(response.code() == 401) {
+
+					AlertDialogs.authorizationTokenRevokedDialog(context, context.getString(R.string.alertDialogTokenRevokedTitle),
+						context.getString(R.string.alertDialogTokenRevokedMessage),
+						context.getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+						context.getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+				}
+				else {
+
+					actionResult.finish(ActionResult.Status.FAILED);
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
+
+				Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
+			}
+		});
+
+		return actionResult;
+
+	}
+
 }

app/src/main/java/org/mian/gitnex/actions/LabelsActions.java

@@ -0,0 +1,116 @@
+package org.mian.gitnex.actions;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.util.Log;
+import android.view.View;
+import androidx.annotation.NonNull;
+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.Authorization;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Labels;
+import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class LabelsActions {
+
+	public static void getCurrentIssueLabels(Context ctx, String instanceUrl, String loginUid, String instanceToken, String repoOwner, String repoName, int issueIndex, List<Integer> currentLabelsIds) {
+
+		Call<List<Labels>> callSingleIssueLabels = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.getIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
+
+		callSingleIssueLabels.enqueue(new Callback<List<Labels>>() {
+
+			@Override
+			public void onResponse(@NonNull Call<List<Labels>> call, @NonNull retrofit2.Response<List<Labels>> response) {
+
+				if(response.code() == 200) {
+
+					List<Labels> issueLabelsList = response.body();
+
+					assert issueLabelsList != null;
+
+					if(issueLabelsList.size() > 0) {
+
+						for (int i = 0; i < issueLabelsList.size(); i++) {
+
+							currentLabelsIds.add(issueLabelsList.get(i).getId());
+						}
+					}
+
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<Labels>> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", t.toString());
+			}
+
+		});
+	}
+
+	public static void getRepositoryLabels(Context ctx, String instanceUrl, String instanceToken, String repoOwner, String repoName, List<Labels> labelsList, Dialog dialogLabels, LabelsListAdapter labelsAdapter, CustomLabelsSelectionDialogBinding labelsBinding) {
+
+		Call<List<Labels>> call = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.getlabels(instanceToken, repoOwner, repoName);
+
+		call.enqueue(new Callback<List<Labels>>() {
+
+			@Override
+			public void onResponse(@NonNull Call<List<Labels>> call, @NonNull retrofit2.Response<List<Labels>> response) {
+
+				labelsList.clear();
+				List<Labels> labelsList_ = response.body();
+
+				labelsBinding.progressBar.setVisibility(View.GONE);
+				labelsBinding.dialogFrame.setVisibility(View.VISIBLE);
+
+				if (response.code() == 200) {
+
+					assert labelsList_ != null;
+
+					if(labelsList_.size() > 0) {
+
+						dialogLabels.show();
+
+						labelsList.addAll(labelsList_);
+					}
+					else {
+
+						dialogLabels.dismiss();
+						Toasty.warning(ctx, ctx.getResources().getString(R.string.noLabelsFound));
+					}
+
+					labelsBinding.labelsRecyclerView.setAdapter(labelsAdapter);
+
+				}
+				else {
+
+					Toasty.error(ctx, ctx.getResources().getString(R.string.genericError));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<Labels>> call, @NonNull Throwable t) {
+
+				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
+			}
+		});
+
+	}
+
+}

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

@@ -63,7 +63,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
         ImageView closeActivity = findViewById(R.id.close);
         addCollaboratorSearch = findViewById(R.id.addCollaboratorSearch);
         mRecyclerView = findViewById(R.id.recyclerViewUserSearch);
-        mProgressBar = findViewById(R.id.progress_bar);
+        mProgressBar = findViewById(R.id.progressBar);
         noData = findViewById(R.id.noData);
 
         addCollaboratorSearch.requestFocus();
@@ -76,7 +76,10 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
         addCollaboratorSearch.setOnEditorActionListener((v, actionId, event) -> {
 
             if (actionId == EditorInfo.IME_ACTION_SEND) {
+
                 if(!addCollaboratorSearch.getText().toString().equals("")) {
+
+	                mProgressBar.setVisibility(View.VISIBLE);
                     loadUserSearchList(instanceUrl, instanceToken, addCollaboratorSearch.getText().toString(), loginUid);
                 }
             }
@@ -99,10 +102,15 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
             @Override
             public void onResponse(@NonNull Call<UserSearch> call, @NonNull Response<UserSearch> response) {
 
-                if (response.isSuccessful()) {
+	            mProgressBar.setVisibility(View.GONE);
+
+                if (response.code() == 200) {
+
                     assert response.body() != null;
                     getUsersList(response.body().getData(), ctx);
-                } else {
+                }
+                else {
+
                     Log.i("onResponse", String.valueOf(response.code()));
                 }
 
@@ -129,11 +137,13 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
         mProgressBar.setVisibility(View.VISIBLE);
 
         if(adapter.getItemCount() > 0) {
+
             mRecyclerView.setAdapter(adapter);
             noData.setVisibility(View.GONE);
             mProgressBar.setVisibility(View.GONE);
         }
         else {
+
             noData.setVisibility(View.VISIBLE);
             mProgressBar.setVisibility(View.GONE);
         }

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

@@ -1,294 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.util.Log;
-import androidx.annotation.NonNull;
-import com.google.gson.JsonElement;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.MultiSelectDialog;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.models.Collaborators;
-import org.mian.gitnex.models.Issues;
-import org.mian.gitnex.models.MultiSelectModel;
-import org.mian.gitnex.models.UpdateIssueAssignees;
-import java.util.ArrayList;
-import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class AddRemoveAssigneesActivity extends BaseActivity {
-
-    private ArrayList<MultiSelectModel> listOfCollaborators = new ArrayList<>();
-    private ArrayList<Integer> issueAssigneesIds = new ArrayList<>();
-    private Boolean assigneesFlag = false;
-    private MultiSelectDialog multiSelectDialogAssignees;
-    final Context ctx = this;
-    private Context appCtx;
-
-    @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_add_remove_assignees;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
-        //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
-
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
-
-        getAssignees(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
-
-    }
-
-    private void getAssignees(final String instanceUrl, final String instanceToken, final String repoOwner, final String repoName, final int issueIndex, final String loginUid) {
-
-        final TinyDB tinyDb = new TinyDB(appCtx);
-
-        Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
-                .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-
-        call.enqueue(new Callback<List<Collaborators>>() {
-
-            @Override
-            public void onResponse(@NonNull final Call<List<Collaborators>> call, @NonNull final retrofit2.Response<List<Collaborators>> response) {
-
-                if(response.isSuccessful()) {
-                    if(response.code() == 200) {
-
-                        final List<Collaborators> collaboratorsList_ = response.body();
-
-                        assert collaboratorsList_ != null;
-                        if(collaboratorsList_.size() > 0) {
-                            for (int i = 0; i < collaboratorsList_.size(); i++) {
-
-                                listOfCollaborators.add(new MultiSelectModel(collaboratorsList_.get(i).getId(), collaboratorsList_.get(i).getUsername().trim()));
-
-                            }
-                        }
-
-                        // get current issue assignees
-                        Call<Issues> callSingleIssueAssignees = RetrofitClient
-                                .getInstance(instanceUrl, ctx)
-                                .getApiInterface()
-                                .getIssueByIndex(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
-
-                        callSingleIssueAssignees.enqueue(new Callback<Issues>() {
-
-                            @Override
-                            public void onResponse(@NonNull Call<Issues> call, @NonNull retrofit2.Response<Issues> response) {
-
-                                if(response.code() == 200) {
-
-                                    Issues issueAssigneesList = response.body();
-
-                                    assert issueAssigneesList != null;
-                                    if (issueAssigneesList.getAssignees() != null) {
-                                        if (issueAssigneesList.getAssignees().size() > 0) {
-                                            for (int i = 0; i < issueAssigneesList.getAssignees().size(); i++) {
-
-                                                issueAssigneesIds.add(issueAssigneesList.getAssignees().get(i).getId());
-
-                                                if(issueAssigneesList.getAssignees().get(i).getUsername().equals(loginUid)) {
-                                                    listOfCollaborators.add(new MultiSelectModel(issueAssigneesList.getAssignees().get(i).getId(), issueAssigneesList.getAssignees().get(i).getUsername().trim()));
-                                                }
-
-                                            }
-                                            assigneesFlag = true;
-                                        }
-                                    }
-                                    else {
-                                        listOfCollaborators.add(new MultiSelectModel(tinyDb.getInt("userId"), loginUid));
-                                    }
-
-                                    if(assigneesFlag) {
-
-                                        multiSelectDialogAssignees = new MultiSelectDialog()
-                                                .title(getResources().getString(R.string.newIssueSelectAssigneesListTitle))
-                                                .titleSize(25)
-                                                .positiveText(getResources().getString(R.string.saveButton))
-                                                .negativeText(getResources().getString(R.string.cancelButton))
-                                                .setMinSelectionLimit(0)
-                                                .preSelectIDsList(issueAssigneesIds)
-                                                .setMaxSelectionLimit(listOfCollaborators.size())
-                                                .multiSelectList(listOfCollaborators)
-                                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
-                                                    @Override
-                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
-
-                                                        Log.i("selectedNames", String.valueOf(selectedNames));
-
-                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
-                                                        tinyDb.putBoolean("singleIssueUpdate", true);
-                                                        CloseActivity();
-                                                    }
-
-                                                    @Override
-                                                    public void onCancel() {
-                                                        CloseActivity();
-                                                    }
-                                                });
-
-                                    }
-                                    else {
-
-                                        multiSelectDialogAssignees = new MultiSelectDialog()
-                                                .title(getResources().getString(R.string.newIssueSelectAssigneesListTitle))
-                                                .titleSize(25)
-                                                .positiveText(getResources().getString(R.string.saveButton))
-                                                .negativeText(getResources().getString(R.string.cancelButton))
-                                                .setMinSelectionLimit(0)
-                                                .setMaxSelectionLimit(listOfCollaborators.size())
-                                                .multiSelectList(listOfCollaborators)
-                                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
-                                                    @Override
-                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
-
-                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
-                                                        tinyDb.putBoolean("singleIssueUpdate", true);
-                                                        CloseActivity();
-
-                                                    }
-
-                                                    @Override
-                                                    public void onCancel() {
-                                                        CloseActivity();
-                                                    }
-                                                });
-
-                                    }
-
-                                    multiSelectDialogAssignees.show(getSupportFragmentManager(), "issueMultiSelectDialog");
-
-                                }
-                            }
-
-                            @Override
-                            public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
-                                Log.e("onFailure", t.toString());
-                            }
-
-                        });
-                        // get current issue assignees
-
-                    }
-                    else if(response.code() == 401) {
-
-                        AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-                                getResources().getString(R.string.alertDialogTokenRevokedMessage),
-                                getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-                                getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
-                    }
-                    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, getString(R.string.genericError));
-
-                    }
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-                Log.e("onFailure", t.toString());
-            }
-        });
-
-    }
-
-    private void CloseActivity() {
-        this.finish();
-    }
-
-    private void updateIssueAssignees(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String loginUid, int issueIndex, List<String> issueAssigneesList) {
-
-        UpdateIssueAssignees updateAssigneeJson = new UpdateIssueAssignees(issueAssigneesList);
-
-        Call<JsonElement> call3;
-
-        call3 = RetrofitClient
-                .getInstance(instanceUrl, ctx)
-                .getApiInterface()
-                .patchIssueAssignees(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);
-
-        call3.enqueue(new Callback<JsonElement>() {
-
-            @Override
-            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response2) {
-
-                if(response2.code() == 201) {
-
-                    Toasty.success(ctx, ctx.getString(R.string.assigneesUpdated));
-
-                }
-                else if(response2.code() == 401) {
-
-                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
-                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
-                }
-                else if(response2.code() == 403) {
-
-                    Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-
-                }
-                else if(response2.code() == 404) {
-
-                    Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-
-                }
-                else {
-
-                    Toasty.error(ctx, getString(R.string.genericError));
-
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-                Log.e("onFailure", t.toString());
-            }
-        });
-
-    }
-
-}

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

@@ -1,308 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.util.Log;
-import androidx.annotation.NonNull;
-import com.google.gson.JsonElement;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.MultiSelectDialog;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.models.Labels;
-import org.mian.gitnex.models.MultiSelectModel;
-import java.util.ArrayList;
-import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class AddRemoveLabelsActivity extends BaseActivity {
-
-    private ArrayList<MultiSelectModel> listOfLabels = new ArrayList<>();
-    private ArrayList<Integer> issueLabelIds = new ArrayList<>();
-    private Boolean labelsFlag = false;
-    private MultiSelectDialog multiSelectDialogLabels;
-    final Context ctx = this;
-    private Context appCtx;
-
-    @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_add_remove_labels;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
-        //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
-
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
-
-        getLabels(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
-
-    }
-
-    private void getLabels(final String instanceUrl, final String instanceToken, final String repoOwner, final String repoName, final int issueIndex, final String loginUid) {
-
-        final TinyDB tinyDb = new TinyDB(appCtx);
-
-        Call<List<Labels>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
-                .getApiInterface()
-                .getlabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-
-        call.enqueue(new Callback<List<Labels>>() {
-
-            @Override
-            public void onResponse(@NonNull Call<List<Labels>> call, @NonNull retrofit2.Response<List<Labels>> response) {
-
-                if(response.isSuccessful()) {
-                    if(response.code() == 200) {
-
-                        List<Labels> labelsList_ = response.body();
-
-                        assert labelsList_ != null;
-                        if(labelsList_.size() > 0) {
-                            for (int i = 0; i < labelsList_.size(); i++) {
-
-                                listOfLabels.add(new MultiSelectModel(labelsList_.get(i).getId(), labelsList_.get(i).getName().trim()));
-
-                            }
-                        }
-
-                        // get current issue labels
-                        Call<List<Labels>> callSingleIssueLabels = RetrofitClient
-                                .getInstance(instanceUrl, ctx)
-                                .getApiInterface()
-                                .getIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
-
-                        callSingleIssueLabels.enqueue(new Callback<List<Labels>>() {
-
-                            @Override
-                            public void onResponse(@NonNull Call<List<Labels>> call, @NonNull retrofit2.Response<List<Labels>> response) {
-
-                                if(response.code() == 200) {
-
-                                    List<Labels> issueLabelsList = response.body();
-
-                                    assert issueLabelsList != null;
-                                    if(issueLabelsList.size() > 0) {
-                                        for (int i = 0; i < issueLabelsList.size(); i++) {
-
-                                            issueLabelIds.add(issueLabelsList.get(i).getId());
-
-                                        }
-                                        labelsFlag = true;
-                                    }
-
-                                    if(labelsFlag) {
-
-                                        multiSelectDialogLabels = new MultiSelectDialog()
-                                                .title(getResources().getString(R.string.newIssueSelectLabelsListTitle))
-                                                .titleSize(25)
-                                                .positiveText(getResources().getString(R.string.saveButton))
-                                                .negativeText(getResources().getString(R.string.cancelButton))
-                                                .setMinSelectionLimit(0)
-                                                .preSelectIDsList(issueLabelIds)
-                                                .setMaxSelectionLimit(listOfLabels.size())
-                                                .multiSelectList(listOfLabels)
-                                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
-                                                    @Override
-                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
-
-                                                        String labelIds = selectedIds.toString();
-                                                        int[] integers;
-                                                        if (selectedIds.size() > 0) {
-
-                                                            String[] items = labelIds.replaceAll("\\[", "").replaceAll("\\]", "").replaceAll("\\s", "").split(",");
-                                                            integers = new int[items.length];
-                                                            for (int i = 0; i < integers.length; i++) {
-                                                                integers[i] = Integer.parseInt(items[i]);
-                                                            }
-
-                                                        }
-                                                        else {
-                                                            integers = new int[0];
-                                                        }
-
-                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
-                                                        tinyDb.putBoolean("singleIssueUpdate", true);
-                                                        CloseActivity();
-                                                    }
-
-                                                    @Override
-                                                    public void onCancel() {
-                                                        CloseActivity();
-                                                    }
-                                                });
-
-                                    }
-                                    else {
-
-                                        multiSelectDialogLabels = new MultiSelectDialog()
-                                                .title(getResources().getString(R.string.newIssueSelectLabelsListTitle))
-                                                .titleSize(25)
-                                                .positiveText(getResources().getString(R.string.saveButton))
-                                                .negativeText(getResources().getString(R.string.cancelButton))
-                                                .setMinSelectionLimit(0)
-                                                .setMaxSelectionLimit(listOfLabels.size())
-                                                .multiSelectList(listOfLabels)
-                                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
-                                                    @Override
-                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
-
-                                                        String labelIds = selectedIds.toString();
-                                                        int[] integers;
-                                                        if (selectedIds.size() > 0) {
-
-                                                            String[] items = labelIds.replaceAll("\\[", "").replaceAll("\\]", "").replaceAll("\\s", "").split(",");
-                                                            integers = new int[items.length];
-                                                            for (int i = 0; i < integers.length; i++) {
-                                                                integers[i] = Integer.parseInt(items[i]);
-                                                            }
-
-                                                        }
-                                                        else {
-                                                            integers = new int[0];
-                                                        }
-
-                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
-                                                        tinyDb.putBoolean("singleIssueUpdate", true);
-                                                        CloseActivity();
-
-                                                    }
-
-                                                    @Override
-                                                    public void onCancel() {
-                                                        CloseActivity();
-                                                    }
-                                                });
-
-                                    }
-
-                                    multiSelectDialogLabels.show(getSupportFragmentManager(), "issueMultiSelectDialog");
-
-                                }
-                            }
-
-                            @Override
-                            public void onFailure(@NonNull Call<List<Labels>> call, @NonNull Throwable t) {
-                                Log.e("onFailure", t.toString());
-                            }
-
-                        });
-                        // get current issue labels
-
-                    }
-                    else if(response.code() == 401) {
-
-                        AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-                                getResources().getString(R.string.alertDialogTokenRevokedMessage),
-                                getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-                                getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
-                    }
-                    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, getString(R.string.genericError));
-
-                    }
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<List<Labels>> call, @NonNull Throwable t) {
-                Log.e("onFailure", t.toString());
-            }
-        });
-
-    }
-
-    private void updateIssueLabels(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, int issueIndex, int[] issueLabels, String loginUid) {
-
-        Labels patchIssueLabels = new Labels(issueLabels);
-
-        Call<JsonElement> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
-                .getApiInterface()
-                .updateIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, patchIssueLabels);
-
-        call.enqueue(new Callback<JsonElement>() {
-
-            @Override
-            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-                if(response.code() == 200) {
-
-                    Toasty.success(ctx, ctx.getString(R.string.labelsUpdated));
-
-                }
-                else if(response.code() == 401) {
-
-                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
-                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
-                }
-                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, getString(R.string.genericError));
-
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-                Log.e("onFailure", t.toString());
-            }
-        });
-
-    }
-
-    private void CloseActivity() {
-        this.finish();
-    }
-}

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -75,7 +76,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
                 DividerItemDecoration.VERTICAL);
         mRecyclerView.addItemDecoration(dividerItemDecoration);
 
-        swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
             swipeRefresh.setRefreshing(false);
             AdminGetUsersViewModel.loadUsersList(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken));
@@ -116,7 +117,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
         final MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
 
-        new Handler().postDelayed(() -> {
+        new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
             if(searchFilter) {
 

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

@@ -17,7 +17,9 @@ import org.mian.gitnex.helpers.FontsOverride;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.notifications.NotificationsMaster;
-import static org.acra.ReportField.*;
+import static org.acra.ReportField.ANDROID_VERSION;
+import static org.acra.ReportField.PHONE_MODEL;
+import static org.acra.ReportField.STACK_TRACE;
 
 /**
  * Author M M Arif
@@ -145,7 +147,6 @@ public abstract class BaseActivity extends AppCompatActivity {
 			ACRA.init(getApplication(), ACRABuilder);
 
 		}
-
 	}
 
 	protected abstract int getLayoutResourceId();

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.activities;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
 import android.view.Menu;
@@ -24,6 +25,7 @@ import org.mian.gitnex.clients.AppApiService;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.interfaces.ApiInterface;
 import org.mian.gitnex.models.Commits;
@@ -100,7 +102,7 @@ public class CommitsActivity extends BaseActivity {
 		recyclerView = findViewById(R.id.recyclerView);
 		commitsList = new ArrayList<>();
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
 			swipeRefresh.setRefreshing(false);
 			loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName, resultLimit);
@@ -115,7 +117,6 @@ public class CommitsActivity extends BaseActivity {
 
 				int page = (commitsList.size() + resultLimit) / resultLimit;
 				loadMore(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, page, branchName, resultLimit);
-
 			}
 
 		}));
@@ -138,7 +139,7 @@ public class CommitsActivity extends BaseActivity {
 			@Override
 			public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {
 
-				if(response.isSuccessful()) {
+				if(response.code() == 200) {
 
 					assert response.body() != null;
 					if(response.body().size() > 0) {
@@ -150,13 +151,15 @@ public class CommitsActivity extends BaseActivity {
 
 					}
 					else {
+
 						commitsList.clear();
 						adapter.notifyDataChanged();
 						noData.setVisibility(View.VISIBLE);
 					}
+				}
+				if(response.code() == 409) {
 
-					progressBar.setVisibility(View.GONE);
-
+					noData.setVisibility(View.VISIBLE);
 				}
 				else {
 
@@ -164,12 +167,13 @@ public class CommitsActivity extends BaseActivity {
 
 				}
 
+				progressBar.setVisibility(View.GONE);
 			}
 
 			@Override
 			public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
 
-				Log.e(TAG, t.toString());
+				Toasty.error(ctx, getResources().getString(R.string.errorOnLogin));
 			}
 
 		});
@@ -190,23 +194,19 @@ public class CommitsActivity extends BaseActivity {
 				if(response.isSuccessful()) {
 
 					List<Commits> result = response.body();
-
 					assert result != null;
+
 					if(result.size() > 0) {
 
 						pageSize = result.size();
 						commitsList.addAll(result);
-
 					}
 					else {
 
 						adapter.setMoreDataAvailable(false);
-
 					}
 
 					adapter.notifyDataChanged();
-					progressLoadMore.setVisibility(View.GONE);
-
 				}
 				else {
 
@@ -214,13 +214,13 @@ public class CommitsActivity extends BaseActivity {
 
 				}
 
+				progressLoadMore.setVisibility(View.GONE);
 			}
 
 			@Override
 			public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
 
-				Log.e(TAG, t.toString());
-
+				Toasty.error(ctx, getResources().getString(R.string.errorOnLogin));
 			}
 
 		});

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

@@ -5,12 +5,11 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
@@ -44,7 +43,7 @@ public class CreateFileActivity extends BaseActivity {
     private EditText newFileContent;
     private EditText newFileBranchName;
     private EditText newFileCommitMessage;
-    private Spinner newFileBranchesSpinner;
+    private AutoCompleteTextView newFileBranchesSpinner;
 	private String filePath;
 	private String fileSha;
 	private int fileAction = 0; // 0 = create, 1 = delete, 2 = edit
@@ -54,6 +53,14 @@ public class CreateFileActivity extends BaseActivity {
 
     List<Branches> branchesList = new ArrayList<>();
 
+    private String instanceUrl;
+	private String loginUid;
+	private String repoOwner;
+	private String repoName;
+	private String instanceToken;
+
+	private String selectedBranch;
+
     @Override
     protected int getLayoutResourceId(){
         return R.layout.activity_new_file;
@@ -70,23 +77,20 @@ public class CreateFileActivity extends BaseActivity {
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
+        instanceUrl = tinyDb.getString("instanceUrl");
+        loginUid = tinyDb.getString("loginUid");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        repoOwner = parts[0];
+        repoName = parts[1];
+        instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         closeActivity = findViewById(R.id.close);
         newFileName = findViewById(R.id.newFileName);
         newFileContent = findViewById(R.id.newFileContent);
         newFileBranchName = findViewById(R.id.newFileBranchName);
         newFileCommitMessage = findViewById(R.id.newFileCommitMessage);
-        TextView branchNameId = findViewById(R.id.branchNameId);
-        TextView branchNameHintText = findViewById(R.id.branchNameHintText);
 	    TextView toolbarTitle = findViewById(R.id.toolbarTitle);
-	    TextView fileNameHint = findViewById(R.id.fileNameHint);
 
         newFileName.requestFocus();
         assert imm != null;
@@ -99,7 +103,6 @@ public class CreateFileActivity extends BaseActivity {
 
 	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", 1) == 1) {
 
-		    fileNameHint.setVisibility(View.GONE);
 		    fileAction = getIntent().getIntExtra("fileAction", 1);
 
 		    filePath = getIntent().getStringExtra("filePath");
@@ -120,7 +123,6 @@ public class CreateFileActivity extends BaseActivity {
 
 	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", 2) == 2) {
 
-		    fileNameHint.setVisibility(View.GONE);
 		    fileAction = getIntent().getIntExtra("fileAction", 2);
 
 		    filePath = getIntent().getStringExtra("filePath");
@@ -143,32 +145,6 @@ public class CreateFileActivity extends BaseActivity {
         newFileBranchesSpinner = findViewById(R.id.newFileBranchesSpinner);
         getBranches(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
 
-        newFileBranchesSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
-        {
-            public void onItemSelected(AdapterView<?> arg0,
-                                       View arg1, int arg2, long arg3)
-            {
-                Branches bModelValue = (Branches) newFileBranchesSpinner.getSelectedItem();
-
-                if(bModelValue.toString().equals("No branch")) {
-                    newFileBranchName.setEnabled(true);
-                    newFileBranchName.setVisibility(View.VISIBLE);
-                    branchNameId.setVisibility(View.VISIBLE);
-                    branchNameHintText.setVisibility(View.VISIBLE);
-                }
-                else {
-                    newFileBranchName.setEnabled(false);
-                    newFileBranchName.setVisibility(View.GONE);
-                    branchNameId.setVisibility(View.GONE);
-                    branchNameHintText.setVisibility(View.GONE);
-                    newFileBranchName.setText("");
-                }
-
-            }
-
-            public void onNothingSelected(AdapterView<?> arg0) {}
-        });
-
         disableProcessButton();
 
         if(!connToInternet) {
@@ -188,37 +164,27 @@ public class CreateFileActivity extends BaseActivity {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
 
         String newFileName_ = newFileName.getText().toString();
         String newFileContent_ = newFileContent.getText().toString();
         String newFileBranchName_ = newFileBranchName.getText().toString();
         String newFileCommitMessage_ = newFileCommitMessage.getText().toString();
 
-        Branches currentBranch = (Branches) newFileBranchesSpinner.getSelectedItem();
+        //Branches currentBranch = (Branches) newFileBranchesSpinner.getSelectedItem();
 
         if(!connToInternet) {
 
             Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
             return;
-
         }
 
         if(newFileName_.equals("") || newFileContent_.equals("") || newFileCommitMessage_.equals("")) {
 
             Toasty.error(ctx, getString(R.string.newFileRequiredFields));
             return;
-
         }
 
-        if(currentBranch.toString().equals("No branch")) {
+        if(selectedBranch.equals("No branch")) {
 
             if(newFileBranchName_.equals("")) {
                 Toasty.error(ctx, getString(R.string.newFileRequiredFieldNewBranchName));
@@ -229,7 +195,6 @@ public class CreateFileActivity extends BaseActivity {
 
                     Toasty.error(ctx, getString(R.string.newFileInvalidBranchName));
                     return;
-
                 }
             }
 
@@ -238,7 +203,6 @@ public class CreateFileActivity extends BaseActivity {
         if(appUtil.charactersLength(newFileCommitMessage_) > 255) {
 
             Toasty.warning(ctx, getString(R.string.newFileCommitMessageError));
-
         }
         else {
 
@@ -247,17 +211,17 @@ public class CreateFileActivity extends BaseActivity {
             if(fileAction == 1) {
 
 	            deleteFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, filePath,
-		            newFileBranchName_, newFileCommitMessage_, currentBranch.toString(), fileSha);
+		            newFileBranchName_, newFileCommitMessage_, selectedBranch, fileSha);
             }
             else if(fileAction == 2) {
 
 	            editFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, filePath,
-		           appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString(), fileSha);
+		           appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, selectedBranch, fileSha);
             }
             else {
 
 	            createNewFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newFileName_,
-		            appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString());
+		            appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, selectedBranch);
             }
 
         }
@@ -268,9 +232,11 @@ public class CreateFileActivity extends BaseActivity {
 
         NewFile createNewFileJsonStr;
         if(currentBranch.equals("No branch")) {
+
             createNewFileJsonStr = new NewFile("", fileContent, fileCommitMessage, fileBranchName);
         }
         else {
+
             createNewFileJsonStr = new NewFile(currentBranch, fileContent, fileCommitMessage, "");
         }
 
@@ -358,7 +324,6 @@ public class CreateFileActivity extends BaseActivity {
 					getIntent().removeExtra("fileSha");
 					getIntent().removeExtra("fileContents");
 					finish();
-
 				}
 				else if(response.code() == 401) {
 
@@ -367,7 +332,6 @@ public class CreateFileActivity extends BaseActivity {
 						getResources().getString(R.string.alertDialogTokenRevokedMessage),
 						getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
 						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
 				}
 				else {
 
@@ -430,7 +394,6 @@ public class CreateFileActivity extends BaseActivity {
 					getIntent().removeExtra("fileContents");
 					tinyDb.putBoolean("fileModified", true);
 					finish();
-
 				}
 				else if(response.code() == 401) {
 
@@ -439,7 +402,6 @@ public class CreateFileActivity extends BaseActivity {
 						getResources().getString(R.string.alertDialogTokenRevokedMessage),
 						getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
 						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
 				}
 				else {
 
@@ -499,12 +461,29 @@ public class CreateFileActivity extends BaseActivity {
                         }
 
                         ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreateFileActivity.this,
-                                R.layout.spinner_item, branchesList);
+                                R.layout.list_spinner_items, branchesList);
 
-                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
                         newFileBranchesSpinner.setAdapter(adapter);
                         enableProcessButton();
 
+	                    newFileBranchesSpinner.setOnItemClickListener ((parent, view, position, id) -> {
+
+		                    selectedBranch = branchesList.get(position).getName();
+
+		                    if(selectedBranch.equals("No branch")) {
+
+			                    newFileBranchName.setEnabled(true);
+			                    newFileBranchName.setVisibility(View.VISIBLE);
+		                    }
+		                    else {
+
+			                    newFileBranchName.setEnabled(false);
+			                    newFileBranchName.setVisibility(View.GONE);
+			                    newFileBranchName.setText("");
+		                    }
+
+	                    });
+
                     }
                 }
 
@@ -512,6 +491,7 @@ public class CreateFileActivity extends BaseActivity {
 
             @Override
             public void onFailure(@NonNull Call<List<Branches>> call, @NonNull Throwable t) {
+
                 Log.e("onFailure", t.toString());
             }
         });
@@ -519,6 +499,7 @@ public class CreateFileActivity extends BaseActivity {
     }
 
     private void initCloseListener() {
+
         onClickListener = view -> finish();
     }
 

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

@@ -1,29 +1,29 @@
 package org.mian.gitnex.activities;
 
 import android.app.DatePickerDialog;
+import android.app.Dialog;
 import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.DatePicker;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.Spinner;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import com.hendraanggrian.appcompat.socialview.Mention;
-import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
-import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
 import org.mian.gitnex.R;
+import org.mian.gitnex.actions.AssigneesActions;
+import org.mian.gitnex.actions.LabelsActions;
+import org.mian.gitnex.adapters.AssigneesListAdapter;
+import org.mian.gitnex.adapters.LabelsListAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.databinding.ActivityCreateIssueBinding;
+import org.mian.gitnex.databinding.CustomAssigneesSelectionDialogBinding;
+import org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.MultiSelectDialog;
 import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
@@ -32,45 +32,50 @@ import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.CreateIssue;
 import org.mian.gitnex.models.Labels;
 import org.mian.gitnex.models.Milestones;
-import org.mian.gitnex.models.MultiSelectModel;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
+import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
-import retrofit2.Response;
 
 /**
  * Author M M Arif
  */
 
-public class CreateIssueActivity extends BaseActivity implements View.OnClickListener {
+public class CreateIssueActivity extends BaseActivity implements View.OnClickListener, LabelsListAdapter.LabelsListAdapterListener, AssigneesListAdapter.AssigneesListAdapterListener {
 
+	private ActivityCreateIssueBinding viewBinding;
+	private CustomLabelsSelectionDialogBinding labelsBinding;
+	private CustomAssigneesSelectionDialogBinding assigneesBinding;
     private View.OnClickListener onClickListener;
-    MultiSelectDialog multiSelectDialog;
-    MultiSelectDialog multiSelectDialogLabels;
-    private TextView assigneesList;
-    private TextView newIssueLabels;
-    private TextView newIssueDueDate;
-    private Spinner newIssueMilestoneSpinner;
-    private EditText newIssueTitle;
-    private SocialAutoCompleteTextView newIssueDescription;
-    private Button createNewIssueButton;
-    private TextView labelsIdHolder;
-    private boolean assigneesFlag;
-    private boolean labelsFlag;
     final Context ctx = this;
     private Context appCtx;
+    private TinyDB tinyDb;
     private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
+	private Dialog dialogLabels;
+	private Dialog dialogAssignees;
+	private String labelsSetter;
+	private String assigneesSetter;
+	private int milestoneId;
 
-    List<Milestones> milestonesList = new ArrayList<>();
-    ArrayList<MultiSelectModel> listOfAssignees = new ArrayList<>();
-    ArrayList<MultiSelectModel> listOfLabels= new ArrayList<>();
-    private ArrayAdapter<Mention> defaultMentionAdapter;
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
+	private String repoOwner;
+	private String repoName;
+
+	private LabelsListAdapter labelsAdapter;
+	private AssigneesListAdapter assigneesAdapter;
+
+	private List<Integer> labelsIds = new ArrayList<>();
+	private List<Labels> labelsList = new ArrayList<>();
+	private List<Milestones> milestonesList = new ArrayList<>();
+	private List<Collaborators> assigneesList = new ArrayList<>();
+	private List<String> assigneesListData = new ArrayList<>();
 
     @Override
-    protected int getLayoutResourceId(){
+    protected int getLayoutResourceId() {
         return R.layout.activity_create_issue;
     }
 
@@ -79,20 +84,24 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
+	    tinyDb = new TinyDB(appCtx);
+
+	    viewBinding = ActivityCreateIssueBinding.inflate(getLayoutInflater());
+	    View view = viewBinding.getRoot();
+	    setContentView(view);
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
+        instanceUrl = tinyDb.getString("instanceUrl");
+        loginUid = tinyDb.getString("loginUid");
         final String loginFullName = tinyDb.getString("userFullname");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        repoOwner = parts[0];
+        repoName = parts[1];
+        instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         // require gitea 1.12 or higher
         if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
@@ -100,71 +109,113 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
             resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
         }
 
-        ImageView closeActivity = findViewById(R.id.close);
-        assigneesList = findViewById(R.id.newIssueAssigneesList);
-        newIssueLabels = findViewById(R.id.newIssueLabels);
-        newIssueDueDate = findViewById(R.id.newIssueDueDate);
-        createNewIssueButton = findViewById(R.id.createNewIssueButton);
-        newIssueTitle = findViewById(R.id.newIssueTitle);
-        newIssueDescription = findViewById(R.id.newIssueDescription);
-        labelsIdHolder = findViewById(R.id.labelsIdHolder);
-
-        newIssueTitle.requestFocus();
+	    viewBinding.newIssueTitle.requestFocus();
         assert imm != null;
-        imm.showSoftInput(newIssueTitle, InputMethodManager.SHOW_IMPLICIT);
+        imm.showSoftInput(viewBinding.newIssueTitle, InputMethodManager.SHOW_IMPLICIT);
 
-        defaultMentionAdapter = new MentionArrayAdapter<>(this);
-        loadCollaboratorsList();
-
-        newIssueDescription.setMentionAdapter(defaultMentionAdapter);
+	    labelsAdapter = new LabelsListAdapter(labelsList, CreateIssueActivity.this, labelsIds);
+	    assigneesAdapter = new AssigneesListAdapter(ctx, assigneesList, CreateIssueActivity.this, assigneesListData);
 
         initCloseListener();
-        closeActivity.setOnClickListener(onClickListener);
+	    viewBinding.close.setOnClickListener(onClickListener);
 
-        assigneesList.setOnClickListener(this);
-        newIssueLabels.setOnClickListener(this);
-        newIssueDueDate.setOnClickListener(this);
+	    viewBinding.newIssueAssigneesList.setOnClickListener(this);
+	    viewBinding.newIssueLabels.setOnClickListener(this);
+	    viewBinding.newIssueDueDate.setOnClickListener(this);
 
-        newIssueMilestoneSpinner = findViewById(R.id.newIssueMilestoneSpinner);
         getMilestones(instanceUrl, instanceToken, repoOwner, repoName, loginUid, resultLimit);
 
-        getLabels(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
-        getCollaborators(instanceUrl, instanceToken, repoOwner, repoName, loginUid, loginFullName);
-
         disableProcessButton();
 
+	    viewBinding.newIssueLabels.setOnClickListener(newIssueLabels ->
+		    showLabels()
+	    );
+
+	    viewBinding.newIssueAssigneesList.setOnClickListener(newIssueAssigneesList ->
+		    showAssignees()
+	    );
+
         if(!connToInternet) {
 
-            createNewIssueButton.setEnabled(false);
+	        viewBinding.createNewIssueButton.setEnabled(false);
         }
         else {
 
-            createNewIssueButton.setOnClickListener(this);
+	        viewBinding.createNewIssueButton.setOnClickListener(this);
         }
 
     }
 
+	@Override
+	public void assigneesInterface(List<String> data) {
+
+		assigneesSetter = String.valueOf(data);
+		viewBinding.newIssueAssigneesList.setText(assigneesSetter.replace("]", "").replace("[", ""));
+		assigneesListData = data;
+	}
+
+	@Override
+	public void labelsInterface(List<String> data) {
+
+		labelsSetter = String.valueOf(data);
+		viewBinding.newIssueLabels.setText(labelsSetter.replace("]", "").replace("[", ""));
+	}
+
+	@Override
+	public void labelsIdsInterface(List<Integer> data) {
+
+		labelsIds = data;
+	}
+
+	private void showAssignees() {
+
+		dialogAssignees = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
+
+		if (dialogAssignees.getWindow() != null) {
+
+			dialogAssignees.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+		}
+
+		assigneesBinding = CustomAssigneesSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
+
+		View view = assigneesBinding.getRoot();
+		dialogAssignees.setContentView(view);
+
+		assigneesBinding.cancel.setOnClickListener(assigneesBinding_ ->
+			dialogAssignees.dismiss()
+		);
+
+		AssigneesActions.getRepositoryAssignees(ctx, instanceUrl, instanceToken, repoOwner, repoName, assigneesList, dialogAssignees, assigneesAdapter, assigneesBinding);
+	}
+
+	private void showLabels() {
+
+		dialogLabels = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
+
+		if (dialogLabels.getWindow() != null) {
+
+			dialogLabels.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+		}
+
+		labelsBinding = CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
+
+		View view = labelsBinding.getRoot();
+		dialogLabels.setContentView(view);
+
+		labelsBinding.cancel.setOnClickListener(labelsBinding_ ->
+			dialogLabels.dismiss()
+		);
+
+		LabelsActions.getRepositoryLabels(ctx, instanceUrl, instanceToken, repoOwner, repoName, labelsList, dialogLabels, labelsAdapter, labelsBinding);
+	}
+
     private void processNewIssue() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        Milestones mModel = (Milestones) newIssueMilestoneSpinner.getSelectedItem();
-
-        int newIssueMilestoneIdForm = mModel.getId();
-        String newIssueTitleForm = newIssueTitle.getText().toString();
-        String newIssueDescriptionForm = newIssueDescription.getText().toString();
-        String newIssueAssigneesListForm = assigneesList.getText().toString();
-        //String newIssueLabelsForm = newIssueLabels.getText().toString();
-        String newIssueDueDateForm = newIssueDueDate.getText().toString();
-        String newIssueLabelsIdHolderForm = labelsIdHolder.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) {
 
@@ -177,101 +228,25 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
             Toasty.error(ctx, getString(R.string.issueTitleEmpty));
             return;
-
         }
 
-        /*if (newIssueDescriptionForm.equals("")) {
-
-            Toasty.error(ctx, getString(R.string.issueDescriptionEmpty));
-            return;
-
-        }*/
-
         if (newIssueDueDateForm.equals("")) {
+
             newIssueDueDateForm = null;
-        } else {
+        }
+        else {
+
             newIssueDueDateForm = (AppUtil.customDateCombine(AppUtil.customDateFormat(newIssueDueDateForm)));
         }
 
-        List<String> newIssueAssigneesListForm_ = new ArrayList<>(Arrays.asList(newIssueAssigneesListForm.split(",")));
-
-        for (int i = 0; i < newIssueAssigneesListForm_.size(); i++) {
-            newIssueAssigneesListForm_.set(i, newIssueAssigneesListForm_.get(i).trim());
-        }
-
-        int[] integers;
-        if (!newIssueLabelsIdHolderForm.equals("") && !newIssueLabelsIdHolderForm.equals("[]")) {
-
-            String[] items = newIssueLabelsIdHolderForm.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\\s", "").split(",");
-            integers = new int[items.length];
-            for (int i = 0; i < integers.length; i++) {
-                integers[i] = Integer.parseInt(items[i]);
-            }
-
-        }
-        else {
-            integers = new int[0];
-        }
-
-        //Log.i("FormData", String.valueOf(newIssueLabelsForm));
         disableProcessButton();
-        createNewIssueFunc(instanceUrl, instanceToken, repoOwner, repoName, loginUid, newIssueDescriptionForm, newIssueDueDateForm, newIssueMilestoneIdForm, newIssueTitleForm, newIssueAssigneesListForm_, integers);
+        createNewIssueFunc(instanceUrl, instanceToken, repoOwner, repoName, loginUid, newIssueDescriptionForm, newIssueDueDateForm, milestoneId, newIssueTitleForm);
 
     }
 
-    public void loadCollaboratorsList() {
+    private void createNewIssueFunc(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String loginUid, String newIssueDescriptionForm, String newIssueDueDateForm, int newIssueMilestoneIdForm, String newIssueTitleForm) {
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
-
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-
-        Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
-                .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-
-        call.enqueue(new Callback<List<Collaborators>>() {
-
-            @Override
-            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
-
-                if (response.isSuccessful()) {
-
-                    assert response.body() != null;
-                    String fullName = "";
-                    for (int i = 0; i < response.body().size(); i++) {
-                        if(!response.body().get(i).getFull_name().equals("")) {
-                            fullName = response.body().get(i).getFull_name();
-                        }
-                        defaultMentionAdapter.add(
-                                new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
-                    }
-
-                } else {
-
-                    Log.i("onResponse", String.valueOf(response.code()));
-
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-                Log.i("onFailure", t.toString());
-            }
-
-        });
-    }
-
-    private void createNewIssueFunc(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String loginUid, String newIssueDescriptionForm, String newIssueDueDateForm, int newIssueMilestoneIdForm, String newIssueTitleForm, List<String> newIssueAssigneesListForm, int[] newIssueLabelsForm) {
-
-        CreateIssue createNewIssueJson = new CreateIssue(loginUid, newIssueDescriptionForm, false, newIssueDueDateForm, newIssueMilestoneIdForm, newIssueTitleForm, newIssueAssigneesListForm, newIssueLabelsForm);
+        CreateIssue createNewIssueJson = new CreateIssue(loginUid, newIssueDescriptionForm, false, newIssueDueDateForm, newIssueMilestoneIdForm, newIssueTitleForm, assigneesListData, labelsIds);
 
         Call<JsonElement> call3;
 
@@ -285,19 +260,14 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
             @Override
             public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response2) {
 
-                if(response2.isSuccessful()) {
-                    if(response2.code() == 201) {
+				if(response2.code() == 201) {
 
-                        //Log.i("isSuccessful1", String.valueOf(response2.body()));
-                        TinyDB tinyDb = new TinyDB(appCtx);
-                        tinyDb.putBoolean("resumeIssues", true);
-
-                        Toasty.success(ctx, getString(R.string.issueCreated));
-                        enableProcessButton();
-                        finish();
-
-                    }
+                    TinyDB tinyDb = new TinyDB(appCtx);
+                    tinyDb.putBoolean("resumeIssues", true);
 
+                    Toasty.success(ctx, getString(R.string.issueCreated));
+                    enableProcessButton();
+                    finish();
                 }
                 else if(response2.code() == 401) {
 
@@ -306,21 +276,19 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
                 }
                 else {
 
                     Toasty.error(ctx, getString(R.string.issueCreatedError));
                     enableProcessButton();
-                    //Log.i("isSuccessful2", String.valueOf(response2.body()));
-
                 }
 
             }
 
             @Override
             public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-                Log.e("onFailure", t.toString());
+
+	            Toasty.error(ctx, getString(R.string.genericServerResponseError));
                 enableProcessButton();
             }
         });
@@ -368,12 +336,16 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                         }
 
                         ArrayAdapter<Milestones> adapter = new ArrayAdapter<>(CreateIssueActivity.this,
-                                R.layout.spinner_item, milestonesList);
+                                R.layout.list_spinner_items, milestonesList);
 
-                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
-                        newIssueMilestoneSpinner.setAdapter(adapter);
+	                    viewBinding.newIssueMilestoneSpinner.setAdapter(adapter);
                         enableProcessButton();
 
+	                    viewBinding.newIssueMilestoneSpinner.setOnItemClickListener ((parent, view, position, id) ->
+
+		                    milestoneId = milestonesList.get(position).getId()
+	                    );
+
                     }
                 }
 
@@ -381,143 +353,8 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
             @Override
             public void onFailure(@NonNull Call<List<Milestones>> call, @NonNull Throwable t) {
-                Log.e("onFailure", t.toString());
-            }
-        });
 
-    }
-
-    private void getCollaborators(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid, String loginFullName) {
-
-        Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
-                .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-
-        listOfAssignees.add(new MultiSelectModel(-1, loginFullName));
-
-        call.enqueue(new Callback<List<Collaborators>>() {
-
-            @Override
-            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull retrofit2.Response<List<Collaborators>> response) {
-
-                if(response.isSuccessful()) {
-                    if(response.code() == 200) {
-
-                        List<Collaborators> assigneesList_ = response.body();
-
-                        assert assigneesList_ != null;
-                        if(assigneesList_.size() > 0) {
-                            for (int i = 0; i < assigneesList_.size(); i++) {
-
-                                /*String assigneesCopy;
-                                if(!assigneesList_.get(i).getFull_name().equals("")) {
-                                    assigneesCopy = getString(R.string.dialogAssignessText, assigneesList_.get(i).getFull_name(), assigneesList_.get(i).getLogin());
-                                }
-                                else {
-                                    assigneesCopy = assigneesList_.get(i).getLogin();
-                                }*/
-                                listOfAssignees.add(new MultiSelectModel(assigneesList_.get(i).getId(), assigneesList_.get(i).getLogin().trim()));
-
-                            }
-                            assigneesFlag = true;
-                        }
-
-                        multiSelectDialog = new MultiSelectDialog()
-                                .title(getResources().getString(R.string.newIssueSelectAssigneesListTitle))
-                                .titleSize(25)
-                                .positiveText(getResources().getString(R.string.okButton))
-                                .negativeText(getResources().getString(R.string.cancelButton))
-                                .setMinSelectionLimit(0)
-                                .setMaxSelectionLimit(listOfAssignees.size())
-                                .multiSelectList(listOfAssignees)
-                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
-                                    @Override
-                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
-
-                                        assigneesList.setText(dataString);
-
-                                    }
-
-                                    @Override
-                                    public void onCancel() {
-                                        //Log.d("multiSelect","Dialog cancelled");
-
-                                    }
-                                });
-
-                    }
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-                Log.e("onFailure", t.toString());
-            }
-        });
-
-    }
-
-    private void getLabels(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
-
-        Call<List<Labels>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
-                .getApiInterface()
-                .getlabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-
-        call.enqueue(new Callback<List<Labels>>() {
-
-            @Override
-            public void onResponse(@NonNull Call<List<Labels>> call, @NonNull retrofit2.Response<List<Labels>> response) {
-
-                if(response.isSuccessful()) {
-                    if(response.code() == 200) {
-
-                        List<Labels> labelsList_ = response.body();
-
-                        assert labelsList_ != null;
-                        if(labelsList_.size() > 0) {
-                            for (int i = 0; i < labelsList_.size(); i++) {
-
-                                listOfLabels.add(new MultiSelectModel(labelsList_.get(i).getId(), labelsList_.get(i).getName().trim()));
-
-                            }
-                            labelsFlag = true;
-                        }
-
-                        multiSelectDialogLabels = new MultiSelectDialog()
-                                .title(getResources().getString(R.string.newIssueSelectLabelsListTitle))
-                                .titleSize(25)
-                                .positiveText(getResources().getString(R.string.okButton))
-                                .negativeText(getResources().getString(R.string.cancelButton))
-                                .setMinSelectionLimit(0)
-                                .setMaxSelectionLimit(listOfLabels.size())
-                                .multiSelectList(listOfLabels)
-                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
-                                    @Override
-                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
-
-                                        newIssueLabels.setText(dataString.trim());
-                                        labelsIdHolder.setText(selectedIds.toString());
-
-                                    }
-
-                                    @Override
-                                    public void onCancel() {
-                                        //Log.d("multiSelect","Dialog cancelled");
-
-                                    }
-                                });
-
-                    }
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<List<Labels>> call, @NonNull Throwable t) {
-                Log.e("onFailure", t.toString());
+	            Toasty.error(ctx, getString(R.string.genericServerResponseError));
             }
         });
 
@@ -525,23 +362,8 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void onClick(View v) {
-        if (v == assigneesList) {
-            if(assigneesFlag) {
-                multiSelectDialog.show(getSupportFragmentManager(), "multiSelectDialog");
-            }
-            else {
-                Toasty.warning(ctx, getResources().getString(R.string.noAssigneesFound));
-            }
-        }
-        else if (v == newIssueLabels) {
-            if(labelsFlag) {
-                multiSelectDialogLabels.show(getSupportFragmentManager(), "multiSelectDialogLabels");
-            }
-            else {
-                Toasty.warning(ctx, getResources().getString(R.string.noLabelsFound));
-            }
-        }
-        else if (v == newIssueDueDate) {
+
+        if (v == viewBinding.newIssueDueDate) {
 
             final Calendar c = Calendar.getInstance();
             int mYear = c.get(Calendar.YEAR);
@@ -549,19 +371,10 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
             final int mDay = c.get(Calendar.DAY_OF_MONTH);
 
             DatePickerDialog datePickerDialog = new DatePickerDialog(this,
-                    new DatePickerDialog.OnDateSetListener() {
-
-                        @Override
-                        public void onDateSet(DatePicker view, int year,
-                                              int monthOfYear, int dayOfMonth) {
-
-                            newIssueDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth));
-
-                        }
-                    }, mYear, mMonth, mDay);
+	            (view, year, monthOfYear, dayOfMonth) -> viewBinding.newIssueDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth)), mYear, mMonth, mDay);
             datePickerDialog.show();
         }
-        else if(v == createNewIssueButton) {
+        else if(v == viewBinding.createNewIssueButton) {
             processNewIssue();
         }
 
@@ -569,11 +382,11 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
     private void disableProcessButton() {
 
-        createNewIssueButton.setEnabled(false);
+	    viewBinding.createNewIssueButton.setEnabled(false);
     }
 
     private void enableProcessButton() {
 
-        createNewIssueButton.setEnabled(true);
+	    viewBinding.createNewIssueButton.setEnabled(true);
     }
 }

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

@@ -12,6 +12,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import org.mian.gitnex.R;
+import org.mian.gitnex.actions.LabelsActions;
 import org.mian.gitnex.adapters.LabelsListAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.ActivityCreatePrBinding;
@@ -48,8 +49,8 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 	private Dialog dialogLabels;
 	private String labelsSetter;
-	private ArrayList<Integer> labelsIds = new ArrayList<>();
-	private ArrayList<String> assignees = new ArrayList<>();
+	private List<Integer> labelsIds = new ArrayList<>();
+	private List<String> assignees = new ArrayList<>();
 	private int milestoneId;
 
 	private String instanceUrl;
@@ -96,7 +97,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
 		}
 
-		labelsAdapter =  new LabelsListAdapter(labelsList, CreatePullRequestActivity.this);
+		labelsAdapter =  new LabelsListAdapter(labelsList, CreatePullRequestActivity.this, labelsIds);
 
 		ImageView closeActivity = findViewById(R.id.close);
 
@@ -164,7 +165,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 		//Log.e("processPullRequest", String.valueOf(milestoneId));
 	}
 
-	private void createPullRequest(String prTitle, String prDescription, String mergeInto, String pullFrom, int milestoneId, String dueDate, ArrayList<String> assignees) {
+	private void createPullRequest(String prTitle, String prDescription, String mergeInto, String pullFrom, int milestoneId, String dueDate, List<String> assignees) {
 
 		CreatePullRequest createPullRequest = new CreatePullRequest(prTitle, prDescription, loginUid, mergeInto, pullFrom, milestoneId, dueDate, assignees, labelsIds);
 
@@ -213,14 +214,14 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 	}
 
 	@Override
-	public void labelsStringData(ArrayList<String> data) {
+	public void labelsInterface(List<String> data) {
 
 		labelsSetter = String.valueOf(data);
 		viewBinding.prLabels.setText(labelsSetter.replace("]", "").replace("[", ""));
 	}
 
 	@Override
-	public void labelsIdsData(ArrayList<Integer> data) {
+	public void labelsIdsInterface(List<Integer> data) {
 
 		labelsIds = data;
 	}
@@ -242,57 +243,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 			dialogLabels.dismiss()
 		);
 
-		Call<List<Labels>> call = RetrofitClient
-			.getInstance(instanceUrl, ctx)
-			.getApiInterface()
-			.getlabels(instanceToken, repoOwner, repoName);
-
-		call.enqueue(new Callback<List<Labels>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Labels>> call, @NonNull retrofit2.Response<List<Labels>> response) {
-
-				labelsList.clear();
-				List<Labels> labelsList_ = response.body();
-
-				labelsBinding.progressBar.setVisibility(View.GONE);
-				labelsBinding.dialogFrame.setVisibility(View.VISIBLE);
-
-				if (response.code() == 200) {
-
-					assert labelsList_ != null;
-					if(labelsList_.size() > 0) {
-						for (int i = 0; i < labelsList_.size(); i++) {
-
-							labelsList.add(new Labels(labelsList_.get(i).getId(), labelsList_.get(i).getName()));
-
-						}
-					}
-					else {
-
-						dialogLabels.dismiss();
-						Toasty.warning(ctx, getString(R.string.noLabelsFound));
-					}
-
-					labelsBinding.labelsRecyclerView.setAdapter(labelsAdapter);
-
-				}
-				else {
-
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Labels>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
-
-		dialogLabels.show();
-
+		LabelsActions.getRepositoryLabels(ctx, instanceUrl, instanceToken, repoOwner, repoName, labelsList, dialogLabels, labelsAdapter, labelsBinding);
 	}
 
 	private void getBranches(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {

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

@@ -5,13 +5,12 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.Spinner;
 import androidx.annotation.NonNull;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -36,7 +35,7 @@ public class CreateReleaseActivity extends BaseActivity {
     private View.OnClickListener onClickListener;
     public ImageView closeActivity;
     private EditText releaseTagName;
-    private Spinner releaseBranch;
+    private AutoCompleteTextView releaseBranch;
     private EditText releaseTitle;
     private EditText releaseContent;
     private CheckBox releaseType;
@@ -44,6 +43,14 @@ public class CreateReleaseActivity extends BaseActivity {
     private Button createNewRelease;
     final Context ctx = this;
     private Context appCtx;
+    private TinyDB tinyDb;
+    private String selectedBranch;
+
+    private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
+	private String repoOwner;
+	private String repoName;
 
     List<Branches> branchesList = new ArrayList<>();
 
@@ -57,19 +64,19 @@ public class CreateReleaseActivity extends BaseActivity {
 
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
+	    tinyDb = new TinyDB(appCtx);
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        instanceUrl = tinyDb.getString("instanceUrl");
+        loginUid = tinyDb.getString("loginUid");
+        instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
+        repoOwner = parts[0];
+        repoName = parts[1];
 
         closeActivity = findViewById(R.id.close);
         releaseTagName = findViewById(R.id.releaseTagName);
@@ -78,26 +85,15 @@ public class CreateReleaseActivity extends BaseActivity {
         releaseType = findViewById(R.id.releaseType);
         releaseDraft = findViewById(R.id.releaseDraft);
 
-        releaseTagName.requestFocus();
+	    releaseTitle.requestFocus();
         assert imm != null;
-        imm.showSoftInput(releaseTagName, InputMethodManager.SHOW_IMPLICIT);
+        imm.showSoftInput(releaseTitle, InputMethodManager.SHOW_IMPLICIT);
 
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
         releaseBranch = findViewById(R.id.releaseBranch);
         getBranches(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-        releaseBranch.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                Branches branch = (Branches) parent.getSelectedItem();
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
 
         createNewRelease = findViewById(R.id.createNewRelease);
         disableProcessButton();
@@ -119,19 +115,10 @@ public class CreateReleaseActivity extends BaseActivity {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-
         String newReleaseTagName = releaseTagName.getText().toString();
         String newReleaseTitle = releaseTitle.getText().toString();
         String newReleaseContent = releaseContent.getText().toString();
-        String newReleaseBranch = releaseBranch.getSelectedItem().toString();
+	    String checkBranch = selectedBranch;
         boolean newReleaseType = releaseType.isChecked();
         boolean newReleaseDraft = releaseDraft.isChecked();
 
@@ -142,28 +129,32 @@ public class CreateReleaseActivity extends BaseActivity {
 
         }
 
+	    if(newReleaseTitle.equals("")) {
+
+		    Toasty.error(ctx, getString(R.string.titleErrorEmpty));
+		    return;
+	    }
+
         if(newReleaseTagName.equals("")) {
 
             Toasty.error(ctx, getString(R.string.tagNameErrorEmpty));
             return;
-
         }
 
-        if(newReleaseTitle.equals("")) {
+	    if(checkBranch == null) {
 
-            Toasty.error(ctx, getString(R.string.titleErrorEmpty));
-            return;
-
-        }
+	    	Toasty.error(ctx, getString(R.string.selectBranchError));
+		    return;
+	    }
 
         disableProcessButton();
-        createNewReleaseFunc(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, newReleaseBranch, newReleaseType, newReleaseDraft);
+        createNewReleaseFunc(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, selectedBranch, newReleaseType, newReleaseDraft);
 
     }
 
-    private void createNewReleaseFunc(final String instanceUrl, final String token, String repoOwner, String repoName, String newReleaseTagName, String newReleaseTitle, String newReleaseContent, String newReleaseBranch, boolean newReleaseType, boolean newReleaseDraft) {
+    private void createNewReleaseFunc(final String instanceUrl, final String token, String repoOwner, String repoName, String newReleaseTagName, String newReleaseTitle, String newReleaseContent, String selectedBranch, boolean newReleaseType, boolean newReleaseDraft) {
 
-        Releases createReleaseJson = new Releases(newReleaseContent, newReleaseDraft, newReleaseTitle, newReleaseType, newReleaseTagName, newReleaseBranch);
+        Releases createReleaseJson = new Releases(newReleaseContent, newReleaseDraft, newReleaseTitle, newReleaseType, newReleaseTagName, selectedBranch);
 
         Call<Releases> call;
 
@@ -179,12 +170,10 @@ public class CreateReleaseActivity extends BaseActivity {
 
                 if (response.code() == 201) {
 
-                    TinyDB tinyDb = new TinyDB(appCtx);
                     tinyDb.putBoolean("updateReleases", true);
                     Toasty.success(ctx, getString(R.string.releaseCreatedText));
                     enableProcessButton();
                     finish();
-
                 }
                 else if(response.code() == 401) {
 
@@ -218,6 +207,7 @@ public class CreateReleaseActivity extends BaseActivity {
 
             @Override
             public void onFailure(@NonNull Call<Releases> call, @NonNull Throwable t) {
+
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -244,23 +234,20 @@ public class CreateReleaseActivity extends BaseActivity {
 
                         assert branchesList_ != null;
                         if(branchesList_.size() > 0) {
-                            for (int i = 0; i < branchesList_.size(); i++) {
 
-                                Branches data = new Branches(
-                                        branchesList_.get(i).getName()
-                                );
-                                branchesList.add(data);
-
-                            }
+	                        branchesList.addAll(branchesList_);
                         }
 
-                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreateReleaseActivity.this,
-                                R.layout.spinner_item, branchesList);
+	                    ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreateReleaseActivity.this,
+		                    R.layout.list_spinner_items, branchesList);
 
-                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
                         releaseBranch.setAdapter(adapter);
                         enableProcessButton();
 
+	                    releaseBranch.setOnItemClickListener ((parent, view, position, id) ->
+
+		                    selectedBranch = branchesList.get(position).getName()
+	                    );
                     }
                 }
                 else if(response.code() == 401) {
@@ -276,6 +263,7 @@ public class CreateReleaseActivity extends BaseActivity {
 
             @Override
             public void onFailure(@NonNull Call<List<Branches>> call, @NonNull Throwable t) {
+
                 Log.e("onFailure", t.toString());
             }
         });
@@ -283,12 +271,8 @@ public class CreateReleaseActivity extends BaseActivity {
     }
 
     private void initCloseListener() {
-        onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        };
+
+        onClickListener = view -> finish();
     }
 
     private void disableProcessButton() {

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

@@ -2,16 +2,17 @@ package org.mian.gitnex.activities;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.Spinner;
 import androidx.annotation.NonNull;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -37,15 +38,23 @@ public class CreateRepoActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
-    private Spinner spinner;
+    private AutoCompleteTextView spinner;
     private Button createRepo;
     private EditText repoName;
     private EditText repoDesc;
     private CheckBox repoAccess;
     final Context ctx = this;
     private Context appCtx;
+    private TinyDB tinyDb;
 
-    List<OrgOwner> organizationsList = new ArrayList<>();
+    private String instanceUrl;
+	private String loginUid;
+	private String userLogin;
+	private String instanceToken;
+
+	private String selectedOwner;
+
+	List<OrgOwner> organizationsList = new ArrayList<>();
 
     //https://github.com/go-gitea/gitea/blob/52cfd2743c0e85b36081cf80a850e6a5901f1865/models/repo.go#L964-L967
     final List<String> reservedRepoNames = Arrays.asList(".", "..");
@@ -61,14 +70,14 @@ public class CreateRepoActivity extends BaseActivity {
 
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
+	    tinyDb = new TinyDB(appCtx);
 
         boolean connToInternet = AppUtil.hasNetworkConnection(ctx);
 
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String userLogin = tinyDb.getString("userLogin");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        instanceUrl = tinyDb.getString("instanceUrl");
+        loginUid = tinyDb.getString("loginUid");
+        userLogin = tinyDb.getString("userLogin");
+        instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -87,18 +96,6 @@ public class CreateRepoActivity extends BaseActivity {
         spinner = findViewById(R.id.ownerSpinner);
         getOrganizations(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), userLogin);
 
-        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                OrgOwner user = (OrgOwner) parent.getSelectedItem();
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
-
         createRepo = findViewById(R.id.createNewRepoButton);
         disableProcessButton();
 
@@ -112,24 +109,15 @@ public class CreateRepoActivity extends BaseActivity {
         }
     }
 
-    private View.OnClickListener createRepoListener = new View.OnClickListener() {
-        public void onClick(View v) {
-            processNewRepo();
-        }
-    };
+    private View.OnClickListener createRepoListener = v -> processNewRepo();
 
     private void processNewRepo() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         String newRepoName = repoName.getText().toString();
         String newRepoDesc = repoDesc.getText().toString();
-        String repoOwner = spinner.getSelectedItem().toString();
         boolean newRepoAccess = repoAccess.isChecked();
 
         if(!connToInternet) {
@@ -161,20 +149,24 @@ public class CreateRepoActivity extends BaseActivity {
         else if (reservedRepoPatterns.matcher(newRepoName).find()) {
 
             Toasty.warning(ctx, getString(R.string.repoNameErrorReservedPatterns));
+        }
+	    else if(selectedOwner == null) {
+
+		    Toasty.error(ctx, getString(R.string.repoOwnerError));
         }
         else {
 
             disableProcessButton();
-            createNewRepository(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, repoOwner, newRepoAccess);
+            createNewRepository(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, selectedOwner, newRepoAccess);
         }
     }
 
-    private void createNewRepository(final String instanceUrl, final String token, String loginUid, String repoName, String repoDesc, String repoOwner, boolean isPrivate) {
+    private void createNewRepository(final String instanceUrl, final String token, String loginUid, String repoName, String repoDesc, String selectedOwner, boolean isPrivate) {
 
         OrganizationRepository createRepository = new OrganizationRepository(true, repoDesc, null, null, repoName, isPrivate, "Default");
 
         Call<OrganizationRepository> call;
-        if(repoOwner.equals(loginUid)) {
+        if(selectedOwner.equals(loginUid)) {
 
             call = RetrofitClient
                     .getInstance(instanceUrl, ctx)
@@ -186,7 +178,7 @@ public class CreateRepoActivity extends BaseActivity {
             call = RetrofitClient
                     .getInstance(instanceUrl, ctx)
                     .getApiInterface()
-                    .createNewUserOrgRepository(token, repoOwner, createRepository);
+                    .createNewUserOrgRepository(token, selectedOwner, createRepository);
         }
 
         call.enqueue(new Callback<OrganizationRepository>() {
@@ -234,8 +226,6 @@ public class CreateRepoActivity extends BaseActivity {
 
     private void getOrganizations(String instanceUrl, String instanceToken, final String userLogin) {
 
-        TinyDB tinyDb = new TinyDB(appCtx);
-
         Call<List<OrgOwner>> call = RetrofitClient
                 .getInstance(instanceUrl, ctx)
                 .getApiInterface()
@@ -246,59 +236,58 @@ public class CreateRepoActivity extends BaseActivity {
             @Override
             public void onResponse(@NonNull Call<List<OrgOwner>> call, @NonNull retrofit2.Response<List<OrgOwner>> response) {
 
-                if(response.isSuccessful()) {
-                    if(response.code() == 200) {
+	            if(response.code() == 200) {
 
-                        int organizationId = 0;
+		            int organizationId = 0;
 
-                        List<OrgOwner> organizationsList_ = response.body();
+		            List<OrgOwner> organizationsList_ = response.body();
 
-                        organizationsList.add(new OrgOwner(userLogin));
-                        assert organizationsList_ != null;
-                        if(organizationsList_.size() > 0) {
+		            organizationsList.add(new OrgOwner(userLogin));
+		            assert organizationsList_ != null;
+		            if(organizationsList_.size() > 0) {
 
-                            for (int i = 0; i < organizationsList_.size(); i++) {
+			            for(int i = 0; i < organizationsList_.size(); i++) {
 
-                                if(!tinyDb.getString("organizationId").isEmpty()) {
+				            if(!tinyDb.getString("organizationId").isEmpty()) {
 
-                                    if (Integer.parseInt(tinyDb.getString("organizationId")) == organizationsList_.get(i).getId()) {
-                                        organizationId = i + 1;
-                                    }
-                                }
+					            if(Integer.parseInt(tinyDb.getString("organizationId")) == organizationsList_.get(i).getId()) {
+						            organizationId = i + 1;
+					            }
+				            }
 
-                                OrgOwner data = new OrgOwner(
-                                        organizationsList_.get(i).getUsername()
-                                );
-                                organizationsList.add(data);
+				            OrgOwner data = new OrgOwner(organizationsList_.get(i).getUsername());
+				            organizationsList.add(data);
 
-                            }
-                        }
+			            }
+		            }
 
-                        ArrayAdapter<OrgOwner> adapter = new ArrayAdapter<>(CreateRepoActivity.this,
-                                R.layout.spinner_item, organizationsList);
+		            ArrayAdapter<OrgOwner> adapter = new ArrayAdapter<>(CreateRepoActivity.this, R.layout.list_spinner_items, organizationsList);
 
-                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
-                        spinner.setAdapter(adapter);
+		            spinner.setAdapter(adapter);
 
-                        if (tinyDb.getBoolean("organizationAction") & organizationId != 0) {
+		            spinner.setOnItemClickListener ((parent, view, position, id) -> selectedOwner = organizationsList.get(position).getUsername());
 
-                            spinner.setSelection(organizationId);
-                            tinyDb.putBoolean("organizationAction", false);
-                        }
+		            if(tinyDb.getBoolean("organizationAction") & organizationId != 0) {
 
-                        enableProcessButton();
+			            int selectOwnerById = organizationId;
+			            new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
-                    }
-                }
-                else if(response.code() == 401) {
+				            spinner.setText(organizationsList.get(selectOwnerById).getUsername(), false);
+				            selectedOwner = organizationsList.get(selectOwnerById).getUsername();
+			            }, 500);
 
-                    enableProcessButton();
-                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
-                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-                }
+			            tinyDb.putBoolean("organizationAction", false);
+		            }
 
+		            enableProcessButton();
+	            }
+
+	            else if(response.code() == 401) {
+
+		            enableProcessButton();
+		            AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage),
+			            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+	            }
             }
 
             @Override

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

@@ -0,0 +1,486 @@
+package org.mian.gitnex.activities;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.view.View;
+import androidx.annotation.NonNull;
+import org.apache.commons.lang3.StringUtils;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.database.api.RepositoriesApi;
+import org.mian.gitnex.database.api.UserAccountsApi;
+import org.mian.gitnex.database.models.Repository;
+import org.mian.gitnex.database.models.UserAccount;
+import org.mian.gitnex.databinding.ActivityDeeplinksBinding;
+import org.mian.gitnex.helpers.PathsHelper;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.UrlHelper;
+import org.mian.gitnex.models.GiteaVersion;
+import org.mian.gitnex.models.PullRequests;
+import org.mian.gitnex.models.UserRepositories;
+import java.net.URI;
+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 DeepLinksActivity extends BaseActivity {
+
+	private ActivityDeeplinksBinding viewBinding;
+	private Context ctx = this;
+	private Context appCtx;
+	private TinyDB tinyDb;
+	private String currentInstance;
+	private String instanceToken;
+
+	private Intent mainIntent;
+	private Intent issueIntent;
+	private Intent repoIntent;
+
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_deeplinks;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+
+		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
+		tinyDb = new TinyDB(appCtx);
+
+		viewBinding = ActivityDeeplinksBinding.inflate(getLayoutInflater());
+		View view = viewBinding.getRoot();
+		setContentView(view);
+
+		mainIntent = new Intent(ctx, MainActivity.class);
+		issueIntent = new Intent(ctx, IssueDetailActivity.class);
+		repoIntent = new Intent(ctx, RepoDetailActivity.class);
+
+		Intent intent = getIntent();
+		Uri data = intent.getData();
+		assert data != null;
+
+		// check for login
+		if(!tinyDb.getBoolean("loggedInMode")) {
+
+			finish();
+			ctx.startActivity(new Intent(ctx, LoginActivity.class));
+		}
+
+		// check for the links(URI) to be in the db
+		UserAccountsApi userAccountsApi = new UserAccountsApi(ctx);
+		List<UserAccount> userAccounts = userAccountsApi.usersAccounts();
+
+		if(userAccounts.size() > 0) {
+
+			String hostUri;
+			for(int i = 0; i < userAccounts.size(); i++) {
+
+				hostUri = userAccounts.get(i).getInstanceUrl();
+
+				currentInstance = userAccounts.get(i).getInstanceUrl();
+				instanceToken = userAccounts.get(i).getToken();
+
+				if(!hostUri.contains(Objects.requireNonNull(data.getHost()))) {
+
+					// check for valid instance
+					checkInstance(data);
+					return;
+				}
+			}
+		}
+
+		// 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() > 0) {
+
+			viewBinding.progressBar.setVisibility(View.GONE);
+			String[] restOfUrl = Objects.requireNonNull(data.getPath()).split("/");
+
+			if(data.getPathSegments().contains("issues")) { // issue
+
+				if(!Objects.requireNonNull(data.getLastPathSegment()).contains("issues") & StringUtils.isNumeric(data.getLastPathSegment())) {
+
+
+					issueIntent.putExtra("issueNumber", data.getLastPathSegment());
+
+					tinyDb.putString("issueNumber", data.getLastPathSegment());
+					tinyDb.putString("issueType", "Issue");
+
+					tinyDb.putString("repoFullName", restOfUrl[restOfUrl.length - 4] + "/" + restOfUrl[restOfUrl.length - 3]);
+
+					final String repoOwner = restOfUrl[restOfUrl.length - 4];
+					final String repoName = restOfUrl[restOfUrl.length - 3];
+
+					int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+					RepositoriesApi repositoryData = new RepositoriesApi(ctx);
+
+					Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+
+					if(count == 0) {
+
+						long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+						tinyDb.putLong("repositoryId", id);
+					}
+					else {
+
+						Repository dataRepo = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+						tinyDb.putLong("repositoryId", dataRepo.getRepositoryId());
+					}
+
+					ctx.startActivity(issueIntent);
+					finish();
+				}
+				else if(Objects.requireNonNull(data.getLastPathSegment()).contains("issues")) {
+
+					new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+						goToRepoSection(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 3], restOfUrl[restOfUrl.length - 2], "issue");
+					}, 500);
+				}
+				else {
+
+					ctx.startActivity(mainIntent);
+					finish();
+				}
+			}
+			else if(data.getPathSegments().contains("pulls")) { // pr
+
+				if(!Objects.requireNonNull(data.getLastPathSegment()).contains("pulls") & StringUtils.isNumeric(data.getLastPathSegment())) {
+
+					new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+						getPullRequest(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 4], restOfUrl[restOfUrl.length - 3],
+							Integer.parseInt(data.getLastPathSegment()));
+					}, 500);
+
+				}
+				else if(Objects.requireNonNull(data.getLastPathSegment()).contains("pulls")) {
+
+					new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+						goToRepoSection(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 3], restOfUrl[restOfUrl.length - 2], "pull");
+					}, 500);
+				}
+				else {
+
+					ctx.startActivity(mainIntent);
+					finish();
+				}
+
+			}
+			else if(!restOfUrl[restOfUrl.length - 2].equals("") & !restOfUrl[restOfUrl.length - 1].equals("")) { // go to repo
+
+				new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+					goToRepoSection(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 2], restOfUrl[restOfUrl.length - 1], "repo");
+				}, 500);
+			}
+			else { // no action, show options
+
+				if(tinyDb.getInt("defaultScreenId") == 1) { // repos
+
+					mainIntent.putExtra("launchFragmentByLinkHandler", "repos");
+					ctx.startActivity(mainIntent);
+					finish();
+				}
+				else if(tinyDb.getInt("defaultScreenId") == 2) { // org
+
+					mainIntent.putExtra("launchFragmentByLinkHandler", "org");
+					ctx.startActivity(mainIntent);
+					finish();
+				}
+				else if(tinyDb.getInt("defaultScreenId") == 3) { // notifications
+
+					mainIntent.putExtra("launchFragmentByLinkHandler", "notification");
+					ctx.startActivity(mainIntent);
+					finish();
+				}
+				else if(tinyDb.getInt("defaultScreenId") == 4) { // explore
+
+					mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
+					ctx.startActivity(mainIntent);
+					finish();
+				}
+				else if(tinyDb.getInt("defaultScreenId") == 0) { // show options
+
+					viewBinding.noActionFrame.setVisibility(View.VISIBLE);
+					viewBinding.addNewAccountFrame.setVisibility(View.GONE);
+
+					viewBinding.repository.setOnClickListener(repository -> {
+
+						tinyDb.putInt("defaultScreenId", 1);
+						tinyDb.putString("defaultScreenStr", getResources().getString(R.string.navRepos));
+						mainIntent.putExtra("launchFragmentByLinkHandler", "repos");
+						ctx.startActivity(mainIntent);
+						finish();
+					});
+
+					viewBinding.organization.setOnClickListener(organization -> {
+
+						tinyDb.putInt("defaultScreenId", 2);
+						tinyDb.putString("defaultScreenStr", getResources().getString(R.string.navOrgs));
+						mainIntent.putExtra("launchFragmentByLinkHandler", "org");
+						ctx.startActivity(mainIntent);
+						finish();
+					});
+
+					viewBinding.notification.setOnClickListener(notification -> {
+
+						tinyDb.putInt("defaultScreenId", 3);
+						tinyDb.putString("defaultScreenStr", getResources().getString(R.string.pageTitleNotifications));
+						mainIntent.putExtra("launchFragmentByLinkHandler", "notification");
+						ctx.startActivity(mainIntent);
+						finish();
+					});
+
+					viewBinding.explore.setOnClickListener(explore -> {
+
+						tinyDb.putInt("defaultScreenId", 4);
+						tinyDb.putString("defaultScreenStr", getResources().getString(R.string.navExplore));
+						mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
+						ctx.startActivity(mainIntent);
+						finish();
+					});
+
+					viewBinding.launchApp2.setOnClickListener(launchApp2 -> {
+
+						tinyDb.putInt("defaultScreenId", 0);
+						tinyDb.putString("defaultScreenStr", getResources().getString(R.string.generalDeepLinkSelectedText));
+						ctx.startActivity(mainIntent);
+						finish();
+					});
+				}
+			}
+		}
+		else {
+
+			ctx.startActivity(mainIntent);
+			finish();
+		}
+	}
+
+	private void checkInstance(Uri data) {
+
+		URI host;
+		if(data.getPort() > 0) {
+
+			host = UrlBuilder.fromString(UrlHelper.fixScheme(data.getHost(), "https")).withPort(data.getPort()).toUri();
+		}
+		else {
+
+			host = UrlBuilder.fromString(UrlHelper.fixScheme(data.getHost(), "https")).toUri();
+		}
+
+		URI instanceUrl = UrlBuilder.fromUri(host).withScheme(data.getScheme().toLowerCase()).withPath(PathsHelper.join(host.getPath(), "/api/v1/"))
+			.toUri();
+
+		Call<GiteaVersion> callVersion;
+		callVersion = RetrofitClient.getInstance(String.valueOf(instanceUrl), ctx).getApiInterface().getGiteaVersion();
+
+		callVersion.enqueue(new Callback<GiteaVersion>() {
+
+			@Override
+			public void onResponse(@NonNull final Call<GiteaVersion> callVersion, @NonNull retrofit2.Response<GiteaVersion> responseVersion) {
+
+				if(responseVersion.isSuccessful() || responseVersion.code() == 403) {
+
+					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.addNewAccount.setOnClickListener(addNewAccount -> {
+
+						Intent accountIntent = new Intent(ctx, AddNewAccountActivity.class);
+						startActivity(accountIntent);
+						finish();
+					});
+
+					viewBinding.openInBrowser.setOnClickListener(addNewAccount -> {
+
+						Intent intentBrowser = new Intent();
+						intentBrowser.setAction(Intent.ACTION_VIEW);
+						intentBrowser.addCategory(Intent.CATEGORY_BROWSABLE);
+						intentBrowser.setData(Uri.parse(String.valueOf(host)));
+						startActivity(intentBrowser);
+						finish();
+					});
+
+					viewBinding.launchApp.setOnClickListener(launchApp -> {
+
+						startActivity(mainIntent);
+						finish();
+					});
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<GiteaVersion> callVersion, @NonNull Throwable t) {
+
+				Toasty.error(ctx, getResources().getString(R.string.versionUnknown));
+				finish();
+			}
+		});
+	}
+
+	private void getPullRequest(String url, String token, String repoOwner, String repoName, int index) {
+
+		Call<PullRequests> call = RetrofitClient
+			.getInstance(url, ctx)
+			.getApiInterface()
+			.getPullRequestByIndex(token, repoOwner, repoName, index);
+
+		call.enqueue(new Callback<PullRequests>() {
+
+			@Override
+			public void onResponse(@NonNull Call<PullRequests> call, @NonNull retrofit2.Response<PullRequests> response) {
+
+				PullRequests prInfo = response.body();
+
+				if (response.code() == 200) {
+
+					assert prInfo != null;
+
+					issueIntent.putExtra("issueNumber", index);
+					issueIntent.putExtra("prMergeable", prInfo.isMergeable());
+
+					if(prInfo.getHead() != null) {
+
+						issueIntent.putExtra("prHeadBranch", prInfo.getHead().getRef());
+						tinyDb.putString("prHeadBranch", prInfo.getHead().getRef());
+
+						if(prInfo.getHead().getRepo() != null) {
+
+							tinyDb.putString("prIsFork", String.valueOf(prInfo.getHead().getRepo().isFork()));
+							tinyDb.putString("prForkFullName", prInfo.getHead().getRepo().getFull_name());
+						}
+						else {
+
+							// pull was done from a deleted fork
+							tinyDb.putString("prIsFork", "true");
+							tinyDb.putString("prForkFullName", ctx.getString(R.string.prDeletedFrok));
+						}
+					}
+
+					tinyDb.putString("issueNumber", String.valueOf(index));
+					tinyDb.putString("prMergeable", String.valueOf(prInfo.isMergeable()));
+					tinyDb.putString("issueType", "Pull");
+
+					tinyDb.putString("repoFullName", repoOwner + "/" + repoName);
+
+					int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+					RepositoriesApi repositoryData = new RepositoriesApi(ctx);
+
+					Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+
+					if(count == 0) {
+
+						long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+						tinyDb.putLong("repositoryId", id);
+					}
+					else {
+
+						Repository dataRepo = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+						tinyDb.putLong("repositoryId", dataRepo.getRepositoryId());
+					}
+
+					ctx.startActivity(issueIntent);
+					finish();
+				}
+
+				else {
+
+					Log.e("onFailure-links-pr", String.valueOf(response.code()));
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<PullRequests> call, @NonNull Throwable t) {
+
+				Log.e("onFailure-links-pr", t.toString());
+			}
+		});
+	}
+
+	private void goToRepoSection(String url, String token, String repoOwner, String repoName, String type) {
+
+		Call<UserRepositories> call = RetrofitClient
+			.getInstance(url, ctx)
+			.getApiInterface()
+			.getUserRepository(token, repoOwner, repoName);
+
+		call.enqueue(new Callback<UserRepositories>() {
+
+			@Override
+			public void onResponse(@NonNull Call<UserRepositories> call, @NonNull retrofit2.Response<UserRepositories> response) {
+
+				UserRepositories repoInfo = response.body();
+
+				if (response.code() == 200) {
+
+					assert repoInfo != null;
+
+					repoIntent.putExtra("repoFullName", repoInfo.getFullName());
+					repoIntent.putExtra("goToSection", "yes");
+					repoIntent.putExtra("goToSectionType", type);
+
+					tinyDb.putString("repoFullName", repoInfo.getFullName());
+					if(repoInfo.getPrivateFlag()) {
+
+						tinyDb.putString("repoType", getResources().getString(R.string.strPrivate));
+					}
+					else {
+
+						tinyDb.putString("repoType", getResources().getString(R.string.strPublic));
+					}
+					tinyDb.putBoolean("isRepoAdmin", repoInfo.getPermissions().isAdmin());
+					tinyDb.putString("repoBranch", repoInfo.getDefault_branch());
+
+					int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+					RepositoriesApi repositoryData = new RepositoriesApi(ctx);
+
+					Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+
+					if(count == 0) {
+
+						long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+						tinyDb.putLong("repositoryId", id);
+					}
+					else {
+
+						Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+						tinyDb.putLong("repositoryId", data.getRepositoryId());
+					}
+
+					ctx.startActivity(repoIntent);
+					finish();
+				}
+
+				else {
+
+					Log.e("onFailure-links", String.valueOf(response.code()));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<UserRepositories> call, @NonNull Throwable t) {
+
+				Log.e("onFailure-links", t.toString());
+			}
+		});
+	}
+}

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

@@ -4,21 +4,19 @@ import android.annotation.SuppressLint;
 import android.app.DatePickerDialog;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.Button;
-import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import com.hendraanggrian.appcompat.socialview.Mention;
-import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
-import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
@@ -28,7 +26,6 @@ import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
-import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.CreateIssue;
 import org.mian.gitnex.models.Issues;
 import org.mian.gitnex.models.Milestones;
@@ -39,7 +36,6 @@ import java.util.Calendar;
 import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
-import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -49,19 +45,27 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
     final Context ctx = this;
     private Context appCtx;
+	private TinyDB tinyDb;
     private View.OnClickListener onClickListener;
     private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 
     private EditText editIssueTitle;
-    private SocialAutoCompleteTextView editIssueDescription;
+    private EditText editIssueDescription;
     private TextView editIssueDueDate;
     private Button editIssueButton;
-    private Spinner editIssueMilestoneSpinner;
+    private AutoCompleteTextView editIssueMilestoneSpinner;
 
     private String msState = "open";
+    private int milestoneId;
 
     List<Milestones> milestonesList = new ArrayList<>();
-    private ArrayAdapter<Mention> defaultMentionAdapter;
+
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
+	private String repoOwner;
+	private String repoName;
+	private int issueIndex;
 
     @Override
     protected int getLayoutResourceId(){
@@ -73,19 +77,18 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
+	    tinyDb = new TinyDB(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
-
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+	    instanceUrl = tinyDb.getString("instanceUrl");
+        loginUid = tinyDb.getString("loginUid");
+        instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+        repoOwner = parts[0];
+        repoName = parts[1];
+        issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
 
         ImageView closeActivity = findViewById(R.id.close);
         editIssueButton = findViewById(R.id.editIssueButton);
@@ -103,13 +106,8 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
         assert imm != null;
         imm.showSoftInput(editIssueTitle, InputMethodManager.SHOW_IMPLICIT);
 
-        defaultMentionAdapter = new MentionArrayAdapter<>(this);
-        loadCollaboratorsList();
-
         editIssueMilestoneSpinner = findViewById(R.id.editIssueMilestoneSpinner);
 
-        editIssueDescription.setMentionAdapter(defaultMentionAdapter);
-
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
@@ -128,85 +126,16 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
         disableProcessButton();
         getIssue(instanceUrl, instanceToken, loginUid, repoOwner, repoName, issueIndex, resultLimit);
-
-
-    }
-
-    public void loadCollaboratorsList() {
-
-        final TinyDB tinyDb = new TinyDB(appCtx);
-
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-
-        Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
-                .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-
-        call.enqueue(new Callback<List<Collaborators>>() {
-
-            @Override
-            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
-
-                if (response.isSuccessful()) {
-
-                    assert response.body() != null;
-                    String fullName = "";
-                    for (int i = 0; i < response.body().size(); i++) {
-                        if(!response.body().get(i).getFull_name().equals("")) {
-                            fullName = response.body().get(i).getFull_name();
-                        }
-                        defaultMentionAdapter.add(
-                                new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
-                    }
-
-                } else {
-
-                    Log.i("onResponse", String.valueOf(response.code()));
-
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-                Log.i("onFailure", t.toString());
-            }
-
-        });
     }
 
     private void initCloseListener() {
-        onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        };
+
+        onClickListener = view -> finish();
     }
 
     private void processEditIssue() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
-
-        Milestones mModel = (Milestones) editIssueMilestoneSpinner.getSelectedItem();
-
-        int editIssueMilestoneId = mModel.getId();
 
         String editIssueTitleForm = editIssueTitle.getText().toString();
         String editIssueDescriptionForm = editIssueDescription.getText().toString();
@@ -226,30 +155,20 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
         }
 
-        /*if (editIssueDescriptionForm.equals("")) {
-
-            Toasty.info(ctx, getString(R.string.issueDescriptionEmpty));
-            return;
-
-        }*/
-
         if (editIssueDueDateForm.equals("")) {
             editIssueDueDateForm = null;
         } else {
             editIssueDueDateForm = (AppUtil.customDateCombine(AppUtil.customDateFormat(editIssueDueDateForm)));
         }
 
-        //Log.i("editIssueDueDateForm", String.valueOf(editIssueDueDateForm));
         disableProcessButton();
-        editIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid, editIssueTitleForm, editIssueDescriptionForm, editIssueDueDateForm, editIssueMilestoneId);
+        editIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid, editIssueTitleForm, editIssueDescriptionForm, editIssueDueDateForm, milestoneId);
 
     }
 
-    private void editIssue(String instanceUrl, String instanceToken, String repoOwner, String repoName, int issueIndex, String loginUid, String title, String description, String dueDate, int editIssueMilestoneId) {
+    private void editIssue(String instanceUrl, String instanceToken, String repoOwner, String repoName, int issueIndex, String loginUid, String title, String description, String dueDate, int milestoneId) {
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
-
-        CreateIssue issueData = new CreateIssue(title, description, dueDate, editIssueMilestoneId);
+        CreateIssue issueData = new CreateIssue(title, description, dueDate, milestoneId);
 
         Call<JsonElement> call = RetrofitClient
                 .getInstance(instanceUrl, ctx)
@@ -264,9 +183,11 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                 if(response.code() == 201) {
 
                     if(tinyDb.getString("issueType").equalsIgnoreCase("Pull")) {
+
                         Toasty.success(ctx, getString(R.string.editPrSuccessMessage));
                     }
                     else {
+
                         Toasty.success(ctx, getString(R.string.editIssueSuccessMessage));
                     }
 
@@ -302,7 +223,6 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
     }
 
-
     @Override
     public void onClick(View v) {
 
@@ -314,16 +234,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
             final int mDay = c.get(Calendar.DAY_OF_MONTH);
 
             DatePickerDialog datePickerDialog = new DatePickerDialog(this,
-                    new DatePickerDialog.OnDateSetListener() {
-
-                        @Override
-                        public void onDateSet(DatePicker view, int year,
-                                              int monthOfYear, int dayOfMonth) {
-
-                            editIssueDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth));
-
-                        }
-                    }, mYear, mMonth, mDay);
+	            (view, year, monthOfYear, dayOfMonth) -> editIssueDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth)), mYear, mMonth, mDay);
             datePickerDialog.show();
 
         }
@@ -351,9 +262,10 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                     editIssueTitle.setText(response.body().getTitle());
                     editIssueDescription.setText(response.body().getBody());
 
-                    int msId = 0;
+                    int currentMilestoneId = 0;
                     if(response.body().getMilestone() != null) {
-                        msId = response.body().getMilestone().getId();
+
+	                    currentMilestoneId = response.body().getMilestone().getId();
                     }
 
                     // get milestones list
@@ -364,14 +276,14 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                                 .getApiInterface()
                                 .getMilestones(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, 1, resultLimit, msState);
 
-                        final int finalMsId = msId;
+	                    int checkMilestoneId = currentMilestoneId;
 
-                        call_.enqueue(new Callback<List<Milestones>>() {
+	                    call_.enqueue(new Callback<List<Milestones>>() {
 
                             @Override
                             public void onResponse(@NonNull Call<List<Milestones>> call, @NonNull retrofit2.Response<List<Milestones>> response_) {
 
-                                int finalMsId1 = 0;
+                                int getSelectedMilestoneId = 0;
 
                                 if (response_.code() == 200) {
 
@@ -379,31 +291,33 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
                                     milestonesList.add(new Milestones(0, "No milestone"));
                                     assert milestonesList_ != null;
+
                                     if (milestonesList_.size() > 0) {
+
+	                                    milestonesList.addAll(milestonesList_);
+
                                         for (int i = 0; i < milestonesList_.size(); i++) {
 
-                                            Milestones data = new Milestones(
-                                                    milestonesList_.get(i).getId(),
-                                                    milestonesList_.get(i).getTitle()
-                                            );
-                                            milestonesList.add(data);
-
-                                            if(finalMsId == milestonesList_.get(i).getId()) {
-                                                finalMsId1 = i + 1;
+                                            if(checkMilestoneId == milestonesList_.get(i).getId()) {
+	                                            getSelectedMilestoneId = i + 1;
                                             }
-
                                         }
                                     }
 
-                                    ArrayAdapter<Milestones> adapter_ = new ArrayAdapter<>(EditIssueActivity.this,
-                                            R.layout.spinner_item, milestonesList);
+                                    ArrayAdapter<Milestones> adapter = new ArrayAdapter<>(EditIssueActivity.this,
+                                            R.layout.list_spinner_items, milestonesList);
 
-                                    adapter_.setDropDownViewResource(R.layout.spinner_dropdown_item);
-                                    editIssueMilestoneSpinner.setAdapter(adapter_);
+                                    editIssueMilestoneSpinner.setAdapter(adapter);
+
+	                                editIssueMilestoneSpinner.setOnItemClickListener ((parent, view, position, id) -> milestoneId = milestonesList.get(position).getId());
+
+	                                int finalMsId = getSelectedMilestoneId;
+	                                new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+		                                editIssueMilestoneSpinner.setText(milestonesList.get(finalMsId).getTitle(),false);
+		                                milestoneId = milestonesList.get(finalMsId).getId();
+	                                }, 500);
 
-                                    if(milestonesList_.size() > 0) {
-                                        editIssueMilestoneSpinner.setSelection(finalMsId1);
-                                    }
                                     enableProcessButton();
 
                                 }
@@ -412,6 +326,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
                             @Override
                             public void onFailure(@NonNull Call<List<Milestones>> call, @NonNull Throwable t) {
+
                                 Log.e("onFailure", t.toString());
                             }
                         });
@@ -444,6 +359,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
             @Override
             public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
+
                 Log.e("onFailure", t.toString());
             }
         });

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

@@ -122,7 +122,7 @@ public class FileDiffActivity extends BaseActivity {
 							toolbarTitle.setText(getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount)));
 						}
 
-						FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, fileContentsArray);
+						FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, getSupportFragmentManager(), fileContentsArray);
 						mListView.setAdapter(adapter);
 
 						mProgressBar.setVisibility(View.GONE);

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

@@ -1,43 +1,49 @@
 package org.mian.gitnex.activities;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.text.Html;
 import android.text.Spanned;
 import android.util.Log;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import com.amulyakhare.textdrawable.TextDrawable;
-import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
+import com.google.gson.JsonElement;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
+import org.mian.gitnex.actions.AssigneesActions;
+import org.mian.gitnex.actions.LabelsActions;
+import org.mian.gitnex.adapters.AssigneesListAdapter;
 import org.mian.gitnex.adapters.IssueCommentsAdapter;
+import org.mian.gitnex.adapters.LabelsListAdapter;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.databinding.ActivityIssueDetailBinding;
+import org.mian.gitnex.databinding.CustomAssigneesSelectionDialogBinding;
+import org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding;
+import org.mian.gitnex.fragments.BottomSheetReplyFragment;
 import org.mian.gitnex.fragments.BottomSheetSingleIssueFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
@@ -48,15 +54,22 @@ import org.mian.gitnex.helpers.LabelWidthCalculator;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.UserMentions;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.models.Labels;
+import org.mian.gitnex.models.UpdateIssueAssignees;
 import org.mian.gitnex.models.WatchInfo;
 import org.mian.gitnex.viewmodels.IssueCommentsViewModel;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import io.noties.markwon.AbstractMarkwonPlugin;
@@ -82,29 +95,36 @@ import retrofit2.Response;
  * Author M M Arif
  */
 
-public class IssueDetailActivity extends BaseActivity {
+public class IssueDetailActivity extends BaseActivity implements LabelsListAdapter.LabelsListAdapterListener, AssigneesListAdapter.AssigneesListAdapterListener, BottomSheetSingleIssueFragment.BottomSheetListener {
 
-	public ImageView closeActivity;
 	private IssueCommentsAdapter adapter;
-	private RecyclerView mRecyclerView;
-	private ImageView assigneeAvatar;
-	private TextView issueTitle;
-	private TextView issueDescription;
-	private TextView issueMilestone;
-	private TextView issueDueDate;
-	private TextView issueCreatedTime;
-	private HorizontalScrollView labelsScrollView;
-	private HorizontalScrollView assigneesScrollView;
-	private ScrollView scrollViewComments;
-	private TextView issueModified;
-	private ExtendedFloatingActionButton createNewComment;
 	final Context ctx = this;
 	private Context appCtx;
-	private LinearLayout labelsLayout;
-	private LinearLayout assigneesLayout;
-	private View divider;
-	private ProgressBar progressBar;
-	private ImageView issuePrState;
+	private TinyDB tinyDb;
+
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
+	private String repoOwner;
+	private String repoName;
+	private int issueIndex;
+
+	private LabelsListAdapter labelsAdapter;
+	private AssigneesListAdapter assigneesAdapter;
+
+	private List<Integer> currentLabelsIds = new ArrayList<>();
+	private List<Integer> labelsIds = new ArrayList<>();
+	private List<Labels> labelsList = new ArrayList<>();
+	private List<Collaborators> assigneesList = new ArrayList<>();
+	private List<String> assigneesListData = new ArrayList<>();
+	private List<String> currentAssignees = new ArrayList<>();
+
+	private Dialog dialogLabels;
+	private Dialog dialogAssignees;
+
+	private CustomLabelsSelectionDialogBinding labelsBinding;
+	private CustomAssigneesSelectionDialogBinding assigneesBinding;
+	private ActivityIssueDetailBinding viewBinding;
 
 	@Override
 	protected int getLayoutResourceId() {
@@ -117,80 +137,65 @@ public class IssueDetailActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 		appCtx = getApplicationContext();
+		tinyDb = new TinyDB(appCtx);
 
-		final TinyDB tinyDb = new TinyDB(appCtx);
+		viewBinding = ActivityIssueDetailBinding.inflate(getLayoutInflater());
+		View view = viewBinding.getRoot();
+		setContentView(view);
 
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+		instanceUrl = tinyDb.getString("instanceUrl");
+		loginUid = tinyDb.getString("loginUid");
+		instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 		String repoFullName = tinyDb.getString("repoFullName");
 		String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
-		final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+		repoOwner = parts[0];
+		repoName = parts[1];
+		issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
 
-		final SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);
-
-		assigneeAvatar = findViewById(R.id.assigneeAvatar);
-		issueTitle = findViewById(R.id.issueTitle);
-		issueDescription = findViewById(R.id.issueDescription);
-		issueMilestone = findViewById(R.id.issueMilestone);
-		issueDueDate = findViewById(R.id.issueDueDate);
-		issueCreatedTime = findViewById(R.id.issueCreatedTime);
-		labelsScrollView = findViewById(R.id.labelsScrollView);
-		assigneesScrollView = findViewById(R.id.assigneesScrollView);
-		scrollViewComments = findViewById(R.id.scrollViewComments);
-		issueModified = findViewById(R.id.issueModified);
-		createNewComment = findViewById(R.id.addNewComment);
-		labelsLayout = findViewById(R.id.frameLabels);
-		assigneesLayout = findViewById(R.id.frameAssignees);
-		divider = findViewById(R.id.divider);
-		progressBar = findViewById(R.id.progressBar);
-		issuePrState = findViewById(R.id.issuePrState);
-
-		Toolbar toolbar = findViewById(R.id.toolbar);
-		TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
-
-		setSupportActionBar(toolbar);
+		setSupportActionBar(viewBinding.toolbar);
 		Objects.requireNonNull(getSupportActionBar()).setTitle(repoName);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-		mRecyclerView = findViewById(R.id.recyclerView);
-		mRecyclerView.setHasFixedSize(true);
-		mRecyclerView.setNestedScrollingEnabled(false);
-		mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
+		viewBinding.recyclerView.setHasFixedSize(true);
+		viewBinding.recyclerView.setNestedScrollingEnabled(false);
+		viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
-		mRecyclerView.addItemDecoration(dividerItemDecoration);
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(viewBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
+		viewBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 
-		createNewComment.setOnClickListener(v -> startActivity(new Intent(ctx, ReplyToIssueActivity.class)));
+		viewBinding.addNewComment.setOnClickListener(v -> BottomSheetReplyFragment.newInstance(new Bundle()).show(getSupportFragmentManager(), "replyBottomSheet"));
+
+		labelsAdapter = new LabelsListAdapter(labelsList, IssueDetailActivity.this, currentLabelsIds);
+		assigneesAdapter = new AssigneesListAdapter(ctx, assigneesList, IssueDetailActivity.this, currentAssignees);
+		LabelsActions.getCurrentIssueLabels(ctx, instanceUrl, loginUid, instanceToken, repoOwner, repoName, issueIndex, currentLabelsIds);
+		AssigneesActions.getCurrentIssueAssignees(ctx, instanceUrl, loginUid, instanceToken, repoOwner, repoName, issueIndex, currentAssignees);
 
 		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 
-			scrollViewComments.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
+			viewBinding.scrollViewComments.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
 
-				if((scrollY - oldScrollY) > 0 && createNewComment.isShown()) {
-					createNewComment.setVisibility(View.GONE);
+				if((scrollY - oldScrollY) > 0 && viewBinding.addNewComment.isShown()) {
+					viewBinding.addNewComment.setVisibility(View.GONE);
 				}
 				else if((scrollY - oldScrollY) < 0) {
-					createNewComment.setVisibility(View.VISIBLE);
+					viewBinding.addNewComment.setVisibility(View.VISIBLE);
 				}
 
-				if(!scrollViewComments.canScrollVertically(1)) { // bottom
-					createNewComment.setVisibility(View.GONE);
+				if(!viewBinding.scrollViewComments.canScrollVertically(1)) { // bottom
+					viewBinding.addNewComment.setVisibility(View.GONE);
 				}
 
-				if(!scrollViewComments.canScrollVertically(-1)) { // top
-					createNewComment.setVisibility(View.VISIBLE);
+				if(!viewBinding.scrollViewComments.canScrollVertically(-1)) { // top
+					viewBinding.addNewComment.setVisibility(View.VISIBLE);
 				}
 
 			});
 
 		}
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+		viewBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
-			swipeRefresh.setRefreshing(false);
+			viewBinding.pullToRefresh.setRefreshing(false);
 			IssueCommentsViewModel
 				.loadIssueComments(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex,
 					ctx);
@@ -215,14 +220,231 @@ public class IssueDetailActivity extends BaseActivity {
 
 		}
 
-		toolbarTitle.setTypeface(myTypeface);
-		toolbarTitle.setText(repoName);
+		viewBinding.toolbarTitle.setTypeface(myTypeface);
+		viewBinding.toolbarTitle.setText(repoName);
 
 		getSingleIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
 		fetchDataAsync(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
 
 	}
 
+	@Override
+	public void onButtonClicked(String text) {
+
+		switch(text) {
+
+			case "showLabels":
+				showLabels();
+				break;
+
+			case "showAssignees":
+				showAssignees();
+				break;
+		}
+
+	}
+
+	@Override
+	public void labelsInterface(List<String> data) {
+	}
+
+	@Override
+	public void labelsIdsInterface(List<Integer> data) {
+
+		labelsIds = data;
+	}
+
+	@Override
+	public void assigneesInterface(List<String> data) {
+
+		assigneesListData = data;
+	}
+
+	private void showAssignees() {
+
+		assigneesAdapter.updateList(currentAssignees);
+		dialogAssignees = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
+		dialogAssignees.setCancelable(false);
+
+		if (dialogAssignees.getWindow() != null) {
+
+			dialogAssignees.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+		}
+
+		assigneesBinding = CustomAssigneesSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
+
+		View view = assigneesBinding.getRoot();
+		dialogAssignees.setContentView(view);
+
+		assigneesBinding.cancel.setOnClickListener(assigneesBinding_ -> {
+
+			currentAssignees = new ArrayList<>(new LinkedHashSet<>(currentAssignees));
+			assigneesListData = new ArrayList<>(new LinkedHashSet<>(assigneesListData));
+			Collections.sort(assigneesListData);
+			Collections.sort(currentAssignees);
+
+			if(!assigneesListData.equals(currentAssignees)) {
+
+				updateIssueAssignees();
+			}
+			else {
+
+				dialogAssignees.dismiss();
+			}
+		});
+
+		AssigneesActions.getRepositoryAssignees(ctx, instanceUrl, instanceToken, repoOwner, repoName, assigneesList, dialogAssignees, assigneesAdapter, assigneesBinding);
+	}
+
+	public void showLabels() {
+
+		labelsAdapter.updateList(currentLabelsIds);
+		dialogLabels = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
+		dialogLabels.setCancelable(false);
+
+		if (dialogLabels.getWindow() != null) {
+
+			dialogLabels.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+		}
+
+		labelsBinding = CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
+
+		View view = labelsBinding.getRoot();
+		dialogLabels.setContentView(view);
+
+		labelsBinding.cancel.setOnClickListener(labelsBinding_ -> {
+
+			currentLabelsIds = new ArrayList<>(new LinkedHashSet<>(currentLabelsIds));
+			labelsIds = new ArrayList<>(new LinkedHashSet<>(labelsIds));
+			Collections.sort(labelsIds);
+			Collections.sort(currentLabelsIds);
+
+			if(!labelsIds.equals(currentLabelsIds)) {
+
+				updateIssueLabels();
+			}
+			else {
+
+				dialogLabels.dismiss();
+			}
+		});
+
+		LabelsActions.getRepositoryLabels(ctx, instanceUrl, instanceToken, repoOwner, repoName, labelsList, dialogLabels, labelsAdapter, labelsBinding);
+	}
+
+	private void updateIssueAssignees() {
+
+		UpdateIssueAssignees updateAssigneeJson = new UpdateIssueAssignees(assigneesListData);
+
+		Call<JsonElement> call3;
+
+		call3 = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.patchIssueAssignees(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);
+
+		call3.enqueue(new Callback<JsonElement>() {
+
+			@Override
+			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response2) {
+
+				if(response2.code() == 201) {
+
+					Toasty.success(ctx, ctx.getString(R.string.assigneesUpdated));
+
+					dialogAssignees.dismiss();
+
+					viewBinding.frameAssignees.removeAllViews();
+					viewBinding.frameLabels.removeAllViews();
+					getSingleIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
+					currentAssignees.clear();
+					new Handler(Looper.getMainLooper()).postDelayed(() -> AssigneesActions.getCurrentIssueAssignees(ctx, instanceUrl, loginUid, instanceToken, repoOwner, repoName, issueIndex, currentAssignees), 1000);
+				}
+				else if(response2.code() == 401) {
+
+					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+						getResources().getString(R.string.alertDialogTokenRevokedMessage),
+						getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+				}
+				else if(response2.code() == 403) {
+
+					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+				}
+				else if(response2.code() == 404) {
+
+					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+				}
+				else {
+
+					Toasty.error(ctx, getString(R.string.genericError));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+				Log.e("onFailure", t.toString());
+			}
+		});
+
+	}
+
+	private void updateIssueLabels() {
+
+		Labels patchIssueLabels = new Labels(labelsIds);
+
+		Call<JsonElement> call = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.updateIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, patchIssueLabels);
+
+		call.enqueue(new Callback<JsonElement>() {
+
+			@Override
+			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+				if(response.code() == 200) {
+
+					Toasty.success(ctx, ctx.getString(R.string.labelsUpdated));
+					dialogLabels.dismiss();
+
+					viewBinding.frameAssignees.removeAllViews();
+					viewBinding.frameLabels.removeAllViews();
+					getSingleIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
+					currentLabelsIds.clear();
+					new Handler(Looper.getMainLooper()).postDelayed(() -> LabelsActions.getCurrentIssueLabels(ctx, instanceUrl, loginUid, instanceToken, repoOwner, repoName, issueIndex, currentLabelsIds), 1000);
+				}
+				else if(response.code() == 401) {
+
+					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+						getResources().getString(R.string.alertDialogTokenRevokedMessage),
+						getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+				}
+				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, getString(R.string.genericError));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+				Log.e("onFailure", t.toString());
+			}
+		});
+
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 
@@ -254,24 +476,15 @@ public class IssueDetailActivity extends BaseActivity {
 	public void onResume() {
 
 		super.onResume();
-		final TinyDB tinyDb = new TinyDB(appCtx);
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-		final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
 
 		if(tinyDb.getBoolean("commentPosted")) {
-			scrollViewComments.post(() -> {
+			viewBinding.scrollViewComments.post(() -> {
 
 				IssueCommentsViewModel
 					.loadIssueComments(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex,
 						ctx);
 
-				new Handler().postDelayed(() -> scrollViewComments.fullScroll(ScrollView.FOCUS_DOWN), 1000);
+				new Handler(Looper.getMainLooper()).postDelayed(() -> viewBinding.scrollViewComments.fullScroll(ScrollView.FOCUS_DOWN), 1000);
 
 				tinyDb.putBoolean("commentPosted", false);
 
@@ -279,7 +492,7 @@ public class IssueDetailActivity extends BaseActivity {
 		}
 
 		if(tinyDb.getBoolean("commentEdited")) {
-			scrollViewComments.post(() -> {
+			viewBinding.scrollViewComments.post(() -> {
 
 				IssueCommentsViewModel
 					.loadIssueComments(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex,
@@ -291,10 +504,10 @@ public class IssueDetailActivity extends BaseActivity {
 
 		if(tinyDb.getBoolean("singleIssueUpdate")) {
 
-			new Handler().postDelayed(() -> {
+			new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
-				assigneesLayout.removeAllViews();
-				labelsLayout.removeAllViews();
+				viewBinding.frameAssignees.removeAllViews();
+				viewBinding.frameLabels.removeAllViews();
 				getSingleIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
 				tinyDb.putBoolean("singleIssueUpdate", false);
 
@@ -304,10 +517,10 @@ public class IssueDetailActivity extends BaseActivity {
 
 		if(tinyDb.getBoolean("issueEdited")) {
 
-			new Handler().postDelayed(() -> {
+			new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
-				assigneesLayout.removeAllViews();
-				labelsLayout.removeAllViews();
+				viewBinding.frameAssignees.removeAllViews();
+				viewBinding.frameLabels.removeAllViews();
 				getSingleIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
 				tinyDb.putBoolean("issueEdited", false);
 
@@ -327,11 +540,11 @@ public class IssueDetailActivity extends BaseActivity {
 				assert issueCommentsMain != null;
 
 				if(issueCommentsMain.size() > 0) {
-					divider.setVisibility(View.VISIBLE);
+					viewBinding.divider.setVisibility(View.VISIBLE);
 				}
 
-				adapter = new IssueCommentsAdapter(ctx, issueCommentsMain);
-				mRecyclerView.setAdapter(adapter);
+				adapter = new IssueCommentsAdapter(ctx, getSupportFragmentManager(), issueCommentsMain);
+				viewBinding.recyclerView.setAdapter(adapter);
 
 			});
 
@@ -353,25 +566,25 @@ public class IssueDetailActivity extends BaseActivity {
 					Issues singleIssue = response.body();
 					assert singleIssue != null;
 
-					issuePrState.setVisibility(View.VISIBLE);
+					viewBinding.issuePrState.setVisibility(View.VISIBLE);
 					if(singleIssue.getPull_request() != null) {
 
 						if(singleIssue.getPull_request().isMerged()) { // merged
 
-							issuePrState.setImageResource(R.drawable.ic_pull_request_merged);
+							viewBinding.issuePrState.setImageResource(R.drawable.ic_pull_request_merged);
 						}
 						else if(!singleIssue.getPull_request().isMerged() && singleIssue.getState().equals("closed")) { // closed
 
-							issuePrState.setImageResource(R.drawable.ic_pull_request_closed);
+							viewBinding.issuePrState.setImageResource(R.drawable.ic_pull_request_closed);
 						}
 						else { // open
 
-							issuePrState.setImageResource(R.drawable.ic_pull_request);
+							viewBinding.issuePrState.setImageResource(R.drawable.ic_pull_request);
 						}
 					}
 					else if(singleIssue.getState().equals("closed")) { // issue closed
 
-						issuePrState.setImageResource(R.drawable.ic_issue_closed_red);
+						viewBinding.issuePrState.setImageResource(R.drawable.ic_issue_closed_red);
 					}
 
 					final Markwon markwon = Markwon.builder(Objects.requireNonNull(ctx)).usePlugin(CorePlugin.create())
@@ -424,21 +637,21 @@ public class IssueDetailActivity extends BaseActivity {
 					tinyDb.putString("singleIssueHtmlUrl", singleIssue.getHtml_url());
 
 					PicassoService.getInstance(ctx).get().load(singleIssue.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated)
-						.transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
+						.transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(viewBinding.assigneeAvatar);
 					String issueNumber_ = "<font color='" + appCtx.getResources().getColor(R.color.lightGray) + "'>" + appCtx.getResources()
 						.getString(R.string.hash) + singleIssue.getNumber() + "</font>";
-					issueTitle.setText(Html.fromHtml(issueNumber_ + " " + singleIssue.getTitle()));
+					viewBinding.issueTitle.setText(Html.fromHtml(issueNumber_ + " " + singleIssue.getTitle()));
 					String cleanIssueDescription = singleIssue.getBody().trim();
 					Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueDescription));
-					markwon.setParsedMarkdown(issueDescription, UserMentions.UserMentionsFunc(ctx, bodyWithMD, cleanIssueDescription));
+					markwon.setParsedMarkdown(viewBinding.issueDescription, UserMentions.UserMentionsFunc(ctx, bodyWithMD, cleanIssueDescription));
 
-					RelativeLayout.LayoutParams paramsDesc = (RelativeLayout.LayoutParams) issueDescription.getLayoutParams();
+					RelativeLayout.LayoutParams paramsDesc = (RelativeLayout.LayoutParams) viewBinding.issueDescription.getLayoutParams();
 
 					LinearLayout.LayoutParams params1 = new LinearLayout.LayoutParams(80, 80);
 					params1.setMargins(15, 0, 0, 0);
 
 					if(singleIssue.getAssignees() != null) {
-						assigneesScrollView.setVisibility(View.VISIBLE);
+						viewBinding.assigneesScrollView.setVisibility(View.VISIBLE);
 						for(int i = 0; i < singleIssue.getAssignees().size(); i++) {
 
 							ImageView assigneesView = new ImageView(ctx);
@@ -447,7 +660,7 @@ public class IssueDetailActivity extends BaseActivity {
 								.placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(100, 100).centerCrop()
 								.into(assigneesView);
 
-							assigneesLayout.addView(assigneesView);
+							viewBinding.frameAssignees.addView(assigneesView);
 							assigneesView.setLayoutParams(params1);
 							if(!singleIssue.getAssignees().get(i).getFull_name().equals("")) {
 								assigneesView.setOnClickListener(
@@ -461,7 +674,7 @@ public class IssueDetailActivity extends BaseActivity {
 						}
 					}
 					else {
-						assigneesScrollView.setVisibility(View.GONE);
+						viewBinding.assigneesScrollView.setVisibility(View.GONE);
 					}
 
 					LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
@@ -469,7 +682,7 @@ public class IssueDetailActivity extends BaseActivity {
 					params.setMargins(0, 0, 15, 0);
 
 					if(singleIssue.getLabels() != null) {
-						labelsScrollView.setVisibility(View.VISIBLE);
+						viewBinding.labelsScrollView.setVisibility(View.VISIBLE);
 
 						for(int i = 0; i < singleIssue.getLabels().size(); i++) {
 
@@ -478,8 +691,8 @@ public class IssueDetailActivity extends BaseActivity {
 							int color = Color.parseColor("#" + labelColor);
 
 							ImageView labelsView = new ImageView(ctx);
-							labelsLayout.setOrientation(LinearLayout.HORIZONTAL);
-							labelsLayout.setGravity(Gravity.START | Gravity.TOP);
+							viewBinding.frameLabels.setOrientation(LinearLayout.HORIZONTAL);
+							viewBinding.frameLabels.setGravity(Gravity.START | Gravity.TOP);
 							labelsView.setLayoutParams(params);
 
 							int height = AppUtil.getPixelsFromDensity(ctx, 25);
@@ -491,12 +704,12 @@ public class IssueDetailActivity extends BaseActivity {
 								.height(height).endConfig().buildRoundRect(labelName, color, AppUtil.getPixelsFromDensity(ctx, 5));
 
 							labelsView.setImageDrawable(drawable);
-							labelsLayout.addView(labelsView);
+							viewBinding.frameLabels.addView(labelsView);
 
 						}
 					}
 					else {
-						labelsScrollView.setVisibility(View.GONE);
+						viewBinding.labelsScrollView.setVisibility(View.GONE);
 					}
 
 					if(singleIssue.getDue_date() != null) {
@@ -504,80 +717,80 @@ public class IssueDetailActivity extends BaseActivity {
 						if(timeFormat.equals("normal") || timeFormat.equals("pretty")) {
 							DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", new Locale(locale));
 							String dueDate = formatter.format(singleIssue.getDue_date());
-							issueDueDate.setText(dueDate);
-							issueDueDate
+							viewBinding.issueDueDate.setText(dueDate);
+							viewBinding.issueDueDate
 								.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(singleIssue.getDue_date()), ctx));
 						}
 						else if(timeFormat.equals("normal1")) {
 							DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", new Locale(locale));
 							String dueDate = formatter.format(singleIssue.getDue_date());
-							issueDueDate.setText(dueDate);
+							viewBinding.issueDueDate.setText(dueDate);
 						}
 
 					}
 					else {
 
-						issueDueDate.setVisibility(View.GONE);
+						viewBinding.issueDueDate.setVisibility(View.GONE);
 					}
 
 					String edited;
 
 					if(!singleIssue.getUpdated_at().equals(singleIssue.getCreated_at())) {
 						edited = getString(R.string.colorfulBulletSpan) + getString(R.string.modifiedText);
-						issueModified.setVisibility(View.VISIBLE);
-						issueModified.setText(edited);
-						issueModified
+						viewBinding.issueModified.setVisibility(View.VISIBLE);
+						viewBinding.issueModified.setText(edited);
+						viewBinding.issueModified
 							.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(singleIssue.getUpdated_at()), ctx));
 					}
 					else {
-						issueModified.setVisibility(View.INVISIBLE);
+						viewBinding.issueModified.setVisibility(View.INVISIBLE);
 					}
 
 					if((singleIssue.getDue_date() == null && singleIssue.getMilestone() == null) && singleIssue.getAssignees() != null) {
 						paramsDesc.setMargins(0, 35, 0, 0);
-						issueDescription.setLayoutParams(paramsDesc);
+						viewBinding.issueDescription.setLayoutParams(paramsDesc);
 					}
 					else if(singleIssue.getDue_date() == null && singleIssue.getMilestone() == null) {
 						paramsDesc.setMargins(0, 55, 0, 0);
-						issueDescription.setLayoutParams(paramsDesc);
+						viewBinding.issueDescription.setLayoutParams(paramsDesc);
 					}
 					else if(singleIssue.getAssignees() == null) {
 						paramsDesc.setMargins(0, 35, 0, 0);
-						issueDescription.setLayoutParams(paramsDesc);
+						viewBinding.issueDescription.setLayoutParams(paramsDesc);
 					}
 					else {
 						paramsDesc.setMargins(0, 15, 0, 0);
-						issueDescription.setLayoutParams(paramsDesc);
+						viewBinding.issueDescription.setLayoutParams(paramsDesc);
 					}
 
-					issueCreatedTime.setText(TimeHelper.formatTime(singleIssue.getCreated_at(), new Locale(locale), timeFormat, ctx));
-					issueCreatedTime.setVisibility(View.VISIBLE);
+					viewBinding.issueCreatedTime.setText(TimeHelper.formatTime(singleIssue.getCreated_at(), new Locale(locale), timeFormat, ctx));
+					viewBinding.issueCreatedTime.setVisibility(View.VISIBLE);
 
 					if(timeFormat.equals("pretty")) {
-						issueCreatedTime
+						viewBinding.issueCreatedTime
 							.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(singleIssue.getCreated_at()), ctx));
 					}
 
 					if(singleIssue.getMilestone() != null) {
-						issueMilestone.setText(getString(R.string.issueMilestone, singleIssue.getMilestone().getTitle()));
+						viewBinding.issueMilestone.setVisibility(View.VISIBLE);
+						viewBinding.issueMilestone.setText(getString(R.string.issueMilestone, singleIssue.getMilestone().getTitle()));
 					}
 					else {
-						issueMilestone.setVisibility(View.GONE);
+						viewBinding.issueMilestone.setVisibility(View.GONE);
 					}
 
 					if(!singleIssue.getUser().getFull_name().equals("")) {
-						assigneeAvatar.setOnClickListener(
+						viewBinding.assigneeAvatar.setOnClickListener(
 							new ClickListener(ctx.getResources().getString(R.string.issueCreator) + singleIssue.getUser().getFull_name(), ctx));
 					}
 					else {
-						assigneeAvatar.setOnClickListener(
+						viewBinding.assigneeAvatar.setOnClickListener(
 							new ClickListener(ctx.getResources().getString(R.string.issueCreator) + singleIssue.getUser().getLogin(), ctx));
 					}
 
-					progressBar.setVisibility(View.GONE);
+					viewBinding.progressBar.setVisibility(View.GONE);
 
 				}
-
 				else if(response.code() == 401) {
 
 					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
@@ -586,6 +799,22 @@ public class IssueDetailActivity extends BaseActivity {
 						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 
 				}
+				else if(response.code() == 404) {
+
+					if(tinyDb.getString("issueType").equals("Issue")) {
+
+						Toasty.warning(ctx, getResources().getString(R.string.noDataIssueTab));
+					}
+					else if(tinyDb.getString("issueType").equals("Pull")) {
+
+						Toasty.warning(ctx, getResources().getString(R.string.noDataPullRequests));
+					}
+
+					Intent mainIntent = new Intent(ctx, MainActivity.class);
+					ctx.startActivity(mainIntent);
+					finish();
+
+				}
 
 			}
 

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

@@ -4,19 +4,15 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.RadioGroup;
-import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import com.tooltip.Tooltip;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.database.api.UserAccountsApi;
@@ -56,10 +52,10 @@ public class LoginActivity extends BaseActivity {
 
 	private Button loginButton;
 	private EditText instanceUrlET, loginUidET, loginPassword, otpCode, loginTokenCode;
-	private Spinner protocolSpinner;
-	private TextView otpInfo;
+	private AutoCompleteTextView protocolSpinner;
 	private RadioGroup loginMethod;
 	private String device_id = "token";
+	private String selectedProtocol;
 
 	@Override
 	protected int getLayoutResourceId() {
@@ -81,51 +77,47 @@ public class LoginActivity extends BaseActivity {
 		loginUidET = findViewById(R.id.login_uid);
 		loginPassword = findViewById(R.id.login_passwd);
 		otpCode = findViewById(R.id.otpCode);
-		otpInfo = findViewById(R.id.otpInfo);
-		ImageView info_button = findViewById(R.id.info);
 		protocolSpinner = findViewById(R.id.httpsSpinner);
 		loginMethod = findViewById(R.id.loginMethod);
 		loginTokenCode = findViewById(R.id.loginTokenCode);
 
 		((TextView) findViewById(R.id.appVersion)).setText(AppUtil.getAppVersion(appCtx));
 
-		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(LoginActivity.this, R.layout.spinner_item, Protocol.values());
-		adapterProtocols.setDropDownViewResource(R.layout.spinner_dropdown_item);
+		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(LoginActivity.this, R.layout.list_spinner_items, Protocol.values());
 
 		protocolSpinner.setAdapter(adapterProtocols);
-		protocolSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
 
-			public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+		protocolSpinner.setOnItemClickListener((parent, view, position, id) -> {
 
-				if(protocolSpinner.getSelectedItem() == Protocol.HTTP) {
-					Toasty.warning(ctx, getResources().getString(R.string.protocolError));
-				}
+			selectedProtocol = String.valueOf(parent.getItemAtPosition(position));
+
+			if(selectedProtocol.equals(String.valueOf(Protocol.HTTP))) {
+				Toasty.warning(ctx, getResources().getString(R.string.protocolError));
 			}
-
-			public void onNothingSelected(AdapterView<?> parent) {
-
-			}
-
 		});
 
-		info_button.setOnClickListener(
-			view -> new Tooltip.Builder(view).setText(R.string.urlInfoTooltip).setTextColor(getResources().getColor(R.color.colorWhite))
-				.setBackgroundColor(getResources().getColor(R.color.tooltipBackground)).setCancelable(true).setDismissOnClick(true).setPadding(30)
-				.setCornerRadius(R.dimen.tooltipCornor).setGravity(Gravity.BOTTOM).show());
+		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));
+			findViewById(R.id.loginTokenCodeLayout).setVisibility(View.GONE);
+		}
 
 		loginMethod.setOnCheckedChangeListener((group, checkedId) -> {
 
 			if(checkedId == R.id.loginToken) {
 
-				AppUtil.setMultiVisibility(View.GONE, loginUidET, loginPassword, otpCode, otpInfo);
-				loginTokenCode.setVisibility(View.VISIBLE);
-
+				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, loginUidET, loginPassword, otpCode, otpInfo);
-				loginTokenCode.setVisibility(View.GONE);
-
+				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);
 			}
 		});
 
@@ -158,16 +150,22 @@ public class LoginActivity extends BaseActivity {
 
 		try {
 
+			if(selectedProtocol == null) {
+
+				Toasty.error(ctx, getResources().getString(R.string.protocolEmptyError));
+				enableProcessButton();
+				return;
+			}
+
 			String loginUid = loginUidET.getText().toString();
 			String loginPass = loginPassword.getText().toString();
 			String loginToken = loginTokenCode.getText().toString().trim();
 
-			Protocol protocol = (Protocol) protocolSpinner.getSelectedItem();
 			LoginType loginType = (loginMethod.getCheckedRadioButtonId() == R.id.loginUsernamePassword) ? LoginType.BASIC : LoginType.TOKEN;
 
 			URI rawInstanceUrl = UrlBuilder.fromString(UrlHelper.fixScheme(instanceUrlET.getText().toString(), "http")).toUri();
 
-			URI instanceUrl = UrlBuilder.fromUri(rawInstanceUrl).withScheme(protocol.name().toLowerCase()).withPath(PathsHelper.join(rawInstanceUrl.getPath(), "/api/v1/"))
+			URI instanceUrl = UrlBuilder.fromUri(rawInstanceUrl).withScheme(selectedProtocol.toLowerCase()).withPath(PathsHelper.join(rawInstanceUrl.getPath(), "/api/v1/"))
 				.toUri();
 
 			tinyDB.putString("loginType", loginType.name().toLowerCase());
@@ -179,7 +177,6 @@ public class LoginActivity extends BaseActivity {
 				Toasty.error(ctx, getResources().getString(R.string.emptyFieldURL));
 				enableProcessButton();
 				return;
-
 			}
 
 			if(loginType == LoginType.BASIC) {
@@ -189,14 +186,12 @@ public class LoginActivity extends BaseActivity {
 					Toasty.warning(ctx, getResources().getString(R.string.loginOTPTypeError));
 					enableProcessButton();
 					return;
-
 				}
 
 				if(rawInstanceUrl.getUserInfo() != null) {
 
 					tinyDB.putString("basicAuthPassword", loginPass);
 					tinyDB.putBoolean("basicAuthFlag", true);
-
 				}
 
 				if(loginUid.equals("")) {
@@ -204,7 +199,6 @@ public class LoginActivity extends BaseActivity {
 					Toasty.error(ctx, getResources().getString(R.string.emptyFieldUsername));
 					enableProcessButton();
 					return;
-
 				}
 
 				if(loginPass.equals("")) {
@@ -212,7 +206,6 @@ public class LoginActivity extends BaseActivity {
 					Toasty.error(ctx, getResources().getString(R.string.emptyFieldPassword));
 					enableProcessButton();
 					return;
-
 				}
 
 				int loginOTP = (otpCode.length() > 0) ? Integer.parseInt(otpCode.getText().toString().trim()) : 0;

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

@@ -1,13 +1,11 @@
 package org.mian.gitnex.activities;
 
 import android.app.Activity;
-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Typeface;
-import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -33,11 +31,10 @@ import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.fragments.AboutFragment;
 import org.mian.gitnex.fragments.AdministrationFragment;
 import org.mian.gitnex.fragments.BottomSheetDraftsFragment;
 import org.mian.gitnex.fragments.DraftsFragment;
-import org.mian.gitnex.fragments.ExploreRepositoriesFragment;
+import org.mian.gitnex.fragments.ExploreFragment;
 import org.mian.gitnex.fragments.MyRepositoriesFragment;
 import org.mian.gitnex.fragments.NotificationsFragment;
 import org.mian.gitnex.fragments.OrganizationsFragment;
@@ -82,6 +79,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 	private TextView toolbarTitle;
 	final Context ctx = this;
 	private Context appCtx;
+	private static TinyDB tinyDb;
 	private Typeface myTypeface;
 
 	private String instanceUrl;
@@ -104,7 +102,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		super.onCreate(savedInstanceState);
 		appCtx = getApplicationContext();
 
-		final TinyDB tinyDb = new TinyDB(appCtx);
+		tinyDb = new TinyDB(appCtx);
 		tinyDb.putBoolean("noConnection", false);
 
 		Intent mainIntent = getIntent();
@@ -179,7 +177,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		else if(fragmentById instanceof OrganizationsFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
 		}
-		else if(fragmentById instanceof ExploreRepositoriesFragment) {
+		else if(fragmentById instanceof ExploreFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
 		}
 		else if(fragmentById instanceof NotificationsFragment) {
@@ -188,9 +186,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		else if(fragmentById instanceof ProfileFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
 		}
-		else if(fragmentById instanceof AboutFragment) {
-			toolbarTitle.setText(getResources().getString(R.string.pageTitleAbout));
-		}
 		else if(fragmentById instanceof DraftsFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
 		}
@@ -311,6 +306,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
+					navigationView.setCheckedItem(R.id.nav_profile);
 					drawer.closeDrawers();
 				});
 
@@ -352,6 +348,36 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			}
 		}
 
+		String launchFragmentByHandler = mainIntent.getStringExtra("launchFragmentByLinkHandler");
+
+		if(launchFragmentByHandler != null) {
+
+			mainIntent.removeExtra("launchFragmentByLinkHandler");
+
+			switch(launchFragmentByHandler) {
+
+				case "repos":
+					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();
+					navigationView.setCheckedItem(R.id.nav_organizations);
+					return;
+
+				case "notification":
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
+					navigationView.setCheckedItem(R.id.nav_notifications);
+					return;
+
+				case "explore":
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
+					navigationView.setCheckedItem(R.id.nav_explore);
+					return;
+			}
+		}
+
 		if(savedInstanceState == null) {
 
 			if(!new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.3")) {
@@ -390,7 +416,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 				case 5:
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreRepositoriesFragment()).commit();
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_explore);
 					break;
 
@@ -455,6 +481,11 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		}
 	}
 
+	public void setActionBarTitle(String title) {
+
+		toolbarTitle.setText(title);
+	}
+
 	@Override
 	public void onButtonClicked(String text) {
 
@@ -544,15 +575,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 				overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
 				break;
 
-			case R.id.nav_about:
-				toolbarTitle.setText(getResources().getString(R.string.pageTitleAbout));
-				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AboutFragment()).commit();
-				break;
-
-			case R.id.nav_rate_app:
-				rateThisApp();
-				break;
-
 			case R.id.nav_starred_repos:
 				toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
 				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new StarredRepositoriesFragment()).commit();
@@ -560,7 +582,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 			case R.id.nav_explore:
 				toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
-				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreRepositoriesFragment()).commit();
+				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
 				break;
 
 			case R.id.nav_notifications:
@@ -584,19 +606,8 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		return true;
 	}
 
-	public void rateThisApp() {
-
-		try {
-			startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + getPackageName())));
-		}
-		catch(ActivityNotFoundException e) {
-			startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + getPackageName())));
-		}
-	}
-
 	public static void logout(Activity activity, Context ctx) {
 
-		TinyDB tinyDb = new TinyDB(ctx.getApplicationContext());
 		tinyDb.putBoolean("loggedInMode", false);
 		tinyDb.remove("basicAuthPassword");
 		tinyDb.putBoolean("basicAuthFlag", false);

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

@@ -6,12 +6,9 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import com.hendraanggrian.appcompat.socialview.Mention;
-import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.ActivityMergePullRequestBinding;
@@ -21,15 +18,13 @@ import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
-import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.MergePullRequest;
 import org.mian.gitnex.models.MergePullRequestSpinner;
 import java.util.ArrayList;
-import java.util.List;
+import java.util.Objects;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Callback;
-import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -40,9 +35,17 @@ public class MergePullRequestActivity extends BaseActivity {
 	private View.OnClickListener onClickListener;
 	final Context ctx = this;
 	private Context appCtx;
+	private TinyDB tinyDb;
+
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
+	private String repoOwner;
+	private String repoName;
+	private int prIndex;
+
 	private ActivityMergePullRequestBinding viewBinding;
 
-	private ArrayAdapter<Mention> defaultMentionAdapter;
 	private String Do;
 
 	@Override
@@ -57,13 +60,22 @@ public class MergePullRequestActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 		appCtx = getApplicationContext();
+		tinyDb = new TinyDB(appCtx);
 
 		viewBinding = ActivityMergePullRequestBinding.inflate(getLayoutInflater());
 		View view = viewBinding.getRoot();
 		setContentView(view);
 
+		instanceUrl = tinyDb.getString("instanceUrl");
+		loginUid = tinyDb.getString("loginUid");
+		instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+		String repoFullName = tinyDb.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		repoOwner = parts[0];
+		repoName = parts[1];
+		prIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-		TinyDB tinyDb = new TinyDB(appCtx);
 
 		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -73,29 +85,8 @@ public class MergePullRequestActivity extends BaseActivity {
 
 		setMergeAdapter();
 
-		viewBinding.mergeSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-
-			@Override
-			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-
-				MergePullRequestSpinner mergeId = (MergePullRequestSpinner) parent.getSelectedItem();
-				Do = mergeId.getId();
-
-			}
-
-			@Override
-			public void onNothingSelected(AdapterView<?> parent) {
-
-			}
-
-		});
-
-		defaultMentionAdapter = new MentionArrayAdapter<>(this);
-		loadCollaboratorsList();
-
-		viewBinding.mergeDescription.setMentionAdapter(defaultMentionAdapter);
-
 		if(!tinyDb.getString("issueTitle").isEmpty()) {
+
 			viewBinding.toolbarTitle.setText(tinyDb.getString("issueTitle"));
 			viewBinding.mergeTitle.setText(tinyDb.getString("issueTitle") + " (#" + tinyDb.getString("issueNumber") + ")");
 		}
@@ -136,8 +127,6 @@ public class MergePullRequestActivity extends BaseActivity {
 
 	private void setMergeAdapter() {
 
-		TinyDB tinyDb = new TinyDB(appCtx);
-
 		ArrayList<MergePullRequestSpinner> mergeList = new ArrayList<>();
 
 		mergeList.add(new MergePullRequestSpinner("merge", getResources().getString(R.string.mergeOptionMerge)));
@@ -148,58 +137,14 @@ public class MergePullRequestActivity extends BaseActivity {
 			mergeList.add(new MergePullRequestSpinner("squash", getResources().getString(R.string.mergeOptionSquash)));
 		}
 
-		ArrayAdapter<MergePullRequestSpinner> adapter = new ArrayAdapter<>(MergePullRequestActivity.this, R.layout.spinner_item, mergeList);
-		adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
+		ArrayAdapter<MergePullRequestSpinner> adapter = new ArrayAdapter<>(MergePullRequestActivity.this, R.layout.list_spinner_items, mergeList);
 		viewBinding.mergeSpinner.setAdapter(adapter);
 
-	}
-
-	public void loadCollaboratorsList() {
-
-		final TinyDB tinyDb = new TinyDB(appCtx);
-
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
-
-		Call<List<Collaborators>> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-
-		call.enqueue(new Callback<List<Collaborators>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
-
-				if(response.isSuccessful()) {
-
-					assert response.body() != null;
-					String fullName = "";
-					for(int i = 0; i < response.body().size(); i++) {
-						if(!response.body().get(i).getFull_name().equals("")) {
-							fullName = response.body().get(i).getFull_name();
-						}
-						defaultMentionAdapter.add(new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
-					}
-
-				}
-				else {
-
-					Log.i("onResponse", String.valueOf(response.code()));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-
-				Log.i("onFailure", t.toString());
-			}
+		viewBinding.mergeSpinner.setOnItemClickListener ((parent, view, position, id) -> {
 
+			Do = mergeList.get(position).getId();
 		});
+
 	}
 
 	private void initCloseListener() {
@@ -211,8 +156,8 @@ public class MergePullRequestActivity extends BaseActivity {
 
 	private void processMergePullRequest() {
 
-		String mergePRDesc = viewBinding.mergeDescription.getText().toString();
-		String mergePRTitle = viewBinding.mergeTitle.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);
@@ -221,27 +166,21 @@ public class MergePullRequestActivity extends BaseActivity {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
-
 		}
 
-		disableProcessButton();
-		mergeFunction(Do, mergePRDesc, mergePRTitle, deleteBranch);
+		if(Do == null) {
 
+			Toasty.error(ctx, getResources().getString(R.string.selectMergeStrategy));
+		}
+		else {
+
+			disableProcessButton();
+			mergeFunction(Do, mergePRDesc, mergePRTitle, deleteBranch);
+		}
 	}
 
 	private void mergeFunction(String Do, String mergePRDT, String mergeTitle, boolean deleteBranch) {
 
-		final TinyDB tinyDb = new TinyDB(appCtx);
-
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
-		final int prIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
-
 		MergePullRequest mergePR = new MergePullRequest(Do, mergePRDT, mergeTitle);
 
 		Call<ResponseBody> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().mergePullRequest(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, prIndex, mergePR);
@@ -268,7 +207,6 @@ public class MergePullRequestActivity extends BaseActivity {
 							tinyDb.putBoolean("prMerged", true);
 							tinyDb.putBoolean("resumePullRequests", true);
 							finish();
-
 						}
 						else {
 
@@ -283,7 +221,6 @@ public class MergePullRequestActivity extends BaseActivity {
 							tinyDb.putBoolean("prMerged", true);
 							tinyDb.putBoolean("resumePullRequests", true);
 							finish();
-
 						}
 
 					}
@@ -293,7 +230,6 @@ public class MergePullRequestActivity extends BaseActivity {
 						tinyDb.putBoolean("prMerged", true);
 						tinyDb.putBoolean("resumePullRequests", true);
 						finish();
-
 					}
 
 				}
@@ -301,19 +237,16 @@ public class MergePullRequestActivity extends BaseActivity {
 
 					enableProcessButton();
 					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
 				}
 				else if(response.code() == 404) {
 
 					enableProcessButton();
 					Toasty.warning(ctx, getString(R.string.mergePR404ErrorMsg));
-
 				}
 				else {
 
 					enableProcessButton();
 					Toasty.error(ctx, getString(R.string.genericError));
-
 				}
 
 			}
@@ -331,11 +264,6 @@ public class MergePullRequestActivity extends BaseActivity {
 
 	private void deleteBranchFunction(String repoOwner, String repoName) {
 
-		TinyDB tinyDb = new TinyDB(appCtx);
-
-		String instanceUrl = tinyDb.getString("instanceUrl");
-		String loginUid = tinyDb.getString("loginUid");
-		String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 		String branchName = tinyDb.getString("prHeadBranch");
 
 		Call<JsonElement> call = RetrofitClient
@@ -351,7 +279,6 @@ public class MergePullRequestActivity extends BaseActivity {
 				if(response.code() == 204) {
 
 					Log.i("deleteBranch", "Branch deleted successfully");
-
 				}
 
 			}
@@ -361,7 +288,6 @@ public class MergePullRequestActivity extends BaseActivity {
 
 				Log.e("onFailure", t.toString());
 				enableProcessButton();
-
 			}
 
 		});

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

@@ -11,15 +11,12 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
-import com.hendraanggrian.appcompat.socialview.Mention;
-import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
-import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.IssueActions;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -30,13 +27,10 @@ import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.Issues;
-import java.util.List;
 import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
-import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -51,8 +45,7 @@ public class ReplyToIssueActivity extends BaseActivity {
 	private Context appCtx;
 
 	private TextView draftSaved;
-	private SocialAutoCompleteTextView addComment;
-	private ArrayAdapter<Mention> defaultMentionAdapter;
+	private EditText addComment;
 	private Button replyButton;
 	private String TAG = StaticGlobalVariables.replyToIssueActivity;
 	private long draftIdOnCreate;
@@ -79,11 +72,6 @@ public class ReplyToIssueActivity extends BaseActivity {
 		addComment = findViewById(R.id.addComment);
 		addComment.setShowSoftInputOnFocus(true);
 
-        defaultMentionAdapter = new MentionArrayAdapter<>(ctx);
-		loadCollaboratorsList();
-
-		addComment.setMentionAdapter(defaultMentionAdapter);
-
 		closeActivity = findViewById(R.id.close);
 		TextView toolbar_title = findViewById(R.id.toolbar_title);
 
@@ -121,13 +109,11 @@ public class ReplyToIssueActivity extends BaseActivity {
 			if(getIntent().getBooleanExtra("cursorToEnd", false)) {
 				addComment.setSelection(addComment.length());
 			}
-
 		}
 
 		if(getIntent().getStringExtra("draftTitle") != null) {
 
 			toolbar_title.setText(getIntent().getStringExtra("draftTitle"));
-
 		}
 
 		if(getIntent().getStringExtra("commentAction") != null && Objects.equals(getIntent().getStringExtra("commentAction"), "edit") && !Objects.equals(getIntent().getStringExtra("commentId"), "new")) {
@@ -144,14 +130,12 @@ public class ReplyToIssueActivity extends BaseActivity {
 				}
 
 				public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
 				}
 
 				public void onTextChanged(CharSequence s, int start, int before, int count) {
 
 					saveDraft(addComment.getText().toString(), commentId, draftIdOnCreate);
 					draftSaved.setVisibility(View.VISIBLE);
-
 				}
 
 			});
@@ -161,7 +145,6 @@ public class ReplyToIssueActivity extends BaseActivity {
 				disableProcessButton();
 				assert commentId != null;
 				IssueActions.editIssueComment(ctx, Integer.parseInt(commentId), addComment.getText().toString(), draftIdOnCreate);
-
 			});
 
 			return;
@@ -171,18 +154,15 @@ public class ReplyToIssueActivity extends BaseActivity {
 		addComment.addTextChangedListener(new TextWatcher() {
 
 			public void afterTextChanged(Editable s) {
-
 			}
 
 			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
 			}
 
 			public void onTextChanged(CharSequence s, int start, int before, int count) {
 
 				saveDraft(addComment.getText().toString(), "new", draftIdOnCreate);
 				draftSaved.setVisibility(View.VISIBLE);
-
 			}
 
 		});
@@ -190,12 +170,10 @@ public class ReplyToIssueActivity extends BaseActivity {
 		if(!connToInternet) {
 
 			disableProcessButton();
-
 		}
 		else {
 
 			replyButton.setOnClickListener(replyToIssue);
-
 		}
 
 	}
@@ -218,7 +196,6 @@ public class ReplyToIssueActivity extends BaseActivity {
 
 			DraftsApi.updateDraft(draftText, (int) draftIdOnCreate, commentId); //updateDraftByIssueIdAsyncTask(draftText, issueNumber, repositoryId, commentId);
 		}
-
 	}
 
 	private long returnDraftId(String draftText) {
@@ -235,57 +212,6 @@ public class ReplyToIssueActivity extends BaseActivity {
 
 	}
 
-	public void loadCollaboratorsList() {
-
-		final TinyDB tinyDb = new TinyDB(appCtx);
-
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
-
-		Call<List<Collaborators>> call = RetrofitClient
-			.getInstance(instanceUrl, ctx)
-			.getApiInterface()
-			.getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-
-		call.enqueue(new Callback<List<Collaborators>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
-
-				if (response.isSuccessful()) {
-
-					assert response.body() != null;
-					String fullName = "";
-					for(int i = 0; i < response.body().size(); i++) {
-						if(!response.body().get(i).getFull_name().equals("")) {
-							fullName = response.body().get(i).getFull_name();
-						}
-						defaultMentionAdapter.add(new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
-					}
-
-				}
-				else {
-
-					Log.i(TAG, String.valueOf(response.code()));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-
-				Log.e(TAG, t.toString());
-			}
-
-		});
-	}
-
 	private void initCloseListener() {
 
 		onClickListener = view -> finish();
@@ -302,19 +228,16 @@ public class ReplyToIssueActivity extends BaseActivity {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
-
 		}
 
 		if(newReplyDT.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.commentEmptyError));
-
 		}
 		else {
 
 			disableProcessButton();
 			replyComment(newReplyDT);
-
 		}
 
 	}

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

@@ -238,6 +238,25 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 			}
 		}
 
+		Intent mainIntent = getIntent();
+		String goToSection = mainIntent.getStringExtra("goToSection");
+		String goToSectionType = mainIntent.getStringExtra("goToSectionType");
+
+		if(goToSection != null) {
+
+			mainIntent.removeExtra("goToSection");
+			mainIntent.removeExtra("goToSectionType");
+
+			if(goToSectionType.equals("issue")) {
+
+				RepoDetailActivity.mViewPager.setCurrentItem(2);
+			}
+			else if(goToSectionType.equals("pull")) {
+
+				RepoDetailActivity.mViewPager.setCurrentItem(3);
+			}
+		}
+
 		checkRepositoryStarStatus(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repositoryOwner, repositoryName);
 		checkRepositoryWatchStatus(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repositoryOwner, repositoryName);
 

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

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
 import android.view.Menu;
@@ -106,7 +107,7 @@ public class RepoForksActivity extends BaseActivity {
 			DividerItemDecoration.VERTICAL);
 		recyclerView.addItemDecoration(dividerItemDecoration);
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
 			swipeRefresh.setRefreshing(false);
 			loadInitial(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, pageSize, resultLimit);

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

@@ -0,0 +1,94 @@
+package org.mian.gitnex.activities;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.app.AlertDialog;
+import org.mian.gitnex.R;
+import org.mian.gitnex.databinding.ActivitySettingsGeneralBinding;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class SettingsGeneralActivity extends BaseActivity {
+
+	private ActivitySettingsGeneralBinding viewBinding;
+	private Context appCtx;
+	private View.OnClickListener onClickListener;
+
+	private List<String> defaultScreen;
+	private static int defaultScreenSelectedChoice = 0;
+
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_general;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+
+		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
+
+		viewBinding = ActivitySettingsGeneralBinding.inflate(getLayoutInflater());
+		View view = viewBinding.getRoot();
+		setContentView(view);
+
+		TinyDB tinyDb = new TinyDB(appCtx);
+
+		initCloseListener();
+		viewBinding.close.setOnClickListener(onClickListener);
+
+		String[] defaultScreen_ = {getResources().getString(R.string.generalDeepLinkSelectedText), getResources().getString(R.string.navRepos), getResources().getString(R.string.navOrgs), getResources().getString(R.string.pageTitleNotifications), getResources().getString(R.string.navExplore)};
+		defaultScreen = new ArrayList<>(Arrays.asList(defaultScreen_));
+
+		String[] linksArray = new String[defaultScreen.size()];
+		defaultScreen.toArray(linksArray);
+
+		if(!tinyDb.getString("defaultScreenStr").isEmpty()) {
+			viewBinding.generalDeepLinkSelected.setText(tinyDb.getString("defaultScreenStr"));
+		}
+
+		if(defaultScreenSelectedChoice == 0) {
+			defaultScreenSelectedChoice = tinyDb.getInt("defaultScreenId");
+		}
+
+		viewBinding.setDefaultLinkHandler.setOnClickListener(setDefaultLinkHandler -> {
+
+			AlertDialog.Builder dlBuilder = new AlertDialog.Builder(SettingsGeneralActivity.this);
+			dlBuilder.setTitle(R.string.linkSelectorDialogTitle);
+
+			if(defaultScreenSelectedChoice != -1) {
+				dlBuilder.setCancelable(true);
+			}
+			else {
+				dlBuilder.setCancelable(false);
+			}
+
+			dlBuilder.setSingleChoiceItems(linksArray, defaultScreenSelectedChoice, (dialogInterfaceHomeScreen, i) -> {
+
+				defaultScreenSelectedChoice = i;
+				viewBinding.generalDeepLinkSelected.setText(linksArray[i]);
+				tinyDb.putString("defaultScreenStr", linksArray[i]);
+				tinyDb.putInt("defaultScreenId", i);
+
+				dialogInterfaceHomeScreen.dismiss();
+				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+			});
+
+			AlertDialog dlDialog = dlBuilder.create();
+			dlDialog.show();
+
+		});
+
+	}
+
+	private void initCloseListener() { onClickListener = view -> finish(); }
+}

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

@@ -12,8 +12,6 @@ import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
 import org.apache.commons.io.FileUtils;
 import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.FilesData;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
@@ -21,7 +19,6 @@ import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 import org.mian.gitnex.notifications.NotificationsMaster;
 import java.io.File;
 import java.io.IOException;
-import java.util.HashSet;
 
 /**
  * Author M M Arif
@@ -99,10 +96,7 @@ public class SettingsSecurityActivity extends BaseActivity {
 
 		// clear cache setter
 		File cacheDir = appCtx.getCacheDir();
-		long size__ = FilesData.getFileSizeRecursively(new HashSet<>(), cacheDir);
-		if(size__ > 0) {
-			clearCacheSelected.setText(String.valueOf(AppUtil.formatFileSizeInDetail(size__)));
-		}
+		clearCacheSelected.setText(FileUtils.byteCountToDisplaySize((int) FileUtils.sizeOfDirectory(cacheDir)));
 
 		// clear cache
 		clearCacheFrame.setOnClickListener(v1 -> {

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

@@ -0,0 +1,130 @@
+package org.mian.gitnex.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.models.Collaborators;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdapter.AssigneesViewHolder> {
+
+	private Context mCtx;
+	private List<Collaborators> assigneesList;
+	private List<String> assigneesStrings = new ArrayList<>();
+	private List<String> currentAssignees;
+
+	private AssigneesListAdapterListener assigneesListener;
+
+	public interface AssigneesListAdapterListener {
+
+		void assigneesInterface(List<String> data);
+	}
+
+	public AssigneesListAdapter(Context mCtx, List<Collaborators> dataMain, AssigneesListAdapterListener assigneesListener, List<String> currentAssignees) {
+
+		this.mCtx = mCtx;
+		this.assigneesList = dataMain;
+		this.assigneesListener = assigneesListener;
+		this.currentAssignees = currentAssignees;
+	}
+
+	static class AssigneesViewHolder extends RecyclerView.ViewHolder {
+
+		private CheckBox assigneesSelection;
+		private TextView assigneesName;
+		private ImageView assigneesAvatar;
+
+		private AssigneesViewHolder(View itemView) {
+			super(itemView);
+
+			assigneesSelection = itemView.findViewById(R.id.assigneesSelection);
+			assigneesName = itemView.findViewById(R.id.assigneesName);
+			assigneesAvatar = itemView.findViewById(R.id.assigneesAvatar);
+
+		}
+	}
+
+	@NonNull
+	@Override
+	public AssigneesListAdapter.AssigneesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+		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) {
+
+		Collaborators currentItem = assigneesList.get(position);
+
+		if(currentItem.getFull_name().equals("")) {
+			holder.assigneesName.setText(currentItem.getLogin());
+		}
+		else {
+			holder.assigneesName.setText(currentItem.getFull_name());
+		}
+		PicassoService
+			.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(holder.assigneesAvatar);
+
+		for(int i = 0; i < assigneesList.size(); i++) {
+
+			if(assigneesStrings.contains(currentItem.getLogin())) {
+
+				holder.assigneesSelection.setChecked(true);
+			}
+		}
+
+		currentAssignees = new ArrayList<>(new LinkedHashSet<>(currentAssignees));
+		for(int i = 0; i < currentAssignees.size(); i++) {
+
+			if(currentAssignees.contains(currentItem.getLogin())) {
+
+				holder.assigneesSelection.setChecked(true);
+				assigneesStrings.add(currentAssignees.get(i));
+			}
+		}
+		assigneesListener.assigneesInterface(assigneesStrings);
+
+		holder.assigneesSelection.setOnCheckedChangeListener((buttonView, isChecked) -> {
+
+			if(isChecked) {
+
+				assigneesStrings.add(currentItem.getLogin());
+			}
+			else {
+
+				assigneesStrings.remove(currentItem.getLogin());
+			}
+
+			assigneesListener.assigneesInterface(assigneesStrings);
+		});
+
+		assigneesStrings = new ArrayList<>(new LinkedHashSet<>(assigneesStrings));
+	}
+
+	@Override
+	public int getItemCount() {
+		return assigneesList.size();
+	}
+
+	public void updateList(List<String> list) {
+
+		currentAssignees = list;
+		notifyDataSetChanged();
+	}
+}

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

@@ -2,7 +2,7 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
+import android.os.Bundle;
 import android.text.Html;
 import android.text.Spanned;
 import android.view.LayoutInflater;
@@ -11,11 +11,12 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ReplyToIssueActivity;
 import org.mian.gitnex.database.api.DraftsApi;
 import org.mian.gitnex.database.models.DraftWithRepository;
+import org.mian.gitnex.fragments.BottomSheetReplyFragment;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import java.util.List;
@@ -27,6 +28,7 @@ import java.util.List;
 public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsViewHolder> {
 
     private List<DraftWithRepository> draftsList;
+    private FragmentManager fragmentManager;
     private Context mCtx;
 
     class DraftsViewHolder extends RecyclerView.ViewHolder {
@@ -69,16 +71,17 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 
 	        itemView.setOnClickListener(itemEdit -> {
 
-                Intent intent = new Intent(mCtx, ReplyToIssueActivity.class);
-                intent.putExtra("commentBody", draftText.getText().toString());
-                intent.putExtra("issueNumber", issueNumber.getText().toString());
-                intent.putExtra("repositoryId", repoId.getText().toString());
-                intent.putExtra("draftTitle", repoInfo.getText().toString());
-		        intent.putExtra("commentId", commentId.getText().toString());
-		        intent.putExtra("draftId", draftId.getText().toString());
+		        Bundle bundle = new Bundle();
 
-                if(!commentId.getText().toString().equalsIgnoreCase("")) {
-	                intent.putExtra("commentAction", "edit");
+                bundle.putString("commentBody", draftText.getText().toString());
+                bundle.putString("issueNumber", issueNumber.getText().toString());
+                bundle.putString("repositoryId", repoId.getText().toString());
+                bundle.putString("draftTitle", repoInfo.getText().toString());
+		        bundle.putString("commentId", commentId.getText().toString());
+		        bundle.putString("draftId", draftId.getText().toString());
+
+                if(!commentId.getText().toString().isEmpty()) {
+	                bundle.putString("commentAction", "edit");
                 }
 
                 TinyDB tinyDb = new TinyDB(mCtx);
@@ -86,7 +89,7 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
                 tinyDb.putLong("repositoryId", Long.parseLong(repoId.getText().toString()));
                 //tinyDb.putString("issueType", issueType.getText().toString());
 
-                mCtx.startActivity(intent);
+		        BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
 
             });
 
@@ -94,8 +97,9 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 
     }
 
-    public DraftsAdapter(Context mCtx, List<DraftWithRepository> draftsListMain) {
+    public DraftsAdapter(Context mCtx, FragmentManager fragmentManager, List<DraftWithRepository> draftsListMain) {
         this.mCtx = mCtx;
+        this.fragmentManager = fragmentManager;
         this.draftsList = draftsListMain;
     }
 

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

@@ -318,4 +318,9 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 		return searchedReposList.size();
 	}
 
+	public void notifyDataChanged() {
+
+		notifyDataSetChanged();
+	}
+
 }

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

@@ -10,8 +10,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+import org.apache.commons.io.FileUtils;
 import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Files;
 import java.util.ArrayList;
@@ -165,7 +165,7 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 	        holder.dirTypeImage.setVisibility(View.GONE);
 	        holder.unknownTypeImage.setVisibility(View.GONE);
             holder.fileInfo.setVisibility(View.VISIBLE);
-            holder.fileInfo.setText(AppUtil.formatFileSizeInDetail(currentItem.getSize()));
+            holder.fileInfo.setText(FileUtils.byteCountToDisplaySize(currentItem.getSize()));
         }
         else if(currentItem.getType().equals("dir")) {
 	        holder.dirTypeImage.setVisibility(View.VISIBLE);

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

@@ -2,8 +2,8 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
 import android.graphics.Typeface;
+import android.os.Bundle;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,8 +12,9 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import androidx.fragment.app.FragmentManager;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ReplyToIssueActivity;
+import org.mian.gitnex.fragments.BottomSheetReplyFragment;
 import org.mian.gitnex.helpers.DiffTextView;
 import org.mian.gitnex.models.FileDiffView;
 import java.util.List;
@@ -36,11 +37,13 @@ public class FilesDiffAdapter extends BaseAdapter {
 	private static int COLOR_FONT;
 
 	private Context context;
+	private FragmentManager fragmentManager;
 	private List<FileDiffView> fileDiffViews;
 
-	public FilesDiffAdapter(Context context, List<FileDiffView> fileDiffViews) {
+	public FilesDiffAdapter(Context context, FragmentManager fragmentManager, List<FileDiffView> fileDiffViews) {
 
 		this.context = context;
+		this.fragmentManager = fragmentManager;
 		this.fileDiffViews = fileDiffViews;
 
 		selectedViews = new ConcurrentSkipListMap<>();
@@ -201,12 +204,11 @@ public class FilesDiffAdapter extends BaseAdapter {
 
 								selectedViews.clear();
 
-								Intent intent = new Intent(context, ReplyToIssueActivity.class);
-								intent.putExtra("commentBody", stringBuilder.toString());
-								intent.putExtra("cursorToEnd", true);
-								intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+								Bundle bundle = new Bundle();
+								bundle.putString("commentBody", stringBuilder.toString());
+								bundle.putBoolean("cursorToEnd", true);
 
-								context.startActivity(intent);
+								BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
 
 							}
 

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

@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Bundle;
 import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,14 +15,15 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.gson.JsonElement;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ReplyToIssueActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.fragments.BottomSheetReplyFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
@@ -60,11 +62,13 @@ import retrofit2.Callback;
 public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdapter.IssueCommentViewHolder> {
 
 	private List<IssueComments> issuesComments;
+	private FragmentManager fragmentManager;
 	private Context mCtx;
 
-	public IssueCommentsAdapter(Context mCtx, List<IssueComments> issuesCommentsMain) {
+	public IssueCommentsAdapter(Context mCtx, FragmentManager fragmentManager, List<IssueComments> issuesCommentsMain) {
 
 		this.mCtx = mCtx;
+		this.fragmentManager = fragmentManager;
 		this.issuesComments = issuesCommentsMain;
 
 	}
@@ -126,11 +130,12 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 				commentMenuEdit.setOnClickListener(ediComment -> {
 
-					Intent intent = new Intent(ctx, ReplyToIssueActivity.class);
-					intent.putExtra("commentId", commendId.getText());
-					intent.putExtra("commentAction", "edit");
-					intent.putExtra("commentBody", commendBodyRaw.getText());
-					ctx.startActivity(intent);
+					Bundle bundle = new Bundle();
+					bundle.putString("commentId", commendId.getText().toString());
+					bundle.putString("commentAction", "edit");
+					bundle.putString("commentBody", commendBodyRaw.getText().toString());
+
+					BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
 					dialog.dismiss();
 
 				});
@@ -187,13 +192,12 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 					stringBuilder.append("\n");
 
-					Intent intent = new Intent(ctx, ReplyToIssueActivity.class);
-					intent.putExtra("commentBody", stringBuilder.toString());
-					intent.putExtra("cursorToEnd", true);
-					intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+					Bundle bundle = new Bundle();
+					bundle.putString("commentBody", stringBuilder.toString());
+					bundle.putBoolean("cursorToEnd", true);
 
 					dialog.dismiss();
-					ctx.startActivity(intent);
+					BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
 
 				});
 

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

@@ -1,14 +1,18 @@
 package org.mian.gitnex.adapters;
 
+import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.models.Labels;
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
 
 /**
@@ -17,32 +21,38 @@ import java.util.List;
 
 public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.LabelsViewHolder> {
 
+	private List<Integer> currentLabelsIds;
 	private List<Labels> labels;
-	private ArrayList<String> labelsStrings = new ArrayList<>();
-	private ArrayList<Integer> labelsIds = new ArrayList<>();
+	private List<String> labelsStrings = new ArrayList<>();
+	private List<Integer> labelsIds = new ArrayList<>();
 
 	private LabelsListAdapterListener labelsListener;
 
 	public interface LabelsListAdapterListener {
 
-		void labelsStringData(ArrayList<String> data);
-		void labelsIdsData(ArrayList<Integer> data);
+		void labelsInterface(List<String> data);
+		void labelsIdsInterface(List<Integer> data);
 	}
 
-	public LabelsListAdapter(List<Labels> labelsMain, LabelsListAdapterListener labelsListener) {
+	public LabelsListAdapter(List<Labels> labelsMain, LabelsListAdapterListener labelsListener, List<Integer> currentLabelsIds) {
 
 		this.labels = labelsMain;
 		this.labelsListener = labelsListener;
+		this.currentLabelsIds = currentLabelsIds;
 	}
 
 	static class LabelsViewHolder extends RecyclerView.ViewHolder {
 
 		private CheckBox labelSelection;
+		private TextView labelText;
+		private ImageView labelColor;
 
 		private LabelsViewHolder(View itemView) {
 			super(itemView);
 
 			labelSelection = itemView.findViewById(R.id.labelSelection);
+			labelText = itemView.findViewById(R.id.labelText);
+			labelColor = itemView.findViewById(R.id.labelColor);
 
 		}
 	}
@@ -60,7 +70,11 @@ public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.La
 
 		Labels currentItem = labels.get(position);
 
-		holder.labelSelection.setText(currentItem.getName());
+		String labelColor = currentItem.getColor();
+		int color = Color.parseColor("#" + labelColor);
+
+		holder.labelText.setText(currentItem.getName());
+		holder.labelColor.setBackgroundColor(color);
 
 		for(int i = 0; i < labelsIds.size(); i++) {
 
@@ -70,6 +84,17 @@ public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.La
 			}
 		}
 
+		currentLabelsIds = new ArrayList<>(new LinkedHashSet<>(currentLabelsIds));
+		for(int i = 0; i < currentLabelsIds.size(); i++) {
+
+			if(currentLabelsIds.contains(currentItem.getId())) {
+
+				holder.labelSelection.setChecked(true);
+				labelsIds.add(currentLabelsIds.get(i));
+			}
+		}
+		labelsListener.labelsIdsInterface(labelsIds);
+
 		holder.labelSelection.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
 			if(isChecked) {
@@ -83,13 +108,21 @@ public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.La
 				labelsIds.remove(Integer.valueOf(currentItem.getId()));
 			}
 
-			labelsListener.labelsStringData(labelsStrings);
-			labelsListener.labelsIdsData(labelsIds);
+			labelsListener.labelsInterface(labelsStrings);
+			labelsListener.labelsIdsInterface(labelsIds);
 		});
+
+		labelsIds = new ArrayList<>(new LinkedHashSet<>(labelsIds));
 	}
 
 	@Override
 	public int getItemCount() {
 		return labels.size();
 	}
+
+	public void updateList(List<Integer> list) {
+
+		currentLabelsIds = list;
+		notifyDataSetChanged();
+	}
 }

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

@@ -1,190 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.Typeface;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.style.TextAppearanceSpan;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.AppCompatCheckBox;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.MultiSelectDialog;
-import org.mian.gitnex.models.MultiSelectModel;
-import java.util.List;
-
-/**
- * Author com.github.abumoallim, modified by M M Arif
- */
-
-public class MutliSelectAdapter extends RecyclerView.Adapter<MutliSelectAdapter.MultiSelectDialogViewHolder> {
-
-    private List<MultiSelectModel> mDataSet;
-    private String mSearchQuery = "";
-    private Context mContext;
-
-    public MutliSelectAdapter(List<MultiSelectModel> dataSet, Context context) {
-        this.mDataSet = dataSet;
-        this.mContext = context;
-    }
-
-    @NonNull
-    @Override
-    public MultiSelectDialogViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.multi_select_item, parent, false);
-        return new MultiSelectDialogViewHolder(view);
-
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull final MultiSelectDialogViewHolder holder, int position) {
-
-        if (!mSearchQuery.equals("") && mSearchQuery.length() > 1) {
-            setHighlightedText(position, holder.dialog_name_item);
-        } else {
-            holder.dialog_name_item.setText(mDataSet.get(position).getName());
-        }
-
-        if (mDataSet.get(position).getSelected()) {
-
-            if (!MultiSelectDialog.selectedIdsForCallback.contains(mDataSet.get(position).getId())) {
-                MultiSelectDialog.selectedIdsForCallback.add(mDataSet.get(position).getId());
-            }
-        }
-
-        if (checkForSelection(mDataSet.get(position).getId())) {
-            holder.dialog_item_checkbox.setChecked(true);
-        } else {
-            holder.dialog_item_checkbox.setChecked(false);
-        }
-
-        /*holder.dialog_item_checkbox.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (holder.dialog_item_checkbox.isChecked()) {
-                    MultiSelectDialog.selectedIdsForCallback.add(mDataSet.get(holder.getAdapterPosition()).getId());
-                    holder.dialog_item_checkbox.setChecked(true);
-                } else {
-                    removeFromSelection(mDataSet.get(holder.getAdapterPosition()).getId());
-                    holder.dialog_item_checkbox.setChecked(false);
-                }
-            }
-        });*/
-
-        holder.main_container.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                if (!holder.dialog_item_checkbox.isChecked()) {
-                    MultiSelectDialog.selectedIdsForCallback.add(mDataSet.get(holder.getAdapterPosition()).getId());
-                    holder.dialog_item_checkbox.setChecked(true);
-                    mDataSet.get(holder.getAdapterPosition()).setSelected(true);
-                    notifyItemChanged(holder.getAdapterPosition());
-                } else {
-                    removeFromSelection(mDataSet.get(holder.getAdapterPosition()).getId());
-                    holder.dialog_item_checkbox.setChecked(false);
-                    mDataSet.get(holder.getAdapterPosition()).setSelected(false);
-                    notifyItemChanged(holder.getAdapterPosition());
-                }
-            }
-
-        });
-    }
-
-    private void setHighlightedText(int position, TextView textview) {
-
-        String name = mDataSet.get(position).getName();
-        SpannableString str = new SpannableString(name);
-        int endLength = name.toLowerCase().indexOf(mSearchQuery) + mSearchQuery.length();
-        ColorStateList highlightedColor = new ColorStateList(new int[][]{new int[]{}}, new int[]{ContextCompat.getColor(mContext, R.color.colorAccent)});
-        TextAppearanceSpan textAppearanceSpan = new TextAppearanceSpan(null, Typeface.NORMAL, -1, highlightedColor, null);
-        str.setSpan(textAppearanceSpan, name.toLowerCase().indexOf(mSearchQuery), endLength, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        textview.setText(str);
-
-    }
-
-    private void removeFromSelection(Integer id) {
-
-        for (int i = 0; i < MultiSelectDialog.selectedIdsForCallback.size(); i++) {
-            if (id.equals(MultiSelectDialog.selectedIdsForCallback.get(i))) {
-                MultiSelectDialog.selectedIdsForCallback.remove(i);
-            }
-        }
-
-    }
-
-    private boolean checkForSelection(Integer id) {
-
-        for (int i = 0; i < MultiSelectDialog.selectedIdsForCallback.size(); i++) {
-            if (id.equals(MultiSelectDialog.selectedIdsForCallback.get(i))) {
-                return true;
-            }
-        }
-        return false;
-
-    }
-
-    /*//get selected name string separated by coma
-    public String getDataString() {
-        String data = "";
-        for (int i = 0; i < mDataSet.size(); i++) {
-            if (checkForSelection(mDataSet.get(i).getId())) {
-                data = data + ", " + mDataSet.get(i).getName();
-            }
-        }
-        if (data.length() > 0) {
-            return data.substring(1);
-        } else {
-            return "";
-        }
-    }
-    //get selected name ararylist
-    public ArrayList<String> getSelectedNameList() {
-        ArrayList<String> names = new ArrayList<>();
-        for (int i = 0; i < mDataSet.size(); i++) {
-            if (checkForSelection(mDataSet.get(i).getId())) {
-                names.add(mDataSet.get(i).getName());
-            }
-        }
-        //  return names.toArray(new String[names.size()]);
-        return names;
-    }*/
-
-    @Override
-    public int getItemCount() {
-        return mDataSet.size();
-    }
-
-    public void setData(List<MultiSelectModel> data, String query, MutliSelectAdapter mutliSelectAdapter) {
-
-        this.mDataSet = data;
-        this.mSearchQuery = query;
-        mutliSelectAdapter.notifyDataSetChanged();
-
-    }
-
-    class MultiSelectDialogViewHolder extends RecyclerView.ViewHolder {
-
-        private TextView dialog_name_item;
-        private AppCompatCheckBox dialog_item_checkbox;
-        private LinearLayout main_container;
-
-        MultiSelectDialogViewHolder(View view) {
-
-            super(view);
-            dialog_name_item = view.findViewById(R.id.dialog_item_name);
-            dialog_item_checkbox = view.findViewById(R.id.dialog_item_checkbox);
-            main_container = view.findViewById(R.id.main_container);
-
-        }
-
-    }
-}

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

@@ -0,0 +1,172 @@
+package org.mian.gitnex.adapters;
+
+import android.content.Context;
+import android.content.Intent;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.IssueDetailActivity;
+import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.database.api.RepositoriesApi;
+import org.mian.gitnex.database.models.Repository;
+import org.mian.gitnex.helpers.ClickListener;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Issues;
+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 SearchIssuesAdapter extends RecyclerView.Adapter<SearchIssuesAdapter.SearchViewHolder> {
+
+	private List<Issues> searchedList;
+	private Context mCtx;
+	private TinyDB tinyDb;
+
+	public SearchIssuesAdapter(List<Issues> dataList, Context mCtx) {
+
+		this.mCtx = mCtx;
+		this.searchedList = dataList;
+		this.tinyDb = new TinyDB(mCtx);
+	}
+
+	class SearchViewHolder extends RecyclerView.ViewHolder {
+
+		private TextView issueNumber;
+		private ImageView issueAssigneeAvatar;
+		private TextView issueTitle;
+		private TextView issueCreatedTime;
+		private TextView issueCommentsCount;
+		private TextView repoFullName;
+
+		private SearchViewHolder(View itemView) {
+
+			super(itemView);
+
+			issueNumber = itemView.findViewById(R.id.issueNumber);
+			issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
+			issueTitle = itemView.findViewById(R.id.issueTitle);
+			issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
+			issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
+			repoFullName = itemView.findViewById(R.id.repoFullName);
+
+			issueTitle.setOnClickListener(v -> {
+
+				Context context = v.getContext();
+
+				Intent intent = new Intent(context, IssueDetailActivity.class);
+				intent.putExtra("issueNumber", issueNumber.getText());
+
+				tinyDb.putString("issueNumber", issueNumber.getText().toString());
+				tinyDb.putString("issueType", "Issue");
+
+				tinyDb.putString("repoFullName", repoFullName.getText().toString());
+
+				String[] parts = repoFullName.getText().toString().split("/");
+				final String repoOwner = parts[0];
+				final String repoName = parts[1];
+
+				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+				RepositoriesApi repositoryData = new RepositoriesApi(context);
+
+				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+
+				if(count == 0) {
+
+					long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+					tinyDb.putLong("repositoryId", id);
+
+				}
+				else {
+
+					Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+					tinyDb.putLong("repositoryId", data.getRepositoryId());
+
+				}
+
+				context.startActivity(intent);
+			});
+		}
+
+	}
+
+	@NonNull
+	@Override
+	public SearchIssuesAdapter.SearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_issues, parent, false);
+		return new SearchIssuesAdapter.SearchViewHolder(v);
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull final SearchIssuesAdapter.SearchViewHolder holder, int position) {
+
+		Issues currentItem = searchedList.get(position);
+
+		String locale = tinyDb.getString("locale");
+		String timeFormat = tinyDb.getString("dateFormat");
+
+		if(!currentItem.getUser().getFull_name().equals("")) {
+			holder.issueAssigneeAvatar.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.issueCreator) + currentItem.getUser().getFull_name(), mCtx));
+		}
+		else {
+			holder.issueAssigneeAvatar.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.issueCreator) + currentItem.getUser().getLogin(), mCtx));
+		}
+
+		PicassoService
+			.getInstance(mCtx).get().load(currentItem.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.issueAssigneeAvatar);
+
+		String issueNumber_ = "<font color='" + mCtx.getResources().getColor(R.color.lightGray) + "'>" + currentItem.getRepository().getFull_name() + mCtx.getResources().getString(R.string.hash) + currentItem.getNumber() + "</font>";
+		holder.issueTitle.setText(Html.fromHtml(issueNumber_ + " " + currentItem.getTitle()));
+
+		holder.issueNumber.setText(String.valueOf(currentItem.getNumber()));
+		holder.issueCommentsCount.setText(String.valueOf(currentItem.getComments()));
+		holder.repoFullName.setText(currentItem.getRepository().getFull_name());
+
+		switch(timeFormat) {
+			case "pretty": {
+				PrettyTime prettyTime = new PrettyTime(new Locale(locale));
+				String createdTime = prettyTime.format(currentItem.getCreated_at());
+				holder.issueCreatedTime.setText(createdTime);
+				holder.issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getCreated_at()), mCtx));
+				break;
+			}
+			case "normal": {
+				DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + mCtx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+				String createdTime = formatter.format(currentItem.getCreated_at());
+				holder.issueCreatedTime.setText(createdTime);
+				break;
+			}
+			case "normal1": {
+				DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + mCtx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+				String createdTime = formatter.format(currentItem.getCreated_at());
+				holder.issueCreatedTime.setText(createdTime);
+				break;
+			}
+		}
+	}
+
+	@Override
+	public int getItemCount() {
+
+		return searchedList.size();
+	}
+
+	public void notifyDataChanged() {
+
+		notifyDataSetChanged();
+	}
+}

app/src/main/java/org/mian/gitnex/database/api/DraftsApi.java

@@ -50,7 +50,7 @@ public class DraftsApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.draftsRepository, e.toString());
+			Log.e(StaticGlobalVariables.draftsApi, e.toString());
 		}
 
 		return draftId;
@@ -66,7 +66,7 @@ public class DraftsApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.draftsRepository, e.toString());
+			Log.e(StaticGlobalVariables.draftsApi, e.toString());
 		}
 
 		return draftId;
@@ -82,7 +82,7 @@ public class DraftsApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.draftsRepository, e.toString());
+			Log.e(StaticGlobalVariables.draftsApi, e.toString());
 		}
 
 		return checkDraftFlag;

app/src/main/java/org/mian/gitnex/database/api/RepositoriesApi.java

@@ -47,7 +47,7 @@ public class RepositoriesApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+			Log.e(StaticGlobalVariables.repositoriesApi, e.toString());
 		}
 
 		return repositoryId;
@@ -63,7 +63,7 @@ public class RepositoriesApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+			Log.e(StaticGlobalVariables.repositoriesApi, e.toString());
 		}
 
 		return repository;
@@ -89,7 +89,7 @@ public class RepositoriesApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+			Log.e(StaticGlobalVariables.repositoriesApi, e.toString());
 		}
 
 		return checkRepository;
@@ -105,7 +105,7 @@ public class RepositoriesApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+			Log.e(StaticGlobalVariables.repositoriesApi, e.toString());
 		}
 
 		return repository;
@@ -121,7 +121,7 @@ public class RepositoriesApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+			Log.e(StaticGlobalVariables.repositoriesApi, e.toString());
 		}
 
 		return repository;

app/src/main/java/org/mian/gitnex/database/api/UserAccountsApi.java

@@ -17,6 +17,7 @@ public class UserAccountsApi {
 
 	private static UserAccountsDao userAccountsDao;
 	private static UserAccount userAccount;
+	private static List<UserAccount> userAccounts;
 	private static Integer checkAccount;
 	private static long accountId;
 
@@ -49,7 +50,7 @@ public class UserAccountsApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.userAccountsRepository, e.toString());
+			Log.e(StaticGlobalVariables.userAccountsApi, e.toString());
 		}
 
 		return accountId;
@@ -80,7 +81,7 @@ public class UserAccountsApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.userAccountsRepository, e.toString());
+			Log.e(StaticGlobalVariables.userAccountsApi, e.toString());
 		}
 
 		return userAccount;
@@ -96,7 +97,7 @@ public class UserAccountsApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.userAccountsRepository, e.toString());
+			Log.e(StaticGlobalVariables.userAccountsApi, e.toString());
 		}
 
 		return checkAccount;
@@ -107,6 +108,22 @@ public class UserAccountsApi {
 		return userAccountsDao.fetchAllAccounts();
 	}
 
+	public List<UserAccount> usersAccounts() {
+
+		try {
+
+			Thread thread = new Thread(() -> userAccounts = userAccountsDao.userAccounts());
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(StaticGlobalVariables.userAccountsApi, e.toString());
+		}
+
+		return userAccounts;
+	}
+
 	public void deleteAccount(final int accountId) {
 
 		new Thread(() -> userAccountsDao.deleteAccount(accountId)).start();

app/src/main/java/org/mian/gitnex/database/dao/UserAccountsDao.java

@@ -20,6 +20,9 @@ public interface UserAccountsDao {
     @Query("SELECT * FROM UserAccounts ORDER BY accountId ASC")
     LiveData<List<UserAccount>> fetchAllAccounts();
 
+	@Query("SELECT * FROM UserAccounts ORDER BY accountId ASC")
+	List<UserAccount> userAccounts();
+
     @Query("SELECT COUNT(accountId) FROM UserAccounts WHERE accountName = :accountName")
     Integer getCount(String accountName);
 

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

@@ -9,6 +9,7 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.databinding.FragmentAboutBinding;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.TinyDB;
@@ -29,6 +30,8 @@ public class AboutFragment extends Fragment {
 	    viewBinding.userServerVersion.setText(tinyDb.getString("giteaVersion"));
 	    viewBinding.appBuild.setText(String.valueOf(AppUtil.getAppBuildNo(requireContext())));
 
+		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.pageTitleAbout));
+
 		viewBinding.donationLinkLiberapay.setOnClickListener(v1 -> {
 
             Intent intent = new Intent();

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

@@ -0,0 +1,214 @@
+package org.mian.gitnex.fragments;
+
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import org.mian.gitnex.R;
+import org.mian.gitnex.actions.ActionResult;
+import org.mian.gitnex.actions.IssueActions;
+import org.mian.gitnex.activities.MainActivity;
+import org.mian.gitnex.database.api.DraftsApi;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import java.util.Objects;
+
+/**
+ * @author opyale
+ */
+
+public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
+
+	private TinyDB tinyDB;
+	private DraftsApi draftsApi;
+
+	private int repositoryId;
+	private int currentActiveAccountId;
+	private int issueNumber;
+	private long draftId;
+
+	private TextView draftsHint;
+
+	@Override
+	public void onAttach(@NonNull Context context) {
+
+		tinyDB = new TinyDB(context);
+		draftsApi = new DraftsApi(context);
+
+		repositoryId = (int) tinyDB.getLong("repositoryId", 0);
+		currentActiveAccountId = tinyDB.getInt("currentActiveAccountId");
+		issueNumber = Integer.parseInt(tinyDB.getString("issueNumber"));
+
+		super.onAttach(context);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+		View view = inflater.inflate(R.layout.bottom_sheet_reply_layout, container, false);
+		Bundle arguments = requireArguments();
+
+		draftsHint = view.findViewById(R.id.drafts_hint);
+
+		EditText commentContent = view.findViewById(R.id.comment);
+		TextView toolbarTitle = view.findViewById(R.id.toolbar_title);
+		ImageButton close = view.findViewById(R.id.close);
+		ImageButton drafts = view.findViewById(R.id.drafts);
+		ImageButton send = view.findViewById(R.id.send);
+
+		send.setEnabled(false);
+
+		if(Objects.equals(arguments.getString("commentAction"), "edit")) {
+
+			send.setVisibility(View.GONE);
+		}
+
+		if(arguments.getString("draftId") != null) {
+
+			draftId = Long.parseLong(arguments.getString("draftId"));
+		}
+
+		if(!tinyDB.getString("issueTitle").isEmpty()) {
+
+			toolbarTitle.setText(tinyDB.getString("issueTitle"));
+		}
+		else if(arguments.getString("draftTitle") != null) {
+
+			toolbarTitle.setText(arguments.getString("draftTitle"));
+		}
+
+		if(arguments.getString("commentBody") != null) {
+
+			send.setEnabled(true);
+			send.setAlpha(1f);
+
+			commentContent.setText(arguments.getString("commentBody"));
+
+			if(arguments.getBoolean("cursorToEnd", false)) {
+
+				commentContent.setSelection(commentContent.length());
+			}
+		}
+
+		commentContent.requestFocus();
+		commentContent.addTextChangedListener(new TextWatcher() {
+
+			@Override
+			public void afterTextChanged(Editable s) {
+
+				String text = commentContent.getText().toString();
+
+				if(text.isEmpty()) {
+
+					send.setEnabled(false);
+					send.setAlpha(0.5f);
+					saveDraft(null, true);
+				}
+				else {
+
+					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) {}
+		});
+
+		close.setOnClickListener(v -> dismiss());
+
+		drafts.setOnClickListener(v -> {
+
+			Intent intent = new Intent(getContext(), MainActivity.class);
+			intent.putExtra("launchFragment", "drafts");
+			startActivity(intent);
+
+			dismiss();
+		});
+
+		send.setOnClickListener(v -> IssueActions
+			.reply(getContext(), commentContent.getText().toString(), issueNumber)
+			.accept((status, result) -> {
+
+				if(status == ActionResult.Status.SUCCESS) {
+
+					Toasty.success(getContext(), getString(R.string.commentSuccess));
+
+					tinyDB.putBoolean("commentPosted", true);
+					tinyDB.putBoolean("resumeIssues", true);
+					tinyDB.putBoolean("resumePullRequests", true);
+
+					if(draftId != 0 && tinyDB.getBoolean("draftsCommentsDeletionEnabled")) {
+
+						draftsApi.deleteSingleDraft((int) draftId);
+					}
+
+					dismiss();
+				}
+				else {
+
+					Toasty.error(getContext(), getString(R.string.commentError));
+					dismiss();
+				}
+			}));
+
+		return view;
+	}
+
+	private void saveDraft(String text, boolean remove) {
+
+		ValueAnimator valueAnimator = ValueAnimator.ofFloat(0f, 1f);
+		valueAnimator.setDuration(500);
+		valueAnimator.addUpdateListener(animation -> {
+
+			float value = (Float) animation.getAnimatedValue();
+
+			if(value == 0f)  {
+				draftsHint.setVisibility((remove) ? View.GONE : View.VISIBLE);
+			}
+
+			draftsHint.setAlpha(value);
+		});
+
+		if(remove) {
+
+			draftsApi.deleteSingleDraft((int) draftId);
+			draftId = 0;
+
+			valueAnimator.reverse();
+		}
+		else {
+
+			if(draftId == 0) {
+				draftId = draftsApi.insertDraft(repositoryId, currentActiveAccountId, issueNumber, text, StaticGlobalVariables.draftTypeComment, "TODO");
+			} else {
+				DraftsApi.updateDraft(text, (int) draftId, "TODO");
+			}
+
+			draftsHint.setVisibility(View.VISIBLE);
+			valueAnimator.start();
+		}
+	}
+
+	public static BottomSheetReplyFragment newInstance(Bundle bundle) {
+
+		BottomSheetReplyFragment fragment = new BottomSheetReplyFragment();
+		fragment.setArguments(bundle);
+
+		return fragment;
+	}
+}

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

@@ -14,8 +14,6 @@ import androidx.annotation.Nullable;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.IssueActions;
-import org.mian.gitnex.activities.AddRemoveAssigneesActivity;
-import org.mian.gitnex.activities.AddRemoveLabelsActivity;
 import org.mian.gitnex.activities.EditIssueActivity;
 import org.mian.gitnex.activities.FileDiffActivity;
 import org.mian.gitnex.activities.MergePullRequestActivity;
@@ -30,6 +28,8 @@ import java.util.Objects;
 
 public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
+	private BottomSheetListener bmListener;
+
 	@Nullable
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -78,42 +78,36 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 		else {
 
 			mergePullRequest.setVisibility(View.GONE);
-
 		}
 
 		mergePullRequest.setOnClickListener(v13 -> {
 
 			startActivity(new Intent(ctx, MergePullRequestActivity.class));
 			dismiss();
-
 		});
 
 		openFilesDiff.setOnClickListener(v14 -> {
 
 			startActivity(new Intent(ctx, FileDiffActivity.class));
 			dismiss();
-
 		});
 
 		editIssue.setOnClickListener(v15 -> {
 
 			startActivity(new Intent(ctx, EditIssueActivity.class));
 			dismiss();
-
 		});
 
 		editLabels.setOnClickListener(v16 -> {
 
-			startActivity(new Intent(ctx, AddRemoveLabelsActivity.class));
+			bmListener.onButtonClicked("showLabels");
 			dismiss();
-
 		});
 
 		addRemoveAssignees.setOnClickListener(v17 -> {
 
-			startActivity(new Intent(ctx, AddRemoveAssigneesActivity.class));
+			bmListener.onButtonClicked("showAssignees");
 			dismiss();
-
 		});
 
 		shareIssue.setOnClickListener(v1 -> {
@@ -125,7 +119,6 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 			startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle")));
 
 			dismiss();
-
 		});
 
 		copyIssueUrl.setOnClickListener(v12 -> {
@@ -139,7 +132,6 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 			Toasty.info(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
 
 			dismiss();
-
 		});
 
 		if(tinyDB.getString("issueType").equalsIgnoreCase("Issue")) {
@@ -183,14 +175,12 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
 			IssueActions.subscribe(ctx);
 			dismiss();
-
 		});
 
 		unsubscribeIssue.setOnClickListener(unsubscribeToIssue -> {
 
 			IssueActions.unsubscribe(ctx);
 			dismiss();
-
 		});
 
 		if(new Version(tinyDB.getString("giteaVersion")).less("1.12.0")) {
@@ -209,4 +199,23 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 		return v;
 	}
 
+	public interface BottomSheetListener {
+
+		void onButtonClicked(String text);
+	}
+
+	@Override
+	public void onAttach(@NonNull Context context) {
+
+		super.onAttach(context);
+
+		try {
+
+			bmListener = (BottomSheetListener) context;
+		}
+		catch(ClassCastException e) {
+
+			throw new ClassCastException(context.toString() + " must implement BottomSheetListener");
+		}
+	}
 }

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -19,6 +20,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.adapters.DraftsAdapter;
 import org.mian.gitnex.database.api.DraftsApi;
 import org.mian.gitnex.database.models.DraftWithRepository;
@@ -50,6 +52,8 @@ public class DraftsFragment extends Fragment {
 	    ctx = getContext();
         setHasOptionsMenu(true);
 
+	    ((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.titleDrafts));
+
         TinyDB tinyDb = new TinyDB(ctx);
 
 	    draftsList_ = new ArrayList<>();
@@ -66,11 +70,9 @@ public class DraftsFragment extends Fragment {
                 DividerItemDecoration.VERTICAL);
         mRecyclerView.addItemDecoration(dividerItemDecoration);
 
-	    adapter = new DraftsAdapter(getContext(), draftsList_);
-
+	    adapter = new DraftsAdapter(getContext(), getChildFragmentManager(), draftsList_);
 	    currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-
-        swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
 	        draftsList_.clear();
             fetchDataAsync(currentActiveAccountId);

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

@@ -0,0 +1,129 @@
+package org.mian.gitnex.fragments;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import com.google.android.material.tabs.TabLayout;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
+import org.mian.gitnex.helpers.TinyDB;
+
+/**
+ * Author M M Arif
+ */
+
+public class ExploreFragment extends Fragment {
+
+	private Context ctx;
+	private TinyDB tinyDB;
+
+	private int tabsCount;
+	public ViewPager mViewPager;
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+		View v = inflater.inflate(R.layout.fragment_explore, container,false);
+		ctx = getContext();
+		tinyDB = new TinyDB(ctx);
+
+		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navExplore));
+
+		TabLayout tabLayout = v.findViewById(R.id.tabsExplore);
+
+		ViewGroup viewGroup = (ViewGroup) tabLayout.getChildAt(0);
+		tabsCount = viewGroup.getChildCount();
+
+		Typeface myTypeface;
+
+		switch(tinyDB.getInt("customFontId", -1)) {
+
+			case 0:
+				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf");
+				break;
+
+			case 2:
+				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf");
+				break;
+
+			default:
+				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/manroperegular.ttf");
+				break;
+
+		}
+
+		for(int j = 0; j < tabsCount; j++) {
+
+			ViewGroup vgTab = (ViewGroup) viewGroup.getChildAt(j);
+			int tabChildCount = vgTab.getChildCount();
+
+			for(int i = 0; i < tabChildCount; i++) {
+
+				View tabViewChild = vgTab.getChildAt(i);
+
+				if(tabViewChild instanceof TextView) {
+					((TextView) tabViewChild).setTypeface(myTypeface);
+				}
+			}
+		}
+
+		mViewPager = v.findViewById(R.id.containerExplore);
+
+		mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
+		tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
+
+		SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getChildFragmentManager());
+		mViewPager.setAdapter(mSectionsPagerAdapter);
+
+		return v;
+	}
+
+	public class SectionsPagerAdapter extends FragmentPagerAdapter {
+
+		SectionsPagerAdapter(FragmentManager fm) {
+
+			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+		}
+
+		@NonNull
+		@Override
+		public Fragment getItem(int position) {
+
+			Fragment fragment = null;
+
+			switch(position) {
+
+				case 0: // Repositories
+					fragment = new ExploreRepositoriesFragment();
+					break;
+
+				case 1: // Issues
+					fragment = new SearchIssuesFragment();
+					break;
+			}
+
+			assert fragment != null;
+			return fragment;
+
+		}
+
+		@Override
+		public int getCount() {
+
+			return tabsCount;
+		}
+
+	}
+
+}

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

@@ -1,27 +1,37 @@
 package org.mian.gitnex.fragments;
 
+import android.app.Dialog;
 import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
-import android.widget.ProgressBar;
-import android.widget.TextView;
+import android.view.inputmethod.InputMethodManager;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.ExploreRepositoriesAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.databinding.CustomExploreRepositoriesDialogBinding;
+import org.mian.gitnex.databinding.FragmentExploreRepoBinding;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.InfiniteScrollListener;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.models.ExploreRepositories;
 import org.mian.gitnex.models.UserRepositories;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import retrofit2.Call;
@@ -29,189 +39,300 @@ import retrofit2.Callback;
 import retrofit2.Response;
 
 /**
- * Template Author Author M M Arif
+ * Template Author M M Arif
  * Author 6543
  */
 
 public class ExploreRepositoriesFragment extends Fragment {
 
-	private static String repoNameF = "param2";
-	private static String repoOwnerF = "param1";
-	private ProgressBar mProgressBar;
-	private RecyclerView mRecyclerView;
-	private TextView noData;
-	private TextView searchKeyword;
-	private Boolean repoTypeInclude = true;
+	private FragmentExploreRepoBinding viewBinding;
+	private Context ctx;
+	private TinyDB tinyDb;
+
+	private int pageCurrentIndex = 1;
+	private boolean repoTypeInclude = true;
 	private String sort = "updated";
 	private String order = "desc";
-	private int limit = 50;
+	private int limit = 10;
+	private List<UserRepositories> dataList;
+	private ExploreRepositoriesAdapter adapter;
 
-	private OnFragmentInteractionListener mListener;
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
 
-	public ExploreRepositoriesFragment() {
-
-	}
-
-	public static ExploreRepositoriesFragment newInstance(String param1, String param2) {
-
-		ExploreRepositoriesFragment fragment = new ExploreRepositoriesFragment();
-		Bundle args = new Bundle();
-		args.putString(repoOwnerF, param1);
-		args.putString(repoNameF, param2);
-		fragment.setArguments(args);
-		return fragment;
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-		if(getArguments() != null) {
-			String repoName = getArguments().getString(repoNameF);
-			String repoOwner = getArguments().getString(repoOwnerF);
-		}
-	}
+	private Dialog dialogFilterOptions;
+	private CustomExploreRepositoriesDialogBinding filterBinding;
 
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		final View v = inflater.inflate(R.layout.fragment_explore_repo, container, false);
-		//setHasOptionsMenu(true);
+		viewBinding = FragmentExploreRepoBinding.inflate(inflater, container, false);
+		setHasOptionsMenu(true);
 
-		TinyDB tinyDb = new TinyDB(getContext());
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+		ctx = getContext();
+		tinyDb = new TinyDB(getContext());
 
-		searchKeyword = v.findViewById(R.id.searchKeyword);
-		noData = v.findViewById(R.id.noData);
-		mProgressBar = v.findViewById(R.id.progress_bar);
-		mRecyclerView = v.findViewById(R.id.recyclerViewReposSearch);
+		instanceUrl = tinyDb.getString("instanceUrl");
+		loginUid = tinyDb.getString("loginUid");
+		instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-		mProgressBar.setVisibility(View.VISIBLE);
+		dataList = new ArrayList<>();
+		adapter = new ExploreRepositoriesAdapter(dataList, ctx);
 
-		searchKeyword.setOnEditorActionListener((v1, actionId, event) -> {
+		tinyDb.putBoolean("exploreRepoIncludeTopic", false);
+		tinyDb.putBoolean("exploreRepoIncludeDescription", false);
+		tinyDb.putBoolean("exploreRepoIncludeTemplate", false);
+		tinyDb.putBoolean("exploreRepoOnlyArchived", false);
+
+		// if gitea is 1.12 or higher use the new limit
+		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+			limit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+		}
+
+		LinearLayoutManager linearLayoutManager = new LinearLayoutManager(ctx);
+
+		viewBinding.recyclerViewReposSearch.setHasFixedSize(true);
+		viewBinding.recyclerViewReposSearch.setLayoutManager(linearLayoutManager);
+		viewBinding.recyclerViewReposSearch.setAdapter(adapter);
+
+		viewBinding.searchKeyword.setOnEditorActionListener((v1, actionId, event) -> {
 
 			if(actionId == EditorInfo.IME_ACTION_SEND) {
-				if(!searchKeyword.getText().toString().equals("")) {
-					mProgressBar.setVisibility(View.VISIBLE);
-					mRecyclerView.setVisibility(View.GONE);
-					loadSearchReposList(instanceUrl, instanceToken, loginUid, searchKeyword.getText().toString(), repoTypeInclude, sort, order, getContext(), limit);
+
+				if(!Objects.requireNonNull(viewBinding.searchKeyword.getText()).toString().equals("")) {
+
+					InputMethodManager imm = (InputMethodManager) requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+					imm.hideSoftInputFromWindow(viewBinding.searchKeyword.getWindowToken(), 0);
+
+					// if gitea is 1.12 or higher use the new limit
+					if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+						limit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+					}
+					else {
+						limit = 10;
+					}
+
+					pageCurrentIndex = 1;
+					viewBinding.progressBar.setVisibility(View.VISIBLE);
+					loadData(false, viewBinding.searchKeyword.getText().toString(), tinyDb.getBoolean("exploreRepoIncludeTopic"), tinyDb.getBoolean("exploreRepoIncludeDescription"), tinyDb.getBoolean("exploreRepoIncludeTemplate"), tinyDb.getBoolean("exploreRepoOnlyArchived"));
 				}
 			}
 			return false;
 		});
 
-		int limitDefault = 25;
-		loadDefaultList(instanceUrl, instanceToken, loginUid, repoTypeInclude, sort, order, getContext(), limitDefault);
-
-		return v;
-
-	}
-
-	private void loadDefaultList(String instanceUrl, String instanceToken, String loginUid, Boolean repoTypeInclude, String sort, String order, final Context context, int limit) {
-
-		Call<ExploreRepositories> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().queryRepos(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), null, repoTypeInclude, sort, order, limit);
-
-		call.enqueue(new Callback<ExploreRepositories>() {
+		viewBinding.recyclerViewReposSearch.addOnScrollListener(new InfiniteScrollListener(pageCurrentIndex, linearLayoutManager) {
 
 			@Override
-			public void onResponse(@NonNull Call<ExploreRepositories> call, @NonNull Response<ExploreRepositories> response) {
-
-				if(response.isSuccessful()) {
-					assert response.body() != null;
-					getReposList(response.body().getSearchedData(), context);
-				}
-				else {
-					Log.i("onResponse", String.valueOf(response.code()));
-				}
+			public void onScrolledToEnd(int firstVisibleItemPosition) {
 
+				pageCurrentIndex++;
+				loadData(true, Objects.requireNonNull(viewBinding.searchKeyword.getText()).toString(), tinyDb.getBoolean("exploreRepoIncludeTopic"), tinyDb.getBoolean("exploreRepoIncludeDescription"), tinyDb.getBoolean("exploreRepoIncludeTemplate"), tinyDb.getBoolean("exploreRepoOnlyArchived"));
 			}
-
-			@Override
-			public void onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) {
-
-				Log.i("onFailure", Objects.requireNonNull(t.getMessage()));
-			}
-
 		});
 
-	}
+		viewBinding.pullToRefresh.setOnRefreshListener(() -> {
 
-	private void loadSearchReposList(String instanceUrl, String instanceToken, String loginUid, String searchKeyword, Boolean repoTypeInclude, String sort, String order, final Context context, int limit) {
-
-		Call<ExploreRepositories> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().queryRepos(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), searchKeyword, repoTypeInclude, sort, order, limit);
-
-		call.enqueue(new Callback<ExploreRepositories>() {
-
-			@Override
-			public void onResponse(@NonNull Call<ExploreRepositories> call, @NonNull Response<ExploreRepositories> response) {
-
-				if(response.isSuccessful()) {
-					assert response.body() != null;
-					getReposList(response.body().getSearchedData(), context);
-				}
-				else {
-					Log.i("onResponse", String.valueOf(response.code()));
-				}
+			pageCurrentIndex = 1;
 
+			// if gitea is 1.12 or higher use the new limit
+			if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+				limit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+			}
+			else {
+				limit = 10;
 			}
 
-			@Override
-			public void onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) {
-
-				Log.i("onFailure", Objects.requireNonNull(t.getMessage()));
-			}
-
+			loadData(false, Objects.requireNonNull(viewBinding.searchKeyword.getText()).toString(), tinyDb.getBoolean("exploreRepoIncludeTopic"), tinyDb.getBoolean("exploreRepoIncludeDescription"), tinyDb.getBoolean("exploreRepoIncludeTemplate"), tinyDb.getBoolean("exploreRepoOnlyArchived"));
 		});
 
+		loadData(false, "", tinyDb.getBoolean("exploreRepoIncludeTopic"), tinyDb.getBoolean("exploreRepoIncludeDescription"), tinyDb.getBoolean("exploreRepoIncludeTemplate"), tinyDb.getBoolean("exploreRepoOnlyArchived"));
+
+		return viewBinding.getRoot();
+
 	}
 
-	private void getReposList(List<UserRepositories> dataList, Context context) {
+	private void loadData(boolean append, String searchKeyword, boolean exploreRepoIncludeTopic, boolean exploreRepoIncludeDescription, boolean exploreRepoIncludeTemplate, boolean exploreRepoOnlyArchived) {
 
-		ExploreRepositoriesAdapter adapter = new ExploreRepositoriesAdapter(dataList, context);
+		viewBinding.noData.setVisibility(View.GONE);
 
-		mRecyclerView.setVisibility(View.VISIBLE);
+		int apiCallDefaultLimit = 10;
+		// if gitea is 1.12 or higher use the new limit
+		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+			apiCallDefaultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+		}
 
-		mRecyclerView.setHasFixedSize(true);
-		mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
-		mRecyclerView.addItemDecoration(dividerItemDecoration);
+		if(apiCallDefaultLimit > limit) {
+			return;
+		}
 
-		if(adapter.getItemCount() > 0) {
-
-			mRecyclerView.setAdapter(adapter);
-			noData.setVisibility(View.GONE);
-			mProgressBar.setVisibility(View.GONE);
+		if(pageCurrentIndex == 1 || !append) {
 
+			dataList.clear();
+			adapter.notifyDataSetChanged();
+			viewBinding.pullToRefresh.setRefreshing(false);
+			viewBinding.progressBar.setVisibility(View.VISIBLE);
 		}
 		else {
 
-			noData.setVisibility(View.VISIBLE);
-			mProgressBar.setVisibility(View.GONE);
-
+			viewBinding.loadingMoreView.setVisibility(View.VISIBLE);
 		}
 
+		Call<ExploreRepositories> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().queryRepos(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), searchKeyword, repoTypeInclude, sort, order, exploreRepoIncludeTopic, exploreRepoIncludeDescription, exploreRepoIncludeTemplate, exploreRepoOnlyArchived, limit, pageCurrentIndex);
+
+		call.enqueue(new Callback<ExploreRepositories>() {
+
+			@Override
+			public void onResponse(@NonNull Call<ExploreRepositories> call, @NonNull Response<ExploreRepositories> response) {
+
+				if(response.code() == 200) {
+
+					assert response.body() != null;
+
+					limit = response.body().getSearchedData().size();
+
+					if(!append) {
+
+						dataList.clear();
+					}
+
+					dataList.addAll(response.body().getSearchedData());
+					adapter.notifyDataSetChanged();
+
+				}
+				else {
+
+					dataList.clear();
+					adapter.notifyDataChanged();
+					viewBinding.noData.setVisibility(View.VISIBLE);
+
+				}
+
+				onCleanup();
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", Objects.requireNonNull(t.getMessage()));
+				onCleanup();
+
+			}
+
+			private void onCleanup() {
+
+				AppUtil.setMultiVisibility(View.GONE, viewBinding.loadingMoreView, viewBinding.progressBar);
+
+				if(dataList.isEmpty()) {
+
+					viewBinding.noData.setVisibility(View.VISIBLE);
+				}
+			}
+		});
+	}
+
+	@Override
+	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+
+		menu.clear();
+		inflater.inflate(R.menu.filter_menu, menu);
+		super.onCreateOptionsMenu(menu, inflater);
+
+		MenuItem filter = menu.findItem(R.id.filter);
+
+		filter.setOnMenuItemClickListener(filter_ -> {
+
+			showFilterOptions();
+			return false;
+		});
+
 	}
 
-	public void onButtonPressed(Uri uri) {
+	private void showFilterOptions() {
 
-		if(mListener != null) {
-			mListener.onFragmentInteraction(uri);
+		dialogFilterOptions = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
+
+		if (dialogFilterOptions.getWindow() != null) {
+
+			dialogFilterOptions.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
 		}
+
+		filterBinding = CustomExploreRepositoriesDialogBinding.inflate(LayoutInflater.from(ctx));
+
+		View view = filterBinding.getRoot();
+		dialogFilterOptions.setContentView(view);
+
+		filterBinding.includeTopic.setOnClickListener(includeTopic -> {
+
+			if(filterBinding.includeTopic.isChecked()) {
+
+				tinyDb.putBoolean("exploreRepoIncludeTopic", true);
+			}
+			else {
+
+				tinyDb.putBoolean("exploreRepoIncludeTopic", false);
+			}
+		});
+
+		filterBinding.includeDesc.setOnClickListener(includeDesc -> {
+
+			if(filterBinding.includeDesc.isChecked()) {
+
+				tinyDb.putBoolean("exploreRepoIncludeDescription", true);
+			}
+			else {
+
+				tinyDb.putBoolean("exploreRepoIncludeDescription", false);
+			}
+		});
+
+		filterBinding.includeTemplate.setOnClickListener(includeTemplate -> {
+
+			if(filterBinding.includeTemplate.isChecked()) {
+
+				tinyDb.putBoolean("exploreRepoIncludeTemplate", true);
+			}
+			else {
+
+				tinyDb.putBoolean("exploreRepoIncludeTemplate", false);
+			}
+		});
+
+		filterBinding.onlyArchived.setOnClickListener(onlyArchived -> {
+
+			if(filterBinding.onlyArchived.isChecked()) {
+
+				tinyDb.putBoolean("exploreRepoOnlyArchived", true);
+			}
+			else {
+
+				tinyDb.putBoolean("exploreRepoOnlyArchived", false);
+			}
+		});
+
+
+		filterBinding.includeTopic.setChecked(tinyDb.getBoolean("exploreRepoIncludeTopic"));
+		filterBinding.includeDesc.setChecked(tinyDb.getBoolean("exploreRepoIncludeDescription"));
+		filterBinding.includeTemplate.setChecked(tinyDb.getBoolean("exploreRepoIncludeTemplate"));
+		filterBinding.onlyArchived.setChecked(tinyDb.getBoolean("exploreRepoOnlyArchived"));
+
+		filterBinding.cancel.setOnClickListener(editProperties -> {
+			dialogFilterOptions.dismiss();
+		});
+
+		dialogFilterOptions.show();
 	}
 
 	@Override
 	public void onDetach() {
 
 		super.onDetach();
-		mListener = null;
 	}
 
 	public interface OnFragmentInteractionListener {
 
 		void onFragmentInteraction(Uri uri);
-
 	}
 
 }

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

@@ -207,17 +207,19 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 		FilesViewModel filesModel = new ViewModelProvider(this).get(FilesViewModel.class);
 
-		filesModel.getFilesList(instanceUrl, instanceToken, owner, repo, ref, getContext()).observe(getViewLifecycleOwner(), filesListMain -> {
+		filesModel.getFilesList(instanceUrl, instanceToken, owner, repo, ref, getContext(), mProgressBar, noDataFiles).observe(getViewLifecycleOwner(), filesListMain -> {
 
 			adapter = new FilesAdapter(getContext(), filesListMain, FilesFragment.this);
 			mBreadcrumbsView.removeItemAfter(1);
 
 			if(adapter.getItemCount() > 0) {
+
 				mRecyclerView.setAdapter(adapter);
 				AppUtil.setMultiVisibility(View.VISIBLE, mRecyclerView, filesFrame);
 				noDataFiles.setVisibility(View.GONE);
 			}
 			else {
+
 				adapter.notifyDataSetChanged();
 				mRecyclerView.setAdapter(adapter);
 				AppUtil.setMultiVisibility(View.VISIBLE, mRecyclerView, filesFrame, noDataFiles);
@@ -225,7 +227,6 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 			filesFrame.setVisibility(View.VISIBLE);
 			mProgressBar.setVisibility(View.GONE);
-
 		});
 
 	}
@@ -237,7 +238,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 		FilesViewModel filesModel2 = new ViewModelProvider(this).get(FilesViewModel.class);
 
-		filesModel2.getFilesList2(instanceUrl, instanceToken, owner, repo, filesDir, ref, getContext()).observe(this, filesListMain2 -> {
+		filesModel2.getFilesList2(instanceUrl, instanceToken, owner, repo, filesDir, ref, getContext(), mProgressBar, noDataFiles).observe(this, filesListMain2 -> {
 
 			adapter = new FilesAdapter(getContext(), filesListMain2, FilesFragment.this);
 

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -87,7 +88,7 @@ public class IssuesFragment extends Fragment {
 		mProgressBar = v.findViewById(R.id.progress_bar);
 		noDataIssues = v.findViewById(R.id.noDataIssues);
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
 			swipeRefresh.setRefreshing(false);
 			loadInitial(instanceToken, repoOwner, repoName, resultLimit, requestType, tinyDb.getString("repoIssuesState"));

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -87,18 +88,12 @@ public class LabelsFragment extends Fragment {
 
         mProgressBar = v.findViewById(R.id.progress_bar);
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        LabelsViewModel.loadLabelsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, getContext());
-                    }
-                }, 200);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            LabelsViewModel.loadLabelsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, getContext());
+
+        }, 200));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
 

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -27,7 +28,6 @@ import org.mian.gitnex.interfaces.ApiInterface;
 import org.mian.gitnex.models.Milestones;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -95,7 +95,7 @@ public class MilestonesFragment extends Fragment {
         viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
         viewBinding.recyclerView.setAdapter(adapter);
 
-        viewBinding.pullToRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+        viewBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
             dataList.clear();
             viewBinding.pullToRefresh.setRefreshing(false);
@@ -104,7 +104,7 @@ public class MilestonesFragment extends Fragment {
 
         }, 50));
 
-        ((RepoDetailActivity) Objects.requireNonNull(getActivity())).setFragmentRefreshListenerMilestone(milestoneState -> {
+        ((RepoDetailActivity) requireActivity()).setFragmentRefreshListenerMilestone(milestoneState -> {
 
             if(milestoneState.equals("closed")) {
                 menu.getItem(1).setIcon(R.drawable.ic_filter_closed);

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -14,9 +15,7 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -25,14 +24,12 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateRepoActivity;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.adapters.MyReposListAdapter;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.UserRepositories;
 import org.mian.gitnex.viewmodels.MyRepositoriesViewModel;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -81,7 +78,7 @@ public class MyRepositoriesFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
-        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(requireContext());
 
         final View v = inflater.inflate(R.layout.fragment_my_repositories, container, false);
         setHasOptionsMenu(true);
@@ -95,6 +92,8 @@ public class MyRepositoriesFragment extends Fragment {
 
         final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
 
+	    ((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navMyRepos));
+
         noDataMyRepo = v.findViewById(R.id.noDataMyRepo);
         mProgressBar = v.findViewById(R.id.progress_bar);
         mRecyclerView = v.findViewById(R.id.recyclerView);
@@ -130,10 +129,11 @@ public class MyRepositoriesFragment extends Fragment {
             }
         });
 
-        swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
             swipeRefresh.setRefreshing(false);
             MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext(),  pageSize, resultLimit);
+
         }, 50));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, pageSize, resultLimit);
@@ -162,29 +162,28 @@ public class MyRepositoriesFragment extends Fragment {
 
         MyRepositoriesViewModel myRepoModel = new ViewModelProvider(this).get(MyRepositoriesViewModel.class);
 
-        myRepoModel.getCurrentUserRepositories(instanceUrl, instanceToken, userLogin, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
-            @Override
-            public void onChanged(@Nullable List<UserRepositories> myReposListMain) {
-                adapter = new MyReposListAdapter(getContext(), myReposListMain);
-                if(adapter.getItemCount() > 0) {
-                    mRecyclerView.setAdapter(adapter);
-                    noDataMyRepo.setVisibility(View.GONE);
-                }
-                else {
-                    adapter.notifyDataSetChanged();
-                    mRecyclerView.setAdapter(adapter);
-                    noDataMyRepo.setVisibility(View.VISIBLE);
-                }
-                mProgressBar.setVisibility(View.GONE);
-            }
-        });
+        myRepoModel.getCurrentUserRepositories(instanceUrl, instanceToken, userLogin, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(),
+	        myReposListMain -> {
+
+	            adapter = new MyReposListAdapter(getContext(), myReposListMain);
+	            if(adapter.getItemCount() > 0) {
+	                mRecyclerView.setAdapter(adapter);
+	                noDataMyRepo.setVisibility(View.GONE);
+	            }
+	            else {
+	                adapter.notifyDataSetChanged();
+	                mRecyclerView.setAdapter(adapter);
+	                noDataMyRepo.setVisibility(View.VISIBLE);
+	            }
+	            mProgressBar.setVisibility(View.GONE);
+	        });
 
     }
 
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
-        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(requireContext());
 
         inflater.inflate(R.menu.search_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -15,7 +16,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -24,14 +24,12 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateOrganizationActivity;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.adapters.OrganizationsListAdapter;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.UserOrganizations;
 import org.mian.gitnex.viewmodels.OrganizationListViewModel;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -52,7 +50,7 @@ public class OrganizationsFragment extends Fragment {
         final View v = inflater.inflate(R.layout.fragment_organizations, container, false);
         setHasOptionsMenu(true);
 
-        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(requireContext());
 
         TinyDB tinyDb = new TinyDB(getContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -61,6 +59,8 @@ public class OrganizationsFragment extends Fragment {
 
         final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
 
+	    ((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navOrgs));
+
         mProgressBar = v.findViewById(R.id.progress_bar);
         noDataOrg = v.findViewById(R.id.noDataOrg);
         mRecyclerView = v.findViewById(R.id.recyclerView);
@@ -73,14 +73,10 @@ public class OrganizationsFragment extends Fragment {
 
         createNewOrganization = v.findViewById(R.id.addNewOrganization);
 
-        createNewOrganization.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(view.getContext(), CreateOrganizationActivity.class);
-                startActivity(intent);
-            }
+        createNewOrganization.setOnClickListener(view -> {
 
+            Intent intent = new Intent(view.getContext(), CreateOrganizationActivity.class);
+            startActivity(intent);
         });
 
         mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
@@ -99,18 +95,12 @@ public class OrganizationsFragment extends Fragment {
             }
         });
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        OrganizationListViewModel.loadOrgsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
-                    }
-                }, 50);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            OrganizationListViewModel.loadOrgsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
+
+        }, 50));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
 
@@ -136,21 +126,19 @@ public class OrganizationsFragment extends Fragment {
 
         OrganizationListViewModel orgModel = new ViewModelProvider(this).get(OrganizationListViewModel.class);
 
-        orgModel.getUserOrgs(instanceUrl, instanceToken, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserOrganizations>>() {
-            @Override
-            public void onChanged(@Nullable List<UserOrganizations> orgsListMain) {
-                adapter = new OrganizationsListAdapter(getContext(), orgsListMain);
-                if(adapter.getItemCount() > 0) {
-                    mRecyclerView.setAdapter(adapter);
-                    noDataOrg.setVisibility(View.GONE);
-                }
-                else {
-                    adapter.notifyDataSetChanged();
-                    mRecyclerView.setAdapter(adapter);
-                    noDataOrg.setVisibility(View.VISIBLE);
-                }
-                mProgressBar.setVisibility(View.GONE);
+        orgModel.getUserOrgs(instanceUrl, instanceToken, getContext()).observe(getViewLifecycleOwner(), orgsListMain -> {
+            adapter = new OrganizationsListAdapter(getContext(), orgsListMain);
+
+            if(adapter.getItemCount() > 0) {
+                mRecyclerView.setAdapter(adapter);
+                noDataOrg.setVisibility(View.GONE);
             }
+            else {
+                adapter.notifyDataSetChanged();
+                mRecyclerView.setAdapter(adapter);
+                noDataOrg.setVisibility(View.VISIBLE);
+            }
+            mProgressBar.setVisibility(View.GONE);
         });
 
     }
@@ -158,7 +146,7 @@ public class OrganizationsFragment extends Fragment {
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
-        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(requireContext());
 
         inflater.inflate(R.menu.search_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -88,18 +89,12 @@ public class ProfileEmailsFragment extends Fragment {
 
         mProgressBar = v.findViewById(R.id.progress_bar);
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        ProfileEmailsViewModel.loadEmailsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
-                    }
-                }, 200);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            ProfileEmailsViewModel.loadEmailsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
+
+        }, 200));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
 

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -88,18 +89,12 @@ public class ProfileFollowersFragment extends Fragment {
 
         mProgressBar = v.findViewById(R.id.progress_bar);
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        ProfileFollowersViewModel.loadFollowersList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
-                    }
-                }, 200);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            ProfileFollowersViewModel.loadFollowersList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
+
+        }, 200));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
 

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -88,18 +89,12 @@ public class ProfileFollowingFragment extends Fragment {
 
         mProgressBar = v.findViewById(R.id.progress_bar);
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        ProfileFollowingViewModel.loadFollowingList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
-                    }
-                }, 200);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            ProfileFollowingViewModel.loadFollowingList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
+
+        }, 200));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
 

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

@@ -28,7 +28,6 @@ import org.mian.gitnex.helpers.ColorInverter;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import java.util.Locale;
-import java.util.Objects;
 import eightbitlab.com.blurview.BlurView;
 import eightbitlab.com.blurview.RenderScriptBlur;
 
@@ -49,6 +48,8 @@ public class ProfileFragment extends Fragment {
         View v = inflater.inflate(R.layout.fragment_profile, container, false);
         setHasOptionsMenu(true);
 
+	    ((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navProfile));
+
         TinyDB tinyDb = new TinyDB(getContext());
 
 	    BlurView blurView = v.findViewById(R.id.blurView);
@@ -123,15 +124,15 @@ public class ProfileFragment extends Fragment {
         switch(tinyDb.getInt("customFontId", -1)) {
 
             case 0:
-                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
+                myTypeface = Typeface.createFromAsset(requireContext().getAssets(), "fonts/roboto.ttf");
                 break;
 
             case 2:
-                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
+                myTypeface = Typeface.createFromAsset(requireContext().getAssets(), "fonts/sourcecodeproregular.ttf");
                 break;
 
             default:
-                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/manroperegular.ttf");
+                myTypeface = Typeface.createFromAsset(requireContext().getAssets(), "fonts/manroperegular.ttf");
                 break;
 
         }
@@ -203,7 +204,7 @@ public class ProfileFragment extends Fragment {
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
         menu.clear();
-        Objects.requireNonNull(getActivity()).getMenuInflater().inflate(R.menu.profile_dotted_menu, menu);
+        requireActivity().getMenuInflater().inflate(R.menu.profile_dotted_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);
 
     }

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -88,7 +89,7 @@ public class PullRequestsFragment extends Fragment {
 		mProgressBar = v.findViewById(R.id.progress_bar);
 		noData = v.findViewById(R.id.noData);
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
 			swipeRefresh.setRefreshing(false);
 			loadInitial(instanceToken, repoOwner, repoName, pageSize, tinyDb.getString("repoPrState"), resultLimit);

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -88,18 +89,12 @@ public class ReleasesFragment extends Fragment {
 
         mProgressBar = v.findViewById(R.id.progress_bar);
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        ReleasesViewModel.loadReleasesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, getContext());
-                    }
-                }, 50);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            ReleasesViewModel.loadReleasesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, getContext());
+
+        }, 50));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
 

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

@@ -18,13 +18,13 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
+import org.apache.commons.io.FileUtils;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.TimeHelper;
@@ -283,13 +283,7 @@ public class RepoInfoFragment extends Fragment {
 
 							repoMetaForks.setText(repoInfo.getForks_count());
 							repoMetaWatchers.setText(repoInfo.getWatchers_count());
-
-							if(repoInfo.getSize() != 0) {
-								repoMetaSize.setText(AppUtil.formatFileSize(repoInfo.getSize()));
-							}
-							else {
-								repoMetaSize.setText("0 B");
-							}
+							repoMetaSize.setText(FileUtils.byteCountToDisplaySize((int) repoInfo.getSize()));
 
 							repoMetaCreatedAt.setText(TimeHelper.formatTime(repoInfo.getCreated_at(), new Locale(locale), timeFormat, ctx));
 							if(timeFormat.equals("pretty")) {

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -92,18 +93,12 @@ public class RepositoriesByOrgFragment extends Fragment {
 
         mProgressBar = v.findViewById(R.id.progress_bar);
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext(), pageSize, resultLimit);
-                    }
-                }, 200);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext(), pageSize, resultLimit);
+
+        }, 200));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, pageSize, resultLimit);
 

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -15,7 +16,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -24,14 +24,12 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateRepoActivity;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.adapters.ReposListAdapter;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.UserRepositories;
 import org.mian.gitnex.viewmodels.RepositoriesListViewModel;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -51,7 +49,7 @@ public class RepositoriesFragment extends Fragment {
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(requireContext());
 
         final View v = inflater.inflate(R.layout.fragment_repositories, container, false);
         setHasOptionsMenu(true);
@@ -63,6 +61,8 @@ public class RepositoriesFragment extends Fragment {
 
         final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
 
+	    ((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navRepos));
+
         noDataRepo = v.findViewById(R.id.noData);
         mProgressBar = v.findViewById(R.id.progress_bar);
         mRecyclerView = v.findViewById(R.id.recyclerView);
@@ -98,10 +98,11 @@ public class RepositoriesFragment extends Fragment {
             }
         });
 
-        swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
             swipeRefresh.setRefreshing(false);
             RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
+
         }, 50));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), pageSize, resultLimit);
@@ -128,29 +129,28 @@ public class RepositoriesFragment extends Fragment {
 
         RepositoriesListViewModel repoModel = new ViewModelProvider(this).get(RepositoriesListViewModel.class);
 
-        repoModel.getUserRepositories(instanceUrl, instanceToken, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
-            @Override
-            public void onChanged(@Nullable List<UserRepositories> reposListMain) {
-                adapter = new ReposListAdapter(getContext(), reposListMain);
-                if(adapter.getItemCount() > 0) {
-                    mRecyclerView.setAdapter(adapter);
-                    noDataRepo.setVisibility(View.GONE);
-                }
-                else {
-                    adapter.notifyDataSetChanged();
-                    mRecyclerView.setAdapter(adapter);
-                    noDataRepo.setVisibility(View.VISIBLE);
-                }
-                mProgressBar.setVisibility(View.GONE);
-            }
-        });
+        repoModel.getUserRepositories(instanceUrl, instanceToken, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(),
+	        reposListMain -> {
+
+	            adapter = new ReposListAdapter(getContext(), reposListMain);
+	            if(adapter.getItemCount() > 0) {
+	                mRecyclerView.setAdapter(adapter);
+	                noDataRepo.setVisibility(View.GONE);
+	            }
+	            else {
+	                adapter.notifyDataSetChanged();
+	                mRecyclerView.setAdapter(adapter);
+	                noDataRepo.setVisibility(View.VISIBLE);
+	            }
+	            mProgressBar.setVisibility(View.GONE);
+	        });
 
     }
 
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
-        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(requireContext());
 
         inflater.inflate(R.menu.search_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);

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

@@ -0,0 +1,190 @@
+package org.mian.gitnex.fragments;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import org.mian.gitnex.adapters.SearchIssuesAdapter;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.databinding.FragmentSearchIssuesBinding;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.InfiniteScrollListener;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Issues;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+/**
+ * Author M M Arif
+ */
+
+public class SearchIssuesFragment extends Fragment {
+
+	private Context ctx;
+	private TinyDB tinyDb;
+	private FragmentSearchIssuesBinding viewBinding;
+	private SearchIssuesAdapter adapter;
+	private List<Issues> dataList;
+
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
+
+	private int apiCallCurrentValue = 10;
+	private int pageCurrentIndex = 1;
+	private String type = "issues";
+	private String state = "open";
+
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+		viewBinding = FragmentSearchIssuesBinding.inflate(inflater, container, false);
+		setHasOptionsMenu(true);
+
+		ctx = getContext();
+		tinyDb = new TinyDB(getContext());
+
+		instanceUrl = tinyDb.getString("instanceUrl");
+		loginUid = tinyDb.getString("loginUid");
+		instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+		dataList = new ArrayList<>();
+		adapter = new SearchIssuesAdapter(dataList, ctx);
+
+		LinearLayoutManager linearLayoutManager = new LinearLayoutManager(ctx);
+
+		viewBinding.recyclerViewSearchIssues.setHasFixedSize(true);
+		viewBinding.recyclerViewSearchIssues.setLayoutManager(linearLayoutManager);
+		viewBinding.recyclerViewSearchIssues.setAdapter(adapter);
+
+		viewBinding.searchKeyword.setOnEditorActionListener((v1, actionId, event) -> {
+
+			if(actionId == EditorInfo.IME_ACTION_SEND) {
+
+				if(!Objects.requireNonNull(viewBinding.searchKeyword.getText()).toString().equals("")) {
+
+					InputMethodManager imm = (InputMethodManager) requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+					imm.hideSoftInputFromWindow(viewBinding.searchKeyword.getWindowToken(), 0);
+
+					pageCurrentIndex = 1;
+					apiCallCurrentValue = 10;
+					viewBinding.progressBar.setVisibility(View.VISIBLE);
+					loadData(false, viewBinding.searchKeyword.getText().toString());
+				}
+			}
+
+			return false;
+		});
+
+		viewBinding.recyclerViewSearchIssues.addOnScrollListener(new InfiniteScrollListener(pageCurrentIndex, linearLayoutManager) {
+
+			@Override
+			public void onScrolledToEnd(int firstVisibleItemPosition) {
+
+				pageCurrentIndex++;
+				loadData(true, Objects.requireNonNull(viewBinding.searchKeyword.getText()).toString());
+
+			}
+		});
+
+		viewBinding.pullToRefresh.setOnRefreshListener(() -> {
+
+			pageCurrentIndex = 1;
+			apiCallCurrentValue = 10;
+			loadData(false, Objects.requireNonNull(viewBinding.searchKeyword.getText()).toString());
+
+		});
+
+		loadData(false, "");
+
+		return viewBinding.getRoot();
+	}
+
+	private void loadData(boolean append, String searchKeyword) {
+
+		viewBinding.noData.setVisibility(View.GONE);
+
+		int apiCallDefaultLimit = 10;
+		if(apiCallDefaultLimit > apiCallCurrentValue) {
+			return;
+		}
+
+		if(pageCurrentIndex == 1 || !append) {
+
+			dataList.clear();
+			adapter.notifyDataSetChanged();
+			viewBinding.pullToRefresh.setRefreshing(false);
+			viewBinding.progressBar.setVisibility(View.VISIBLE);
+		}
+		else {
+
+			viewBinding.loadingMoreView.setVisibility(View.VISIBLE);
+		}
+
+		Call<List<Issues>> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().queryIssues(
+			Authorization.returnAuthentication(getContext(), loginUid, instanceToken), searchKeyword, type, state, pageCurrentIndex);
+
+		call.enqueue(new Callback<List<Issues>>() {
+
+			@Override
+			public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
+
+				if(response.code() == 200) {
+
+					assert response.body() != null;
+					apiCallCurrentValue = response.body().size();
+
+					if(!append) {
+
+						dataList.clear();
+					}
+
+					dataList.addAll(response.body());
+					adapter.notifyDataSetChanged();
+
+				}
+				else {
+
+					dataList.clear();
+					adapter.notifyDataChanged();
+					viewBinding.noData.setVisibility(View.VISIBLE);
+
+				}
+
+				onCleanup();
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", Objects.requireNonNull(t.getMessage()));
+				onCleanup();
+
+			}
+
+			private void onCleanup() {
+
+				AppUtil.setMultiVisibility(View.GONE, viewBinding.loadingMoreView, viewBinding.progressBar);
+
+				if(dataList.isEmpty()) {
+
+					viewBinding.noData.setVisibility(View.VISIBLE);
+				}
+			}
+		});
+	}
+
+}

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

@@ -1,6 +1,8 @@
 package org.mian.gitnex.fragments;
 
+import android.content.ActivityNotFoundException;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,14 +12,15 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.activities.SettingsAppearanceActivity;
 import org.mian.gitnex.activities.SettingsDraftsActivity;
 import org.mian.gitnex.activities.SettingsFileViewerActivity;
+import org.mian.gitnex.activities.SettingsGeneralActivity;
 import org.mian.gitnex.activities.SettingsReportsActivity;
 import org.mian.gitnex.activities.SettingsSecurityActivity;
 import org.mian.gitnex.activities.SettingsTranslationActivity;
 import org.mian.gitnex.helpers.TinyDB;
-import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -31,12 +34,19 @@ public class SettingsFragment extends Fragment {
 
 		View v = inflater.inflate(R.layout.fragment_settings, container, false);
 
+		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navSettings));
+
+		LinearLayout generalFrame = v.findViewById(R.id.generalFrame);
 		LinearLayout appearanceFrame = v.findViewById(R.id.appearanceFrame);
 		LinearLayout fileViewerFrame = v.findViewById(R.id.fileViewerFrame);
 		LinearLayout draftsFrame = v.findViewById(R.id.draftsFrame);
 		LinearLayout securityFrame = v.findViewById(R.id.securityFrame);
 		LinearLayout languagesFrame = v.findViewById(R.id.languagesFrame);
 		LinearLayout reportsFrame = v.findViewById(R.id.reportsFrame);
+		LinearLayout rateAppFrame = v.findViewById(R.id.rateAppFrame);
+		LinearLayout aboutAppFrame = v.findViewById(R.id.aboutAppFrame);
+
+		generalFrame.setOnClickListener(generalFrameCall -> startActivity(new Intent(getContext(), SettingsGeneralActivity.class)));
 
 		appearanceFrame.setOnClickListener(v1 -> startActivity(new Intent(getContext(), SettingsAppearanceActivity.class)));
 
@@ -50,10 +60,24 @@ public class SettingsFragment extends Fragment {
 
 		reportsFrame.setOnClickListener(v1 -> startActivity(new Intent(getContext(), SettingsReportsActivity.class)));
 
+		rateAppFrame.setOnClickListener(aboutApp -> rateThisApp());
+
+		aboutAppFrame.setOnClickListener(aboutApp -> requireActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AboutFragment()).commit());
+
 		return v;
 
 	}
 
+	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())));
+		}
+	}
+
 	@Override
 	public void onResume() {
 
@@ -62,8 +86,8 @@ public class SettingsFragment extends Fragment {
 		TinyDB tinyDb = new TinyDB(getContext());
 
 		if(tinyDb.getBoolean("refreshParent")) {
-			Objects.requireNonNull(getActivity()).recreate();
-			getActivity().overridePendingTransition(0, 0);
+			requireActivity().recreate();
+			requireActivity().overridePendingTransition(0, 0);
 			tinyDb.putBoolean("refreshParent", false);
 		}
 

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -14,9 +15,7 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -25,14 +24,12 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateRepoActivity;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.adapters.StarredReposListAdapter;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.UserRepositories;
 import org.mian.gitnex.viewmodels.StarredRepositoriesViewModel;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -78,7 +75,7 @@ public class StarredRepositoriesFragment extends Fragment {
                              Bundle savedInstanceState) {
 
         View v = inflater.inflate(R.layout.fragment_starred_repositories, container, false);
-        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(requireContext());
         setHasOptionsMenu(true);
 
         TinyDB tinyDb = new TinyDB(getContext());
@@ -88,6 +85,8 @@ public class StarredRepositoriesFragment extends Fragment {
 
         final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
 
+	    ((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navStarredRepos));
+
         noData = v.findViewById(R.id.noData);
         mProgressBar = v.findViewById(R.id.progress_bar);
         mRecyclerView = v.findViewById(R.id.recyclerView);
@@ -127,18 +126,12 @@ public class StarredRepositoriesFragment extends Fragment {
             }
         });
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
-                    }
-                }, 50);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
+
+        }, 50));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), pageSize, resultLimit);
 
@@ -164,29 +157,28 @@ public class StarredRepositoriesFragment extends Fragment {
 
         StarredRepositoriesViewModel starredRepoModel = new ViewModelProvider(this).get(StarredRepositoriesViewModel.class);
 
-        starredRepoModel.getUserStarredRepositories(instanceUrl, instanceToken, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
-            @Override
-            public void onChanged(@Nullable List<UserRepositories> starredReposListMain) {
-                adapter = new StarredReposListAdapter(getContext(), starredReposListMain);
-                if(adapter.getItemCount() > 0) {
-                    mRecyclerView.setAdapter(adapter);
-                    noData.setVisibility(View.GONE);
-                }
-                else {
-                    adapter.notifyDataSetChanged();
-                    mRecyclerView.setAdapter(adapter);
-                    noData.setVisibility(View.VISIBLE);
-                }
-                mProgressBar.setVisibility(View.GONE);
-            }
-        });
+        starredRepoModel.getUserStarredRepositories(instanceUrl, instanceToken, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(),
+	        starredReposListMain -> {
+
+	            adapter = new StarredReposListAdapter(getContext(), starredReposListMain);
+	            if(adapter.getItemCount() > 0) {
+	                mRecyclerView.setAdapter(adapter);
+	                noData.setVisibility(View.GONE);
+	            }
+	            else {
+	                adapter.notifyDataSetChanged();
+	                mRecyclerView.setAdapter(adapter);
+	                noData.setVisibility(View.VISIBLE);
+	            }
+	            mProgressBar.setVisibility(View.GONE);
+	        });
 
     }
 
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
-        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(requireContext());
 
         inflater.inflate(R.menu.search_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -90,18 +91,12 @@ public class TeamsByOrgFragment extends Fragment {
 
         mProgressBar = v.findViewById(R.id.progress_bar);
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        TeamsByOrgViewModel.loadTeamsByOrgList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext());
-                    }
-                }, 200);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            TeamsByOrgViewModel.loadTeamsByOrgList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext());
+
+        }, 200));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName);
 

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,6 +16,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.AddNewAccountActivity;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.adapters.UserAccountsAdapter;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
@@ -42,6 +44,8 @@ public class UserAccountsFragment extends Fragment {
 		ctx = getContext();
 		setHasOptionsMenu(true);
 
+		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.pageTitleUserAccounts));
+
 		userAccountsList = new ArrayList<>();
 		userAccountsApi = new UserAccountsApi(ctx);
 
@@ -57,7 +61,7 @@ public class UserAccountsFragment extends Fragment {
 
 		adapter = new UserAccountsAdapter(getContext(), userAccountsList);
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
 			userAccountsList.clear();
 			swipeRefresh.setRefreshing(false);

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

@@ -13,7 +13,6 @@ import android.view.View;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -123,33 +122,6 @@ public class AppUtil {
 
 	}
 
-	public static String formatFileSize(long size) {
-
-		String repoSize = size + " B";
-
-		double m = size / 1024.0;
-		double g = ((size / 1024.0) / 1024.0);
-		double t = (((size / 1024.0) / 1024.0) / 1024.0);
-
-		DecimalFormat dec = new DecimalFormat("0.00");
-
-		if(t > 1) {
-			repoSize = dec.format(t).concat(" TB");
-		}
-		else if(g > 1) {
-			repoSize = dec.format(g).concat(" GB");
-		}
-		else if(m > 1) {
-			repoSize = dec.format(m).concat(" MB");
-		}
-		else if((double) size > 1) {
-			repoSize = dec.format((double) size).concat(" KB");
-		}
-
-		return repoSize;
-
-	}
-
 	public static String getTimestampFromDate(Context context, Date date) {
 
 		TinyDB tinyDB = new TinyDB(context);
@@ -159,37 +131,6 @@ public class AppUtil {
 
 	}
 
-	public static String formatFileSizeInDetail(long size) {
-
-		String fileSize = null;
-
-		double k = size / 1024.0;
-		double m = ((size / 1024.0) / 1024.0);
-		double g = (((size / 1024.0) / 1024.0) / 1024.0);
-		double t = ((((size / 1024.0) / 1024.0) / 1024.0) / 1024.0);
-
-		DecimalFormat dec = new DecimalFormat("0.00");
-
-		if(t > 1) {
-			fileSize = dec.format(t).concat(" TB");
-		}
-		else if(g > 1) {
-			fileSize = dec.format(g).concat(" GB");
-		}
-		else if(m > 1) {
-			fileSize = dec.format(m).concat(" MB");
-		}
-		else if(k > 1) {
-			fileSize = dec.format(k).concat(" KB");
-		}
-		else if((double) size > 1) {
-			fileSize = dec.format((double) size).concat(" B");
-		}
-
-		return fileSize;
-
-	}
-
 	public static String customDateFormat(String customDate) {
 
 		String[] parts = customDate.split("-");

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

@@ -3,7 +3,6 @@ package org.mian.gitnex.helpers;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 import org.mian.gitnex.R;
@@ -18,17 +17,16 @@ public class ClickListener implements View.OnClickListener {
     private Context mCtx;
 
     public ClickListener(String infoText, Context mCtx) {
+
         this.infoText = infoText;
         this.mCtx = mCtx;
     }
 
     @Override
-    public void onClick(View v)
-    {
+    public void onClick(View v) {
 
         LayoutInflater inflater1 = LayoutInflater.from(mCtx);
-        View layout = inflater1.inflate(R.layout.custom_toast_success,
-                (ViewGroup) 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);

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

@@ -1,12 +1,5 @@
 package org.mian.gitnex.helpers;
 
-import java.io.File;
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
 /**
  * Author M M Arif
  */
@@ -16,69 +9,5 @@ public class FilesData {
 	public static int returnOnlyNumber(String fileSize) {
 
 		return Integer.parseInt(fileSize.substring(0, fileSize.indexOf(" ")));
-
 	}
-
-	public static long getFileSizeRecursively(Set<File> alreadySeen, File dirDirectory) {
-
-		long fileSize = 0;
-
-		for (File filItem : Objects.requireNonNull(dirDirectory.listFiles())) {
-
-			if (filItem.isDirectory()) {
-
-				fileSize += getFileSize(filItem);
-
-			}
-			else {
-
-				alreadySeen.add(new File(filItem.getName()));
-				fileSize += filItem.length();
-
-			}
-
-		}
-
-		return fileSize;
-
-	}
-
-	private static long getFileSize(File subDirectory) {
-
-		long fileSize = 0;
-
-		Deque<File> unprocessedDirs = new ArrayDeque<>();
-		unprocessedDirs.add(subDirectory);
-		Set<File> alreadySeen = new HashSet<>();
-
-		while (!unprocessedDirs.isEmpty()) {
-
-			File dir = unprocessedDirs.removeFirst();
-
-			for (File filItem : Objects.requireNonNull(dir.listFiles())) {
-
-				if (filItem.isDirectory()) {
-
-					unprocessedDirs.addFirst(filItem);
-
-				}
-				else {
-
-					if (! alreadySeen.contains(filItem.getName())) {
-
-						alreadySeen.add(new File(filItem.getName()));
-						fileSize += filItem.length();
-
-					}
-
-				}
-
-			}
-
-		}
-
-		return fileSize;
-
-	}
-
 }

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

@@ -1,318 +0,0 @@
-package org.mian.gitnex.helpers;
-
-import android.annotation.SuppressLint;
-import android.app.Dialog;
-import android.os.Bundle;
-import android.util.TypedValue;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatDialogFragment;
-import androidx.appcompat.widget.SearchView;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import org.mian.gitnex.R;
-import org.mian.gitnex.adapters.MutliSelectAdapter;
-import org.mian.gitnex.models.MultiSelectModel;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Author com.github.abumoallim, modified by M M Arif
- */
-
-public class MultiSelectDialog extends AppCompatDialogFragment implements SearchView.OnQueryTextListener, View.OnClickListener {
-
-    public static List<Integer> selectedIdsForCallback = new ArrayList<>();
-
-    public List<MultiSelectModel> mainListOfAdapter = new ArrayList<>();
-    private MutliSelectAdapter mutliSelectAdapter;
-    //Default Values
-    private String title;
-    private float titleSize = 25;
-    private String positiveText = "DONE";
-    private String negativeText = "CANCEL";
-    private TextView dialogTitle, dialogSubmit, dialogCancel;
-    private List<Integer> previouslySelectedIdsList = new ArrayList<>();
-
-    private List<Integer> tempPreviouslySelectedIdsList = new ArrayList<>();
-    private List<MultiSelectModel> tempMainListOfAdapter = new ArrayList<>();
-
-    private SubmitCallbackListener submitCallbackListener;
-
-    private int minSelectionLimit = 1;
-    private String minSelectionMessage = null;
-    private int maxSelectionLimit = 0;
-    private String maxSelectionMessage = null;
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-
-        final Dialog dialog = new Dialog(Objects.requireNonNull(getActivity()));
-        Objects.requireNonNull(dialog.getWindow()).requestFeature(Window.FEATURE_NO_TITLE);
-        dialog.getWindow().setFlags(
-                WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);
-
-        dialog.setContentView(R.layout.custom_multi_select);
-        dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-
-        RecyclerViewEmptySupport mrecyclerView =  dialog.findViewById(R.id.recycler_view);
-        SearchView searchView =  dialog.findViewById(R.id.search_view);
-        dialogTitle =  dialog.findViewById(R.id.title);
-        dialogSubmit =  dialog.findViewById(R.id.done);
-        dialogCancel =  dialog.findViewById(R.id.cancel);
-
-        mrecyclerView.setEmptyView(dialog.findViewById(R.id.list_empty1));
-        @SuppressLint("WrongConstant") LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false);
-        mrecyclerView.setLayoutManager(layoutManager);
-
-        dialogSubmit.setOnClickListener(this);
-        dialogCancel.setOnClickListener(this);
-
-        settingValues();
-
-        mainListOfAdapter = setCheckedIDS(mainListOfAdapter, previouslySelectedIdsList);
-        mutliSelectAdapter = new MutliSelectAdapter(mainListOfAdapter, getContext());
-        mrecyclerView.setAdapter(mutliSelectAdapter);
-
-        searchView.setOnQueryTextListener(this);
-        searchView.onActionViewExpanded();
-        searchView.clearFocus();
-
-
-        return dialog;
-    }
-
-    public MultiSelectDialog title(String title) {
-        this.title = title;
-        return this;
-    }
-
-    public MultiSelectDialog titleSize(float titleSize) {
-        this.titleSize = titleSize;
-        return this;
-    }
-
-    public MultiSelectDialog positiveText(@NonNull String message) {
-        this.positiveText = message;
-        return this;
-    }
-
-    public MultiSelectDialog negativeText(@NonNull String message) {
-        this.negativeText = message;
-        return this;
-    }
-
-    public MultiSelectDialog preSelectIDsList(List<Integer> list) {
-        this.previouslySelectedIdsList = list;
-        this.tempPreviouslySelectedIdsList = new ArrayList<>(previouslySelectedIdsList);
-        return this;
-    }
-
-    public MultiSelectDialog multiSelectList(List<MultiSelectModel> list) {
-        this.mainListOfAdapter = list;
-        this.tempMainListOfAdapter = new ArrayList<>(mainListOfAdapter);
-        if(maxSelectionLimit == 0)
-            maxSelectionLimit = list.size();
-        return this;
-    }
-
-    public MultiSelectDialog setMaxSelectionLimit(int limit){
-        this.maxSelectionLimit = limit;
-        return this;
-    }
-
-    public MultiSelectDialog setMaxSelectionMessage(String message) {
-        this.maxSelectionMessage = message;
-        return this;
-    }
-
-    public MultiSelectDialog setMinSelectionLimit(int limit){
-        this.minSelectionLimit = limit;
-        return this;
-    }
-
-    public MultiSelectDialog setMinSelectionMessage(String message) {
-        this.minSelectionMessage = message;
-        return this;
-    }
-
-    public MultiSelectDialog onSubmit(@NonNull SubmitCallbackListener callback) {
-        this.submitCallbackListener = callback;
-        return this;
-    }
-
-    private void settingValues() {
-        dialogTitle.setText(title);
-        dialogTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, titleSize);
-        dialogSubmit.setText(positiveText.toUpperCase());
-        dialogCancel.setText(negativeText.toUpperCase());
-    }
-
-    private List<MultiSelectModel> setCheckedIDS(List<MultiSelectModel> multiselectdata, List<Integer> listOfIdsSelected) {
-
-        for (int i = 0; i < multiselectdata.size(); i++) {
-            multiselectdata.get(i).setSelected(false);
-            for (int j = 0; j < listOfIdsSelected.size(); j++) {
-                if (listOfIdsSelected.get(j) == (multiselectdata.get(i).getId())) {
-                    multiselectdata.get(i).setSelected(true);
-                }
-            }
-        }
-        return multiselectdata;
-
-    }
-
-    private List<MultiSelectModel> filter(List<MultiSelectModel> models, String query) {
-
-        query = query.toLowerCase();
-        final List<MultiSelectModel> filteredModelList = new ArrayList<>();
-        if (query.equals("") | query.isEmpty()) {
-            filteredModelList.addAll(models);
-            return filteredModelList;
-        }
-
-        for (MultiSelectModel model : models) {
-            final String name = model.getName().toLowerCase();
-            if (name.contains(query)) {
-                filteredModelList.add(model);
-            }
-        }
-        return filteredModelList;
-
-    }
-
-    @Override
-    public boolean onQueryTextSubmit(String query) {
-        return false;
-    }
-
-    @Override
-    public boolean onQueryTextChange(String newText) {
-
-        selectedIdsForCallback = previouslySelectedIdsList;
-        mainListOfAdapter = setCheckedIDS(mainListOfAdapter, selectedIdsForCallback);
-        List<MultiSelectModel> filteredlist = filter(mainListOfAdapter, newText);
-        mutliSelectAdapter.setData(filteredlist, newText.toLowerCase(), mutliSelectAdapter);
-        return false;
-
-    }
-
-    @Override
-    public void onClick(View view) {
-
-        if (view.getId() == R.id.done) {
-            List<Integer> callBackListOfIds = selectedIdsForCallback;
-
-            if (callBackListOfIds.size() >= minSelectionLimit) {
-                if (callBackListOfIds.size() <= maxSelectionLimit) {
-
-                    //to remember last selected ids which were successfully done
-                    tempPreviouslySelectedIdsList = new ArrayList<>(callBackListOfIds);
-
-                    if(submitCallbackListener !=null) {
-                        submitCallbackListener.onSelected(callBackListOfIds, getSelectNameList(), getSelectedDataString());
-                    }
-                    dismiss();
-                } else {
-                    String youCan = getResources().getString(R.string.you_can_only_select_upto);
-                    String options = getResources().getString(R.string.options);
-                    String option = getResources().getString(R.string.option);
-                    String message = "";
-
-                    if(this.maxSelectionMessage != null) {
-                        message = maxSelectionMessage;
-                    }
-                    else {
-                        if (maxSelectionLimit > 1)
-                            message = youCan + " " + maxSelectionLimit + " " + options;
-                        else
-                            message = youCan + " " + maxSelectionLimit + " " + option;
-                    }
-                    Toast.makeText(getActivity(), message, Toast.LENGTH_LONG).show();
-                }
-            } else {
-                String pleaseSelect = getResources().getString(R.string.please_select_atleast);
-                String options = getResources().getString(R.string.options);
-                String option = getResources().getString(R.string.option);
-                String message = "";
-
-                if(this.minSelectionMessage != null) {
-                    message = minSelectionMessage;
-                }
-                else {
-                    if (minSelectionLimit > 1)
-                        message = pleaseSelect + " " + minSelectionLimit + " " + options;
-                    else
-                        message = pleaseSelect + " " + minSelectionLimit + " " + option;
-                }
-                Toast.makeText(getActivity(), message, Toast.LENGTH_LONG).show();
-            }
-        }
-
-        if (view.getId() == R.id.cancel) {
-            if(submitCallbackListener!=null){
-                selectedIdsForCallback.clear();
-                selectedIdsForCallback.addAll(tempPreviouslySelectedIdsList);
-                submitCallbackListener.onCancel();
-            }
-            dismiss();
-        }
-
-    }
-
-    private String getSelectedDataString() {
-
-        String data = "";
-        for (int i = 0; i < tempMainListOfAdapter.size(); i++) {
-            if (checkForSelection(tempMainListOfAdapter.get(i).getId())) {
-                data = data + ", " + tempMainListOfAdapter.get(i).getName();
-            }
-        }
-        if (data.length() > 0) {
-            return data.substring(1);
-        } else {
-            return "";
-        }
-
-    }
-
-    private List<String> getSelectNameList() {
-
-        List<String> names = new ArrayList<>();
-        for(int i=0;i<tempMainListOfAdapter.size();i++){
-            if(checkForSelection(tempMainListOfAdapter.get(i).getId())){
-                names.add(tempMainListOfAdapter.get(i).getName());
-            }
-        }
-        return names;
-
-    }
-
-    private boolean checkForSelection(Integer id) {
-
-        for (int i = 0; i < MultiSelectDialog.selectedIdsForCallback.size(); i++) {
-            if (id.equals(MultiSelectDialog.selectedIdsForCallback.get(i))) {
-                return true;
-            }
-        }
-        return false;
-
-    }
-
-   /* public void setCallbackListener(SubmitCallbackListener submitCallbackListener) {
-        this.submitCallbackListener = submitCallbackListener;
-    }*/
-
-    public interface SubmitCallbackListener {
-        void onSelected(List<Integer> selectedIds, List<String> selectedNames, String commonSeperatedData);
-        void onCancel();
-    }
-
-}

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

@@ -25,11 +25,11 @@ public abstract class StaticGlobalVariables {
 	public static String tagPullRequestsList = "PullRequestsListFragment";
 	public static String tagIssuesList = "IssuesListFragment";
 	public static String tagMilestonesAdapter = "MilestonesAdapter";
-	public static String draftsRepository = "DraftsRepository";
-	public static String repositoriesRepository = "RepositoriesRepository";
+	public static String draftsApi = "DraftsApi";
+	public static String repositoriesApi = "RepositoriesApi";
 	public static String replyToIssueActivity = "ReplyToIssueActivity";
 	public static String tagDraftsBottomSheet = "BottomSheetDraftsFragment";
-	public static String userAccountsRepository = "UserAccountsRepository";
+	public static String userAccountsApi = "UserAccountsApi";
 
 	// issues variables
 	public static int issuesPageInit = 1;

app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java

@@ -58,6 +58,9 @@ import retrofit2.http.Query;
 
 public interface ApiInterface {
 
+	@GET("version") // gitea version API without any auth
+	Call<GiteaVersion> getGiteaVersion();
+
     @GET("version") // gitea version API
     Call<GiteaVersion> getGiteaVersionWithBasic(@Header("Authorization") String authorization);
 
@@ -163,6 +166,9 @@ public interface ApiInterface {
     @GET("repos/{owner}/{repo}/collaborators") // get collaborators list
     Call<List<Collaborators>> getCollaborators(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
 
+    @GET("orgs/{org}/members") // get organization members
+    Call<List<Collaborators>> getOrgMembers(@Header("Authorization") String token, @Path("org") String ownerName);
+
     @POST("repos/{owner}/{repo}/milestones") // create new milestone
     Call<Milestones> createMilestone(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Body Milestones jsonStr);
 
@@ -266,7 +272,10 @@ public interface ApiInterface {
     Call<List<UserInfo>> getRepoWatchers(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
 
     @GET("repos/search") // get all the repos which match the query string
-    Call<ExploreRepositories> queryRepos(@Header("Authorization") String token, @Query("q") String searchKeyword, @Query("private") Boolean repoTypeInclude, @Query("sort") String sort, @Query("order") String order, @Query("limit") int limit);
+    Call<ExploreRepositories> queryRepos(@Header("Authorization") String token, @Query("q") String searchKeyword, @Query("private") Boolean repoTypeInclude, @Query("sort") String sort, @Query("order") String order, @Query("topic") boolean topic, @Query("includeDesc") boolean includeDesc, @Query("template") boolean template, @Query("archived") boolean archived, @Query("limit") int limit, @Query("page") int page);
+
+	@GET("repos/issues/search") // get all the issues which match the query string
+	Call<List<Issues>> queryIssues(@Header("Authorization") String token, @Query("q") String searchKeyword, @Query("type") String type, @Query("state") String state, @Query("page") int page);
 
     @POST("repos/{owner}/{repo}/contents/{file}") // create new file
     Call<JsonElement> createNewFile(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("file") String fileName, @Body NewFile jsonStr);
@@ -325,6 +334,9 @@ public interface ApiInterface {
 	@POST("repos/{owner}/{repo}/pulls") // create a pull request
 	Call<ResponseBody> createPullRequest(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Body CreatePullRequest jsonStr);
 
+	@GET("repos/{owner}/{repo}/pulls/{index}") // get pull request by index
+	Call<PullRequests> getPullRequestByIndex(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Path("index") int index);
+
     @GET("repos/{owner}/{repo}/commits") // get all commits
     Call<List<Commits>> getRepositoryCommits(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("sha") String branchName, @Query("limit") int limit);
 

app/src/main/java/org/mian/gitnex/models/Collaborators.java

@@ -1,5 +1,7 @@
 package org.mian.gitnex.models;
 
+import java.util.Objects;
+
 /**
  * Author M M Arif
  */
@@ -14,6 +16,13 @@ public class Collaborators {
     private String language;
     private String username;
 
+	public Collaborators(String full_name, String login, String avatar_url) {
+
+		this.full_name =  full_name;
+		this.login = login;
+		this.avatar_url = avatar_url;
+	}
+
     public int getId() {
         return id;
     }
@@ -41,4 +50,24 @@ public class Collaborators {
     public String getUsername() {
         return username;
     }
+
+	@Override
+	public boolean equals(Object o) {
+
+		if(this == o) {
+			return true;
+		}
+		if(o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		Collaborators that = (Collaborators) o;
+		return Objects.equals(login, that.login);
+	}
+
+	@Override
+	public int hashCode() {
+
+		return Objects.hash(login);
+	}
+
 }

app/src/main/java/org/mian/gitnex/models/CreateIssue.java

@@ -15,9 +15,9 @@ public class CreateIssue {
     private String title;
 
     private List<String> assignees;
-    private int[] labels;
+	private List<Integer> labels;
 
-    public CreateIssue(String assignee, String body, boolean closed, String due_date, int milestone, String title, List<String> assignees, int[] labels) {
+    public CreateIssue(String assignee, String body, boolean closed, String due_date, int milestone, String title, List<String> assignees, List<Integer> labels) {
         this.body = body;
         this.closed = closed;
         this.due_date = due_date;

app/src/main/java/org/mian/gitnex/models/CreatePullRequest.java

@@ -1,6 +1,6 @@
 package org.mian.gitnex.models;
 
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Author M M Arif
@@ -17,10 +17,10 @@ public class CreatePullRequest {
 	private String due_date;
 	private String message;
 
-	private ArrayList<String> assignees;
-	private ArrayList<Integer> labels;
+	private List<String> assignees;
+	private List<Integer> labels;
 
-	public CreatePullRequest(String title, String body, String assignee, String base, String head, int milestone, String due_date, ArrayList<String> assignees, ArrayList<Integer> labels) {
+	public CreatePullRequest(String title, String body, String assignee, String base, String head, int milestone, String due_date, List<String> assignees, List<Integer> labels) {
 
 		this.title = title;
 		this.body = body;

app/src/main/java/org/mian/gitnex/models/Issues.java

@@ -27,6 +27,7 @@ public class Issues {
     private pullRequestObject pull_request;
     private milestoneObject milestone;
     private List<assigneesObject> assignees;
+	private repositoryObject repository;
 
     public Issues(String body) {
         this.body = body;
@@ -193,6 +194,35 @@ public class Issues {
         }
     }
 
+	public static class repositoryObject {
+
+		private int id;
+		private String full_name;
+		private String name;
+		private String owner;
+
+		public int getId() {
+
+			return id;
+		}
+
+		public String getFull_name() {
+
+			return full_name;
+		}
+
+		public String getName() {
+
+			return name;
+		}
+
+		public String getOwner() {
+
+			return owner;
+		}
+
+	}
+
     public int getId() {
         return id;
     }
@@ -267,4 +297,9 @@ public class Issues {
         this.html_url = html_url;
     }
 
+	public repositoryObject getRepository() {
+
+		return repository;
+	}
+
 }

app/src/main/java/org/mian/gitnex/models/Labels.java

@@ -1,5 +1,7 @@
 package org.mian.gitnex.models;
 
+import java.util.List;
+
 /**
  * Author M M Arif
  */
@@ -10,20 +12,21 @@ public class Labels {
     private String name;
     private String color;
     private String url;
-    private int[] labels;
+    private List<Integer> labels;
 
     public Labels(String name, String color) {
         this.name = name;
         this.color = color;
     }
 
-    public Labels(int[] labels) {
+    public Labels(List<Integer> labels) {
         this.labels = labels;
     }
 
-	public Labels(int id, String name) {
+	public Labels(int id, String name, String color) {
 		this.id = id;
 		this.name = name;
+		this.color = color;
 	}
 
     public int getId() {

app/src/main/java/org/mian/gitnex/viewmodels/FilesViewModel.java

@@ -1,7 +1,9 @@
 package org.mian.gitnex.viewmodels;
 
 import android.content.Context;
-import android.util.Log;
+import android.view.View;
+import android.widget.ProgressBar;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
@@ -25,15 +27,15 @@ public class FilesViewModel extends ViewModel {
     private static MutableLiveData<List<Files>> filesList;
     private static MutableLiveData<List<Files>> filesList2;
 
-    public LiveData<List<Files>> getFilesList(String instanceUrl, String token, String owner, String repo, String ref, Context ctx) {
+    public LiveData<List<Files>> getFilesList(String instanceUrl, String token, String owner, String repo, String ref, Context ctx, ProgressBar progressBar, TextView noDataFiles) {
 
         filesList = new MutableLiveData<>();
-        loadFilesList(instanceUrl, token, owner, repo, ref, ctx);
+        loadFilesList(instanceUrl, token, owner, repo, ref, ctx, progressBar, noDataFiles);
 
         return filesList;
     }
 
-    private static void loadFilesList(String instanceUrl, String token, String owner, String repo, String ref, final Context ctx) {
+    private static void loadFilesList(String instanceUrl, String token, String owner, String repo, String ref, final Context ctx, ProgressBar progressBar, TextView noDataFiles) {
 
         Call<List<Files>> call = RetrofitClient
                 .getInstance(instanceUrl, ctx)
@@ -45,37 +47,47 @@ public class FilesViewModel extends ViewModel {
             @Override
             public void onResponse(@NonNull Call<List<Files>> call, @NonNull Response<List<Files>> response) {
 
-                if (response.isSuccessful()) {
+                if (response.code() == 200) {
 
 	                assert response.body() != null;
-	                Collections.sort(response.body(), (byType1, byType2) -> byType1.getType().compareTo(byType2.getType()));
-                    filesList.postValue(response.body());
 
-                } else {
+	                if(response.body().size() > 0) {
 
-                    Toasty.warning(ctx, ctx.getString(R.string.noDataFilesTab));
-                    Log.i("onResponse", String.valueOf(response.code()));
+		                Collections.sort(response.body(), (byType1, byType2) -> byType1.getType().compareTo(byType2.getType()));
+	                    filesList.postValue(response.body());
+	                }
+	                else {
+
+		                progressBar.setVisibility(View.GONE);
+		                noDataFiles.setVisibility(View.VISIBLE);
+	                }
+                }
+                else {
+
+	                progressBar.setVisibility(View.GONE);
+	                noDataFiles.setVisibility(View.VISIBLE);
                 }
 
             }
 
             @Override
             public void onFailure(@NonNull Call<List<Files>> call, @NonNull Throwable t) {
-                Log.i("onFailure", t.toString());
+
+	            Toasty.error(ctx, ctx.getString(R.string.errorOnLogin));
             }
 
         });
     }
 
-    public LiveData<List<Files>> getFilesList2(String instanceUrl, String token, String owner, String repo, String filesDir, String ref, Context ctx) {
+    public LiveData<List<Files>> getFilesList2(String instanceUrl, String token, String owner, String repo, String filesDir, String ref, Context ctx, ProgressBar progressBar, TextView noDataFiles) {
 
         filesList2 = new MutableLiveData<>();
-        loadFilesList2(instanceUrl, token, owner, repo, filesDir, ref, ctx);
+        loadFilesList2(instanceUrl, token, owner, repo, filesDir, ref, ctx, progressBar, noDataFiles);
 
         return filesList2;
     }
 
-    private static void loadFilesList2(String instanceUrl, String token, String owner, String repo, String filesDir, String ref, final Context ctx) {
+    private static void loadFilesList2(String instanceUrl, String token, String owner, String repo, String filesDir, String ref, final Context ctx, ProgressBar progressBar, TextView noDataFiles) {
 
         Call<List<Files>> call = RetrofitClient
                 .getInstance(instanceUrl, ctx)
@@ -87,23 +99,32 @@ public class FilesViewModel extends ViewModel {
             @Override
             public void onResponse(@NonNull Call<List<Files>> call, @NonNull Response<List<Files>> response) {
 
-                if (response.isSuccessful()) {
+                if (response.code() == 200) {
 
 	                assert response.body() != null;
-	                Collections.sort(response.body(), (byType1, byType2) -> byType1.getType().compareTo(byType2.getType()));
-                    filesList2.postValue(response.body());
 
-                } else {
+	                if(response.body().size() > 0) {
 
-                    Toasty.warning(ctx, ctx.getString(R.string.noDataFilesTab));
-                    Log.i("onResponse", String.valueOf(response.code()));
+		                Collections.sort(response.body(), (byType1, byType2) -> byType1.getType().compareTo(byType2.getType()));
+		                filesList2.postValue(response.body());
+	                }
+	                else {
+
+		                progressBar.setVisibility(View.GONE);
+		                noDataFiles.setVisibility(View.VISIBLE);
+	                }
                 }
+                else {
 
+	                progressBar.setVisibility(View.GONE);
+	                noDataFiles.setVisibility(View.VISIBLE);
+                }
             }
 
             @Override
             public void onFailure(@NonNull Call<List<Files>> call, @NonNull Throwable t) {
-                Log.i("onFailure", t.toString());
+
+	            Toasty.error(ctx, ctx.getString(R.string.errorOnLogin));
             }
 
         });

app/src/main/res/drawable/ic_send.xml

@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,2L11,13"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M22,2l-7,20l-4,-9l-9,-4l20,-7z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+</vector>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    android:layout_width="match_parent"
+<LinearLayout android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="?attr/primaryBackgroundColor">
@@ -42,24 +42,52 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <EditText
-        android:id="@+id/addCollaboratorSearch"
+    <com.google.android.material.progressindicator.ProgressIndicator
+        android:id="@+id/progressBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="10dp"
-        android:textSize="14sp"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="20dp"
-        android:inputType="text"
-        android:labelFor="@+id/addCollaboratorSearch"
-        android:background="@drawable/shape_inputs"
-        android:textColor="?attr/inputTextColor"
-        android:textColorHint="?attr/hintColor"
-        android:textColorHighlight="?attr/primaryTextColor"
-        android:hint="@string/addCollaboratorSearchHint"
-        android:imeOptions="actionSend" />
+        style="@style/Widget.MaterialComponents.ProgressIndicator.Linear.Indeterminate"
+        android:visibility="gone"
+        app:indicatorColor="?attr/progressIndicatorColor" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp">
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/addCollaboratorSearchLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            android:textColorHint="?attr/hintColor"
+            app:hintTextColor="?attr/hintColor"
+            app:boxStrokeErrorColor="@color/darkRed"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            app:startIconDrawable="@drawable/ic_search"
+            app:startIconTint="?attr/iconsColor"
+            app:endIconMode="clear_text"
+            app:endIconTint="?attr/iconsColor"
+            android:hint="@string/addCollaboratorSearchHint">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/addCollaboratorSearch"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/inputTextColor"
+                android:textColorHighlight="?attr/hintColor"
+                android:textColorHint="?attr/hintColor"
+                android:imeOptions="actionSend"
+                android:inputType="text"
+                android:textSize="16sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+    </LinearLayout>
 
     <TextView
         android:id="@+id/noData"
@@ -72,14 +100,6 @@
         android:textSize="20sp"
         android:visibility="gone" />
 
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        style="@style/Base.Widget.AppCompat.ProgressBar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:indeterminate="true"
-        android:visibility="gone" />
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerViewUserSearch"
         android:layout_width="match_parent"

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

@@ -140,7 +140,6 @@
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:layout_marginTop="8dp"
-            android:layout_marginBottom="15dp"
             android:text="@string/addNewAccountText"
             android:textColor="@color/btnTextColor"
             android:textSize="16sp" />

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

@@ -50,24 +50,43 @@
         style="@style/Widget.MaterialComponents.ProgressIndicator.Linear.Indeterminate"
         app:indicatorColor="?attr/progressIndicatorColor" />
 
-    <EditText
-        android:id="@+id/addNewTeamMember"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="10dp"
-        android:textSize="14sp"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="20dp"
-        android:inputType="text"
-        android:background="@drawable/shape_inputs"
-        android:textColor="?attr/inputTextColor"
-        android:textColorHint="?attr/hintColor"
-        android:textColorHighlight="?attr/primaryTextColor"
-        android:hint="@string/addCollaboratorSearchHint"
-        android:imeOptions="actionSend"
-        android:autofillHints="@string/addCollaboratorSearchHint" />
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp">
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/addNewTeamMemberLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            android:textColorHint="?attr/hintColor"
+            app:hintTextColor="?attr/hintColor"
+            app:boxStrokeErrorColor="@color/darkRed"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            app:startIconDrawable="@drawable/ic_search"
+            app:startIconTint="?attr/iconsColor"
+            app:endIconMode="clear_text"
+            app:endIconTint="?attr/iconsColor"
+            android:hint="@string/addCollaboratorSearchHint">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/addNewTeamMember"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/inputTextColor"
+                android:textColorHighlight="?attr/hintColor"
+                android:textColorHint="?attr/hintColor"
+                android:inputType="text"
+                android:textSize="16sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+    </LinearLayout>
 
     <TextView
         android:id="@+id/noData"

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/primaryBackgroundColor"
-    tools:context=".activities.AddRemoveAssigneesActivity" />

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/primaryBackgroundColor"
-    tools:context=".activities.AddRemoveLabelsActivity" />

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    android:layout_width="match_parent"
+<LinearLayout android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="?attr/primaryBackgroundColor">
@@ -13,7 +13,6 @@
         android:theme="@style/Widget.AppCompat.SearchView">
 
         <com.google.android.material.appbar.MaterialToolbar
-            xmlns:tools="http://schemas.android.com/tools"
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -44,7 +43,6 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <ScrollView
-        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?attr/primaryBackgroundColor">
@@ -55,163 +53,162 @@
             android:padding="16dp"
             android:orientation="vertical">
 
-            <TextView
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/newIssueTitleLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/newIssueTitle"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
-
-            <EditText
-                android:id="@+id/newIssueTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:inputType="textCapSentences|text"
-                android:labelFor="@+id/newIssueTitle"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor" />
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                app:counterEnabled="true"
+                app:counterMaxLength="255"
+                app:counterTextColor="?attr/inputTextColor"
+                android:hint="@string/newIssueTitle">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/newIssueDescriptionTitle"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp"/>
-
-            <com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView
-                android:id="@+id/newIssueDescription"
-                android:layout_width="match_parent"
-                android:layout_height="240dp"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:completionThreshold="1"
-                android:background="@drawable/shape_inputs"
-                android:maxLines="10"
-                android:minLines="8"
-                tools:ignore="Autofill"
-                android:labelFor="@+id/newReplyToIssue"
-                android:scrollbars="vertical"
-                android:gravity="top|start"
-                android:textSize="14sp"
-                android:inputType="textCapSentences|textMultiLine"
-                android:textColor="?attr/inputTextColor"
-                android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/newIssueAssigneesListTitle"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp"/>
-
-            <TextView
-                android:id="@+id/newIssueAssigneesList"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
-                android:textColorHint="?attr/hintColor"
-                android:inputType="none"
-                android:textColorHighlight="?attr/primaryTextColor"/>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/labelsIdHolder"
-                android:visibility="gone" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/newIssueMilestoneTitle"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp"/>
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/shape_dropdown"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp" >
-
-                <Spinner
-                    android:id="@+id/newIssueMilestoneSpinner"
-                    android:layout_width="wrap_content"
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/newIssueTitle"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:spinnerMode="dropdown"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginBottom="5dp"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
-                    android:paddingStart="5dp" />
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:textSize="16sp" />
 
-            </RelativeLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <TextView
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/newIssueDescriptionLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/newIssueLabelsTitle"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp"/>
-
-            <TextView
-                android:id="@+id/newIssueLabels"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:inputType="none"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/newIssueDescriptionTitle">
 
-            <TextView
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/newIssueDescription"
+                    android:layout_width="match_parent"
+                    android:layout_height="140dp"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:gravity="top|start"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/newIssueAssigneesListLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/newIssueDueDateTitle"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp" />
-
-            <TextView
-                android:id="@+id/newIssueDueDate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:focusable="false"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                app:hintTextColor="?attr/hintColor"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:hint="@string/newIssueAssigneesListTitle">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/newIssueAssigneesList"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:focusable="false"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/newIssueMilestoneSpinnerLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                android:textColorHint="?attr/hintColor"
+                app:hintTextColor="?attr/hintColor"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:hint="@string/newIssueMilestoneTitle"
+                app:endIconTint="?attr/iconsColor"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
+
+                <AutoCompleteTextView
+                    android:id="@+id/newIssueMilestoneSpinner"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="none"
+                    android:textColor="?attr/inputTextColor"
+                    android:labelFor="@+id/newIssueMilestoneSpinner"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/newIssueLabelsLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                android:textColorHint="?attr/hintColor"
+                app:hintTextColor="?attr/hintColor"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:hint="@string/newIssueLabelsTitle">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/newIssueLabels"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:focusable="false"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/newIssueDueDateLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                android:textColorHint="?attr/hintColor"
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/newIssueDueDateTitle">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/newIssueDueDate"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:maxLines="1"
+                    android:focusable="false"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
 
             <Button
                 android:id="@+id/createNewIssueButton"
-                android:gravity="center"
-                android:layout_gravity="end"
-                android:layout_marginTop="20dp"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="60dp"
+                android:layout_marginTop="8dp"
                 android:text="@string/newCreateButtonCopy"
                 android:textColor="@color/btnTextColor" />
 

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

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    android:layout_width="match_parent"
+<LinearLayout android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="?attr/primaryBackgroundColor">
@@ -49,27 +48,30 @@
         android:padding="16dp"
         android:orientation="vertical">
 
-        <TextView
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/labelNameLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/labelName"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
-
-        <EditText
-            android:id="@+id/labelName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:padding="10dp"
-            android:textSize="14sp"
-            tools:ignore="Autofill"
-            android:inputType="textCapSentences|text"
-            android:labelFor="@+id/labelName"
-            android:background="@drawable/shape_inputs"
-            android:textColor="?attr/inputTextColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
             android:textColorHint="?attr/hintColor"
-            android:textColorHighlight="?attr/primaryTextColor"/>
+            app:hintTextColor="?attr/hintColor"
+            app:boxStrokeErrorColor="@color/darkRed"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            app:endIconMode="clear_text"
+            app:endIconTint="?attr/iconsColor"
+            android:hint="@string/labelName">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/labelName"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/inputTextColor"
+                android:textColorHighlight="?attr/hintColor"
+                android:textColorHint="?attr/hintColor"
+                android:textSize="16sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -98,11 +100,9 @@
 
         <Button
             android:id="@+id/createLabelButton"
-            android:gravity="center"
-            android:layout_gravity="end"
-            android:layout_marginTop="20dp"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="60dp"
+            android:layout_marginTop="8dp"
             android:text="@string/newCreateButtonCopy"
             android:textColor="@color/btnTextColor" />
 

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

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    android:layout_width="match_parent"
+<LinearLayout android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="?attr/primaryBackgroundColor">
@@ -54,104 +53,111 @@
             android:padding="16dp"
             android:orientation="vertical">
 
-            <TextView
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/fullNameLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/userFullNameText"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
-
-            <EditText
-                android:id="@+id/fullName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:inputType="textCapSentences|text"
-                android:labelFor="@+id/fullName"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/userFullNameText">
 
-            <TextView
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/fullName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/userUserNameLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/userUserName"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp" />
-
-            <EditText
-                android:id="@+id/userUserName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:inputType="text"
-                android:labelFor="@+id/userUserName"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/userUserName">
 
-            <TextView
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/userUserName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/userEmailLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/userEmail"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp" />
-
-            <EditText
-                android:id="@+id/userEmail"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:inputType="textEmailAddress"
-                android:labelFor="@+id/userEmail"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/userEmail">
 
-            <TextView
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/userEmail"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/userPasswordLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/userPassword"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp"/>
-
-            <EditText
-                android:id="@+id/userPassword"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:inputType="textPassword"
-                android:labelFor="@+id/userPassword"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/userPassword">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/userPassword"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
 
             <Button
                 android:id="@+id/createUserButton"
-                android:gravity="center"
-                android:layout_gravity="end"
-                android:layout_marginTop="20dp"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="60dp"
+                android:layout_marginTop="8dp"
                 android:text="@string/newCreateButtonCopy"
                 android:textColor="@color/btnTextColor" />
 

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

@@ -102,6 +102,7 @@
                     android:textColor="?attr/inputTextColor"
                     android:textColorHighlight="?attr/hintColor"
                     android:textColorHint="?attr/hintColor"
+                    android:gravity="top|start"
                     android:textSize="16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>
@@ -231,11 +232,9 @@
 
             <Button
                 android:id="@+id/createPr"
-                android:gravity="center"
-                android:layout_gravity="end"
-                android:layout_marginTop="8dp"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="60dp"
+                android:layout_marginTop="8dp"
                 android:text="@string/newCreateButtonCopy"
                 android:textColor="@color/btnTextColor" />
 

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

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    android:layout_width="match_parent"
+<LinearLayout android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="?attr/primaryBackgroundColor">
@@ -54,105 +53,105 @@
             android:padding="16dp"
             android:orientation="vertical">
 
-            <TextView
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/releaseTitleLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/releaseTagNameText"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
-
-            <EditText
-                android:id="@+id/releaseTagName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:inputType="text"
-                android:labelFor="@+id/releaseTagName"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor" />
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/releaseTitleText">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/releaseBranchText"
-                android:textColor="?attr/primaryTextColor"
-                android:layout_marginTop="10dp"
-                android:textSize="16sp" />
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/shape_dropdown"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp">
-
-                <Spinner
-                    android:id="@+id/releaseBranch"
-                    android:layout_width="wrap_content"
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/releaseTitle"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:spinnerMode="dropdown"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginBottom="5dp"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
-                    android:paddingStart="5dp" />
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:textSize="16sp" />
 
-            </RelativeLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <TextView
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/releaseTagNameLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/releaseTitleText"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp" />
-
-            <EditText
-                android:id="@+id/releaseTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:inputType="text"
-                android:labelFor="@+id/releaseTitle"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor" />
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/releaseTagNameText">
 
-            <TextView
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/releaseTagName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/releaseContentLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/releaseContentText"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp" />
-
-            <EditText
-                android:id="@+id/releaseContent"
-                android:layout_width="match_parent"
-                android:layout_height="240dp"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:maxLines="8"
-                android:minLines="6"
-                tools:ignore="Autofill"
-                android:labelFor="@+id/releaseContent"
-                android:scrollbars="vertical"
-                android:gravity="top|start"
-                android:textSize="14sp"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor"
-                android:inputType="textCapSentences|textMultiLine" />
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/releaseContentText">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/releaseContent"
+                    android:layout_width="match_parent"
+                    android:layout_height="140dp"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:gravity="top|start"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/releaseBranchLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                android:textColorHint="?attr/hintColor"
+                app:hintTextColor="?attr/hintColor"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:hint="@string/releaseBranchText"
+                app:endIconTint="?attr/iconsColor"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
+
+                <AutoCompleteTextView
+                    android:id="@+id/releaseBranch"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="none"
+                    android:textColor="?attr/inputTextColor"
+                    android:labelFor="@+id/releaseBranch"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
 
             <CheckBox
                 android:id="@+id/releaseType"
@@ -176,11 +175,9 @@
 
             <Button
                 android:id="@+id/createNewRelease"
-                android:gravity="center"
-                android:layout_gravity="end"
-                android:layout_marginTop="20dp"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="60dp"
+                android:layout_marginTop="8dp"
                 android:text="@string/newCreateButtonCopy"
                 android:textColor="@color/btnTextColor" />
 

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

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    android:layout_width="match_parent"
+<LinearLayout android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="?attr/primaryBackgroundColor">
@@ -54,72 +53,83 @@
             android:padding="16dp"
             android:orientation="vertical">
 
-            <TextView
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/teamNameLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/newTeamTitle"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
-
-            <EditText
-                android:id="@+id/teamName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:inputType="textCapSentences|text"
-                android:labelFor="@+id/teamName"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor" />
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/newTeamTitle">
 
-            <TextView
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/teamName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/teamDescLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/newTeamDesc"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp" />
-
-            <EditText
-                android:id="@+id/teamDesc"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:inputType="textCapSentences|text"
-                android:labelFor="@+id/teamDesc"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor" />
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                app:counterEnabled="true"
+                app:counterMaxLength="255"
+                app:counterTextColor="?attr/inputTextColor"
+                android:hint="@string/newTeamDesc">
 
-            <TextView
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/teamDesc"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/teamPermissionLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/newTeamPermission"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp" />
-
-            <TextView
-                android:id="@+id/teamPermission"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor"
-                android:inputType="none" />
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:hint="@string/newTeamPermission">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/teamPermission"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:maxLines="1"
+                    android:focusable="false"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
                 android:id="@+id/teamPermissionDetail"
@@ -130,27 +140,30 @@
                 android:gravity="start"
                 android:visibility="gone" />
 
-            <TextView
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/teamAccessControlsLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/newTeamAccessControls"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp" />
-
-            <TextView
-                android:id="@+id/teamAccessControls"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor"
-                android:inputType="none" />
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:hint="@string/newTeamAccessControls">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/teamAccessControls"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:maxLines="1"
+                    android:focusable="false"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
                 android:id="@+id/teamAccessControlsArray"
@@ -160,11 +173,9 @@
 
             <Button
                 android:id="@+id/createTeamButton"
-                android:gravity="center"
-                android:layout_gravity="end"
-                android:layout_marginTop="20dp"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="60dp"
+                android:layout_marginTop="8dp"
                 android:text="@string/newCreateButtonCopy"
                 android:textColor="@color/btnTextColor" />
 

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

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="?attr/primaryBackgroundColor"
+    android:orientation="vertical"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <com.google.android.material.progressindicator.ProgressIndicator
+        android:id="@+id/progressBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Widget.MaterialComponents.ProgressIndicator.Linear.Indeterminate"
+        android:layout_centerInParent="true"
+        app:indicatorColor="?attr/progressIndicatorColor" />
+
+    <LinearLayout
+        android:id="@+id/addNewAccountFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="32dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:visibility="gone"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/addAccountText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/accountDoesNotExist"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="16sp" />
+
+        <Button
+            android:id="@+id/addNewAccount"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:text="@string/addNewAccountText"
+            android:textColor="@color/btnTextColor"
+            android:textSize="16sp"
+            android:layout_marginTop="24dp" />
+
+        <Button
+            android:id="@+id/openInBrowser"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:text="@string/openWebRepo"
+            android:textColor="@color/btnTextColor"
+            android:textSize="16sp"
+            android:layout_marginTop="8dp" />
+
+        <Button
+            android:id="@+id/launchApp"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:text="@string/launchApp"
+            android:textColor="@color/btnTextColor"
+            android:textSize="16sp"
+            android:layout_marginTop="8dp" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/noActionFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="32dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:visibility="gone"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/noActionText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/noActionText"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="16sp" />
+
+        <Button
+            android:id="@+id/repository"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:text="@string/navRepos"
+            android:textColor="@color/btnTextColor"
+            android:textSize="16sp"
+            android:layout_marginTop="24dp" />
+
+        <Button
+            android:id="@+id/organization"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:text="@string/navOrgs"
+            android:textColor="@color/btnTextColor"
+            android:textSize="16sp"
+            android:layout_marginTop="8dp" />
+
+        <Button
+            android:id="@+id/notification"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:text="@string/pageTitleNotifications"
+            android:textColor="@color/btnTextColor"
+            android:textSize="16sp"
+            android:layout_marginTop="8dp" />
+
+        <Button
+            android:id="@+id/explore"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:text="@string/navExplore"
+            android:textColor="@color/btnTextColor"
+            android:textSize="16sp"
+            android:layout_marginTop="8dp" />
+
+        <Button
+            android:id="@+id/launchApp2"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:text="@string/launchApp"
+            android:textColor="@color/btnTextColor"
+            android:textSize="16sp"
+            android:layout_marginTop="8dp" />
+
+    </LinearLayout>
+
+</RelativeLayout>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    android:layout_width="match_parent"
+<LinearLayout android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="?attr/primaryBackgroundColor">
@@ -13,7 +13,6 @@
         android:theme="@style/Widget.AppCompat.SearchView">
 
         <com.google.android.material.appbar.MaterialToolbar
-            xmlns:tools="http://schemas.android.com/tools"
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -44,7 +43,6 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <ScrollView
-        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?attr/primaryBackgroundColor">
@@ -55,114 +53,114 @@
             android:padding="16dp"
             android:orientation="vertical">
 
-            <TextView
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/editIssueTitleLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/newIssueTitle"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
-
-            <EditText
-                android:id="@+id/editIssueTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:labelFor="@+id/editIssueTitle"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/inputTextColor"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor" />
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/newIssueTitle">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/newIssueDescriptionTitle"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp"/>
-
-            <com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView
-                android:id="@+id/editIssueDescription"
-                android:layout_width="match_parent"
-                android:layout_height="240dp"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:completionThreshold="1"
-                android:background="@drawable/shape_inputs"
-                android:maxLines="12"
-                android:minLines="10"
-                tools:ignore="Autofill"
-                android:labelFor="@+id/newReplyToIssue"
-                android:scrollbars="vertical"
-                android:gravity="top|start"
-                android:textSize="14sp"
-                android:textColor="?attr/inputTextColor"
-                android:textColorHint="?attr/primaryBackgroundColor"
-                android:textColorHighlight="?attr/primaryTextColor"
-                android:inputType="textCapSentences|textMultiLine" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/newIssueDueDateTitle"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:visibility="gone"
-                android:layout_marginTop="10dp" />
-
-            <TextView
-                android:id="@+id/editIssueDueDate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:focusable="false"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:textSize="14sp"
-                tools:ignore="Autofill"
-                android:background="@drawable/shape_inputs"
-                android:textColor="?attr/primaryTextColor"
-                android:textColorHint="?attr/primaryTextColor"
-                android:visibility="gone"
-                android:textColorHighlight="?attr/primaryTextColor"/>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/newIssueMilestoneTitle"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:layout_marginTop="10dp"/>
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/shape_dropdown"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp" >
-
-                <Spinner
-                    android:id="@+id/editIssueMilestoneSpinner"
-                    android:layout_width="wrap_content"
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/editIssueTitle"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:spinnerMode="dropdown"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginBottom="5dp"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
-                    android:paddingStart="5dp" />
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:textSize="16sp" />
 
-            </RelativeLayout>
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/editIssueDescriptionLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                android:textColorHint="?attr/hintColor"
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                android:hint="@string/newIssueDescriptionTitle">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/editIssueDescription"
+                    android:layout_width="match_parent"
+                    android:layout_height="140dp"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:gravity="top|start"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/editIssueMilestoneSpinnerLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                android:textColorHint="?attr/hintColor"
+                app:hintTextColor="?attr/hintColor"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:hint="@string/newIssueMilestoneTitle"
+                app:endIconTint="?attr/iconsColor"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
+
+                <AutoCompleteTextView
+                    android:id="@+id/editIssueMilestoneSpinner"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="none"
+                    android:textColor="?attr/inputTextColor"
+                    android:labelFor="@+id/editIssueMilestoneSpinner"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/editIssueDueDateLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:boxBackgroundColor="?attr/inputBackgroundColor"
+                android:textColorHint="?attr/hintColor"
+                app:hintTextColor="?attr/hintColor"
+                app:boxStrokeErrorColor="@color/darkRed"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:endIconMode="clear_text"
+                app:endIconTint="?attr/iconsColor"
+                android:visibility="gone"
+                android:hint="@string/newIssueDueDateTitle">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/editIssueDueDate"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/inputTextColor"
+                    android:textColorHighlight="?attr/hintColor"
+                    android:textColorHint="?attr/hintColor"
+                    android:maxLines="1"
+                    android:focusable="false"
+                    android:textSize="16sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
 
             <Button
                 android:id="@+id/editIssueButton"
-                android:gravity="center"
-                android:layout_gravity="end"
-                android:layout_marginTop="20dp"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="60dp"
+                android:layout_marginTop="8dp"
                 android:text="@string/saveButton"
                 android:textColor="@color/btnTextColor" />
 

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:gravity="center"
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="20dp"
+        android:padding="16dp"
         android:fitsSystemWindows="true" >
 
         <ImageView
@@ -31,8 +31,6 @@
             android:text="@string/loginMethodText"
             android:textColor="?attr/primaryTextColor"
             android:textSize="12sp"
-            android:paddingStart="5dp"
-            android:paddingEnd="5dp"
             android:layout_marginBottom="10dp"
             android:gravity="start" />
 
@@ -40,16 +38,14 @@
             android:id="@+id/loginMethod"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingStart="5dp"
-            android:paddingEnd="5dp"
-            android:layout_margin="10dp"
-            android:background="@drawable/shape_inputs"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
             android:orientation="vertical">
 
             <RadioButton
                 android:id="@+id/loginToken"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="36dp"
                 android:text="@string/copyToken"
                 android:checked="true"
                 android:textColor="?attr/primaryTextColor"/>
@@ -57,158 +53,184 @@
             <RadioButton
                 android:id="@+id/loginUsernamePassword"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="36dp"
                 android:text="@string/loginViaPassword"
-                android:layout_marginEnd="30dp"
                 android:textColor="?attr/primaryTextColor"/>
 
         </RadioGroup>
 
-        <RelativeLayout
-            android:layout_width="wrap_content"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/httpsSpinnerLayout"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/shape_dropdown"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp" >
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
+            android:textColorHint="?attr/hintColor"
+            app:hintTextColor="?attr/hintColor"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:hint="@string/protocol"
+            app:endIconTint="?attr/iconsColor"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
 
-            <Spinner
+            <AutoCompleteTextView
                 android:id="@+id/httpsSpinner"
-                android:layout_width="120dp"
-                android:layout_height="44dp"
-                android:spinnerMode="dropdown"
-                android:padding="10dp" />
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="none"
+                android:textColor="?attr/inputTextColor"
+                android:labelFor="@+id/httpsSpinner"
+                android:textSize="16sp" />
 
-        </RelativeLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <LinearLayout
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/info"
-                android:layout_width="28dp"
-                android:layout_height="28dp"
-                android:src="@drawable/ic_info"
-                android:layout_marginStart="120dp"
-                android:layout_marginTop="10dp"
-                android:contentDescription="@string/urlInfoTooltip" />
-
-        </LinearLayout>
-
-        <EditText
-            android:id="@+id/instance_url"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/instance_urlLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:padding="10dp"
-            android:textSize="14sp"
-            tools:ignore="Autofill"
-            android:drawableStart="@drawable/ic_link"
-            android:drawablePadding="10dp"
-            android:inputType="textUri"
-            android:background="@drawable/shape_inputs"
-            android:textColor="?attr/inputTextColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
             android:textColorHint="?attr/hintColor"
-            android:textColorHighlight="?attr/hintColor"
-            android:hint="@string/instanceUrl" />
+            app:hintTextColor="?attr/hintColor"
+            app:boxStrokeErrorColor="@color/darkRed"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            app:startIconDrawable="@drawable/ic_link"
+            app:startIconTint="?attr/iconsColor"
+            app:endIconMode="clear_text"
+            app:endIconTint="?attr/iconsColor"
+            android:hint="@string/instanceUrl">
 
-        <EditText
-            android:id="@+id/login_uid"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/instance_url"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/inputTextColor"
+                android:textColorHighlight="?attr/hintColor"
+                android:textColorHint="?attr/hintColor"
+                android:inputType="textUri"
+                android:textSize="16sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/login_uidLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:padding="10dp"
-            android:textSize="14sp"
-            tools:ignore="Autofill"
-            android:drawableStart="@drawable/ic_person"
-            android:drawablePadding="10dp"
-            android:background="@drawable/shape_inputs"
-            android:textColor="?attr/inputTextColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
             android:textColorHint="?attr/hintColor"
-            android:textColorHighlight="?attr/hintColor"
-            android:hint="@string/userName"
-            android:inputType="text"
-            android:visibility="gone" />
+            app:hintTextColor="?attr/hintColor"
+            app:boxStrokeErrorColor="@color/darkRed"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            app:startIconDrawable="@drawable/ic_person"
+            app:startIconTint="?attr/iconsColor"
+            app:endIconMode="clear_text"
+            app:endIconTint="?attr/iconsColor"
+            android:hint="@string/userName">
 
-        <EditText
-            android:id="@+id/login_passwd"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/login_uid"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/inputTextColor"
+                android:textColorHighlight="?attr/hintColor"
+                android:textColorHint="?attr/hintColor"
+                android:textSize="16sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/login_passwdLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:padding="10dp"
-            android:textSize="14sp"
-            tools:ignore="Autofill"
-            android:drawableStart="@drawable/ic_lock"
-            android:drawablePadding="10dp"
-            android:background="@drawable/shape_inputs"
-            android:textColor="?attr/inputTextColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
             android:textColorHint="?attr/hintColor"
-            android:textColorHighlight="?attr/hintColor"
-            android:hint="@string/passWord"
-            android:inputType="textPassword"
-            android:visibility="gone" />
+            app:hintTextColor="?attr/hintColor"
+            app:boxStrokeErrorColor="@color/darkRed"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            app:startIconDrawable="@drawable/ic_lock"
+            app:startIconTint="?attr/iconsColor"
+            app:endIconTint="?attr/iconsColor"
+            app:endIconMode="password_toggle"
+            android:hint="@string/passWord">
 
-        <EditText
-            android:id="@+id/otpCode"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/login_passwd"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/inputTextColor"
+                android:textColorHighlight="?attr/hintColor"
+                android:textColorHint="?attr/hintColor"
+                android:inputType="textPassword"
+                android:textSize="16sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/otpCodeLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:padding="10dp"
-            android:textSize="14sp"
-            tools:ignore="Autofill"
-            android:drawableStart="@drawable/ic_otp"
-            android:drawablePadding="10dp"
-            android:background="@drawable/shape_inputs"
-            android:textColor="?attr/inputTextColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
             android:textColorHint="?attr/hintColor"
-            android:textColorHighlight="?attr/hintColor"
-            android:hint="@string/loginOTP"
-            android:inputType="number"
-            android:visibility="gone" />
+            app:hintTextColor="?attr/hintColor"
+            app:boxStrokeErrorColor="@color/darkRed"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            app:startIconDrawable="@drawable/ic_otp"
+            app:startIconTint="?attr/iconsColor"
+            app:endIconMode="clear_text"
+            app:endIconTint="?attr/iconsColor"
+            app:helperText="@string/otpMessage"
+            app:helperTextTextColor="?attr/inputTextColor"
+            app:helperTextEnabled="true"
+            android:hint="@string/loginOTP">
 
-        <EditText
-            android:id="@+id/loginTokenCode"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/otpCode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/inputTextColor"
+                android:textColorHighlight="?attr/hintColor"
+                android:textColorHint="?attr/hintColor"
+                android:inputType="number"
+                android:textSize="16sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/loginTokenCodeLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:padding="10dp"
-            android:textSize="14sp"
-            tools:ignore="Autofill"
-            android:drawableStart="@drawable/ic_lock"
-            android:drawablePadding="10dp"
-            android:background="@drawable/shape_inputs"
-            android:textColor="?attr/inputTextColor"
+            app:boxBackgroundColor="?attr/inputBackgroundColor"
             android:textColorHint="?attr/hintColor"
-            android:textColorHighlight="?attr/hintColor"
-            android:hint="@string/copyToken"
-            android:inputType="text"
-            android:visibility="visible" />
+            app:hintTextColor="?attr/hintColor"
+            app:boxStrokeErrorColor="@color/darkRed"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            app:startIconDrawable="@drawable/ic_lock"
+            app:startIconTint="?attr/iconsColor"
+            app:endIconMode="clear_text"
+            app:endIconTint="?attr/iconsColor"
+            android:hint="@string/copyToken">
 
-        <TextView
-            android:id="@+id/otpInfo"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/otpMessage"
-            android:textColor="@color/hintColor"
-            android:textSize="12sp"
-            android:paddingStart="10dp"
-            android:paddingEnd="10dp"
-            android:gravity="end"
-            android:visibility="gone" />
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/loginTokenCode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/inputTextColor"
+                android:textColorHighlight="?attr/hintColor"
+                android:textColorHint="?attr/hintColor"
+                android:textSize="16sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
 
         <Button
+            android:id="@+id/login_button"
             android:layout_width="match_parent"
             android:layout_height="60dp"
+            android:layout_marginTop="8dp"
             android:text="@string/btnLogin"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="15dp"
-            android:layout_marginTop="15dp"
-            android:textColor="@color/btnTextColor"
-            android:textSize="16sp"
-            android:id="@+id/login_button"/>
+            android:textColor="@color/btnTextColor" />
 
         <TextView
             android:layout_width="match_parent"