Update readme (#718)

Update readme

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

.drone.yml

@@ -66,7 +66,7 @@ steps:
   - name: build
     image: nextcloudci/android:android-49
     commands:
-      - ./gradlew build
+      - ./gradlew assembleFreeRelease
 
   - name: sign
     image: nextcloudci/android:android-49
@@ -78,7 +78,7 @@ steps:
       KEY_PASS:
         from_secret: KEY_PASS
       OUTPUT: signed.apk
-      GITEA: https://gitea.com
+      INSTANCE: https://codeberg.org
       KS_FILE: ci_keystore.jks
       KS_REPO:
         from_secret: KS_REPO

.gitignore

@@ -11,6 +11,9 @@
 # Release dir
 app/release/*
 
+# Pro dir
+app/pro/*
+
 # Files for the ART/Dalvik VM
 *.dex
 

.gitlab-ci.yml

@@ -7,6 +7,9 @@ stages:
 test:
   image: nextcloudci/android:android-49
   stage: test
+  only:
+    - master
+    - tags
   script:
     - ./gradlew test
 
@@ -15,8 +18,9 @@ build:
   stage: build
   only:
     - master
+    - tags
   script:
-    - ./gradlew build
+    - ./gradlew assembleFreeRelease
   artifacts:
     paths:
       - app/build/outputs/
@@ -27,9 +31,10 @@ sign:
   stage: sign
   only:
     - master
+    - tags
   variables:
     OUTPUT: "signed.apk"
-    GITEA: "https://gitea.com"
+    INSTANCE: "https://codeberg.org"
     KS_FILE: "ci_keystore.jks"
   script:
     - ./scripts/sign-build.sh
@@ -43,6 +48,7 @@ latest:
   stage: publish
   only:
     - master
+    - tags
   variables:
     WEBDAV_USERNAME: "GitNexBot"
     PLUGIN_FILE: "signed.apk"

.idea/codeStyles/Project.xml

@@ -16,6 +16,24 @@
         </value>
       </option>
     </JavaCodeStyleSettings>
+    <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" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="RIGHT_MARGIN" value="220" />
       <option name="KEEP_LINE_BREAKS" value="false" />
@@ -162,4 +180,4 @@
       </arrangement>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>

README.md

@@ -1,16 +1,16 @@
-[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://codeberg.org/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://codeberg.org/gitnex/GitNex/releases) [![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex) [![Join the Discord chat at https://discord.gg/FbSS4rf](https://img.shields.io/discord/632219664587685908.svg)](https://discord.gg/FbSS4rf)
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) ![Pipeline status](https://img.shields.io/gitlab/pipeline/opyale/gitnex/master) [![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://codeberg.org/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://codeberg.org/gitnex/GitNex/releases) [![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex) [![Join the Discord chat at https://discord.gg/FbSS4rf](https://img.shields.io/discord/632219664587685908.svg)](https://discord.gg/FbSS4rf)
 
 [<img alt="Become a Patroen" src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" height="40"/>](https://www.patreon.com/mmarif) [<img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="40"/>](https://liberapay.com/mmarif/donate)
 
 # 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='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='assets/apk-badge.png' height="82"/>](https://cloud.swatian.com/s/DN7E5xxtaw4fRbE)
 
 ## Note about Gitea version
@@ -21,10 +21,10 @@ Check the versions [compatibility page](https://codeberg.org/gitnex/GitNex/wiki/
 ## Build from source
 Option 1 - Download the source code, open it in Android Studio and build it there.
 
-Option 2 - Open terminal(Linux) and cd to the project dir. Run `./gradlew build`.
+Option 2 - Open terminal(Linux) and cd to the project dir. Run `./gradlew assembleFree`.
 
 ## Features
-- Repositories / issues/ org list
+- Multiple accounts support
 - File and directory browser
 - File viewer
 - Create files
@@ -33,6 +33,7 @@ Option 2 - Open terminal(Linux) and cd to the project dir. Run `./gradlew build`
 - Files diff for PRs
 - Notifications
 - Drafts
+- Repositories / issues / org list
 - [MANY MORE](https://codeberg.org/gitnex/GitNex/wiki/Features)
 
 ## Contributing
@@ -86,9 +87,9 @@ Thanks to all the open source libraries, contributors and donators.
 - Apache/commons-io
 - Caverock/androidsvg
 - Droidsonroids.gif/android-gif-drawable
-- Barteksc/AndroidPdfViewer
-- Ge0rg/MemorizingTrustManager
-- Dimezis/BlurView
-- mikaelhg/urlbuilder
+- Barteksc/androidPdfViewer
+- Ge0rg/memorizingTrustManager
+- Dimezis/blurView
+- Mikaelhg/urlbuilder
 
 [Follow me on Fediverse - mastodon.social/@mmarif](https://mastodon.social/@mmarif)

app/build.gradle

@@ -1,15 +1,28 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 307
-        versionName "3.1.0-rc1"
+        targetSdkVersion 30
+        versionCode 320
+        versionName "3.2.0"
+        multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+    dexOptions {
+        javaMaxHeapSize "4g"
+    }
+    flavorDimensions "default"
+    productFlavors {
+        free {
+            applicationId "org.mian.gitnex"
+        }
+        pro {
+            applicationId "org.mian.gitnex.pro"
+        }
+    }
     buildFeatures {
         viewBinding = true
     }
@@ -28,6 +41,9 @@ android {
         targetCompatibility = "8"
         sourceCompatibility = "8"
     }
+    defaultConfig{
+        vectorDrawables.useSupportLibrary = true
+    }
 }
 
 configurations {
@@ -36,29 +52,29 @@ configurations {
 }
 
 dependencies {
-    def lifecycle_version = "2.3.0-alpha06"
-    def markwon_version = "4.4.0"
+    def lifecycle_version = '2.3.0-alpha07'
+    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-alpha01"
+    implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
     implementation "com.google.android.material:material:1.3.0-alpha02"
-    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
     testImplementation "junit:junit:4.13"
-    androidTestImplementation "androidx.test:runner:1.2.0"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
+    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.8.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"
     implementation "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1"
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     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.8.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
     implementation 'org.ocpsoft.prettytime:prettytime:4.0.5.Final'
     implementation "com.vdurmont:emoji-java:5.1.1"
     implementation "com.pes.materialcolorpicker:library:1.2.5"

app/src/main/AndroidManifest.xml

@@ -48,8 +48,6 @@
             android:name=".activities.OrganizationDetailActivity"
             android:label="@string/title_activity_org_detail"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".activities.SponsorsActivity" />
-        <activity android:name=".activities.CreditsActivity" />
         <activity android:name=".activities.CreateLabelActivity" />
         <activity android:name=".activities.CreateIssueActivity" />
         <activity android:name=".activities.CreateMilestoneActivity" />
@@ -86,6 +84,8 @@
         <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" />
 
         <!-- Version < 3.0. DeX Mode and Screen Mirroring support -->
         <meta-data android:name="com.samsung.android.keepalive.density" android:value="true"/>

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

@@ -7,6 +7,7 @@ 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;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
@@ -22,7 +23,7 @@ import retrofit2.Callback;
 
 public class IssueActions {
 
-	public static void editIssueComment(final Context ctx, final int commentId, final String commentBody) {
+	public static void editIssueComment(final Context ctx, final int commentId, final String commentBody, long draftIdOnCreate) {
 
 		final TinyDB tinyDb = new TinyDB(ctx);
 		final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -47,7 +48,11 @@ public class IssueActions {
 					if(response.code() == 200) {
 
 						tinyDb.putBoolean("commentEdited", true);
-						Toasty.success(ctx, ctx.getString(R.string.editCommentUpdatedText));
+						Toasty.info(ctx, ctx.getString(R.string.editCommentUpdatedText));
+
+						DraftsApi draftsApi = new DraftsApi(ctx);
+						draftsApi.deleteSingleDraft((int) draftIdOnCreate);
+
 						((ReplyToIssueActivity) ctx).finish();
 
 					}

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

@@ -144,5 +144,4 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
         onClickListener = view -> finish();
     }
 
-
 }

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

@@ -40,9 +40,11 @@ public class AddNewAccountActivity extends BaseActivity {
 	private ActivityAddNewAccountBinding viewBinding;
 
 	private enum Protocol {HTTPS, HTTP}
+	private String spinnerSelectedValue;
 
 	@Override
-	protected int getLayoutResourceId(){
+	protected int getLayoutResourceId() {
+
 		return R.layout.activity_add_new_account;
 	}
 
@@ -62,12 +64,12 @@ public class AddNewAccountActivity extends BaseActivity {
 		initCloseListener();
 		viewBinding.close.setOnClickListener(onClickListener);
 
-		ArrayAdapter<AddNewAccountActivity.Protocol> adapterProtocols = new ArrayAdapter<>(AddNewAccountActivity.this, R.layout.spinner_item, AddNewAccountActivity.Protocol.values());
-		adapterProtocols.setDropDownViewResource(R.layout.spinner_dropdown_item);
-
+		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(ctx, R.layout.list_spinner_items, Protocol.values());
 		viewBinding.protocolSpinner.setAdapter(adapterProtocols);
 
-		viewBinding.addNewAccount.setOnClickListener(login  -> {
+		viewBinding.protocolSpinner.setOnItemClickListener((parent, view1, position, id) -> spinnerSelectedValue = String.valueOf(parent.getItemAtPosition(position)));
+
+		viewBinding.addNewAccount.setOnClickListener(login -> {
 
 			boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
@@ -80,7 +82,7 @@ public class AddNewAccountActivity extends BaseActivity {
 
 				processLogin();
 			}
-		 });
+		});
 
 	}
 
@@ -88,9 +90,15 @@ public class AddNewAccountActivity extends BaseActivity {
 
 		try {
 
-			String instanceUrlET = viewBinding.instanceUrl.getText().toString();
-			String loginToken = viewBinding.loginToken.getText().toString();
-			Protocol protocol = (Protocol) viewBinding.protocolSpinner.getSelectedItem();
+			String instanceUrlET = String.valueOf(viewBinding.instanceUrl.getText());
+			String loginToken = String.valueOf(viewBinding.loginToken.getText());
+			String protocol = spinnerSelectedValue;
+
+			if(protocol == null) {
+
+				Toasty.error(ctx, getResources().getString(R.string.protocolEmptyError));
+				return;
+			}
 
 			if(instanceUrlET.equals("")) {
 
@@ -106,10 +114,7 @@ public class AddNewAccountActivity extends BaseActivity {
 
 			URI rawInstanceUrl = UrlBuilder.fromString(UrlHelper.fixScheme(instanceUrlET, "http")).toUri();
 
-			URI instanceUrlWithProtocol = UrlBuilder.fromUri(rawInstanceUrl).withPath(PathsHelper.join(rawInstanceUrl.getPath()))
-				.withScheme(protocol.name().toLowerCase()).toUri();
-
-			URI instanceUrl = UrlBuilder.fromUri(instanceUrlWithProtocol).withPath(PathsHelper.join(instanceUrlWithProtocol.getPath(), "/api/v1/"))
+			URI instanceUrl = UrlBuilder.fromUri(rawInstanceUrl).withScheme(protocol.toLowerCase()).withPath(PathsHelper.join(rawInstanceUrl.getPath(), "/api/v1/"))
 				.toUri();
 
 			versionCheck(instanceUrl.toString(), loginToken);
@@ -127,7 +132,7 @@ public class AddNewAccountActivity extends BaseActivity {
 
 		Call<GiteaVersion> callVersion;
 
-		callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken(loginToken);
+		callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken("token " + loginToken);
 
 		callVersion.enqueue(new Callback<GiteaVersion>() {
 
@@ -137,19 +142,16 @@ public class AddNewAccountActivity extends BaseActivity {
 				if(responseVersion.code() == 200) {
 
 					GiteaVersion version = responseVersion.body();
-					Version giteaVersion;
 
 					assert version != null;
-
-					try {
-						giteaVersion = new Version(version.getVersion());
-					}
-					catch(Exception e) {
-
+					if(!Version.valid(version.getVersion())) {
 						Toasty.error(ctx, getResources().getString(R.string.versionUnknown));
 						return;
 					}
 
+					tinyDB.putString("giteaVersion", version.getVersion());
+					Version giteaVersion = new Version(version.getVersion());
+
 					if(giteaVersion.less(getString(R.string.versionLow))) {
 
 						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx).setTitle(getString(R.string.versionAlertDialogHeader))
@@ -159,7 +161,6 @@ public class AddNewAccountActivity extends BaseActivity {
 						alertDialogBuilder.setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> {
 
 							dialog.dismiss();
-							//enableProcessButton();
 						});
 
 						alertDialogBuilder.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
@@ -239,12 +240,12 @@ public class AddNewAccountActivity extends BaseActivity {
 
 					case 401:
 
-						Toasty.error(ctx,getResources().getString(R.string.unauthorizedApiError));
+						Toasty.error(ctx, getResources().getString(R.string.unauthorizedApiError));
 						break;
 
 					default:
 
-						Toasty.error(ctx,getResources().getString(R.string.genericApiStatusError) + response.code());
+						Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + response.code());
 				}
 
 			}
@@ -253,7 +254,7 @@ public class AddNewAccountActivity extends BaseActivity {
 			public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
 
 				Log.e("onFailure", t.toString());
-				Toasty.error(ctx,getResources().getString(R.string.genericError));
+				Toasty.error(ctx, getResources().getString(R.string.genericError));
 			}
 		});
 

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

@@ -68,7 +68,7 @@ public class AddNewTeamMemberActivity extends BaseActivity {
 		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
 		ImageView closeActivity = findViewById(R.id.close);
-		addNewTeamMember = findViewById(R.id.addNewTeamMeber);
+		addNewTeamMember = findViewById(R.id.addNewTeamMember);
 		mRecyclerView = findViewById(R.id.recyclerViewUserSearch);
 		mProgressBar = findViewById(R.id.progress_bar);
 		noData = findViewById(R.id.noData);
@@ -125,6 +125,8 @@ public class AddNewTeamMemberActivity extends BaseActivity {
 
 		Call<UserSearch> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserBySearch(Authorization.returnAuthentication(ctx, loginUid, token), searchKeyword, 10);
 
+		mProgressBar.setVisibility(View.VISIBLE);
+
 		call.enqueue(new Callback<UserSearch>() {
 
 			@Override

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import org.acra.ACRA;
 import org.acra.BuildConfig;
+import org.acra.annotation.AcraCore;
 import org.acra.annotation.AcraNotification;
 import org.acra.config.CoreConfigurationBuilder;
 import org.acra.config.LimiterConfigurationBuilder;
@@ -16,6 +17,7 @@ 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.*;
 
 /**
  * Author M M Arif
@@ -25,6 +27,7 @@ import org.mian.gitnex.notifications.NotificationsMaster;
 		resTitle = R.string.crashTitle,
 		resChannelName = R.string.setCrashReports,
 		resText = R.string.crashMessage)
+@AcraCore(reportContent = { ANDROID_VERSION, PHONE_MODEL, STACK_TRACE })
 
 public abstract class BaseActivity extends AppCompatActivity {
 
@@ -51,6 +54,19 @@ public abstract class BaseActivity extends AppCompatActivity {
 				}
 				break;
 
+			case 3:
+				setTheme(R.style.AppThemeRetro);
+				break;
+
+			case 4:
+				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
+					setTheme(R.style.AppTheme);
+				}
+				else {
+					setTheme(R.style.AppThemeRetro);
+				}
+				break;
+
 			default:
 				setTheme(R.style.AppTheme);
 				break;
@@ -120,11 +136,6 @@ public abstract class BaseActivity extends AppCompatActivity {
 			tinyDb.putString("draftsCommentsDeletionEnabledInit", "yes");
 		}
 
-		if(!tinyDb.getString("instanceUrlWithProtocol").endsWith("/")) {
-
-			tinyDb.putString("instanceUrlWithProtocol", tinyDb.getString("instanceUrlWithProtocol") + "/");
-		}
-
 		if (tinyDb.getBoolean("crashReportingEnabled")) {
 
 			CoreConfigurationBuilder ACRABuilder = new CoreConfigurationBuilder(this);

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

@@ -52,6 +52,7 @@ public class CommitsActivity extends BaseActivity {
 	private List<Commits> commitsList;
 	private CommitsAdapter adapter;
 	private ApiInterface api;
+	private ProgressBar progressLoadMore;
 
 	@Override
 	protected int getLayoutResourceId() {
@@ -84,6 +85,7 @@ public class CommitsActivity extends BaseActivity {
 
 		ImageView closeActivity = findViewById(R.id.close);
 		noData = findViewById(R.id.noDataCommits);
+		progressLoadMore = findViewById(R.id.progressLoadMore);
 		progressBar = findViewById(R.id.progress_bar);
 		SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);
 
@@ -176,9 +178,7 @@ public class CommitsActivity extends BaseActivity {
 
 	private void loadMore(String token, String repoOwner, String repoName, final int page, String branchName, int resultLimit) {
 
-		//add loading progress view
-		commitsList.add(new Commits("load"));
-		adapter.notifyItemInserted((commitsList.size() - 1));
+		progressLoadMore.setVisibility(View.VISIBLE);
 
 		Call<List<Commits>> call = api.getRepositoryCommits(token, repoOwner, repoName, page, branchName, resultLimit);
 
@@ -189,9 +189,6 @@ public class CommitsActivity extends BaseActivity {
 
 				if(response.isSuccessful()) {
 
-					//remove loading view
-					commitsList.remove(commitsList.size() - 1);
-
 					List<Commits> result = response.body();
 
 					assert result != null;
@@ -208,6 +205,7 @@ public class CommitsActivity extends BaseActivity {
 					}
 
 					adapter.notifyDataChanged();
+					progressLoadMore.setVisibility(View.GONE);
 
 				}
 				else {

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -23,6 +22,8 @@ import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.models.DeleteFile;
+import org.mian.gitnex.models.EditFile;
 import org.mian.gitnex.models.NewFile;
 import java.util.ArrayList;
 import java.util.List;
@@ -44,8 +45,12 @@ public class CreateFileActivity extends BaseActivity {
     private EditText newFileBranchName;
     private EditText newFileCommitMessage;
     private Spinner newFileBranchesSpinner;
+	private String filePath;
+	private String fileSha;
+	private int fileAction = 0; // 0 = create, 1 = delete, 2 = edit
     final Context ctx = this;
     private Context appCtx;
+    private TinyDB tinyDb;
 
     List<Branches> branchesList = new ArrayList<>();
 
@@ -59,12 +64,12 @@ public class CreateFileActivity 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");
         String repoFullName = tinyDb.getString("repoFullName");
@@ -80,6 +85,8 @@ public class CreateFileActivity extends BaseActivity {
         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;
@@ -90,11 +97,50 @@ public class CreateFileActivity extends BaseActivity {
 
         newFileCreate = findViewById(R.id.newFileCreate);
 
+	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", 1) == 1) {
+
+		    fileNameHint.setVisibility(View.GONE);
+		    fileAction = getIntent().getIntExtra("fileAction", 1);
+
+		    filePath = getIntent().getStringExtra("filePath");
+		    String fileContents = getIntent().getStringExtra("fileContents");
+		    fileSha = getIntent().getStringExtra("fileSha");
+
+		    toolbarTitle.setText(getString(R.string.deleteFileText, filePath));
+
+		    newFileCreate.setText(R.string.deleteFile);
+		    newFileName.setText(filePath);
+		    newFileName.setEnabled(false);
+		    newFileName.setFocusable(false);
+
+		    newFileContent.setText(fileContents);
+		    newFileContent.setEnabled(false);
+		    newFileContent.setFocusable(false);
+	    }
+
+	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", 2) == 2) {
+
+		    fileNameHint.setVisibility(View.GONE);
+		    fileAction = getIntent().getIntExtra("fileAction", 2);
+
+		    filePath = getIntent().getStringExtra("filePath");
+		    String fileContents = getIntent().getStringExtra("fileContents");
+		    fileSha = getIntent().getStringExtra("fileSha");
+
+		    toolbarTitle.setText(getString(R.string.editFileText, filePath));
+
+		    newFileCreate.setText(R.string.editFile);
+		    newFileName.setText(filePath);
+		    newFileName.setEnabled(false);
+		    newFileName.setFocusable(false);
+
+		    newFileContent.setText(fileContents);
+	    }
+
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
         newFileBranchesSpinner = findViewById(R.id.newFileBranchesSpinner);
-        newFileBranchesSpinner.getBackground().setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
         getBranches(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
 
         newFileBranchesSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
@@ -197,7 +243,22 @@ public class CreateFileActivity extends BaseActivity {
         else {
 
             disableProcessButton();
-            createNewFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newFileName_, appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString());
+
+            if(fileAction == 1) {
+
+	            deleteFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, filePath,
+		            newFileBranchName_, newFileCommitMessage_, currentBranch.toString(), fileSha);
+            }
+            else if(fileAction == 2) {
+
+	            editFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, filePath,
+		           appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString(), fileSha);
+            }
+            else {
+
+	            createNewFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newFileName_,
+		            appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString());
+            }
 
         }
 
@@ -256,6 +317,7 @@ public class CreateFileActivity extends BaseActivity {
 
             @Override
             public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -263,6 +325,149 @@ public class CreateFileActivity extends BaseActivity {
 
     }
 
+	private void deleteFile(final String instanceUrl, final String token, String repoOwner, String repoName, String fileName, String fileBranchName, String fileCommitMessage, String currentBranch, String fileSha) {
+
+    	String branchName;
+		DeleteFile deleteFileJsonStr;
+		if(currentBranch.equals("No branch")) {
+
+			branchName = fileBranchName;
+			deleteFileJsonStr = new DeleteFile("", fileCommitMessage, fileBranchName, fileSha);
+		}
+		else {
+
+			branchName = currentBranch;
+			deleteFileJsonStr = new DeleteFile(currentBranch, fileCommitMessage, "", fileSha);
+		}
+
+		Call<JsonElement> call = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.deleteFile(token, repoOwner, repoName, fileName, deleteFileJsonStr);
+
+		call.enqueue(new Callback<JsonElement>() {
+
+			@Override
+			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+				if(response.code() == 200) {
+
+					enableProcessButton();
+					Toasty.info(ctx, getString(R.string.deleteFileMessage, branchName));
+					getIntent().removeExtra("filePath");
+					getIntent().removeExtra("fileSha");
+					getIntent().removeExtra("fileContents");
+					finish();
+
+				}
+				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));
+
+				}
+				else {
+
+					if(response.code() == 404) {
+
+						enableProcessButton();
+						Toasty.info(ctx, getString(R.string.apiNotFound));
+					}
+					else {
+
+						enableProcessButton();
+						Toasty.info(ctx, getString(R.string.genericError));
+					}
+
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", t.toString());
+				enableProcessButton();
+			}
+		});
+
+	}
+
+	private void editFile(final String instanceUrl, final String token, String repoOwner, String repoName, String fileName, String fileContent, String fileBranchName, String fileCommitMessage, String currentBranch, String fileSha) {
+
+		String branchName;
+		EditFile editFileJsonStr;
+		if(currentBranch.equals("No branch")) {
+
+			branchName = fileBranchName;
+			editFileJsonStr = new EditFile("", fileCommitMessage, fileBranchName, fileSha, fileContent);
+		}
+		else {
+
+			branchName = currentBranch;
+			editFileJsonStr = new EditFile(currentBranch, fileCommitMessage, "", fileSha, fileContent);
+		}
+
+		Call<JsonElement> call = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.editFile(token, repoOwner, repoName, fileName, editFileJsonStr);
+
+		call.enqueue(new Callback<JsonElement>() {
+
+			@Override
+			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+				if(response.code() == 200) {
+
+					enableProcessButton();
+					Toasty.info(ctx, getString(R.string.editFileMessage, branchName));
+					getIntent().removeExtra("filePath");
+					getIntent().removeExtra("fileSha");
+					getIntent().removeExtra("fileContents");
+					tinyDb.putBoolean("fileModified", true);
+					finish();
+
+				}
+				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));
+
+				}
+				else {
+
+					if(response.code() == 404) {
+
+						enableProcessButton();
+						Toasty.info(ctx, getString(R.string.apiNotFound));
+					}
+					else {
+
+						enableProcessButton();
+						Toasty.info(ctx, getString(R.string.genericError));
+					}
+
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", t.toString());
+				enableProcessButton();
+			}
+		});
+
+	}
+
     private void getBranches(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
 
         Call<List<Branches>> call = RetrofitClient

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

@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import android.app.DatePickerDialog;
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -95,8 +94,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         final String repoName = parts[1];
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        // if gitea is 1.12 or higher use the new limit
+        // require gitea 1.12 or higher
         if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+
             resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
         }
 
@@ -126,7 +126,6 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         newIssueDueDate.setOnClickListener(this);
 
         newIssueMilestoneSpinner = findViewById(R.id.newIssueMilestoneSpinner);
-        newIssueMilestoneSpinner.getBackground().setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
         getMilestones(instanceUrl, instanceToken, repoOwner, repoName, loginUid, resultLimit);
 
         getLabels(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
@@ -201,9 +200,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         }
 
         int[] integers;
-        if (!newIssueLabelsIdHolderForm.equals("")) {
+        if (!newIssueLabelsIdHolderForm.equals("") && !newIssueLabelsIdHolderForm.equals("[]")) {
 
-            String[] items = newIssueLabelsIdHolderForm.replaceAll("\\[", "").replaceAll("\\]", "").replaceAll("\\s", "").split(",");
+            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]);

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

@@ -0,0 +1,431 @@
+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.view.LayoutInflater;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+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.ActivityCreatePrBinding;
+import org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding;
+import org.mian.gitnex.helpers.AppUtil;
+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.models.Branches;
+import org.mian.gitnex.models.CreatePullRequest;
+import org.mian.gitnex.models.Labels;
+import org.mian.gitnex.models.Milestones;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class CreatePullRequestActivity extends BaseActivity implements LabelsListAdapter.LabelsListAdapterListener {
+
+	private View.OnClickListener onClickListener;
+	private Context ctx = this;
+	private Context appCtx;
+	private TinyDB tinyDb;
+	private ActivityCreatePrBinding viewBinding;
+	private CustomLabelsSelectionDialogBinding labelsBinding;
+	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
+	private Dialog dialogLabels;
+	private String labelsSetter;
+	private ArrayList<Integer> labelsIds = new ArrayList<>();
+	private ArrayList<String> assignees = new ArrayList<>();
+	private int milestoneId;
+
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
+	private String repoOwner;
+	private String repoName;
+
+	private LabelsListAdapter labelsAdapter;
+
+	List<Milestones> milestonesList = new ArrayList<>();
+	List<Branches> branchesList = new ArrayList<>();
+	List<Labels> labelsList = new ArrayList<>();
+
+	public CreatePullRequestActivity() {
+	}
+
+	@Override
+	protected int getLayoutResourceId(){
+		return R.layout.activity_create_pr;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+
+		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
+		tinyDb = new TinyDB(appCtx);
+
+		viewBinding = ActivityCreatePrBinding.inflate(getLayoutInflater());
+		View view = viewBinding.getRoot();
+		setContentView(view);
+
+		instanceUrl = tinyDb.getString("instanceUrl");
+		loginUid = tinyDb.getString("loginUid");
+		String repoFullName = tinyDb.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		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")) {
+			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+		}
+
+		labelsAdapter =  new LabelsListAdapter(labelsList, CreatePullRequestActivity.this);
+
+		ImageView closeActivity = findViewById(R.id.close);
+
+		initCloseListener();
+		closeActivity.setOnClickListener(onClickListener);
+
+		viewBinding.prDueDate.setOnClickListener(dueDate ->
+			setDueDate()
+		);
+
+		disableProcessButton();
+
+		getMilestones(instanceUrl, instanceToken, repoOwner, repoName, loginUid, resultLimit);
+		getBranches(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
+
+		viewBinding.prLabels.setOnClickListener(prLabels ->
+			showLabels()
+		);
+
+		viewBinding.createPr.setOnClickListener(createPr ->
+			processPullRequest()
+		);
+	}
+
+	private void processPullRequest() {
+
+		String prTitle = String.valueOf(viewBinding.prTitle.getText());
+		String prDescription = String.valueOf(viewBinding.prBody.getText());
+		String mergeInto = viewBinding.mergeIntoBranchSpinner.getText().toString();
+		String pullFrom = viewBinding.pullFromBranchSpinner.getText().toString();
+		String dueDate = String.valueOf(viewBinding.prDueDate.getText());
+
+		assignees.add("");
+
+		if (labelsIds.size() == 0) {
+			labelsIds.add(0);
+		}
+
+		if (dueDate.matches("")) {
+			dueDate = null;
+		}
+		else {
+			dueDate = AppUtil.customDateCombine(AppUtil.customDateFormat(dueDate));
+		}
+
+		if(prTitle.matches("")) {
+
+			Toasty.error(ctx, getString(R.string.titleError));
+		}
+		else if(mergeInto.matches("")) {
+
+			Toasty.error(ctx, getString(R.string.mergeIntoError));
+		}
+		else if(pullFrom.matches("")) {
+
+			Toasty.error(ctx, getString(R.string.pullFromError));
+		}
+		else if(pullFrom.equals(mergeInto)) {
+
+			Toasty.error(ctx, getString(R.string.sameBranchesError));
+		}
+		else {
+			createPullRequest(prTitle, prDescription, mergeInto, pullFrom, milestoneId, dueDate, assignees);
+		}
+		//Log.e("processPullRequest", String.valueOf(milestoneId));
+	}
+
+	private void createPullRequest(String prTitle, String prDescription, String mergeInto, String pullFrom, int milestoneId, String dueDate, ArrayList<String> assignees) {
+
+		CreatePullRequest createPullRequest = new CreatePullRequest(prTitle, prDescription, loginUid, mergeInto, pullFrom, milestoneId, dueDate, assignees, labelsIds);
+
+		Call<ResponseBody> transferCall = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.createPullRequest(instanceToken, repoOwner, repoName, createPullRequest);
+
+		transferCall.enqueue(new Callback<ResponseBody>() {
+
+			@Override
+			public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
+
+				disableProcessButton();
+
+				if (response.code() == 201) {
+
+					Toasty.success(ctx, getString(R.string.prCreateSuccess));
+					finish();
+				}
+				else if (response.code() == 409 && response.message().equals("Conflict")) {
+
+					enableProcessButton();
+					Toasty.error(ctx, getString(R.string.prAlreadyExists));
+				}
+				else if (response.code() == 404) {
+
+					enableProcessButton();
+					Toasty.error(ctx, getString(R.string.apiNotFound));
+				}
+				else {
+
+					enableProcessButton();
+					Toasty.error(ctx, getString(R.string.genericError));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
+
+				enableProcessButton();
+				Toasty.error(ctx, getString(R.string.genericServerResponseError));
+			}
+		});
+	}
+
+	@Override
+	public void labelsStringData(ArrayList<String> data) {
+
+		labelsSetter = String.valueOf(data);
+		viewBinding.prLabels.setText(labelsSetter.replace("]", "").replace("[", ""));
+	}
+
+	@Override
+	public void labelsIdsData(ArrayList<Integer> data) {
+
+		labelsIds = data;
+	}
+
+	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(editProperties ->
+			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();
+
+	}
+
+	private void getBranches(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
+
+		Call<List<Branches>> call = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.getBranches(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+
+		call.enqueue(new Callback<List<Branches>>() {
+
+			@Override
+			public void onResponse(@NonNull Call<List<Branches>> call, @NonNull retrofit2.Response<List<Branches>> response) {
+
+				if(response.isSuccessful()) {
+					if(response.code() == 200) {
+
+						List<Branches> branchesList_ = response.body();
+
+						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);
+
+							}
+						}
+
+						ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreatePullRequestActivity.this,
+							R.layout.list_spinner_items, branchesList);
+
+						viewBinding.mergeIntoBranchSpinner.setAdapter(adapter);
+						viewBinding.pullFromBranchSpinner.setAdapter(adapter);
+						enableProcessButton();
+
+					}
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<Branches>> call, @NonNull Throwable t) {
+
+				Toasty.error(ctx, getString(R.string.genericServerResponseError));
+			}
+		});
+
+	}
+
+	private void getMilestones(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid, int resultLimit) {
+
+		String msState = "open";
+		Call<List<Milestones>> call = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.getMilestones(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, 1, resultLimit, msState);
+
+		call.enqueue(new Callback<List<Milestones>>() {
+
+			@Override
+			public void onResponse(@NonNull Call<List<Milestones>> call, @NonNull retrofit2.Response<List<Milestones>> response) {
+
+				if(response.code() == 200) {
+
+					List<Milestones> milestonesList_ = response.body();
+
+					milestonesList.add(new Milestones(0,getString(R.string.issueCreatedNoMilestone)));
+					assert milestonesList_ != null;
+					if(milestonesList_.size() > 0) {
+						for (int i = 0; i < milestonesList_.size(); i++) {
+
+							//Don't translate "open" is a enum
+							if(milestonesList_.get(i).getState().equals("open")) {
+								Milestones data = new Milestones(
+									milestonesList_.get(i).getId(),
+									milestonesList_.get(i).getTitle()
+								);
+								milestonesList.add(data);
+							}
+
+						}
+					}
+
+					ArrayAdapter<Milestones> adapter = new ArrayAdapter<>(CreatePullRequestActivity.this,
+						R.layout.list_spinner_items, milestonesList);
+
+					viewBinding.milestonesSpinner.setAdapter(adapter);
+					enableProcessButton();
+
+					viewBinding.milestonesSpinner.setOnItemClickListener ((parent, view, position, id) ->
+
+						milestoneId = milestonesList.get(position).getId()
+					);
+
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<Milestones>> call, @NonNull Throwable t) {
+
+				Toasty.error(ctx, getString(R.string.genericServerResponseError));
+			}
+		});
+
+	}
+
+	private void setDueDate() {
+
+		final Calendar c = Calendar.getInstance();
+		int mYear = c.get(Calendar.YEAR);
+		final int mMonth = c.get(Calendar.MONTH);
+		final int mDay = c.get(Calendar.DAY_OF_MONTH);
+
+		DatePickerDialog datePickerDialog = new DatePickerDialog(this,
+			(view, year, monthOfYear, dayOfMonth) -> viewBinding.prDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth)), mYear, mMonth, mDay);
+		datePickerDialog.show();
+	}
+
+	private void initCloseListener() {
+
+		onClickListener = view -> finish();
+	}
+
+	private void disableProcessButton() {
+
+		viewBinding.createPr.setEnabled(false);
+	}
+
+	private void enableProcessButton() {
+
+		viewBinding.createPr.setEnabled(true);
+	}
+}

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -87,7 +86,6 @@ public class CreateReleaseActivity extends BaseActivity {
         closeActivity.setOnClickListener(onClickListener);
 
         releaseBranch = findViewById(R.id.releaseBranch);
-        releaseBranch.getBackground().setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
         getBranches(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
         releaseBranch.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -86,9 +85,8 @@ public class CreateRepoActivity extends BaseActivity {
         closeActivity.setOnClickListener(onClickListener);
 
         spinner = findViewById(R.id.ownerSpinner);
-        spinner.getBackground().setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
         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) {

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

@@ -1,64 +0,0 @@
-package org.mian.gitnex.activities;
-
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.adapters.CreditsAdapter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Author M M Arif
- */
-
-public class CreditsActivity extends BaseActivity {
-
-    private View.OnClickListener onClickListener;
-    final Context ctx = this;
-
-    @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_credits;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-
-        ImageView closeActivity = findViewById(R.id.close);
-
-        initCloseListener();
-        closeActivity.setOnClickListener(onClickListener);
-
-        Resources res = getResources();
-        CharSequence[] creditsInfo = res.getTextArray(R.array.creditsInfo);
-
-        List<CharSequence> creditsList = new ArrayList<>(Arrays.asList(creditsInfo));
-
-        RecyclerView mRecyclerView = findViewById(R.id.recyclerView);
-
-        mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
-
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
-                DividerItemDecoration.VERTICAL);
-        mRecyclerView.addItemDecoration(dividerItemDecoration);
-
-        CreditsAdapter adapter = new CreditsAdapter(creditsList);
-        mRecyclerView.setAdapter(adapter);
-
-    }
-
-    private void initCloseListener() {
-
-        onClickListener = view -> finish();
-    }
-}

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

@@ -3,7 +3,6 @@ package org.mian.gitnex.activities;
 import android.annotation.SuppressLint;
 import android.app.DatePickerDialog;
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -108,7 +107,6 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
         loadCollaboratorsList();
 
         editIssueMilestoneSpinner = findViewById(R.id.editIssueMilestoneSpinner);
-        editIssueMilestoneSpinner.getBackground().setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
 
         editIssueDescription.setMentionAdapter(defaultMentionAdapter);
 

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

@@ -82,8 +82,9 @@ public class FileDiffActivity extends BaseActivity {
 
 		// fallback for old gitea instances
 		if(new Version(tinyDb.getString("giteaVersion")).less("1.13.0")) {
+
 			apiCall = false;
-			instanceUrl = tinyDb.getString("instanceUrlWithProtocol");
+			instanceUrl = instanceUrl.substring(0, instanceUrl.lastIndexOf("api/v1/"));
 		}
 
 		getPullDiffContent(instanceUrl, repoOwner, repoName, pullIndex, instanceToken, apiCall);

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

@@ -84,6 +84,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 	private byte[] decodedPdf;
 	private Boolean pdfNightMode;
 	private String singleFileName;
+	private String fileSha;
 	private AppUtil appUtil;
 	private TinyDB tinyDb;
 
@@ -153,6 +154,27 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 	}
 
+	@Override
+	public void onResume() {
+
+		super.onResume();
+
+		String repoFullName = tinyDb.getString("repoFullName");
+		String repoBranch = tinyDb.getString("repoBranch");
+		String[] parts = repoFullName.split("/");
+		String repoOwner = parts[0];
+		String repoName = parts[1];
+		String instanceUrl = tinyDb.getString("instanceUrl");
+		String loginUid = tinyDb.getString("loginUid");
+		String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+		if(tinyDb.getBoolean("fileModified")) {
+			getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName, repoBranch);
+			tinyDb.putBoolean("fileModified", false);
+		}
+	}
+
+
 	private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename, String ref) {
 
 		Call<Files> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getSingleFileContents(token, owner, repo, filename, ref);
@@ -171,6 +193,8 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 						String fileExtension = FileUtils.getExtension(filename);
 						mProgressBar.setVisibility(View.GONE);
 
+						fileSha = response.body().getSha();
+
 						// download file meta
 						tinyDb.putString("downloadFileName", filename);
 						tinyDb.putString("downloadFileContents", response.body().getContent());
@@ -403,7 +427,42 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		if("downloadFile".equals(text)) {
 
 			requestFileDownload();
+		}
 
+		if("deleteFile".equals(text)) {
+
+			String fileExtension = FileUtils.getExtension(singleFileName);
+			String data = appUtil.decodeBase64(tinyDb.getString("downloadFileContents"));
+			Intent intent = new Intent(ctx, CreateFileActivity.class);
+			intent.putExtra("fileAction", 1);
+			intent.putExtra("filePath", singleFileName);
+			intent.putExtra("fileSha", fileSha);
+			if(!appUtil.imageExtension(fileExtension)) {
+				intent.putExtra("fileContents", data);
+			}
+			else {
+				intent.putExtra("fileContents", "");
+			}
+
+			ctx.startActivity(intent);
+		}
+
+		if("editFile".equals(text)) {
+
+			String fileExtension = FileUtils.getExtension(singleFileName);
+			String data = appUtil.decodeBase64(tinyDb.getString("downloadFileContents"));
+			Intent intent = new Intent(ctx, CreateFileActivity.class);
+			intent.putExtra("fileAction", 2);
+			intent.putExtra("filePath", singleFileName);
+			intent.putExtra("fileSha", fileSha);
+			if(!appUtil.imageExtension(fileExtension)) {
+				intent.putExtra("fileContents", data);
+			}
+			else {
+				intent.putExtra("fileContents", "");
+			}
+
+			ctx.startActivity(intent);
 		}
 
 	}
@@ -426,6 +485,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 		}
 		else {
+
 			Toasty.warning(ctx, getString(R.string.waitLoadingDownloadFile));
 		}
 
@@ -456,6 +516,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 			}
 			catch(IOException e) {
+
 				Log.e("errorFileDownloading", Objects.requireNonNull(e.getMessage()));
 			}
 
@@ -469,7 +530,6 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 			getIntent().removeExtra("singleFileName");
 			finish();
-
 		};
 	}
 

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

@@ -104,6 +104,7 @@ public class IssueDetailActivity extends BaseActivity {
 	private LinearLayout assigneesLayout;
 	private View divider;
 	private ProgressBar progressBar;
+	private ImageView issuePrState;
 
 	@Override
 	protected int getLayoutResourceId() {
@@ -145,6 +146,7 @@ public class IssueDetailActivity extends BaseActivity {
 		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);
@@ -351,6 +353,27 @@ public class IssueDetailActivity extends BaseActivity {
 					Issues singleIssue = response.body();
 					assert singleIssue != null;
 
+					issuePrState.setVisibility(View.VISIBLE);
+					if(singleIssue.getPull_request() != null) {
+
+						if(singleIssue.getPull_request().isMerged()) { // merged
+
+							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);
+						}
+						else { // open
+
+							issuePrState.setImageResource(R.drawable.ic_pull_request);
+						}
+					}
+					else if(singleIssue.getState().equals("closed")) { // issue closed
+
+						issuePrState.setImageResource(R.drawable.ic_issue_closed_red);
+					}
+
 					final Markwon markwon = Markwon.builder(Objects.requireNonNull(ctx)).usePlugin(CorePlugin.create())
 						.usePlugin(ImagesPlugin.create(plugin -> {
 							plugin.addSchemeHandler(new SchemeHandler() {
@@ -398,6 +421,7 @@ public class IssueDetailActivity extends BaseActivity {
 					final String timeFormat = tinyDb.getString("dateFormat");
 					tinyDb.putString("issueState", singleIssue.getState());
 					tinyDb.putString("issueTitle", singleIssue.getTitle());
+					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);

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

@@ -167,16 +167,12 @@ public class LoginActivity extends BaseActivity {
 
 			URI rawInstanceUrl = UrlBuilder.fromString(UrlHelper.fixScheme(instanceUrlET.getText().toString(), "http")).toUri();
 
-			URI instanceUrlWithProtocol = UrlBuilder.fromUri(rawInstanceUrl).withPath(PathsHelper.join(rawInstanceUrl.getPath()))
-				.withScheme(protocol.name().toLowerCase()).toUri();
-
-			URI instanceUrl = UrlBuilder.fromUri(instanceUrlWithProtocol).withPath(PathsHelper.join(instanceUrlWithProtocol.getPath(), "/api/v1/"))
+			URI instanceUrl = UrlBuilder.fromUri(rawInstanceUrl).withScheme(protocol.name().toLowerCase()).withPath(PathsHelper.join(rawInstanceUrl.getPath(), "/api/v1/"))
 				.toUri();
 
 			tinyDB.putString("loginType", loginType.name().toLowerCase());
 			tinyDB.putString("instanceUrlRaw", instanceUrlET.getText().toString());
 			tinyDB.putString("instanceUrl", instanceUrl.toString());
-			tinyDB.putString("instanceUrlWithProtocol", instanceUrlWithProtocol.toString());
 
 			if(instanceUrlET.getText().toString().equals("")) {
 
@@ -256,7 +252,7 @@ public class LoginActivity extends BaseActivity {
 
 		if(!loginToken.equals("")) {
 
-			callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken(loginToken);
+			callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken("token " + loginToken);
 		}
 		else {
 
@@ -276,20 +272,17 @@ public class LoginActivity extends BaseActivity {
 				if(responseVersion.code() == 200) {
 
 					GiteaVersion version = responseVersion.body();
-					Version gitea_version;
 
 					assert version != null;
-
-					try {
-						gitea_version = new Version(version.getVersion());
-					}
-					catch(Exception e) {
-
+					if(!Version.valid(version.getVersion())) {
 						Toasty.error(ctx, getResources().getString(R.string.versionUnknown));
 						enableProcessButton();
 						return;
 					}
 
+					tinyDB.putString("giteaVersion", version.getVersion());
+					Version gitea_version = new Version(version.getVersion());
+
 					if(gitea_version.less(getString(R.string.versionLow))) {
 
 						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx).setTitle(getString(R.string.versionAlertDialogHeader))
@@ -570,7 +563,8 @@ public class LoginActivity extends BaseActivity {
 
 										if(checkAccount == 0) {
 
-											accountId = userAccountsApi.insertNewAccount(accountName, instanceUrl, userDetails.getUsername(), newToken.getSha1(), "");
+											accountId = userAccountsApi
+												.insertNewAccount(accountName, instanceUrl, userDetails.getUsername(), newToken.getSha1(), "");
 											tinyDB.putInt("currentActiveAccountId", (int) accountId);
 										}
 										else {

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

@@ -1,15 +1,14 @@
 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;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,20 +17,24 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.navigation.NavigationView;
 import org.mian.gitnex.R;
+import org.mian.gitnex.adapters.UserAccountsNavAdapter;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.fragments.AboutFragment;
+import org.mian.gitnex.database.api.UserAccountsApi;
+import org.mian.gitnex.database.models.UserAccount;
 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;
@@ -50,7 +53,10 @@ import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.models.GiteaVersion;
+import org.mian.gitnex.models.NotificationCount;
 import org.mian.gitnex.models.UserInfo;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 import eightbitlab.com.blurview.BlurView;
 import eightbitlab.com.blurview.RenderScriptBlur;
@@ -75,6 +81,14 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 	private Context appCtx;
 	private Typeface myTypeface;
 
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
+
+	private View hView;
+	private MenuItem navNotifications;
+	private TextView notificationCounter;
+
 	@Override
 	protected int getLayoutResourceId() {
 
@@ -93,9 +107,9 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		Intent mainIntent = getIntent();
 		String launchFragment = mainIntent.getStringExtra("launchFragment");
 
-		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");
 
 		if(tinyDb.getString("dateFormat").isEmpty()) {
 			tinyDb.putString("dateFormat", "pretty");
@@ -162,7 +176,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) {
@@ -171,9 +185,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));
 		}
@@ -184,10 +195,15 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleUserAccounts));
 		}
 
+		getNotificationsCount(instanceUrl, instanceToken);
+
 		drawer = findViewById(R.id.drawer_layout);
 		NavigationView navigationView = findViewById(R.id.nav_view);
 		navigationView.setNavigationItemSelectedListener(this);
-		final View hView = navigationView.getHeaderView(0);
+		hView = navigationView.getHeaderView(0);
+
+		Menu menu = navigationView.getMenu();
+		navNotifications = menu.findItem(R.id.nav_notifications);
 
 		ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
 
@@ -197,6 +213,12 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			@Override
 			public void onDrawerOpened(@NonNull View drawerView) {
 
+				getNotificationsCount(instanceUrl, instanceToken);
+			}
+
+			@Override
+			public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
+
 				if(tinyDb.getBoolean("noConnection")) {
 					Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 					tinyDb.putBoolean("noConnection", false);
@@ -213,14 +235,29 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 				userAvatarBackground = hView.findViewById(R.id.userAvatarBackground);
 				navHeaderFrame = hView.findViewById(R.id.navHeaderFrame);
 
+				List<UserAccount> userAccountsList;
+				userAccountsList = new ArrayList<>();
+				UserAccountsApi userAccountsApi;
+				userAccountsApi = new UserAccountsApi(ctx);
+
+				RecyclerView navRecyclerViewUserAccounts = hView.findViewById(R.id.navRecyclerViewUserAccounts);
+				UserAccountsNavAdapter adapterUserAccounts;
+
+				adapterUserAccounts = new UserAccountsNavAdapter(ctx, userAccountsList, drawer, toolbarTitle);
+
+				userAccountsApi.getAllAccounts().observe((AppCompatActivity) ctx, userAccounts -> {
+
+					if(userAccounts.size() > 0) {
+
+						userAccountsList.addAll(userAccounts);
+						navRecyclerViewUserAccounts.setAdapter(adapterUserAccounts);
+					}
+
+				});
+
 				userEmail.setTypeface(myTypeface);
 				userFullName.setTypeface(myTypeface);
 
-				String currentVersion = tinyDb.getString("giteaVersion");
-
-				navigationView.getMenu().findItem(R.id.nav_administration).setVisible(tinyDb.getBoolean("userIsAdmin"));
-				navigationView.getMenu().findItem(R.id.nav_notifications).setVisible(new Version(currentVersion).higherOrEqual("1.12.3"));
-
 				if(!userEmailNav.equals("")) {
 					userEmail.setText(userEmailNav);
 				}
@@ -268,13 +305,15 @@ 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();
 				});
 
-			}
+				String currentVersion = tinyDb.getString("giteaVersion");
 
-			@Override
-			public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {}
+				navigationView.getMenu().findItem(R.id.nav_administration).setVisible(tinyDb.getBoolean("userIsAdmin"));
+				navigationView.getMenu().findItem(R.id.nav_notifications).setVisible(new Version(currentVersion).higherOrEqual("1.12.3"));
+			}
 
 			@Override
 			public void onDrawerClosed(@NonNull View drawerView) {}
@@ -284,14 +323,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 		});
 
-		ImageView userAccounts = hView.findViewById(R.id.userAccounts);
-		userAccounts.setOnClickListener(v -> {
-
-			toolbarTitle.setText(getResources().getString(R.string.pageTitleUserAccounts));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new UserAccountsFragment()).commit();
-			drawer.closeDrawers();
-		});
-
 		toggle.syncState();
 		toolbar.setNavigationIcon(R.drawable.ic_menu);
 
@@ -318,6 +349,14 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 		if(savedInstanceState == null) {
 
+			if(!new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.3")) {
+
+				if(tinyDb.getInt("homeScreenId") == 7) {
+
+					tinyDb.putInt("homeScreenId", 0);
+				}
+			}
+
 			switch(tinyDb.getInt("homeScreenId")) {
 
 				case 1:
@@ -346,7 +385,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;
 
@@ -356,6 +395,12 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 					navigationView.setCheckedItem(R.id.nav_comments_draft);
 					break;
 
+				case 7:
+					toolbarTitle.setText(getResources().getString(R.string.pageTitleNotifications));
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
+					navigationView.setCheckedItem(R.id.nav_notifications);
+					break;
+
 				default:
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
@@ -405,6 +450,11 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		}
 	}
 
+	public void setActionBarTitle(String title) {
+
+		toolbarTitle.setText(title);
+	}
+
 	@Override
 	public void onButtonClicked(String text) {
 
@@ -494,15 +544,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();
@@ -510,7 +551,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:
@@ -534,16 +575,6 @@ 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());
@@ -671,4 +702,31 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 	}
 
+	private void getNotificationsCount(String instanceUrl, String token) {
+
+		Call<NotificationCount> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().checkUnreadNotifications(token);
+
+		call.enqueue(new Callback<NotificationCount>() {
+
+			@Override
+			public void onResponse(@NonNull Call<NotificationCount> call, @NonNull retrofit2.Response<NotificationCount> response) {
+
+				NotificationCount notificationCount = response.body();
+
+				if(response.code() == 200) {
+
+					assert notificationCount != null;
+					notificationCounter = navNotifications.getActionView().findViewById(R.id.counterBadgeNotification);
+					notificationCounter.setText(String.valueOf(notificationCount.getCounter()));
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<NotificationCount> call, @NonNull Throwable t) {
+
+				Log.e("onFailure-notification", t.toString());
+			}
+		});
+	}
+
 }

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

@@ -9,6 +9,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.GridView;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.ViewModelProvider;
@@ -30,6 +31,7 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
     private View.OnClickListener onClickListener;
     private TeamMembersByOrgAdapter adapter;
     private GridView mGridView;
+	private ProgressBar progressBar;
 
     final Context ctx = this;
     private Context appCtx;
@@ -58,6 +60,7 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
         TextView toolbarTitle = findViewById(R.id.toolbar_title);
         noDataMembers = findViewById(R.id.noDataMembers);
         mGridView = findViewById(R.id.gridView);
+	    progressBar = findViewById(R.id.progressBar);
 
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
@@ -114,6 +117,7 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
                 noDataMembers.setVisibility(View.VISIBLE);
             }
 
+	        progressBar.setVisibility(View.GONE);
         });
 
     }

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

@@ -33,6 +33,7 @@ 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;
@@ -54,7 +55,7 @@ public class ReplyToIssueActivity extends BaseActivity {
 	private ArrayAdapter<Mention> defaultMentionAdapter;
 	private Button replyButton;
 	private String TAG = StaticGlobalVariables.replyToIssueActivity;
-	private long draftId;
+	private long draftIdOnCreate;
 
 	@Override
 	protected int getLayoutResourceId(){
@@ -97,6 +98,20 @@ public class ReplyToIssueActivity extends BaseActivity {
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
+		if(getIntent().getStringExtra("draftId") != null) {
+
+			draftIdOnCreate = Long.parseLong(Objects.requireNonNull(getIntent().getStringExtra("draftId")));
+		}
+		else {
+
+			if(getIntent().getStringExtra("commentBody") != null) {
+				draftIdOnCreate = returnDraftId(getIntent().getStringExtra("commentBody"));
+			}
+			else {
+				draftIdOnCreate = returnDraftId("");
+			}
+		}
+
 		replyButton = findViewById(R.id.replyButton);
 
 		if(getIntent().getStringExtra("commentBody") != null) {
@@ -115,7 +130,7 @@ public class ReplyToIssueActivity extends BaseActivity {
 
 		}
 
-		if(getIntent().getStringExtra("commentAction") != null && getIntent().getStringExtra("commentAction").equals("edit")) {
+		if(getIntent().getStringExtra("commentAction") != null && Objects.equals(getIntent().getStringExtra("commentAction"), "edit") && !Objects.equals(getIntent().getStringExtra("commentId"), "new")) {
 
 			final String commentId = getIntent().getStringExtra("commentId");
 
@@ -134,7 +149,7 @@ public class ReplyToIssueActivity extends BaseActivity {
 
 				public void onTextChanged(CharSequence s, int start, int before, int count) {
 
-					saveDraft(addComment.getText().toString());
+					saveDraft(addComment.getText().toString(), commentId, draftIdOnCreate);
 					draftSaved.setVisibility(View.VISIBLE);
 
 				}
@@ -145,7 +160,7 @@ public class ReplyToIssueActivity extends BaseActivity {
 
 				disableProcessButton();
 				assert commentId != null;
-				IssueActions.editIssueComment(ctx, Integer.parseInt(commentId), addComment.getText().toString());
+				IssueActions.editIssueComment(ctx, Integer.parseInt(commentId), addComment.getText().toString(), draftIdOnCreate);
 
 			});
 
@@ -165,7 +180,7 @@ public class ReplyToIssueActivity extends BaseActivity {
 
 			public void onTextChanged(CharSequence s, int start, int before, int count) {
 
-				saveDraft(addComment.getText().toString());
+				saveDraft(addComment.getText().toString(), "new", draftIdOnCreate);
 				draftSaved.setVisibility(View.VISIBLE);
 
 			}
@@ -185,7 +200,7 @@ public class ReplyToIssueActivity extends BaseActivity {
 
 	}
 
-	private void saveDraft(String draftText) {
+	private void saveDraft(String draftText, String commentId, long draftIdOnCreate) {
 
 		TinyDB tinyDb = new TinyDB(getApplicationContext());
 
@@ -195,17 +210,31 @@ public class ReplyToIssueActivity extends BaseActivity {
 
 		DraftsApi draftsApi = new DraftsApi(appCtx);
 
-		int countDraft = draftsApi.checkDraft(issueNumber, repositoryId);
+		if(draftIdOnCreate == 0) {
 
-		if(countDraft == 0) {
-			draftId = draftsApi.insertDraft(repositoryId, currentActiveAccountId, issueNumber, draftText, StaticGlobalVariables.draftTypeComment);
+			draftsApi.insertDraft(repositoryId, currentActiveAccountId, issueNumber, draftText, StaticGlobalVariables.draftTypeComment, commentId);
 		}
 		else {
-			DraftsApi.updateDraftByIssueIdAsyncTask(draftText, issueNumber, repositoryId);
+
+			DraftsApi.updateDraft(draftText, (int) draftIdOnCreate, commentId); //updateDraftByIssueIdAsyncTask(draftText, issueNumber, repositoryId, commentId);
 		}
 
 	}
 
+	private long returnDraftId(String draftText) {
+
+		TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+		int repositoryId = (int) tinyDb.getLong("repositoryId", 0);
+		int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+		int issueNumber = Integer.parseInt(tinyDb.getString("issueNumber"));
+
+		DraftsApi draftsApi = new DraftsApi(appCtx);
+
+		return draftsApi.insertDraft(repositoryId, currentActiveAccountId, issueNumber, draftText, StaticGlobalVariables.draftTypeComment, "");
+
+	}
+
 	public void loadCollaboratorsList() {
 
 		final TinyDB tinyDb = new TinyDB(appCtx);
@@ -325,12 +354,8 @@ public class ReplyToIssueActivity extends BaseActivity {
 					// delete draft comment
 					if(tinyDb.getBoolean("draftsCommentsDeletionEnabled")) {
 
-						int repositoryId = (int) tinyDb.getLong("repositoryId", 0);
-						int issueNumber = Integer.parseInt(tinyDb.getString("issueNumber"));
-
 						DraftsApi draftsApi = new DraftsApi(appCtx);
-						draftId = draftsApi.getDraftIdAsync(issueNumber, repositoryId);
-						draftsApi.deleteSingleDraft((int) draftId);
+						draftsApi.deleteSingleDraft((int) draftIdOnCreate);
 					}
 
 					finish();

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

@@ -33,7 +33,6 @@ import org.mian.gitnex.fragments.BottomSheetIssuesFilterFragment;
 import org.mian.gitnex.fragments.BottomSheetMilestonesFilterFragment;
 import org.mian.gitnex.fragments.BottomSheetPullRequestFilterFragment;
 import org.mian.gitnex.fragments.BottomSheetRepoFragment;
-import org.mian.gitnex.fragments.BranchesFragment;
 import org.mian.gitnex.fragments.CollaboratorsFragment;
 import org.mian.gitnex.fragments.FilesFragment;
 import org.mian.gitnex.fragments.IssuesFragment;
@@ -163,7 +162,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		}
 
 		// Only show collaborators tab, if you have permission to
-		View collaboratorTab = viewGroup.getChildAt(8);
+		View collaboratorTab = viewGroup.getChildAt(7);
 
 		if(tinyDB.getBoolean("isRepoAdmin") || new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.0")) {
 
@@ -229,8 +228,8 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 				if(textViewBadgeRelease.getText() != "") { // only show if API returned a number
 
-					Objects.requireNonNull(tabLayout.getTabAt(5)).setCustomView(tabHeader6);
-					TabLayout.Tab tabOpenRelease = tabLayout.getTabAt(5);
+					Objects.requireNonNull(tabLayout.getTabAt(4)).setCustomView(tabHeader6);
+					TabLayout.Tab tabOpenRelease = tabLayout.getTabAt(4);
 					assert tabOpenRelease != null; // FIXME This should be cleaned up
 					TextView openReleaseTabView = Objects.requireNonNull(tabOpenRelease.getCustomView()).findViewById(R.id.counterBadgeReleaseText);
 					openReleaseTabView.setTextColor(textColor);
@@ -300,6 +299,12 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 				chooseBranch();
 				return true;
 
+			case R.id.branchCommits:
+				Intent intent = new Intent(ctx, CommitsActivity.class);
+				intent.putExtra("branchName", tinyDB.getString("repoBranch"));
+				ctx.startActivity(intent);
+				return true;
+
 			default:
 				return super.onOptionsItemSelected(item);
 
@@ -397,6 +402,14 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 				}
 				break;
 
+			case "repoSettings":
+				startActivity(new Intent(RepoDetailActivity.this, RepositorySettingsActivity.class));
+				break;
+
+			case "newPullRequest":
+				startActivity(new Intent(RepoDetailActivity.this, CreatePullRequestActivity.class));
+				break;
+
 		}
 
 	}
@@ -490,20 +503,17 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 					fragment = new PullRequestsFragment();
 					break;
 
-				case 4: // Branches
-					return BranchesFragment.newInstance(repositoryOwner, repositoryName);
-
-				case 5: // Releases
+				case 4: // Releases
 					return ReleasesFragment.newInstance(repositoryOwner, repositoryName);
 
-				case 6: // Milestones
+				case 5: // Milestones
 					fragment = new MilestonesFragment();
 					break;
 
-				case 7: // Labels
+				case 6: // Labels
 					return LabelsFragment.newInstance(repositoryOwner, repositoryName);
 
-				case 8: // Collaborators
+				case 7: // Collaborators
 					return CollaboratorsFragment.newInstance(repositoryOwner, repositoryName);
 
 			}

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

@@ -53,6 +53,7 @@ public class RepoForksActivity extends BaseActivity {
 	private RecyclerView recyclerView;
 	private List<UserRepositories> forksList;
 	private RepoForksAdapter adapter;
+	private ProgressBar progressLoadMore;
 
 	@Override
 	protected int getLayoutResourceId() {
@@ -86,6 +87,7 @@ public class RepoForksActivity extends BaseActivity {
 
 		ImageView closeActivity = findViewById(R.id.close);
 		noData = findViewById(R.id.noData);
+		progressLoadMore = findViewById(R.id.progressLoadMore);
 		progressBar = findViewById(R.id.progress_bar);
 		SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);
 
@@ -184,9 +186,7 @@ public class RepoForksActivity extends BaseActivity {
 
 	private void loadMore(String instanceUrl, String instanceToken, String repoOwner, String repoName, int page, int resultLimit) {
 
-		//add loading progress view
-		forksList.add(new UserRepositories("load"));
-		adapter.notifyItemInserted((forksList.size() - 1));
+		progressLoadMore.setVisibility(View.VISIBLE);
 
 		Call<List<UserRepositories>> call = RetrofitClient
 			.getInstance(instanceUrl, ctx)
@@ -219,6 +219,7 @@ public class RepoForksActivity extends BaseActivity {
 					}
 
 					adapter.notifyDataChanged();
+					progressLoadMore.setVisibility(View.GONE);
 
 				}
 				else {

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

@@ -0,0 +1,435 @@
+package org.mian.gitnex.activities;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import androidx.annotation.NonNull;
+import com.google.gson.JsonElement;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.database.api.RepositoriesApi;
+import org.mian.gitnex.databinding.ActivityRepositorySettingsBinding;
+import org.mian.gitnex.databinding.CustomRepositoryDeleteDialogBinding;
+import org.mian.gitnex.databinding.CustomRepositoryEditPropertiesDialogBinding;
+import org.mian.gitnex.databinding.CustomRepositoryTransferDialogBinding;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.RepositoryTransfer;
+import org.mian.gitnex.models.UserRepositories;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class RepositorySettingsActivity extends BaseActivity {
+
+	private ActivityRepositorySettingsBinding viewBinding;
+	private CustomRepositoryEditPropertiesDialogBinding propBinding;
+	private CustomRepositoryDeleteDialogBinding deleteRepoBinding;
+	private CustomRepositoryTransferDialogBinding transferRepoBinding;
+	private Dialog dialogProp;
+	private Dialog dialogDeleteRepository;
+	private Dialog dialogTransferRepository;
+	private View.OnClickListener onClickListener;
+	private Context ctx = this;
+	private Context appCtx;
+	private TinyDB tinyDb;
+
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
+
+	private String repositoryOwner;
+	private String repositoryName;
+
+	@Override
+	protected int getLayoutResourceId(){
+		return R.layout.activity_repository_settings;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+
+		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
+		tinyDb = new TinyDB(appCtx);
+
+		viewBinding = ActivityRepositorySettingsBinding.inflate(getLayoutInflater());
+		View view = viewBinding.getRoot();
+		setContentView(view);
+
+		instanceUrl = tinyDb.getString("instanceUrl");
+		loginUid = tinyDb.getString("loginUid");
+		String repoFullName = tinyDb.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		repositoryOwner = parts[0];
+		repositoryName = parts[1];
+		instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+		ImageView closeActivity = findViewById(R.id.close);
+
+		initCloseListener();
+		closeActivity.setOnClickListener(onClickListener);
+
+		// require gitea 1.12 or higher
+		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+			
+			viewBinding.transferOwnerFrame.setVisibility(View.VISIBLE);
+		}
+
+		viewBinding.editProperties.setOnClickListener(editProperties -> {
+			showRepositoryProperties();
+		});
+
+		viewBinding.deleteRepository.setOnClickListener(deleteRepository -> {
+			showDeleteRepository();
+		});
+
+		viewBinding.transferOwnerFrame.setOnClickListener(transferRepositoryOwnership -> {
+			showTransferRepository();
+		});
+
+	}
+
+	private void showTransferRepository() {
+
+		dialogTransferRepository = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
+
+		if (dialogTransferRepository.getWindow() != null) {
+
+			dialogTransferRepository.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+		}
+
+		transferRepoBinding = CustomRepositoryTransferDialogBinding.inflate(LayoutInflater.from(ctx));
+
+		View view = transferRepoBinding.getRoot();
+		dialogTransferRepository.setContentView(view);
+
+		transferRepoBinding.cancel.setOnClickListener(editProperties -> {
+			dialogTransferRepository.dismiss();
+		});
+
+		transferRepoBinding.transfer.setOnClickListener(deleteRepo -> {
+
+			String newOwner = String.valueOf(transferRepoBinding.ownerNameForTransfer.getText());
+			String repoName = String.valueOf(transferRepoBinding.repoNameForTransfer.getText());
+
+			if(!repositoryName.equals(repoName)) {
+
+				Toasty.error(ctx, getString(R.string.repoSettingsDeleteError));
+			}
+			else if(newOwner.matches("")) {
+
+				Toasty.error(ctx, getString(R.string.repoTransferOwnerError));
+			}
+			else {
+
+				transferRepository(newOwner);
+			}
+		});
+
+		dialogTransferRepository.show();
+	}
+
+	private void transferRepository(String newOwner) {
+
+		RepositoryTransfer repositoryTransfer = new RepositoryTransfer(newOwner);
+
+		Call<JsonElement> transferCall = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.transferRepository(instanceToken, repositoryOwner, repositoryName, repositoryTransfer);
+
+		transferCall.enqueue(new Callback<JsonElement>() {
+
+			@Override
+			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+				transferRepoBinding.transfer.setVisibility(View.GONE);
+				transferRepoBinding.processingRequest.setVisibility(View.VISIBLE);
+
+				if (response.code() == 202) {
+
+					dialogTransferRepository.dismiss();
+					Toasty.success(ctx, getString(R.string.repoTransferSuccess));
+
+					finish();
+					RepositoriesApi.deleteRepository((int) tinyDb.getLong("repositoryId", 0));
+					Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class);
+					RepositorySettingsActivity.this.startActivity(intent);
+				}
+				else if (response.code() == 404) {
+
+					transferRepoBinding.transfer.setVisibility(View.VISIBLE);
+					transferRepoBinding.processingRequest.setVisibility(View.GONE);
+					Toasty.error(ctx, getString(R.string.repoTransferError));
+				}
+				else {
+
+					transferRepoBinding.transfer.setVisibility(View.VISIBLE);
+					transferRepoBinding.processingRequest.setVisibility(View.GONE);
+					Toasty.error(ctx, getString(R.string.genericError));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+
+				transferRepoBinding.transfer.setVisibility(View.VISIBLE);
+				transferRepoBinding.processingRequest.setVisibility(View.GONE);
+				Toasty.error(ctx, getString(R.string.genericServerResponseError));
+			}
+		});
+	}
+
+	private void showDeleteRepository() {
+
+		dialogDeleteRepository = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
+
+		if (dialogDeleteRepository.getWindow() != null) {
+			dialogDeleteRepository.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+		}
+
+		deleteRepoBinding = CustomRepositoryDeleteDialogBinding.inflate(LayoutInflater.from(ctx));
+
+		View view = deleteRepoBinding.getRoot();
+		dialogDeleteRepository.setContentView(view);
+
+		deleteRepoBinding.cancel.setOnClickListener(editProperties -> {
+			dialogDeleteRepository.dismiss();
+		});
+
+		deleteRepoBinding.delete.setOnClickListener(deleteRepo -> {
+
+			if(!repositoryName.equals(String.valueOf(deleteRepoBinding.repoNameForDeletion.getText()))) {
+
+				Toasty.error(ctx, getString(R.string.repoSettingsDeleteError));
+			}
+			else {
+
+				deleteRepository();
+			}
+		});
+
+		dialogDeleteRepository.show();
+	}
+
+	private void deleteRepository() {
+
+		Call<JsonElement> deleteCall = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.deleteRepository(instanceToken, repositoryOwner, repositoryName);
+
+		deleteCall.enqueue(new Callback<JsonElement>() {
+
+			@Override
+			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+				deleteRepoBinding.delete.setVisibility(View.GONE);
+				deleteRepoBinding.processingRequest.setVisibility(View.VISIBLE);
+
+				if (response.code() == 204) {
+
+					dialogDeleteRepository.dismiss();
+					Toasty.success(ctx, getString(R.string.repoDeletionSuccess));
+
+					finish();
+					RepositoriesApi.deleteRepository((int) tinyDb.getLong("repositoryId", 0));
+					Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class);
+					RepositorySettingsActivity.this.startActivity(intent);
+				}
+				else {
+
+					deleteRepoBinding.delete.setVisibility(View.VISIBLE);
+					deleteRepoBinding.processingRequest.setVisibility(View.GONE);
+					Toasty.error(ctx, getString(R.string.genericError));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+
+				deleteRepoBinding.delete.setVisibility(View.VISIBLE);
+				deleteRepoBinding.processingRequest.setVisibility(View.GONE);
+				Toasty.error(ctx, getString(R.string.genericServerResponseError));
+			}
+		});
+	}
+
+	private void showRepositoryProperties() {
+
+		dialogProp = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
+
+		if (dialogProp.getWindow() != null) {
+			dialogProp.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+		}
+
+		propBinding = CustomRepositoryEditPropertiesDialogBinding.inflate(LayoutInflater.from(ctx));
+
+		View view = propBinding.getRoot();
+		dialogProp.setContentView(view);
+
+		propBinding.cancel.setOnClickListener(editProperties -> {
+			dialogProp.dismiss();
+		});
+
+		Call<UserRepositories> call = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.getUserRepository(instanceToken, repositoryOwner, repositoryName);
+
+		call.enqueue(new Callback<UserRepositories>() {
+
+			@Override
+			public void onResponse(@NonNull Call<UserRepositories> call, @NonNull retrofit2.Response<UserRepositories> response) {
+
+				UserRepositories repoInfo = response.body();
+
+				propBinding.progressBar.setVisibility(View.GONE);
+				propBinding.mainView.setVisibility(View.VISIBLE);
+
+				if (response.code() == 200) {
+
+					assert repoInfo != null;
+					propBinding.repoName.setText(repoInfo.getName());
+					propBinding.repoWebsite.setText(repoInfo.getWebsite());
+					propBinding.repoDescription.setText(repoInfo.getDescription());
+					propBinding.repoPrivate.setChecked(repoInfo.getPrivateFlag());
+					propBinding.repoAsTemplate.setChecked(repoInfo.isTemplate());
+
+					propBinding.repoEnableIssues.setChecked(repoInfo.getHas_issues());
+
+					propBinding.repoEnableIssues.setOnCheckedChangeListener((buttonView, isChecked) -> {
+
+						if (isChecked) {
+							propBinding.repoEnableTimer.setVisibility(View.VISIBLE);
+						}
+						else {
+							propBinding.repoEnableTimer.setVisibility(View.GONE);
+						}
+					});
+
+					if(repoInfo.getInternal_tracker() != null) {
+						propBinding.repoEnableTimer.setChecked(repoInfo.getInternal_tracker().isEnable_time_tracker());
+					}
+					else {
+						propBinding.repoEnableTimer.setVisibility(View.GONE);
+					}
+					propBinding.repoEnableWiki.setChecked(repoInfo.isHas_wiki());
+					propBinding.repoEnablePr.setChecked(repoInfo.isHas_pull_requests());
+					propBinding.repoEnableMerge.setChecked(repoInfo.isAllow_merge_commits());
+					propBinding.repoEnableRebase.setChecked(repoInfo.isAllow_rebase());
+					propBinding.repoEnableSquash.setChecked(repoInfo.isAllow_squash_merge());
+					propBinding.repoEnableForceMerge.setChecked(repoInfo.isAllow_rebase_explicit());
+
+				}
+				else {
+
+					Toasty.error(ctx, getString(R.string.genericError));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<UserRepositories> call, @NonNull Throwable t) {
+
+				Toasty.error(ctx, getString(R.string.genericServerResponseError));
+			}
+		});
+
+		propBinding.save.setOnClickListener(saveProperties -> saveRepositoryProperties(String.valueOf(propBinding.repoName.getText()),
+			String.valueOf(propBinding.repoWebsite.getText()),
+			String.valueOf(propBinding.repoDescription.getText()),
+			propBinding.repoPrivate.isChecked(), propBinding.repoAsTemplate.isChecked(),
+			propBinding.repoEnableIssues.isChecked(), propBinding.repoEnableWiki.isChecked(),
+			propBinding.repoEnablePr.isChecked(), propBinding.repoEnableTimer.isChecked(),
+			propBinding.repoEnableMerge.isChecked(), propBinding.repoEnableRebase.isChecked(),
+			propBinding.repoEnableSquash.isChecked(), propBinding.repoEnableForceMerge.isChecked()));
+
+		dialogProp.show();
+
+	}
+
+	private void saveRepositoryProperties(String repoName, String repoWebsite, String repoDescription,
+		boolean repoPrivate, boolean repoAsTemplate, boolean repoEnableIssues, boolean repoEnableWiki,
+		boolean repoEnablePr, boolean repoEnableTimer, boolean repoEnableMerge, boolean repoEnableRebase,
+		boolean repoEnableSquash, boolean repoEnableForceMerge) {
+
+		UserRepositories.internalTimeTrackerObject repoPropsTimeTracker = new UserRepositories.internalTimeTrackerObject(repoEnableTimer);
+
+		UserRepositories repoProps;
+		if(!repoEnableIssues) {
+			repoProps = new UserRepositories(repoName, repoWebsite, repoDescription, repoPrivate, repoAsTemplate, repoEnableIssues, repoEnableWiki, repoEnablePr, repoEnableMerge,
+				repoEnableRebase, repoEnableSquash, repoEnableForceMerge);
+		}
+		else {
+			repoProps = new UserRepositories(repoName, repoWebsite, repoDescription, repoPrivate, repoAsTemplate, repoEnableIssues, repoEnableWiki, repoEnablePr, repoPropsTimeTracker, repoEnableMerge,
+				repoEnableRebase, repoEnableSquash, repoEnableForceMerge);
+		}
+
+		Call<UserRepositories> propsCall = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.updateRepositoryProperties(instanceToken, repositoryOwner, repositoryName, repoProps);
+
+		propsCall.enqueue(new Callback<UserRepositories>() {
+
+			@Override
+			public void onResponse(@NonNull Call<UserRepositories> call, @NonNull retrofit2.Response<UserRepositories> response) {
+
+				propBinding.save.setVisibility(View.GONE);
+				propBinding.processingRequest.setVisibility(View.VISIBLE);
+
+				if (response.code() == 200) {
+
+					tinyDb.putBoolean("hasIssues", repoEnableIssues);
+					tinyDb.putBoolean("hasPullRequests", repoEnablePr);
+
+					dialogProp.dismiss();
+					Toasty.success(ctx, getString(R.string.repoPropertiesSaveSuccess));
+
+					if(!repositoryName.equals(repoName)) {
+
+						finish();
+						RepositoriesApi.updateRepositoryOwnerAndName(repositoryOwner, repoName, (int) tinyDb.getLong("repositoryId", 0));
+						Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class);
+						RepositorySettingsActivity.this.startActivity(intent);
+
+					}
+				}
+				else {
+
+					propBinding.save.setVisibility(View.VISIBLE);
+					propBinding.processingRequest.setVisibility(View.GONE);
+					Toasty.error(ctx, getString(R.string.genericError));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<UserRepositories> call, @NonNull Throwable t) {
+
+				propBinding.save.setVisibility(View.VISIBLE);
+				propBinding.processingRequest.setVisibility(View.GONE);
+				Toasty.error(ctx, getString(R.string.genericServerResponseError));
+			}
+		});
+	}
+
+	private void initCloseListener() {
+		onClickListener = view -> finish();
+	}
+
+}

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

@@ -11,6 +11,7 @@ import androidx.appcompat.app.AlertDialog;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.Version;
 
 /**
  * Author M M Arif
@@ -28,12 +29,13 @@ public class SettingsAppearanceActivity extends BaseActivity {
 	private static int codeBlockSelectedChoice = 0;
 
 	private static String[] homeScreenList = {"My Repositories", "Starred Repositories", "Organizations", "Repositories", "Profile", "Explore", "Drafts"};
+	private static String[] homeScreenListNew = {"My Repositories", "Starred Repositories", "Organizations", "Repositories", "Profile", "Explore", "Drafts",  "Notifications"};
 	private static int homeScreenSelectedChoice = 0;
 
 	private static String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
 	private static int customFontSelectedChoice = 0;
 
-	private static String[] themeList = {"Dark", "Light", "Auto (Day/Night)"};
+	private static String[] themeList = {"Dark", "Light", "Auto (Light / Dark)", "Retro", "Auto (Retro / Dark)"};
 	private static int themeSelectedChoice = 0;
 
 	@Override
@@ -69,6 +71,11 @@ public class SettingsAppearanceActivity extends BaseActivity {
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
+		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.3")) {
+
+			homeScreenList = homeScreenListNew;
+		}
+
 		if(!tinyDb.getString("timeStr").isEmpty()) {
 			tvDateTimeSelected.setText(tinyDb.getString("timeStr"));
 		}

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

@@ -22,8 +22,8 @@ public class SettingsTranslationActivity extends BaseActivity {
 	private Context appCtx;
 	private View.OnClickListener onClickListener;
 
-	private static String[] langList = {"English", "Arabic", "Chinese", "Finnish", "French", "German", "Italian", "Latvian", "Persian", "Polish", "Portuguese/Brazilian", "Russian", "Serbian", "Spanish", "Turkish",
-			"Ukrainian"};
+	private static String[] langList = {"English", "Arabic", "Chinese", "Czech", "Finnish", "French", "German", "Italian", "Latvian", "Persian",
+		"Polish", "Portuguese/Brazilian", "Russian", "Serbian", "Spanish", "Turkish", "Ukrainian"};
 	private static int langSelectedChoice = 0;
 
 	@Override
@@ -95,6 +95,9 @@ public class SettingsTranslationActivity extends BaseActivity {
 					case "Chinese":
 						tinyDb.putString("locale", "zh");
 						break;
+					case "Czech":
+						tinyDb.putString("locale", "cs");
+						break;
 					case "Finnish":
 						tinyDb.putString("locale", "fi");
 						break;
@@ -157,6 +160,7 @@ public class SettingsTranslationActivity extends BaseActivity {
 	}
 
 	private void initCloseListener() {
+
 		onClickListener = view -> finish();
 	}
 

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

@@ -1,66 +0,0 @@
-package org.mian.gitnex.activities;
-
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.adapters.SponsorsAdapter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Author M M Arif
- */
-
-public class SponsorsActivity extends BaseActivity {
-
-    private View.OnClickListener onClickListener;
-    private Context appCtx;
-
-    @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_sponsors;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
-
-        ImageView closeActivity = findViewById(R.id.close);
-
-        initCloseListener();
-        closeActivity.setOnClickListener(onClickListener);
-
-        Resources res = getResources();
-        CharSequence[] sponsorsInfo = res.getTextArray(R.array.sponsorsInfo);
-
-        List<CharSequence> sponsorsList = new ArrayList<>(Arrays.asList(sponsorsInfo));
-
-        RecyclerView mRecyclerView = findViewById(R.id.recyclerView);
-
-        mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(appCtx));
-
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
-                DividerItemDecoration.VERTICAL);
-        mRecyclerView.addItemDecoration(dividerItemDecoration);
-
-        SponsorsAdapter adapter = new SponsorsAdapter(sponsorsList);
-        mRecyclerView.setAdapter(adapter);
-
-    }
-
-    private void initCloseListener() {
-
-        onClickListener = view -> finish();
-    }
-
-}

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

@@ -1,90 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.content.Context;
-import android.content.Intent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.CommitsActivity;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.Branches;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Author M M Arif
- */
-
-public class BranchesAdapter extends RecyclerView.Adapter<BranchesAdapter.BranchesViewHolder> {
-
-    private List<Branches> branchesList;
-    private Context mCtx;
-
-    static class BranchesViewHolder extends RecyclerView.ViewHolder {
-
-        private TextView branchNameTv;
-        private TextView branchCommitAuthor;
-
-        private BranchesViewHolder(View itemView) {
-            super(itemView);
-
-            branchNameTv = itemView.findViewById(R.id.branchName);
-            branchCommitAuthor = itemView.findViewById(R.id.branchCommitAuthor);
-            Button branchCommitHash = itemView.findViewById(R.id.branchCommitHash);
-
-            branchCommitHash.setOnClickListener(new View.OnClickListener() {
-                public void onClick(View v) {
-
-                    Intent intent = new Intent(v.getContext(), CommitsActivity.class);
-                    intent.putExtra("branchName", String.valueOf(branchNameTv.getText()));
-                    Objects.requireNonNull(v.getContext()).startActivity(intent);
-
-                }
-            });
-
-        }
-    }
-
-    public BranchesAdapter(Context mCtx, List<Branches> branchesMain) {
-        this.mCtx = mCtx;
-        this.branchesList = branchesMain;
-    }
-
-    @NonNull
-    @Override
-    public BranchesAdapter.BranchesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_branches, parent, false);
-        return new BranchesAdapter.BranchesViewHolder(v);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull BranchesAdapter.BranchesViewHolder holder, int position) {
-
-        final TinyDB tinyDb = new TinyDB(mCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-
-        Branches currentItem = branchesList.get(position);
-        holder.branchNameTv.setText(currentItem.getName());
-
-        if(currentItem.getCommit().getAuthor().getName() != null || !currentItem.getCommit().getAuthor().getName().equals("")) {
-            holder.branchCommitAuthor.setText(mCtx.getResources().getString(R.string.commitAuthor, currentItem.getCommit().getAuthor().getName()));
-        }
-        else {
-            holder.branchCommitAuthor.setText(mCtx.getResources().getString(R.string.commitAuthor, currentItem.getCommit().getAuthor().getUsername()));
-        }
-
-    }
-
-    @Override
-    public int getItemCount() {
-        return branchesList.size();
-    }
-
-}
-
-

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

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.text.Html;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -38,6 +39,8 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
         private TextView issueType;
         private TextView repoOwner;
         private TextView repoName;
+	    private TextView commentId;
+	    private ImageView editCommentStatus;
 
         private DraftsViewHolder(View itemView) {
 
@@ -51,7 +54,9 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
             issueType = itemView.findViewById(R.id.issueType);
             repoOwner = itemView.findViewById(R.id.repoOwner);
             repoName = itemView.findViewById(R.id.repoName);
+	        commentId = itemView.findViewById(R.id.commentId);
             ImageView deleteDraft = itemView.findViewById(R.id.deleteDraft);
+	        editCommentStatus = itemView.findViewById(R.id.editCommentStatus);
 
             deleteDraft.setOnClickListener(itemDelete -> {
 
@@ -69,6 +74,12 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
                 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());
+
+                if(!commentId.getText().toString().equalsIgnoreCase("")) {
+	                intent.putExtra("commentAction", "edit");
+                }
 
                 TinyDB tinyDb = new TinyDB(mCtx);
                 tinyDb.putString("issueNumber", issueNumber.getText().toString());
@@ -117,9 +128,18 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
         holder.repoOwner.setText(currentItem.getRepositoryOwner());
         holder.repoName.setText(currentItem.getRepositoryName());
         holder.draftText.setText(currentItem.getDraftText());
+	    holder.commentId.setText(currentItem.getCommentId());
 
 	    String issueNumber = "<font color='" + mCtx.getResources().getColor(R.color.lightGray) + "'>" + mCtx.getResources().getString(R.string.hash) + currentItem.getIssueId() + "</font>";
-	    holder.repoInfo.setText(Html.fromHtml(issueNumber + " " + currentItem.getRepositoryOwner() + " / " + currentItem.getRepositoryName()));
+	    Spanned headTitle = Html.fromHtml(issueNumber + " " + currentItem.getRepositoryOwner() + " / " + currentItem.getRepositoryName());
+	    holder.repoInfo.setText(headTitle);
+
+	    if(!currentItem.getCommentId().equalsIgnoreCase("new")) {
+		    holder.editCommentStatus.setVisibility(View.VISIBLE);
+	    }
+	    else {
+	    	holder.editCommentStatus.setVisibility(View.GONE);
+	    }
 
     }
 

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

@@ -286,7 +286,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 			holder.repoDescription.setVisibility(View.VISIBLE);
 			holder.repoDescription.setText(currentItem.getDescription());
 		}
-		holder.fullName.setText(currentItem.getFullname());
+		holder.fullName.setText(currentItem.getFullName());
 		if(currentItem.getPrivateFlag()) {
 			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
 			holder.repoType.setText(R.string.strPrivate);
@@ -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

@@ -37,6 +37,8 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
     class FilesViewHolder extends RecyclerView.ViewHolder {
 
         private ImageView fileTypeImage;
+	    private ImageView dirTypeImage;
+	    private ImageView unknownTypeImage;
         private TextView fileName;
         private TextView fileType;
         private TextView fileInfo;
@@ -46,6 +48,8 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
             super(itemView);
             fileName = itemView.findViewById(R.id.fileName);
             fileTypeImage = itemView.findViewById(R.id.fileImage);
+	        dirTypeImage = itemView.findViewById(R.id.dirImage);
+	        unknownTypeImage = itemView.findViewById(R.id.unknownImage);
             fileType = itemView.findViewById(R.id.fileType);
             fileInfo = itemView.findViewById(R.id.fileInfo);
 
@@ -157,16 +161,22 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
         holder.fileName.setText(currentItem.getName());
 
         if(currentItem.getType().equals("file")) {
-            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_file));
+            holder.fileTypeImage.setVisibility(View.VISIBLE);
+	        holder.dirTypeImage.setVisibility(View.GONE);
+	        holder.unknownTypeImage.setVisibility(View.GONE);
             holder.fileInfo.setVisibility(View.VISIBLE);
             holder.fileInfo.setText(AppUtil.formatFileSizeInDetail(currentItem.getSize()));
         }
         else if(currentItem.getType().equals("dir")) {
+	        holder.dirTypeImage.setVisibility(View.VISIBLE);
+	        holder.unknownTypeImage.setVisibility(View.GONE);
+	        holder.fileTypeImage.setVisibility(View.GONE);
 	        holder.fileInfo.setVisibility(View.GONE);
-            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_directory));
         }
         else {
-            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_question));
+	        holder.unknownTypeImage.setVisibility(View.VISIBLE);
+	        holder.dirTypeImage.setVisibility(View.GONE);
+	        holder.fileTypeImage.setVisibility(View.GONE);
         }
 
     }

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

@@ -109,6 +109,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 				TextView commentMenuQuote = view.findViewById(R.id.commentMenuQuote);
 				TextView commentMenuCopy = view.findViewById(R.id.commentMenuCopy);
 				TextView commentMenuDelete = view.findViewById(R.id.commentMenuDelete);
+				TextView issueCommentCopyUrl = view.findViewById(R.id.issueCommentCopyUrl);
 
 				if(!loginUid.contentEquals(commenterUsername.getText())) {
 					commentMenuEdit.setVisibility(View.GONE);
@@ -151,6 +152,22 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 				});
 
+				issueCommentCopyUrl.setOnClickListener(ediComment -> {
+
+					// comment Url
+					CharSequence commentUrl = htmlUrl.getText();
+
+					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
+					assert clipboard != null;
+
+					ClipData clip = ClipData.newPlainText(commentUrl, commentUrl);
+					clipboard.setPrimaryClip(clip);
+
+					dialog.dismiss();
+					Toasty.success(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
+
+				});
+
 				commentMenuQuote.setOnClickListener(v1 -> {
 
 					StringBuilder stringBuilder = new StringBuilder();
@@ -189,7 +206,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 					clipboard.setPrimaryClip(clip);
 
 					dialog.dismiss();
-					Toasty.info(ctx, ctx.getString(R.string.copyIssueCommentToastMsg));
+					Toasty.success(ctx, ctx.getString(R.string.copyIssueCommentToastMsg));
 
 				});
 

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

@@ -0,0 +1,95 @@
+package org.mian.gitnex.adapters;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+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.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.LabelsViewHolder> {
+
+	private List<Labels> labels;
+	private ArrayList<String> labelsStrings = new ArrayList<>();
+	private ArrayList<Integer> labelsIds = new ArrayList<>();
+
+	private LabelsListAdapterListener labelsListener;
+
+	public interface LabelsListAdapterListener {
+
+		void labelsStringData(ArrayList<String> data);
+		void labelsIdsData(ArrayList<Integer> data);
+	}
+
+	public LabelsListAdapter(List<Labels> labelsMain, LabelsListAdapterListener labelsListener) {
+
+		this.labels = labelsMain;
+		this.labelsListener = labelsListener;
+	}
+
+	static class LabelsViewHolder extends RecyclerView.ViewHolder {
+
+		private CheckBox labelSelection;
+
+		private LabelsViewHolder(View itemView) {
+			super(itemView);
+
+			labelSelection = itemView.findViewById(R.id.labelSelection);
+
+		}
+	}
+
+	@NonNull
+	@Override
+	public LabelsListAdapter.LabelsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.custom_labels_list, parent, false);
+		return new LabelsListAdapter.LabelsViewHolder(v);
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull LabelsListAdapter.LabelsViewHolder holder, int position) {
+
+		Labels currentItem = labels.get(position);
+
+		holder.labelSelection.setText(currentItem.getName());
+
+		for(int i = 0; i < labelsIds.size(); i++) {
+
+			if(labelsStrings.contains(currentItem.getName())) {
+
+				holder.labelSelection.setChecked(true);
+			}
+		}
+
+		holder.labelSelection.setOnCheckedChangeListener((buttonView, isChecked) -> {
+
+			if(isChecked) {
+
+				labelsStrings.add(currentItem.getName());
+				labelsIds.add(currentItem.getId());
+			}
+			else {
+
+				labelsStrings.remove(currentItem.getName());
+				labelsIds.remove(Integer.valueOf(currentItem.getId()));
+			}
+
+			labelsListener.labelsStringData(labelsStrings);
+			labelsListener.labelsIdsData(labelsIds);
+		});
+	}
+
+	@Override
+	public int getItemCount() {
+		return labels.size();
+	}
+}

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

@@ -291,7 +291,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 			holder.repoDescription.setVisibility(View.VISIBLE);
 			holder.repoDescription.setText(currentItem.getDescription());
 		}
-		holder.repoFullName.setText(currentItem.getFullname());
+		holder.repoFullName.setText(currentItem.getFullName());
 		if(currentItem.getPrivateFlag()) {
 			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
 			holder.repoType.setText(R.string.strPrivate);
@@ -344,7 +344,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 				String filterPattern = constraint.toString().toLowerCase().trim();
 
 				for(UserRepositories item : reposListFull) {
-					if(item.getFullname().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
+					if(item.getFullName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
 						filteredList.add(item);
 					}
 				}

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

@@ -44,7 +44,9 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 		private LinearLayout frame;
 		private TextView subject;
 		private TextView repository;
-		private ImageView type;
+		private ImageView typePr;
+		private ImageView typeIssue;
+		private ImageView typeUnknown;
 		private ImageView pinned;
 		private ImageView more;
 
@@ -55,7 +57,9 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 			frame = itemView.findViewById(R.id.frame);
 			subject = itemView.findViewById(R.id.subject);
 			repository = itemView.findViewById(R.id.repository);
-			type = itemView.findViewById(R.id.type);
+			typePr = itemView.findViewById(R.id.typePr);
+			typeIssue = itemView.findViewById(R.id.typeIssue);
+			typeUnknown = itemView.findViewById(R.id.typeUnknown);
 			pinned = itemView.findViewById(R.id.pinned);
 			more = itemView.findViewById(R.id.more);
 
@@ -81,7 +85,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 			.getString(R.string.hash) + url.substring(url.lastIndexOf("/") + 1) + "</font>";
 
 		holder.subject.setText(Html.fromHtml(subjectId + " " + notificationThread.getSubject().getTitle()));
-		holder.repository.setText(notificationThread.getRepository().getFullname());
+		holder.repository.setText(notificationThread.getRepository().getFullName());
 
 		if(notificationThread.isPinned()) {
 			holder.pinned.setVisibility(View.VISIBLE);
@@ -93,15 +97,21 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 		switch(notificationThread.getSubject().getType()) {
 
 			case "Pull":
-				holder.type.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_pull_request, null));
+				holder.typePr.setVisibility(View.VISIBLE);
+				holder.typeIssue.setVisibility(View.GONE);
+				holder.typeUnknown.setVisibility(View.GONE);
 				break;
 
 			case "Issue":
-				holder.type.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_issue, null));
+				holder.typePr.setVisibility(View.GONE);
+				holder.typeIssue.setVisibility(View.VISIBLE);
+				holder.typeUnknown.setVisibility(View.GONE);
 				break;
 
 			default:
-				holder.type.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_question, null));
+				holder.typePr.setVisibility(View.GONE);
+				holder.typeIssue.setVisibility(View.GONE);
+				holder.typeUnknown.setVisibility(View.VISIBLE);
 				break;
 
 		}
@@ -110,7 +120,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 
 			onNotificationClickedListener.onNotificationClicked(notificationThread);
 
-			String[] parts = notificationThread.getRepository().getFullname().split("/");
+			String[] parts = notificationThread.getRepository().getFullName().split("/");
 			final String repoOwner = parts[0];
 			final String repoName = parts[1];
 

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

@@ -175,7 +175,7 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 				repoDescription.setVisibility(View.VISIBLE);
 				repoDescription.setText(forksModel.getDescription());
 			}
-			fullName.setText(forksModel.getFullname());
+			fullName.setText(forksModel.getFullName());
 
 			if(forksModel.getPrivateFlag()) {
 				repoPrivatePublic.setImageResource(R.drawable.ic_lock);

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

@@ -292,7 +292,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 			holder.repoDescription.setVisibility(View.VISIBLE);
 			holder.repoDescription.setText(currentItem.getDescription());
 		}
-		holder.fullName.setText(currentItem.getFullname());
+		holder.fullName.setText(currentItem.getFullName());
 		if(currentItem.getPrivateFlag()) {
 			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
 			holder.repoType.setText(R.string.strPrivate);
@@ -344,7 +344,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 				String filterPattern = constraint.toString().toLowerCase().trim();
 
 				for(UserRepositories item : reposListFull) {
-					if(item.getFullname().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
+					if(item.getFullName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
 						filteredList.add(item);
 					}
 				}

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

@@ -292,7 +292,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
             holder.repoDescription.setVisibility(View.VISIBLE);
             holder.repoDescription.setText(currentItem.getDescription());
         }
-        holder.fullName.setText(currentItem.getFullname());
+        holder.fullName.setText(currentItem.getFullName());
         if(currentItem.getPrivateFlag()) {
             holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
             holder.repoType.setText(R.string.strPrivate);
@@ -340,7 +340,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                 String filterPattern = constraint.toString().toLowerCase().trim();
 
                 for (UserRepositories item : reposListFull) {
-                    if (item.getFullname().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
+                    if (item.getFullName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
                         filteredList.add(item);
                     }
                 }

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/adapters/StarredReposListAdapter.java

@@ -295,7 +295,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
             holder.repoDescription.setVisibility(View.VISIBLE);
             holder.repoDescription.setText(currentItem.getDescription());
         }
-        holder.fullName.setText(currentItem.getFullname());
+        holder.fullName.setText(currentItem.getFullName());
         if(currentItem.getPrivateFlag()) {
             holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
             holder.repoType.setText(R.string.strPrivate);
@@ -342,7 +342,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                 String filterPattern = constraint.toString().toLowerCase().trim();
 
                 for (UserRepositories item : reposListFull) {
-                    if (item.getFullname().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
+                    if (item.getFullName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
                         filteredList.add(item);
                     }
                 }

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

@@ -0,0 +1,76 @@
+package org.mian.gitnex.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.database.models.UserAccount;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TinyDB;
+import java.util.List;
+import io.mikael.urlbuilder.UrlBuilder;
+
+/**
+ * Author M M Arif
+ */
+
+public class UserAccountsListDialogAdapter extends ArrayAdapter<UserAccount> {
+
+	private final Context mCtx;
+	private final TinyDB tinyDB;
+	private final List<UserAccount> userAccounts;
+
+	public UserAccountsListDialogAdapter(@NonNull Context mCtx, int resource, @NonNull List<UserAccount> userAccounts) {
+
+		super(mCtx, resource, userAccounts);
+
+		tinyDB = new TinyDB(mCtx);
+		this.userAccounts = userAccounts;
+		this.mCtx = mCtx;
+
+	}
+
+	@NonNull
+	@Override
+	public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+
+		if(convertView == null) {
+			convertView = LayoutInflater.from(mCtx).inflate(R.layout.custom_user_accounts_list, parent, false);
+		}
+
+		ImageView profileImage = convertView.findViewById(R.id.profileImage);
+		TextView userName = convertView.findViewById(R.id.userName);
+		TextView accountUrl = convertView.findViewById(R.id.accountUrl);
+		ImageView activeAccount = convertView.findViewById(R.id.activeAccount);
+
+		UserAccount currentItem = userAccounts.get(position);
+
+		String url = UrlBuilder.fromString(currentItem.getInstanceUrl())
+			.withPath("/")
+			.toString();
+
+		userName.setText(currentItem.getUserName());
+		accountUrl.setText(url);
+
+		if(tinyDB.getInt("currentActiveAccountId") == currentItem.getAccountId()) {
+			activeAccount.setVisibility(View.VISIBLE);
+		}
+		else {
+			activeAccount.setVisibility(View.GONE);
+		}
+
+		PicassoService
+			.getInstance(mCtx).get().load(url + "img/favicon.png").placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(profileImage);
+
+		return convertView;
+
+	}
+
+}

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

@@ -0,0 +1,147 @@
+package org.mian.gitnex.adapters;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.recyclerview.widget.RecyclerView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.database.api.UserAccountsApi;
+import org.mian.gitnex.database.models.UserAccount;
+import org.mian.gitnex.fragments.UserAccountsFragment;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import java.util.List;
+import io.mikael.urlbuilder.UrlBuilder;
+
+/**
+ * Author M M Arif
+ */
+
+public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNavAdapter.UserAccountsViewHolder> {
+
+	private static DrawerLayout drawer;
+	private List<UserAccount> userAccountsList;
+	private Context mCtx;
+	private TextView toolbarTitle;
+
+	public UserAccountsNavAdapter(Context mCtx, List<UserAccount> userAccountsListMain, DrawerLayout drawerLayout, TextView toolbarTitle) {
+
+		this.mCtx = mCtx;
+		this.userAccountsList = userAccountsListMain;
+		drawer = drawerLayout;
+		this.toolbarTitle = toolbarTitle;
+	}
+
+	class UserAccountsViewHolder extends RecyclerView.ViewHolder {
+
+		private ImageView userAccountAvatar;
+
+		private UserAccountsViewHolder(View itemView) {
+
+			super(itemView);
+
+			userAccountAvatar = itemView.findViewById(R.id.userAccountAvatar);
+
+			itemView.setOnClickListener(item -> {
+
+				customDialogUserAccountsList(userAccountsList);
+				drawer.closeDrawers();
+			});
+
+		}
+
+	}
+
+	@NonNull
+	@Override
+	public UserAccountsNavAdapter.UserAccountsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.nav_user_accounts, parent, false);
+		return new UserAccountsViewHolder(v);
+	}
+
+	@SuppressLint("DefaultLocale")
+	@Override
+	public void onBindViewHolder(@NonNull UserAccountsNavAdapter.UserAccountsViewHolder holder, int position) {
+
+		UserAccount currentItem = userAccountsList.get(position);
+
+		String url = UrlBuilder.fromString(currentItem.getInstanceUrl())
+			.withPath("/")
+			.toString();
+
+		PicassoService
+			.getInstance(mCtx).get().load(url + "img/favicon.png").placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAccountAvatar);
+	}
+
+	@Override
+	public int getItemCount() {
+
+		return userAccountsList.size();
+	}
+
+	private void customDialogUserAccountsList(List<UserAccount> allAccountsList) {
+
+		TinyDB tinyDB = new TinyDB(mCtx);
+		Dialog dialog = new Dialog(mCtx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
+		dialog.setContentView(R.layout.custom_user_accounts_dialog);
+
+		ListView listView = dialog.findViewById(R.id.accountsList);
+		TextView manageAccounts = dialog.findViewById(R.id.manageAccounts);
+
+		if (dialog.getWindow() != null) {
+			dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+		}
+
+		manageAccounts.setOnClickListener(item -> {
+
+			toolbarTitle.setText(mCtx.getResources().getString(R.string.pageTitleUserAccounts));
+			AppCompatActivity activity = (AppCompatActivity) mCtx;
+			activity.getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new UserAccountsFragment()).commit();
+			dialog.dismiss();
+		});
+
+		UserAccountsListDialogAdapter arrayAdapter = new UserAccountsListDialogAdapter(mCtx, R.layout.custom_user_accounts_list, allAccountsList);
+		listView.setAdapter(arrayAdapter);
+
+		listView.setOnItemClickListener((adapterView, view, which, l) -> {
+
+			String accountNameSwitch = allAccountsList.get(which).getAccountName();
+			UserAccountsApi userAccountsApi = new UserAccountsApi(mCtx);
+			UserAccount userAccount = userAccountsApi.getAccountData(accountNameSwitch);
+
+			if(tinyDB.getInt("currentActiveAccountId") != userAccount.getAccountId()) {
+
+				String url = UrlBuilder.fromString(userAccount.getInstanceUrl())
+					.withPath("/")
+					.toString();
+
+				tinyDB.putString("loginUid", userAccount.getUserName());
+				tinyDB.putString("userLogin", userAccount.getUserName());
+				tinyDB.putString(userAccount.getUserName() + "-token", userAccount.getToken());
+				tinyDB.putString("instanceUrl", userAccount.getInstanceUrl());
+				tinyDB.putInt("currentActiveAccountId", userAccount.getAccountId());
+
+				Toasty.success(mCtx,  mCtx.getResources().getString(R.string.switchAccountSuccess, userAccount.getUserName(), url));
+				((Activity) mCtx).recreate();
+				dialog.dismiss();
+			}
+		});
+		dialog.show();
+	}
+
+}

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

@@ -27,7 +27,7 @@ public class DraftsApi {
 		draftsDao = db.draftsDao();
 	}
 
-	public long insertDraft(int repositoryId, int draftAccountId, int issueId, String draftText, String draftType) {
+	public long insertDraft(int repositoryId, int draftAccountId, int issueId, String draftText, String draftType, String commentId) {
 
 		Draft draft = new Draft();
 		draft.setDraftRepositoryId(repositoryId);
@@ -35,6 +35,7 @@ public class DraftsApi {
 		draft.setIssueId(issueId);
 		draft.setDraftText(draftText);
 		draft.setDraftType(draftType);
+		draft.setCommentId(draftType);
 
 		return insertDraftAsyncTask(draft);
 	}
@@ -71,11 +72,11 @@ public class DraftsApi {
 		return draftId;
 	}
 
-	public Integer checkDraft(int issueId, int draftRepositoryId) {
+	public Integer checkDraft(int issueId, int draftRepositoryId, String commentId) {
 
 		try {
 
-			Thread thread = new Thread(() -> checkDraftFlag = draftsDao.checkDraftDao(issueId, draftRepositoryId));
+			Thread thread = new Thread(() -> checkDraftFlag = draftsDao.checkDraftDao(issueId, draftRepositoryId, commentId));
 			thread.start();
 			thread.join();
 		}
@@ -112,14 +113,14 @@ public class DraftsApi {
 		new Thread(() -> draftsDao.deleteAllDrafts(accountId)).start();
 	}
 
-	public static void updateDraft(final String draftText, final int draftId) {
+	public static void updateDraft(final String draftText, final int draftId, final String commentId) {
 
-		new Thread(() -> draftsDao.updateDraft(draftText, draftId)).start();
+		new Thread(() -> draftsDao.updateDraft(draftText, draftId, commentId)).start();
 	}
 
-	public static void updateDraftByIssueIdAsyncTask(final String draftText, final int issueId, final int draftRepositoryId) {
+	public static void updateDraftByIssueIdAsyncTask(final String draftText, final int issueId, final int draftRepositoryId, final String commentId) {
 
-		new Thread(() -> draftsDao.updateDraftByIssueId(draftText, issueId, draftRepositoryId)).start();
+		new Thread(() -> draftsDao.updateDraftByIssueId(draftText, issueId, draftRepositoryId, commentId)).start();
 	}
 
 }

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

@@ -127,6 +127,11 @@ public class RepositoriesApi {
 		return repository;
 	}
 
+	public static void updateRepositoryOwnerAndName(String repositoryOwner, String repositoryName, int repositoryId) {
+
+		new Thread(() -> repositoriesDao.updateRepositoryOwnerAndName(repositoryOwner, repositoryName, repositoryId)).start();
+	}
+
 	public static void deleteRepositoriesByAccount(final int repoAccountId) {
 
 		new Thread(() -> repositoriesDao.deleteRepositoriesByAccount(repoAccountId)).start();

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

@@ -35,14 +35,14 @@ public interface DraftsDao {
     @Query("SELECT * FROM Drafts WHERE issueId = :issueId")
     LiveData<Draft> fetchDraftByIssueId(int issueId);
 
-    @Query("SELECT count(draftId) FROM Drafts WHERE issueId = :issueId AND draftRepositoryId = :draftRepositoryId")
-    Integer checkDraftDao(int issueId, int draftRepositoryId);
+    @Query("SELECT count(draftId) FROM Drafts WHERE issueId = :issueId AND draftRepositoryId = :draftRepositoryId AND commentId = :commentId")
+    Integer checkDraftDao(int issueId, int draftRepositoryId, String commentId);
 
-    @Query("UPDATE Drafts SET draftText= :draftText WHERE draftId = :draftId")
-    void updateDraft(String draftText, int draftId);
+    @Query("UPDATE Drafts SET draftText = :draftText, commentId = :commentId WHERE draftId = :draftId")
+    void updateDraft(String draftText, int draftId, String commentId);
 
-    @Query("UPDATE Drafts SET draftText= :draftText WHERE issueId = :issueId AND draftRepositoryId = :draftRepositoryId")
-    void updateDraftByIssueId(String draftText, int issueId, int draftRepositoryId);
+    @Query("UPDATE Drafts SET draftText = :draftText WHERE issueId = :issueId AND draftRepositoryId = :draftRepositoryId AND commentId = :commentId")
+    void updateDraftByIssueId(String draftText, int issueId, int draftRepositoryId, String commentId);
 
 	@Query("SELECT draftId FROM Drafts WHERE issueId = :issueId AND draftRepositoryId = :draftRepositoryId")
 	Integer getDraftId(int issueId, int draftRepositoryId);

app/src/main/java/org/mian/gitnex/database/db/GitnexDatabase.java

@@ -19,7 +19,7 @@ import org.mian.gitnex.database.models.UserAccount;
  */
 
 @Database(entities = {Draft.class, Repository.class, UserAccount.class},
-        version = 1, exportSchema = false)
+        version = 2, exportSchema = false)
 public abstract class GitnexDatabase extends RoomDatabase {
 
     private static GitnexDatabase gitnexDatabase;
@@ -30,7 +30,7 @@ public abstract class GitnexDatabase extends RoomDatabase {
             String DB_NAME = "gitnex";
             gitnexDatabase = Room.databaseBuilder(context, GitnexDatabase.class, DB_NAME)
                     //.fallbackToDestructiveMigration()
-                    //.addMigrations(MIGRATION_1_2)
+                    .addMigrations(MIGRATION_1_2)
                     .build();
         }
 
@@ -48,7 +48,7 @@ public abstract class GitnexDatabase extends RoomDatabase {
         public void migrate(@NonNull SupportSQLiteDatabase database) {
 
             //database.execSQL("DROP TABLE Drafts");
-	        //database.execSQL("ALTER TABLE 'Drafts' ADD COLUMN 'draftType' TEXT");
+	        database.execSQL("ALTER TABLE 'Drafts' ADD COLUMN 'commentId' TEXT");
 
         }
     };

app/src/main/java/org/mian/gitnex/database/models/Draft.java

@@ -24,6 +24,8 @@ public class Draft implements Serializable {
 	private String draftText;
 	@Nullable
 	private String draftType;
+	@Nullable
+	private String commentId;
 
 	public int getDraftId() {
 
@@ -86,4 +88,15 @@ public class Draft implements Serializable {
 		this.draftType = draftType;
 	}
 
+	@Nullable
+	public String getCommentId() {
+
+		return commentId;
+	}
+
+	public void setCommentId(@Nullable String commentId) {
+
+		this.commentId = commentId;
+	}
+
 }

app/src/main/java/org/mian/gitnex/database/models/DraftWithRepository.java

@@ -18,6 +18,7 @@ public class DraftWithRepository {
 	private int issueId;
 	private String draftText;
 	private String draftType;
+	private String commentId;
 
 	public int getRepositoryId() {
 
@@ -119,4 +120,14 @@ public class DraftWithRepository {
 		this.draftType = draftType;
 	}
 
+	public String getCommentId() {
+
+		return commentId;
+	}
+
+	public void setCommentId(String commentId) {
+
+		this.commentId = commentId;
+	}
+
 }

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

@@ -6,16 +6,13 @@ 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 org.mian.gitnex.R;
-import org.mian.gitnex.activities.CreditsActivity;
-import org.mian.gitnex.activities.SponsorsActivity;
+import org.mian.gitnex.activities.MainActivity;
+import org.mian.gitnex.databinding.FragmentAboutBinding;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.TinyDB;
-import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -23,99 +20,63 @@ import java.util.Objects;
 
 public class AboutFragment extends Fragment {
 
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
-        View v = inflater.inflate(R.layout.fragment_about, container, false);
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
+		FragmentAboutBinding viewBinding = FragmentAboutBinding.inflate(inflater, container, false);
         TinyDB tinyDb = new TinyDB(getContext());
 
-        final TextView appVerBuild;
-        final TextView donationLink;
-        final TextView donationLinkPatreon;
-        final TextView translateLink;
-        final TextView creditsButton;
-        final TextView sponsorsButton;
-        final TextView appWebsite;
-        final TextView appRepo;
+	    viewBinding.appVersion.setText(AppUtil.getAppVersion(requireContext()));
+	    viewBinding.userServerVersion.setText(tinyDb.getString("giteaVersion"));
+	    viewBinding.appBuild.setText(String.valueOf(AppUtil.getAppBuildNo(requireContext())));
 
-        appVerBuild = v.findViewById(R.id.appVerBuild);
-        TextView viewTextGiteaVersion = v.findViewById(R.id.giteaVersion);
-        creditsButton = v.findViewById(R.id.creditsButton);
-        donationLink = v.findViewById(R.id.donationLink);
-        donationLinkPatreon = v.findViewById(R.id.donationLinkPatreon);
-        translateLink = v.findViewById(R.id.translateLink);
-        sponsorsButton = v.findViewById(R.id.sponsorsButton);
-        appWebsite = v.findViewById(R.id.appWebsite);
-        appRepo = v.findViewById(R.id.appRepo);
+		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.pageTitleAbout));
 
-        appVerBuild.setText(getString(R.string.appVerBuild, AppUtil.getAppVersion(Objects.requireNonNull(getContext())), AppUtil.getAppBuildNo(getContext())));
+		viewBinding.donationLinkLiberapay.setOnClickListener(v1 -> {
 
-        donationLink.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_VIEW);
-                intent.addCategory(Intent.CATEGORY_BROWSABLE);
-                intent.setData(Uri.parse(getResources().getString(R.string.supportLink)));
-                startActivity(intent);
-            }
+            Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.addCategory(Intent.CATEGORY_BROWSABLE);
+            intent.setData(Uri.parse(getResources().getString(R.string.supportLink)));
+            startActivity(intent);
         });
 
-        donationLinkPatreon.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_VIEW);
-                intent.addCategory(Intent.CATEGORY_BROWSABLE);
-                intent.setData(Uri.parse(getResources().getString(R.string.supportLinkPatreon)));
-                startActivity(intent);
-            }
+		viewBinding.donationLinkPatreon.setOnClickListener(v12 -> {
+
+            Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.addCategory(Intent.CATEGORY_BROWSABLE);
+            intent.setData(Uri.parse(getResources().getString(R.string.supportLinkPatreon)));
+            startActivity(intent);
         });
 
-        translateLink.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_VIEW);
-                intent.addCategory(Intent.CATEGORY_BROWSABLE);
-                intent.setData(Uri.parse(getResources().getString(R.string.crowdInLink)));
-                startActivity(intent);
-            }
+		viewBinding.translateLink.setOnClickListener(v13 -> {
+
+            Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.addCategory(Intent.CATEGORY_BROWSABLE);
+            intent.setData(Uri.parse(getResources().getString(R.string.crowdInLink)));
+            startActivity(intent);
         });
 
-        appWebsite.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_VIEW);
-                intent.addCategory(Intent.CATEGORY_BROWSABLE);
-                intent.setData(Uri.parse(getResources().getString(R.string.appWebsiteLink)));
-                startActivity(intent);
-            }
+		viewBinding.appWebsite.setOnClickListener(v14 -> {
+
+            Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.addCategory(Intent.CATEGORY_BROWSABLE);
+            intent.setData(Uri.parse(getResources().getString(R.string.appWebsiteLink)));
+            startActivity(intent);
         });
 
-        appRepo.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_VIEW);
-                intent.addCategory(Intent.CATEGORY_BROWSABLE);
-                intent.setData(Uri.parse(getResources().getString(R.string.appRepoLink)));
-                startActivity(intent);
-            }
-        });
+		if(AppUtil.isPro(requireContext())) {
 
-        creditsButton.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                startActivity(new Intent(getContext(), CreditsActivity.class));
-            }
-        });
+			viewBinding.supportHeader.setVisibility(View.GONE);
+			viewBinding.dividerSupport.setVisibility(View.GONE);
+			viewBinding.donationLinkLiberapay.setVisibility(View.GONE);
+			viewBinding.donationLinkPatreon.setVisibility(View.GONE);
+		}
 
-        sponsorsButton.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                startActivity(new Intent(getContext(), SponsorsActivity.class));
-            }
-        });
-
-        String commit = getResources().getString(R.string.commitPage) + tinyDb.getString("giteaVersion");
-        viewTextGiteaVersion.setText(commit);
-
-        return v;
+	    return viewBinding.getRoot();
     }
 
 }

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

@@ -26,15 +26,27 @@ public class BottomSheetFileViewerFragment extends BottomSheetDialogFragment {
         View v = inflater.inflate(R.layout.bottom_sheet_file_viewer, container, false);
 
         TextView downloadFile = v.findViewById(R.id.downloadFile);
+	    TextView deleteFile = v.findViewById(R.id.deleteFile);
+	    TextView editFile = v.findViewById(R.id.editFile);
 
-        downloadFile.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                bmListener.onButtonClicked("downloadFile");
-                dismiss();
-            }
+        downloadFile.setOnClickListener(v1 -> {
+
+            bmListener.onButtonClicked("downloadFile");
+            dismiss();
         });
 
+	    deleteFile.setOnClickListener(v1 -> {
+
+		    bmListener.onButtonClicked("deleteFile");
+		    dismiss();
+	    });
+
+	    editFile.setOnClickListener(v1 -> {
+
+		    bmListener.onButtonClicked("editFile");
+		    dismiss();
+	    });
+
         return v;
     }
 
@@ -47,9 +59,11 @@ public class BottomSheetFileViewerFragment extends BottomSheetDialogFragment {
         super.onAttach(context);
 
         try {
+
             bmListener = (BottomSheetFileViewerFragment.BottomSheetListener) context;
         }
         catch (ClassCastException e) {
+
             throw new ClassCastException(context.toString() + " must implement BottomSheetListener");
         }
     }

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

@@ -41,6 +41,9 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
         TextView unWatchRepository = v.findViewById(R.id.unWatchRepository);
         TextView shareRepository = v.findViewById(R.id.shareRepository);
 	    TextView copyRepoUrl = v.findViewById(R.id.copyRepoUrl);
+	    View repoSettingsDivider = v.findViewById(R.id.repoSettingsDivider);
+	    TextView repoSettings = v.findViewById(R.id.repoSettings);
+	    TextView createPullRequest = v.findViewById(R.id.createPullRequest);
 
         createLabel.setOnClickListener(v112 -> {
 
@@ -49,6 +52,7 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
         });
 
         if(tinyDb.getBoolean("hasIssues")) {
+
             createIssue.setVisibility(View.VISIBLE);
             createIssue.setOnClickListener(v12 -> {
 
@@ -57,9 +61,24 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
             });
         }
         else {
+
             createIssue.setVisibility(View.GONE);
         }
 
+	    if(tinyDb.getBoolean("hasPullRequests")) {
+
+		    createPullRequest.setVisibility(View.VISIBLE);
+		    createPullRequest.setOnClickListener(vPr -> {
+
+			    bmListener.onButtonClicked("newPullRequest");
+			    dismiss();
+		    });
+	    }
+	    else {
+
+		    createPullRequest.setVisibility(View.GONE);
+	    }
+
         createMilestone.setOnClickListener(v13 -> {
 
             bmListener.onButtonClicked("newMilestone");
@@ -67,13 +86,24 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
         });
 
 		if (tinyDb.getBoolean("isRepoAdmin")) {
+
+			repoSettings.setOnClickListener(repoSettingsView -> {
+
+				bmListener.onButtonClicked("repoSettings");
+				dismiss();
+			});
+
 			addCollaborator.setOnClickListener(v1 -> {
 
 				bmListener.onButtonClicked("addCollaborator");
 				dismiss();
 			});
-		} else {
+		}
+		else {
+
 			addCollaborator.setVisibility(View.GONE);
+			repoSettingsDivider.setVisibility(View.GONE);
+			repoSettings.setVisibility(View.GONE);
 		}
 
         createRelease.setOnClickListener(v14 -> {

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

@@ -19,14 +19,10 @@ import org.mian.gitnex.activities.AddRemoveLabelsActivity;
 import org.mian.gitnex.activities.EditIssueActivity;
 import org.mian.gitnex.activities.FileDiffActivity;
 import org.mian.gitnex.activities.MergePullRequestActivity;
-import org.mian.gitnex.helpers.PathsHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.Objects;
-import io.mikael.urlbuilder.UrlBuilder;
 
 /**
  * Author M M Arif
@@ -122,60 +118,27 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
 		shareIssue.setOnClickListener(v1 -> {
 
-			try {
+			Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
+			sharingIntent.setType("text/plain");
+			sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle"));
+			sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, tinyDB.getString("singleIssueHtmlUrl"));
+			startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle")));
 
-				URI instanceUrl = new URI(tinyDB.getString("instanceUrlWithProtocol"));
-
-				String issuePath = PathsHelper.join(instanceUrl.getPath(), tinyDB.getString("repoFullName"), "/issues/", tinyDB.getString("issueNumber"));
-
-				String issueUrl = UrlBuilder.fromUri(instanceUrl)
-					.withPath(issuePath)
-					.toString();
-
-				// share issue
-				Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
-				sharingIntent.setType("text/plain");
-				sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle"));
-				sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, issueUrl);
-				startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle")));
-
-			}
-			catch(URISyntaxException e) {
-				Toasty.error(ctx, getString(R.string.genericError));
-			}
-			finally {
-				dismiss();
-			}
+			dismiss();
 
 		});
 
 		copyIssueUrl.setOnClickListener(v12 -> {
 
-			try {
+			// copy to clipboard
+			ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
+			ClipData clip = ClipData.newPlainText("issueUrl", tinyDB.getString("singleIssueHtmlUrl"));
+			assert clipboard != null;
+			clipboard.setPrimaryClip(clip);
 
-				URI instanceUrl = new URI(tinyDB.getString("instanceUrlWithProtocol"));
+			Toasty.info(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
 
-				String issuePath = PathsHelper.join(instanceUrl.getPath(), tinyDB.getString("repoFullName"), "/issues/", tinyDB.getString("issueNumber"));
-
-				String issueUrl = UrlBuilder.fromUri(instanceUrl)
-					.withPath(issuePath)
-					.toString();
-
-				// copy to clipboard
-				ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
-				ClipData clip = ClipData.newPlainText("issueUrl", issueUrl);
-				assert clipboard != null;
-				clipboard.setPrimaryClip(clip);
-
-				Toasty.info(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
-
-			}
-			catch(URISyntaxException e) {
-				Toasty.error(ctx, getString(R.string.genericError));
-			}
-			finally {
-				dismiss();
-			}
+			dismiss();
 
 		});
 

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

@@ -1,149 +0,0 @@
-package org.mian.gitnex.fragments;
-
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-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;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import org.mian.gitnex.R;
-import org.mian.gitnex.adapters.BranchesAdapter;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.Branches;
-import org.mian.gitnex.viewmodels.BranchesViewModel;
-import java.util.List;
-
-/**
- * Author M M Arif
- */
-
-public class BranchesFragment extends Fragment {
-
-    private ProgressBar mProgressBar;
-    private BranchesAdapter adapter;
-    private RecyclerView mRecyclerView;
-    private TextView noDataBranches;
-    private static String repoNameF = "param2";
-    private static String repoOwnerF = "param1";
-
-    private String repoName;
-    private String repoOwner;
-
-    private OnFragmentInteractionListener mListener;
-
-    public BranchesFragment() {
-    }
-
-    public static BranchesFragment newInstance(String param1, String param2) {
-        BranchesFragment fragment = new BranchesFragment();
-        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) {
-            repoName = getArguments().getString(repoNameF);
-            repoOwner = getArguments().getString(repoOwnerF);
-        }
-    }
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.fragment_branches, container, false);
-
-        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");
-        final String locale = tinyDb.getString("locale");
-        final String timeFormat = tinyDb.getString("dateFormat");
-        noDataBranches = v.findViewById(R.id.noDataBranches);
-
-        final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
-
-        mRecyclerView = v.findViewById(R.id.recyclerView);
-        mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
-                DividerItemDecoration.VERTICAL);
-        mRecyclerView.addItemDecoration(dividerItemDecoration);
-
-        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);
-                        BranchesViewModel.loadBranchesList(instanceUrl, instanceToken, repoOwner, repoName, getContext());
-                    }
-                }, 50);
-            }
-        });
-
-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
-
-        return v;
-    }
-
-    public void onButtonPressed(Uri uri) {
-        if (mListener != null) {
-            mListener.onFragmentInteraction(uri);
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mListener = null;
-    }
-
-    public interface OnFragmentInteractionListener {
-        void onFragmentInteraction(Uri uri);
-    }
-
-    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo) {
-
-        BranchesViewModel branchesModel = new ViewModelProvider(this).get(BranchesViewModel.class);
-
-        branchesModel.getBranchesList(instanceUrl, instanceToken, owner, repo, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Branches>>() {
-            @Override
-            public void onChanged(@Nullable List<Branches> branchesListMain) {
-                adapter = new BranchesAdapter(getContext(), branchesListMain);
-                if(adapter.getItemCount() > 0) {
-                    mRecyclerView.setAdapter(adapter);
-                    noDataBranches.setVisibility(View.GONE);
-                }
-                else {
-                    adapter.notifyDataSetChanged();
-                    mRecyclerView.setAdapter(adapter);
-                    noDataBranches.setVisibility(View.VISIBLE);
-                }
-                mProgressBar.setVisibility(View.GONE);
-            }
-        });
-
-    }
-
-}

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,28 +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.KeyEvent;
 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;
@@ -30,194 +39,300 @@ import retrofit2.Callback;
 import retrofit2.Response;
 
 /**
- * + * Template Author M M Arif
- * + * Author 6543
- * +
+ * 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(new TextView.OnEditorActionListener() {
+		tinyDb.putBoolean("exploreRepoIncludeTopic", false);
+		tinyDb.putBoolean("exploreRepoIncludeDescription", false);
+		tinyDb.putBoolean("exploreRepoIncludeTemplate", false);
+		tinyDb.putBoolean("exploreRepoOnlyArchived", false);
 
-			@Override
-			public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+		// if gitea is 1.12 or higher use the new limit
+		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+			limit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+		}
 
-				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);
+		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(!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;
+			}
+			return false;
+		});
+
+		viewBinding.recyclerViewReposSearch.addOnScrollListener(new InfiniteScrollListener(pageCurrentIndex, linearLayoutManager) {
+
+			@Override
+			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"));
 			}
 		});
 
-		int limitDefault = 10;
-		loadDefaultList(instanceUrl, instanceToken, loginUid, repoTypeInclude, sort, order, getContext(), limitDefault);
+		viewBinding.pullToRefresh.setOnRefreshListener(() -> {
 
-		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>() {
-
-			@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"));
 
-	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()));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) {
-
-				Log.i("onFailure", Objects.requireNonNull(t.getMessage()));
-			}
-
-		});
+		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

@@ -30,7 +30,6 @@ import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.viewmodels.FilesViewModel;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Objects;
 import moe.feng.common.view.breadcrumbs.BreadcrumbsView;
 import moe.feng.common.view.breadcrumbs.DefaultBreadcrumbsCallback;
 import moe.feng.common.view.breadcrumbs.model.BreadcrumbItem;
@@ -111,7 +110,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 		mBreadcrumbsView = v.findViewById(R.id.breadcrumbs_view);
 		mBreadcrumbsView.setItems(new ArrayList<>(Collections.singletonList(BreadcrumbItem.createSimpleItem(getResources().getString(R.string.filesBreadcrumbRoot) + getResources().getString(R.string.colonDivider) + ref))));
 
-		((RepoDetailActivity) Objects.requireNonNull(getActivity())).setFragmentRefreshListenerFiles(repoBranch -> {
+		((RepoDetailActivity) requireActivity()).setFragmentRefreshListenerFiles(repoBranch -> {
 
 			fileStructure.setText("");
 			ref = repoBranch;
@@ -198,7 +197,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 			intent.putExtra("singleFileName", fileName);
 		}
 
-		Objects.requireNonNull(getContext()).startActivity(intent);
+		requireContext().startActivity(intent);
 	}
 
 	private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo, String ref) {
@@ -263,6 +262,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 	@Override
 	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
+		menu.clear();
 		inflater.inflate(R.menu.search_menu, menu);
 		inflater.inflate(R.menu.files_switch_branches_menu, menu);
 		super.onCreateOptionsMenu(menu, inflater);

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

@@ -32,7 +32,6 @@ import org.mian.gitnex.interfaces.ApiInterface;
 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;
@@ -55,6 +54,7 @@ public class IssuesFragment extends Fragment {
 	private TextView noDataIssues;
 	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 	private String requestType = StaticGlobalVariables.issuesRequestType;
+	private ProgressBar progressLoadMore;
 
 	@Nullable
 	@Override
@@ -83,6 +83,7 @@ public class IssuesFragment extends Fragment {
 		recyclerView = v.findViewById(R.id.recyclerView);
 		issuesList = new ArrayList<>();
 
+		progressLoadMore = v.findViewById(R.id.progressLoadMore);
 		mProgressBar = v.findViewById(R.id.progress_bar);
 		noDataIssues = v.findViewById(R.id.noDataIssues);
 
@@ -110,7 +111,7 @@ public class IssuesFragment extends Fragment {
 		recyclerView.setLayoutManager(new LinearLayoutManager(context));
 		recyclerView.setAdapter(adapter);
 
-		((RepoDetailActivity) Objects.requireNonNull(getActivity())).setFragmentRefreshListener(issueState -> {
+		((RepoDetailActivity) requireActivity()).setFragmentRefreshListener(issueState -> {
 
 			if(issueState.equals("closed")) {
 				menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
@@ -226,9 +227,7 @@ public class IssuesFragment extends Fragment {
 
 	private void loadMore(String token, String repoOwner, String repoName, int page, int resultLimit, String requestType, String issueState) {
 
-		//add loading progress view
-		issuesList.add(new Issues("load"));
-		adapter.notifyItemInserted((issuesList.size() - 1));
+		progressLoadMore.setVisibility(View.VISIBLE);
 
 		Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName, page, resultLimit, requestType, issueState);
 
@@ -239,9 +238,6 @@ public class IssuesFragment extends Fragment {
 
 				if(response.code() == 200) {
 
-					//remove loading view
-					issuesList.remove(issuesList.size() - 1);
-
 					List<Issues> result = response.body();
 
 					assert result != null;
@@ -259,6 +255,7 @@ public class IssuesFragment extends Fragment {
 					}
 
 					adapter.notifyDataChanged();
+					progressLoadMore.setVisibility(View.GONE);
 
 				}
 				else {

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

@@ -10,6 +10,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.GridView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -39,6 +40,7 @@ public class MembersByOrgFragment extends Fragment {
     private String orgName;
     private MembersByOrgAdapter adapter;
     private GridView mGridView;
+    private ProgressBar progressBar;
 
     public MembersByOrgFragment() {
     }
@@ -72,6 +74,7 @@ public class MembersByOrgFragment extends Fragment {
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         noDataMembers = v.findViewById(R.id.noDataMembers);
 
+	    progressBar = v.findViewById(R.id.progressBar);
         mGridView = v.findViewById(R.id.gridView);
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName);
@@ -96,6 +99,8 @@ public class MembersByOrgFragment extends Fragment {
                     mGridView.setAdapter(adapter);
                     noDataMembers.setVisibility(View.VISIBLE);
                 }
+
+	            progressBar.setVisibility(View.GONE);
             }
         });
 

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

@@ -27,7 +27,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;
@@ -104,7 +103,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);
@@ -219,9 +218,7 @@ public class MilestonesFragment extends Fragment {
 
     private void loadMore(String token, String repoOwner, String repoName, int page, int resultLimit, String milestoneState) {
 
-        //add loading progress view
-        dataList.add(new Milestones("load"));
-        adapter.notifyItemInserted((dataList.size() - 1));
+    	viewBinding.progressLoadMore.setVisibility(View.VISIBLE);
 
         Call<List<Milestones>> call = api.getMilestones(token, repoOwner, repoName, page, resultLimit, milestoneState);
 
@@ -251,6 +248,7 @@ public class MilestonesFragment extends Fragment {
                     }
 
                     adapter.notifyDataChanged();
+		            viewBinding.progressLoadMore.setVisibility(View.GONE);
 
                 }
                 else {

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

@@ -36,7 +36,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -79,7 +78,7 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 		View v = inflater.inflate(R.layout.fragment_notifications, container, false);
 		setHasOptionsMenu(true);
 
-		activity = Objects.requireNonNull(getActivity());
+		activity = requireActivity();
 		context = getContext();
 		tinyDB = new TinyDB(context);
 
@@ -337,7 +336,7 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 
 			tinyDB.putString("issueNumber", issueUrl.substring(issueUrl.lastIndexOf("/") + 1));
 			tinyDB.putString("issueType", notificationThread.getSubject().getType());
-			tinyDB.putString("repoFullName", notificationThread.getRepository().getFullname());
+			tinyDB.putString("repoFullName", notificationThread.getRepository().getFullName());
 
 			startActivity(intent);
 

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

@@ -67,7 +67,7 @@ public class ProfileFragment extends Fragment {
 	    if(userLanguageCodes.length >= 2) {
 
 		    Locale locale = new Locale(userLanguageCodes[0], userLanguageCodes[1]);
-		    userLanguage.setText(locale.getDisplayCountry());
+		    userLanguage.setText(locale.getDisplayLanguage());
 	    }
 	    else {
 

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

@@ -55,6 +55,7 @@ public class PullRequestsFragment extends Fragment {
 	private int pageSize = StaticGlobalVariables.prPageInit;
 	private TextView noData;
 	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
+	private ProgressBar progressLoadMore;
 
 	@Nullable
 	@Override
@@ -83,6 +84,7 @@ public class PullRequestsFragment extends Fragment {
 		recyclerView = v.findViewById(R.id.recyclerView);
 		prList = new ArrayList<>();
 
+		progressLoadMore = v.findViewById(R.id.progressLoadMore);
 		mProgressBar = v.findViewById(R.id.progress_bar);
 		noData = v.findViewById(R.id.noData);
 
@@ -233,9 +235,7 @@ public class PullRequestsFragment extends Fragment {
 
 	private void loadMore(String token, String repoOwner, String repoName, int page, String prState, int resultLimit) {
 
-		//add loading progress view
-		prList.add(new PullRequests("load"));
-		adapter.notifyItemInserted((prList.size() - 1));
+		progressLoadMore.setVisibility(View.VISIBLE);
 
 		Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState, resultLimit);
 
@@ -266,6 +266,7 @@ public class PullRequestsFragment extends Fragment {
 					}
 
 					adapter.notifyDataChanged();
+					progressLoadMore.setVisibility(View.GONE);
 
 				}
 				else {

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

@@ -16,12 +16,10 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
-import org.mian.gitnex.activities.RepoForksActivity;
 import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -36,7 +34,6 @@ import org.mian.gitnex.models.UserRepositories;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Locale;
-import java.util.Objects;
 import io.noties.markwon.AbstractMarkwonPlugin;
 import io.noties.markwon.Markwon;
 import io.noties.markwon.core.CorePlugin;
@@ -45,7 +42,6 @@ import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
 import io.noties.markwon.ext.tables.TablePlugin;
 import io.noties.markwon.ext.tasklist.TaskListPlugin;
 import io.noties.markwon.html.HtmlPlugin;
-import io.noties.markwon.image.AsyncDrawable;
 import io.noties.markwon.image.DefaultMediaDecoder;
 import io.noties.markwon.image.ImageItem;
 import io.noties.markwon.image.ImagesPlugin;
@@ -165,17 +161,9 @@ public class RepoInfoFragment extends Fragment {
 			toggleExpandViewMeta();
 		}
 
-		fileContentsFrameHeader.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
-				toggleExpandView();
-			}
-		});
+		fileContentsFrameHeader.setOnClickListener(v1 -> toggleExpandView());
 
-		repoMetaFrameHeader.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
-				toggleExpandViewMeta();
-			}
-		});
+		repoMetaFrameHeader.setOnClickListener(v12 -> toggleExpandViewMeta());
 
 		repoMetaStarsFrame.setOnClickListener(metaStars -> {
 
@@ -184,13 +172,6 @@ public class RepoInfoFragment extends Fragment {
 			ctx.startActivity(intent);
 		});
 
-		repoMetaForksFrame.setOnClickListener(metaForks -> {
-
-			Intent intent = new Intent(ctx, RepoForksActivity.class);
-			intent.putExtra("repoFullNameForForks", repoOwner + "/" + repoName);
-			ctx.startActivity(intent);
-		});
-
 		repoMetaWatchersFrame.setOnClickListener(metaWatchers -> {
 
 			Intent intent = new Intent(ctx, RepoWatchersActivity.class);
@@ -370,6 +351,13 @@ public class RepoInfoFragment extends Fragment {
 								tinyDb.putBoolean("hasIssues", true);
 							}
 
+							if(repoInfo.isHas_pull_requests()) {
+								tinyDb.putBoolean("hasPullRequests", repoInfo.isHas_pull_requests());
+							}
+							else {
+								tinyDb.putBoolean("hasPullRequests", false);
+							}
+
 							tinyDb.putString("repoHtmlUrl", repoInfo.getHtml_url());
 
 							mProgressBar.setVisibility(View.GONE);
@@ -412,46 +400,37 @@ public class RepoInfoFragment extends Fragment {
 
 					if (response.code() == 200) {
 
-						final Markwon markwon = Markwon.builder(Objects.requireNonNull(getContext()))
+						final Markwon markwon = Markwon.builder(requireContext())
 							.usePlugin(CorePlugin.create())
-							.usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
-								@Override
-								public void configureImages(@NonNull ImagesPlugin plugin) {
-									plugin.addSchemeHandler(new SchemeHandler() {
-										@NonNull
-										@Override
-										public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+							.usePlugin(ImagesPlugin.create(plugin -> {
+								plugin.addSchemeHandler(new SchemeHandler() {
+									@NonNull
+									@Override
+									public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
 
-											final int resourceId = getContext().getResources().getIdentifier(
-													raw.substring("drawable://".length()),
-													"drawable",
-													getContext().getPackageName());
+										final int resourceId = requireContext().getResources().getIdentifier(
+												raw.substring("drawable://".length()),
+												"drawable",
+												requireContext().getPackageName());
 
-											final Drawable drawable = getContext().getDrawable(resourceId);
+										final Drawable drawable = requireContext().getDrawable(resourceId);
 
-											assert drawable != null;
-											return ImageItem.withResult(drawable);
-										}
+										assert drawable != null;
+										return ImageItem.withResult(drawable);
+									}
 
-										@NonNull
-										@Override
-										public Collection<String> supportedSchemes() {
-											return Collections.singleton("drawable");
-										}
-									});
-									plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
-										@Nullable
-										@Override
-										public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
-											return null;
-										}
-									});
-									plugin.addMediaDecoder(GifMediaDecoder.create(false));
-									plugin.addMediaDecoder(SvgMediaDecoder.create(getContext().getResources()));
-									plugin.addMediaDecoder(SvgMediaDecoder.create());
-									plugin.defaultMediaDecoder(DefaultMediaDecoder.create(getContext().getResources()));
-									plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
-								}
+									@NonNull
+									@Override
+									public Collection<String> supportedSchemes() {
+										return Collections.singleton("drawable");
+									}
+								});
+								plugin.placeholderProvider(drawable -> null);
+								plugin.addMediaDecoder(GifMediaDecoder.create(false));
+								plugin.addMediaDecoder(SvgMediaDecoder.create(requireContext().getResources()));
+								plugin.addMediaDecoder(SvgMediaDecoder.create());
+								plugin.defaultMediaDecoder(DefaultMediaDecoder.create(requireContext().getResources()));
+								plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
 							}))
 							.usePlugin(new AbstractMarkwonPlugin() {
 								@Override
@@ -462,8 +441,8 @@ public class RepoInfoFragment extends Fragment {
 											.linkColor(getResources().getColor(R.color.lightBlue));
 								}
 							})
-							.usePlugin(TablePlugin.create(getContext()))
-							.usePlugin(TaskListPlugin.create(getContext()))
+							.usePlugin(TablePlugin.create(requireContext()))
+							.usePlugin(TaskListPlugin.create(requireContext()))
 							.usePlugin(HtmlPlugin.create())
 							.usePlugin(StrikethroughPlugin.create())
 							.usePlugin(LinkifyPlugin.create())

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;
@@ -17,7 +19,6 @@ 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
@@ -37,6 +38,8 @@ public class SettingsFragment extends Fragment {
 		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);
 
 		appearanceFrame.setOnClickListener(v1 -> startActivity(new Intent(getContext(), SettingsAppearanceActivity.class)));
 
@@ -50,10 +53,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 +79,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/helpers/AppUtil.java

@@ -76,6 +76,10 @@ public class AppUtil {
 		}
 	}
 
+	public static boolean isPro(Context context) {
+		return context.getPackageName().equals("org.mian.gitnex.pro");
+	}
+
 	public int charactersLength(String str) {
 
 		return str.length();

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

@@ -21,9 +21,9 @@ public class ChangeLog {
 
     static final private String TAG = "ChangeLog";
     static final private String CHANGELOG_XML_NODE = "changelog";
-	
+
     private Activity changelogActivity;
-    
+
 	public ChangeLog(Activity context) {
 		changelogActivity = context;
     }
@@ -93,7 +93,7 @@ public class ChangeLog {
 		androidx.appcompat.app.AlertDialog.Builder builder = new AlertDialog.Builder(changelogActivity);
 		builder.setTitle(R.string.changelogTitle);
 		builder.setMessage(Html.fromHtml("<small>" + changelogMessage + "</small>"));
-		builder.setNegativeButton(R.string.close, (dialog, which) -> dialog.cancel());
+		builder.setNeutralButton(R.string.close, null);
 		builder.setCancelable(false);
 		builder.create();
 		builder.show();

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/Version.java

@@ -24,6 +24,21 @@ public class Version {
 
 	}
 
+	/**
+	 * valid return true if string is a valid version
+	 *
+	 * @param value
+	 * @return
+	 */
+	public static boolean valid(String value) {
+
+		if(value == null) {
+			return false;
+		}
+		final Pattern pattern_valid = Pattern.compile("^[v,V]?(\\d+)+(\\.(\\d+))*([_,\\-,+][\\w,\\d,_,\\-,+]*)?$");
+		return pattern_valid.matcher(value).find();
+	}
+
 	/**
 	 * init parse and store values for other functions of an Version instance
 	 * it use the raw variable as base
@@ -32,10 +47,9 @@ public class Version {
 	 */
 	private void init() {
 
-		final Pattern pattern_valid = Pattern.compile("^[v,V]?(\\d+)+(\\.(\\d+))*([_,\\-,+][\\w,\\d,_,\\-,+]*)?$");
 		final Pattern pattern_number_dot_number = Pattern.compile("^\\d+(\\.(\\d)+)*");
 
-		if(!pattern_valid.matcher(raw).find()) {
+		if(!valid(raw)) {
 			throw new IllegalArgumentException("Invalid version format");
 		}
 

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

@@ -7,6 +7,9 @@ import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.Commits;
 import org.mian.gitnex.models.CreateIssue;
 import org.mian.gitnex.models.CreateLabel;
+import org.mian.gitnex.models.CreatePullRequest;
+import org.mian.gitnex.models.DeleteFile;
+import org.mian.gitnex.models.EditFile;
 import org.mian.gitnex.models.Emails;
 import org.mian.gitnex.models.ExploreRepositories;
 import org.mian.gitnex.models.Files;
@@ -17,6 +20,7 @@ import org.mian.gitnex.models.Labels;
 import org.mian.gitnex.models.MergePullRequest;
 import org.mian.gitnex.models.Milestones;
 import org.mian.gitnex.models.NewFile;
+import org.mian.gitnex.models.NotificationCount;
 import org.mian.gitnex.models.NotificationThread;
 import org.mian.gitnex.models.OrgOwner;
 import org.mian.gitnex.models.Organization;
@@ -24,6 +28,7 @@ import org.mian.gitnex.models.OrganizationRepository;
 import org.mian.gitnex.models.Permission;
 import org.mian.gitnex.models.PullRequests;
 import org.mian.gitnex.models.Releases;
+import org.mian.gitnex.models.RepositoryTransfer;
 import org.mian.gitnex.models.Teams;
 import org.mian.gitnex.models.UpdateIssueAssignees;
 import org.mian.gitnex.models.UpdateIssueState;
@@ -39,6 +44,7 @@ import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.DELETE;
 import retrofit2.http.GET;
+import retrofit2.http.HTTP;
 import retrofit2.http.Header;
 import retrofit2.http.PATCH;
 import retrofit2.http.POST;
@@ -89,7 +95,7 @@ public interface ApiInterface {
     Call<ResponseBody> markNotificationThreadsAsRead(@Header("Authorization") String token, @Query("last_read_at") String last_read_at, @Query("all") Boolean all, @Query("status-types") String[] statusTypes, @Query("to-status") String toStatus);
 
     @GET("notifications/new") // Check if unread notifications exist
-    Call<JsonElement> checkUnreadNotifications(@Header("Authorization") String token);
+    Call<NotificationCount> checkUnreadNotifications(@Header("Authorization") String token);
 
     @GET("notifications/threads/{id}") // Get notification thread by ID
     Call<NotificationThread> getNotificationThread(@Header("Authorization") String token, @Path("id") Integer id);
@@ -124,6 +130,15 @@ public interface ApiInterface {
     @GET("repos/{owner}/{repo}") // get repo information
     Call<UserRepositories> getUserRepository(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
 
+	@PATCH("repos/{owner}/{repo}") // patch/update repository properties
+	Call<UserRepositories> updateRepositoryProperties(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Body UserRepositories jsonStr);
+
+	@DELETE("repos/{owner}/{repo}") // delete repository
+	Call<JsonElement> deleteRepository(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
+
+	@POST("repos/{owner}/{repo}/transfer") // transfer repository
+	Call<JsonElement> transferRepository(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Body RepositoryTransfer jsonStr);
+
     @GET("repos/{owner}/{repo}/issues") // get issues by repo
     Call<List<Issues>> getIssues(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("limit") int limit, @Query("type") String requestType, @Query("state") String issueState);
 
@@ -251,7 +266,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);
@@ -265,6 +283,12 @@ public interface ApiInterface {
     @GET("repos/{owner}/{repo}/contents/{fileDir}") // get all the sub files and dirs of a repository
     Call<List<Files>> getDirFiles(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("fileDir") String fileDir, @Query("ref") String ref);
 
+	@HTTP(method = "DELETE", path = "repos/{owner}/{repo}/contents/{filepath}", hasBody = true) // delete a file
+	Call<JsonElement> deleteFile(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("filepath") String filepath, @Body DeleteFile jsonStr);
+
+	@PUT("repos/{owner}/{repo}/contents/{filepath}") // edit/update a file
+	Call<JsonElement> editFile(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("filepath") String filepath, @Body EditFile jsonStr);
+
     @GET("user/starred/{owner}/{repo}") // check star status of a repository
     Call<JsonElement> checkRepoStarStatus(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
 
@@ -301,6 +325,9 @@ public interface ApiInterface {
     @POST("repos/{owner}/{repo}/pulls/{index}/merge") // merge a pull request
     Call<ResponseBody> mergePullRequest(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int index, @Body MergePullRequest jsonStr);
 
+	@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}/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/CreatePullRequest.java

@@ -0,0 +1,36 @@
+package org.mian.gitnex.models;
+
+import java.util.ArrayList;
+
+/**
+ * Author M M Arif
+ */
+
+public class CreatePullRequest {
+
+	private String title;
+	private String body;
+	private String assignee;
+	private String base;
+	private String head;
+	private int milestone;
+	private String due_date;
+	private String message;
+
+	private ArrayList<String> assignees;
+	private ArrayList<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) {
+
+		this.title = title;
+		this.body = body;
+		this.assignee = assignee;
+		this.base = base;           // merge into branch
+		this.head = head;           // pull from branch
+		this.milestone = milestone;
+		this.due_date = due_date;
+		this.assignees = assignees;
+		this.labels = labels;
+	}
+
+}

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

@@ -0,0 +1,60 @@
+package org.mian.gitnex.models;
+
+/**
+ * Author M M Arif
+ */
+
+public class DeleteFile {
+
+	private String branch;
+	private String message;
+	private String new_branch;
+	private String sha;
+
+	public String getBranch() {
+
+		return branch;
+	}
+
+	public void setBranch(String branch) {
+
+		this.branch = branch;
+	}
+
+	public String getMessage() {
+
+		return message;
+	}
+
+	public void setMessage(String message) {
+
+		this.message = message;
+	}
+
+	public String getNew_branch() {
+
+		return new_branch;
+	}
+
+	public void setNew_branch(String new_branch) {
+
+		this.new_branch = new_branch;
+	}
+
+	public String getSha() {
+
+		return sha;
+	}
+
+	public void setSha(String sha) {
+
+		this.sha = sha;
+	}
+
+	public DeleteFile(String branch, String message, String new_branch, String sha) {
+		this.branch = branch;
+		this.message = message;
+		this.new_branch = new_branch;
+		this.sha = sha;
+	}
+}

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

@@ -0,0 +1,73 @@
+package org.mian.gitnex.models;
+
+/**
+ * Author M M Arif
+ */
+
+public class EditFile {
+
+	private String branch;
+	private String message;
+	private String new_branch;
+	private String sha;
+	private String content;
+
+	public String getBranch() {
+
+		return branch;
+	}
+
+	public void setBranch(String branch) {
+
+		this.branch = branch;
+	}
+
+	public String getMessage() {
+
+		return message;
+	}
+
+	public void setMessage(String message) {
+
+		this.message = message;
+	}
+
+	public String getNew_branch() {
+
+		return new_branch;
+	}
+
+	public void setNew_branch(String new_branch) {
+
+		this.new_branch = new_branch;
+	}
+
+	public String getSha() {
+
+		return sha;
+	}
+
+	public void setSha(String sha) {
+
+		this.sha = sha;
+	}
+
+	public String getContent() {
+
+		return content;
+	}
+
+	public void setContent(String content) {
+
+		this.content = content;
+	}
+
+	public EditFile(String branch, String message, String new_branch, String sha, String content) {
+		this.branch = branch;
+		this.message = message;
+		this.new_branch = new_branch;
+		this.sha = sha;
+		this.content = content;
+	}
+
+}

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

@@ -11,6 +11,7 @@ public class Issues {
 
     private int id;
     private String url;
+    private String html_url;
     private int number;
     private String title;
     private String body;
@@ -26,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;
@@ -192,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;
     }
@@ -256,4 +287,19 @@ public class Issues {
         return assignees;
     }
 
+    public String getHtml_url() {
+
+        return html_url;
+    }
+
+    public void setHtml_url(String html_url) {
+
+        this.html_url = html_url;
+    }
+
+	public repositoryObject getRepository() {
+
+		return repository;
+	}
+
 }

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

@@ -21,6 +21,11 @@ public class Labels {
         this.labels = labels;
     }
 
+	public Labels(int id, String name) {
+		this.id = id;
+		this.name = name;
+	}
+
     public int getId() {
         return id;
     }

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

@@ -46,7 +46,7 @@ public class NewFile {
         this.new_branch = new_branch;
     }
 
-    public class authorObject {
+	public static class authorObject {
 
         private String email;
         private String name;
@@ -68,7 +68,7 @@ public class NewFile {
         }
     }
 
-    public class committerObject {
+    public static class committerObject {
 
         private String email;
         private String name;
@@ -96,4 +96,4 @@ public class NewFile {
         this.message = message;
         this.new_branch = new_branch;
     }
-}
+}

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

@@ -0,0 +1,19 @@
+package org.mian.gitnex.models;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Author M M Arif
+ */
+
+public class NotificationCount {
+
+	@SerializedName("new")
+	private int counter;
+
+	public int getCounter() {
+
+		return counter;
+	}
+
+}

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

@@ -0,0 +1,20 @@
+package org.mian.gitnex.models;
+
+/**
+ * Author M M Arif
+ */
+
+public class RepositoryTransfer {
+
+	private String new_owner;
+
+	public RepositoryTransfer(String new_owner) {
+
+		this.new_owner = new_owner;
+	}
+
+	public String getNew_owner() {
+
+		return new_owner;
+	}
+}

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

@@ -32,12 +32,134 @@ public class UserRepositories {
 	private Boolean has_issues;
 	private String avatar_url;
 	private boolean archived;
+	private boolean allow_merge_commits;
+	private boolean allow_rebase;
+	private boolean allow_rebase_explicit;
+	private boolean allow_squash_merge;
+	private boolean has_pull_requests;
+	private boolean has_wiki;
+	private boolean ignore_whitespace_conflicts;
+	private boolean template;
+
+	private permissionsObject permissions;
+	private externalIssueTrackerObject external_tracker;
+	private externalWikiObject external_wiki;
+	private internalTimeTrackerObject internal_tracker;
 
 	public UserRepositories(String body) {
 		this.name = name;
 	}
 
-	private permissionsObject permissions;
+	public UserRepositories(String name, String website, String description,
+		boolean repoPrivate, boolean repoAsTemplate, boolean repoEnableIssues,
+		boolean repoEnableWiki, boolean repoEnablePr,
+		boolean repoEnableMerge, boolean repoEnableRebase, boolean repoEnableSquash, boolean repoEnableForceMerge) {
+
+		this.name = name;
+		this.website = website;
+		this.description = description;
+		this.privateFlag = repoPrivate;
+		this.template = repoAsTemplate;
+		this.has_issues = repoEnableIssues;
+		this.has_wiki = repoEnableWiki;
+		this.has_pull_requests = repoEnablePr;
+		this.allow_merge_commits = repoEnableMerge;
+		this.allow_rebase = repoEnableRebase;
+		this.allow_squash_merge = repoEnableSquash;
+		this.allow_rebase_explicit = repoEnableForceMerge;
+	}
+
+	public UserRepositories(String name, String website, String description,
+		boolean repoPrivate, boolean repoAsTemplate, boolean repoEnableIssues,
+		boolean repoEnableWiki, boolean repoEnablePr, internalTimeTrackerObject repoEnableTimer,
+		boolean repoEnableMerge, boolean repoEnableRebase, boolean repoEnableSquash, boolean repoEnableForceMerge) {
+
+		this.name = name;
+		this.website = website;
+		this.description = description;
+		this.privateFlag = repoPrivate;
+		this.template = repoAsTemplate;
+		this.has_issues = repoEnableIssues;
+		this.has_wiki = repoEnableWiki;
+		this.has_pull_requests = repoEnablePr;
+		this.internal_tracker = repoEnableTimer;
+		this.allow_merge_commits = repoEnableMerge;
+		this.allow_rebase = repoEnableRebase;
+		this.allow_squash_merge = repoEnableSquash;
+		this.allow_rebase_explicit = repoEnableForceMerge;
+	}
+
+	public static class internalTimeTrackerObject {
+
+		private boolean allow_only_contributors_to_track_time;
+		private boolean enable_issue_dependencies;
+		private boolean enable_time_tracker;
+
+		public internalTimeTrackerObject(boolean enable_time_tracker) {
+
+			this.enable_time_tracker = enable_time_tracker;
+		}
+
+		public boolean isAllow_only_contributors_to_track_time() {
+
+			return allow_only_contributors_to_track_time;
+		}
+
+		public boolean isEnable_issue_dependencies() {
+
+			return enable_issue_dependencies;
+		}
+
+		public boolean isEnable_time_tracker() {
+
+			return enable_time_tracker;
+		}
+
+	}
+
+	public static class externalWikiObject {
+
+		private String external_wiki_url;
+
+		public externalWikiObject(String external_wiki_url) {
+
+			this.external_wiki_url = external_wiki_url;
+		}
+
+		public String getExternal_wiki_url() {
+
+			return external_wiki_url;
+		}
+
+	}
+
+	public static class externalIssueTrackerObject {
+
+		private String external_tracker_format;
+		private String external_tracker_style;
+		private String external_tracker_url;
+
+		public externalIssueTrackerObject(String external_tracker_url) {
+
+			this.external_tracker_url = external_tracker_url;
+		}
+
+		public String getExternal_tracker_format() {
+
+			return external_tracker_format;
+		}
+
+		public String getExternal_tracker_style() {
+
+			return external_tracker_style;
+		}
+
+		public String getExternal_tracker_url() {
+
+			return external_tracker_url;
+		}
+
+	}
 
 	public static class permissionsObject {
 
@@ -72,7 +194,7 @@ public class UserRepositories {
 		return name;
 	}
 
-	public String getFullname() {
+	public String getFullName() {
 
 		return full_name;
 	}
@@ -192,4 +314,64 @@ public class UserRepositories {
 		return archived;
 	}
 
+	public String getFull_name() {
+
+		return full_name;
+	}
+
+	public boolean isAllow_merge_commits() {
+
+		return allow_merge_commits;
+	}
+
+	public boolean isAllow_rebase() {
+
+		return allow_rebase;
+	}
+
+	public boolean isAllow_rebase_explicit() {
+
+		return allow_rebase_explicit;
+	}
+
+	public boolean isAllow_squash_merge() {
+
+		return allow_squash_merge;
+	}
+
+	public boolean isHas_pull_requests() {
+
+		return has_pull_requests;
+	}
+
+	public boolean isHas_wiki() {
+
+		return has_wiki;
+	}
+
+	public boolean isIgnore_whitespace_conflicts() {
+
+		return ignore_whitespace_conflicts;
+	}
+
+	public boolean isTemplate() {
+
+		return template;
+	}
+
+	public externalIssueTrackerObject getExternal_tracker() {
+
+		return external_tracker;
+	}
+
+	public externalWikiObject getExternal_wiki() {
+
+		return external_wiki;
+	}
+
+	public internalTimeTrackerObject getInternal_tracker() {
+
+		return internal_tracker;
+	}
+
 }

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

@@ -1,46 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="135.47"
-    android:viewportHeight="135.47">
-  <path
-      android:pathData="M68.02,66.305m-94.784,-6.397a94.999,94.999 48.861,1 1,189.567 12.793a94.999,94.999 48.861,1 1,-189.567 -12.793"
-      android:strokeWidth="1.40255427"
-      android:fillColor="#39404a"/>
-  <path
-      android:pathData="M31.738,45.193a9.139,9.151 63.873,1 0,12.769 -13.108a9.139,9.151 63.873,1 0,-12.769 13.108z"
-      android:strokeWidth="0.99999666"
-      android:fillColor="#609926"/>
-  <path
-      android:pathData="M31.875,115.115a9.139,9.151 63.873,1 0,12.769 -13.108a9.139,9.151 63.873,1 0,-12.769 13.108z"
-      android:strokeWidth="0.99999666"
-      android:fillColor="#609926"/>
-  <path
-      android:pathData="M61.361,80.42a9.139,9.151 63.873,1 0,12.769 -13.108a9.139,9.151 63.873,1 0,-12.769 13.108z"
-      android:strokeWidth="0.99999666"
-      android:fillColor="#609926"/>
-  <path
-      android:pathData="M34.37,18.911l7.038,0.003l-0.096,85.655l-7.038,-0.003z"
-      android:fillColor="#609926"/>
-  <path
-      android:pathData="m37.878,38.707c31.743,0.128 29.614,-4.427 29.723,36.496"
-      android:strokeWidth="8.72550011"
-      android:fillColor="#00000000"
-      android:strokeColor="#609926"/>
-  <path
-      android:pathData="m97.323,109.027c-31.743,-0.128 -29.614,4.427 -29.723,-36.496"
-      android:strokeWidth="8.72550011"
-      android:fillColor="#00000000"
-      android:strokeColor="#609926"/>
-  <path
-      android:pathData="M90.959,45.193a9.139,9.151 63.873,1 0,12.769 -13.108a9.139,9.151 63.873,1 0,-12.769 13.108z"
-      android:strokeWidth="0.99999666"
-      android:fillColor="#609926"/>
-  <path
-      android:pathData="M90.955,115.117a9.139,9.151 63.873,1 0,12.769 -13.108a9.139,9.151 63.873,1 0,-12.769 13.108z"
-      android:strokeWidth="0.99999666"
-      android:fillColor="#609926"/>
-  <path
-      android:pathData="M93.872,35.636l7.038,0.002l-0.096,68.927l-7.038,-0.002z"
-      android:fillColor="#609926"/>
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0"
+      android:scaleY="0"
+      android:translateX="54"
+      android:translateY="54">
+      <path android:fillColor="#3DDC84"
+            android:pathData="M0,0h108v108h-108z"/>
+      <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+  </group>
 </vector>

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

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#368F73"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
-</vector>

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

@@ -1,5 +1,5 @@
 <vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>
+    <path android:fillColor="?attr/iconsColor" android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>
 </vector>

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

@@ -8,20 +8,20 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M8,21L16,21"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,17L12,21"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>

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

@@ -8,20 +8,20 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M1,3h22v5h-22z"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M10,12L14,12"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>

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

@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,19l-7,-7l7,-7"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>

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

@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M19,12l-7,7l-7,-7"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>

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

@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,5l7,7l-7,7"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>

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

@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M5,12l7,-7l7,7"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>

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

@@ -8,27 +8,27 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M18,6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M6,18m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M18,9a9,9 0,0 1,-9 9"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>

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

@@ -1,4 +1,4 @@
 <vector android:height="24dp" android:viewportHeight="16"
     android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#368f73" android:fillType="evenOdd" android:pathData="M6,3h1v1L6,4L6,3zM4,3h1v1L4,4L4,3zM2,3h1v1L2,4L2,3zM14,13L2,13L2,5h12v8zM14,4L8,4L8,3h6v1zM15,3c0,-0.55 -0.45,-1 -1,-1L2,2c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1L15,3z"/>
+    <path android:fillColor="?attr/iconsColor" android:fillType="evenOdd" android:pathData="M6,3h1v1L6,4L6,3zM4,3h1v1L4,4L4,3zM2,3h1v1L2,4L2,3zM14,13L2,13L2,5h12v8zM14,4L8,4L8,3h6v1zM15,3c0,-0.55 -0.45,-1 -1,-1L2,2c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1L15,3z"/>
 </vector>

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

@@ -1,10 +1,83 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:height="24dp" android:viewportHeight="324.274"
-    android:viewportWidth="324.274" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#368F73" android:pathData="M34.419,298V22h138.696h0.841v33.411c0,8.301 6.753,15.055 15.053,15.055h33.154v88.5c2.443,-0.484 4.957,-0.75 7.528,-0.75c5.087,0 9.962,0.994 14.472,2.804V64.006c0,-1.326 -0.526,-2.598 -1.464,-3.536L183.694,1.464C182.755,0.527 181.484,0 180.158,0H27.472c-8.3,0 -15.053,6.753 -15.053,15.054v289.893c0,8.301 6.753,15.054 15.053,15.054h111.884c-1.256,-6.713 1.504,-13.831 7.559,-17.83c2.341,-1.546 4.692,-2.919 7.034,-4.17H34.419z"/>
-    <path android:fillColor="#368F73" android:pathData="M308.487,310.515c-12.254,-8.092 -25.057,-11.423 -33.599,-12.795c6.02,-9.685 9.564,-21.448 9.564,-34.129c0,-9.12 -1.824,-17.889 -5.174,-25.781c8.22,-1.738 18.908,-5.176 29.209,-11.98c3.457,-2.283 4.408,-6.935 2.126,-10.392c-2.283,-3.456 -6.936,-4.407 -10.392,-2.125c-10.742,7.094 -22.229,9.723 -29.102,10.698c-3.459,-4.387 -7.5,-8.249 -12.077,-11.394c0.859,-3.081 1.294,-6.265 1.294,-9.509c0,-17.861 -13.062,-32.393 -29.117,-32.393c-16.055,0 -29.115,14.531 -29.115,32.393c0,3.244 0.435,6.428 1.294,9.509c-4.577,3.145 -8.618,7.007 -12.077,11.394c-6.873,-0.975 -18.358,-3.603 -29.102,-10.698c-3.456,-2.282 -8.108,-1.331 -10.392,2.125c-2.282,3.456 -1.331,8.109 2.126,10.392c10.301,6.803 20.988,10.241 29.208,11.979c-3.351,7.893 -5.175,16.661 -5.175,25.781c0,12.681 3.544,24.444 9.563,34.129c-8.541,1.372 -21.343,4.703 -33.597,12.794c-3.456,2.283 -4.408,6.935 -2.126,10.392c1.442,2.184 3.83,3.368 6.266,3.368c1.419,0 2.854,-0.402 4.126,-1.242c16.62,-10.975 35.036,-11.269 35.362,-11.272c0.639,-0.002 1.255,-0.093 1.847,-0.245c8.877,7.447 19.884,11.861 31.791,11.861c11.907,0 22.914,-4.415 31.791,-11.861c0.598,0.153 1.22,0.244 1.865,0.245c0.183,0 18.499,0.148 35.346,11.272c1.272,0.84 2.707,1.242 4.126,1.242c2.434,0 4.823,-1.184 6.266,-3.368C312.895,317.45 311.943,312.797 308.487,310.515zM238.719,296.005c0,4.142 -3.357,7.5 -7.5,7.5c-4.142,0 -7.5,-3.358 -7.5,-7.5v-64.83c0,-4.142 3.358,-7.5 7.5,-7.5c4.143,0 7.5,3.358 7.5,7.5V296.005z"
-        tools:ignore="VectorPath" />
-    <path android:fillColor="#368F73" android:pathData="M143.627,49.624h-78c-4.418,0 -8,3.582 -8,8c0,4.418 3.582,8 8,8h78c4.418,0 8,-3.582 8,-8C151.627,53.206 148.045,49.624 143.627,49.624z"/>
-    <path android:fillColor="#368F73" android:pathData="M143.627,99.624h-78c-4.418,0 -8,3.582 -8,8c0,4.419 3.582,8 8,8h78c4.418,0 8,-3.581 8,-8C151.627,103.206 148.045,99.624 143.627,99.624z"/>
-    <path android:fillColor="#368F73" android:pathData="M143.627,149.624h-78c-4.418,0 -8,3.582 -8,8c0,4.419 3.582,8 8,8h78c4.418,0 8,-3.581 8,-8C151.627,153.206 148.045,149.624 143.627,149.624z"/>
+<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="M12,7.5L12,7.5A5,5 0,0 1,17 12.5L17,16.5A5,5 0,0 1,12 21.5L12,21.5A5,5 0,0 1,7 16.5L7,12.5A5,5 0,0 1,12 7.5z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M2,12.5l2,2l3,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M22,12.5l-2,2l-3,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3,21.5l2,-3l2,-1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M21,21.5l-2,-3l-2,-1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3,8.5l2,2l2,1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M21,8.5l-2,2l-2,1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,7.5L12,21.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M15.38,8.82A3,3 0,0 0,16 7h0a3,3 0,0 0,-3 -3H11A3,3 0,0 0,8 7H8a3,3 0,0 0,0.61 1.82"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M9,4.5L8,2.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M15,4.5L16,2.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
 </vector>

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

@@ -8,27 +8,27 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M16,2L16,6"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M8,2L8,6"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M3,10L21,10"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>