Merge pull request 'Prepare 2.4.1 release' (#301) from prepare-release-2.4.1 into release-2.4

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/301

.drone.yml

@@ -0,0 +1,31 @@
+---
+kind: pipeline
+name: gitnex-ci-test
+
+steps:
+
+  - name: test
+    image: nextcloudci/android:android-49
+    commands:
+      - ./gradlew test
+
+trigger:
+  event:
+    - pull_request
+
+---
+kind: pipeline
+name: gitnex-ci-build
+
+steps:
+
+  - name: build
+    image: nextcloudci/android:android-49
+    commands:
+      - ./gradlew build
+
+trigger:
+  event:
+    - push
+  branch:
+    - master

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.gitignore

@@ -180,6 +180,9 @@ crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 
+# Crowdin
+crowdin.yml
+
 ### AndroidStudio Patch ###
 
 !/gradle/wrapper/gradle-wrapper.jar

CHANGELOG.md

@@ -1,2 +1,2 @@
 # Changelog
-[Check out the release notes](https://gitea.com/mmarif/GitNex/releases)
+[Check out the release notes](https://gitea.com/gitnex/GitNex/releases)

CONTRIBUTING.md

@@ -20,10 +20,3 @@ Before creating an issue please take a moment and search the repository issues(o
 In case you want to submit a bug report, please provide as much details as possible to better debug the problem. The important part is how to reproduce the bug and steps to reproduce are appreciated.
 
 **Note:** Please contact the project directly via email(gitnex@swatian.com) if have to share sensitive and security related details.
-
-## Translation
-Help us translate GitNex to your native language.
-
-Take a look [here](https://gitea.com/mmarif/GitNex/src/branch/master/app/src/main/res/values/strings.xml) for strings, please ignore the lines with `translatable="false"`. It is recommended to create a Pull Request with your changes.
-
-Check the structure of other languages for example [French](https://gitea.com/mmarif/GitNex/src/branch/master/app/src/main/res/values-fr/strings.xml). 

CONTRIBUTORS.md

@@ -0,0 +1,36 @@
+# Contributors
+This part lists all PUBLIC individuals having contributed content to the code.
+
+ * M M Arif (mmarif)
+ * 6543
+ * Unpublished
+
+# Translators
+This part lists all PUBLIC individuals having contributed content to the translation.  
+*Entries are in alphabetical order*
+
+ * 6543
+ * acrylicpaintboy
+ * Antoine GIRARD (sapk)
+ * BaRaN6161_TURK
+ * ButterflyOfFire (BoFFire)
+ * dadosch
+ * erardiflorian
+ * IndeedNotJames
+ * jaqra
+ * Lafriks
+ * ljoonal
+ * Lunny Xiao (xiaolunwen)
+ * lxs
+ * Marcos de Oliveira (markkrj)
+ * mmarif
+ * Nadezhda Moiseeva (digitalkiller)
+ * Oleg Popenkov (FanHamMer)
+ * PsychotherapistSam
+ * Rodion Borisov (vintproykt)
+ * s4ne
+ * valeriezhao1013
+ * Vladislav Glinsky (cl0ne)
+ * Voyvode
+
+**Thank you for all your work** :+1:

README.md

@@ -1,5 +1,7 @@
 [![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://gitea.com/api/v1/repos/mmarif/GitNex/releases&query=$[0].tag_name)](https://gitea.com/mmarif/GitNex/releases)
+[![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://gitea.com/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://gitea.com/gitnex/GitNex/releases)
+[![Build Status](https://drone.gitea.com/api/badges/gitnex/GitNex/status.svg)](https://drone.gitea.com/gitnex/GitNex)
+[![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex)
 
 [<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)
@@ -14,12 +16,12 @@ No trackers are used and source code is available here for anyone to audit.
 ## Downloads
 [<img alt='Get it on F-droid' src='https://gitlab.com/fdroid/artwork/raw/master/badge/get-it-on.png' height="80"/>](https://f-droid.org/en/packages/org.mian.gitnex/)
 [<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=org.mian.gitnex)
-[<img alt='Download APK' src='https://gitnex.com/img/download-apk.png' height="80"/>](https://gitea.com/mmarif/GitNex/releases)
+[<img alt='Download APK' src='https://gitnex.com/img/download-apk.png' height="80"/>](https://gitea.com/gitnex/GitNex/releases)
 
 ## Note about Gitea version
-Please make sure that you are on Gitea **1.9.x** stable release or later. Below this may not work as one would expect because of the newly added objects to the API at later versions. Please consider updating your Gitea server.
+Please make sure that you are on latest stable release or later for better app experience.
 
-Check the versions [compatibility page](https://gitea.com/mmarif/GitNex/wiki/Compatibility) which lists all the supported versions with compatibility ratio.
+Check the versions [compatibility page](https://gitea.com/gitnex/GitNex/wiki/Compatibility) which lists all the supported versions with compatibility ratio.
 
 ## Build from source
 Option 1 - Download the source code, open it in Android Studio and build it there.
@@ -27,31 +29,43 @@ Option 1 - Download the source code, open it in Android Studio and build it ther
 Option 2 - Open terminal(Linux) and cd to the project dir. Run `./gradlew build`.
 
 ## Features
-- My Repositories
-- Repositories list
-- Organizations list
-- Create repository
-- Create organization
+- File and directory browser
+- Create files
+- Explore repositories
 - Issues list
-- [MANY MORE](https://gitea.com/mmarif/GitNex/wiki/Features)
+- Pull requests
+- Merge pull request
+- [MANY MORE](https://gitea.com/gitnex/GitNex/wiki/Features)
 
 ## Contributing
-[CONTRIBUTING](https://gitea.com/mmarif/GitNex/src/branch/master/CONTRIBUTING.md)
+[CONTRIBUTING](https://gitea.com/gitnex/GitNex/src/branch/master/CONTRIBUTING.md)
+
+## Translation
+Help us translate GitNex to your native language.
+
+We use [Crowdin](https://crowdin.com/project/gitnex) for translation.
+If your language is not listed, please request [here](https://gitea.com/gitnex/GitNex/issues) to add it to the project.
+
+**Link: https://crowdin.com/project/GitNex**
 
 ## Screenshots:
-[Screenshots](https://gitea.com/mmarif/GitNex/src/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots)
+
+<img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/001.png" alt="001.png" width="200"/>  | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/002.png" alt="002.png" width="200"/> | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/003.png" alt="003.png" width="200"/> | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/004.png" alt="004.png" width="200"/>
+---|---|---|---
+<img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/005.png" alt="005.png" width="200"/> | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/006.png" alt="006.png" width="200"/> | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/007.png" alt="007.png" width="200"/>  | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/008.png" alt="008.png" width="200"/>
+
 
 ## FAQ
-[Faq](https://gitea.com/mmarif/GitNex/wiki/FAQ)
+[Faq](https://gitea.com/gitnex/GitNex/wiki/FAQ)
 
 ## Links
 [Website](https://gitnex.com)
 
-[Wiki](https://gitea.com/mmarif/GitNex/wiki/Home)
+[Wiki](https://gitea.com/gitnex/GitNex/wiki/Home)
 
 [Website Repository](https://gitlab.com/mmarif4u/gitnex-website)
 
-[Troubleshoot Guide](https://gitea.com/mmarif/GitNex/wiki/Troubleshoot-Guide)
+[Troubleshoot Guide](https://gitea.com/gitnex/GitNex/wiki/Troubleshoot-Guide)
 
 ## Thanks
 Thanks to all the open source libraries, contributors and donators.
@@ -69,5 +83,12 @@ Open source libraries
 - Abumoallim/android-multi-select-dialog
 - Pes/materialcolorpicker
 - Hendraanggrian/socialview
+- HamidrezaAmz/BreadcrumbsView
+- Chrisbanes/PhotoView
+- Pddstudio/highlightjs-android
+- Apache/commons-io
+- Caverock/androidsvg
+- Droidsonroids.gif/android-gif-drawable
+- Barteksc/AndroidPdfViewer
 
 [Follow me on Fediverse - mastodon.social/@mmarif](https://mastodon.social/@mmarif)

app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 63
-        versionName "2.1.3"
+        targetSdkVersion 29
+        versionCode 91
+        versionName "2.4.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -23,30 +23,29 @@ android {
 }
 
 dependencies {
-    def lifecycle_version = "2.2.0-alpha05"
-    final def  markwon_version =  "4.1.1"
+    def lifecycle_version = "2.2.0"
+    final def markwon_version = "4.1.1"
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0-alpha10'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation 'com.github.vihtarb:tooltip:0.2.0'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.squareup.picasso:picasso:2.71828'
-    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
-    implementation 'com.squareup.retrofit2:converter-scalars:2.5.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.1'
-    implementation 'org.ocpsoft.prettytime:prettytime:4.0.1.Final'
+    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "com.google.android.material:material:1.2.0-alpha05"
+    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
+    implementation "androidx.legacy:legacy-support-v4:1.0.0"
+    testImplementation "junit:junit:4.12"
+    androidTestImplementation "androidx.test:runner:1.2.0"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
+    implementation "com.github.vihtarb:tooltip:0.2.0"
+    implementation "com.squareup.okhttp3:okhttp:3.12.1"
+    implementation "com.google.code.gson:gson:2.8.5"
+    implementation "com.squareup.picasso:picasso:2.71828"
+    implementation "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1"
+    implementation "com.squareup.retrofit2:retrofit:2.5.0"
+    implementation "com.squareup.retrofit2:converter-gson:2.5.0"
+    implementation "com.squareup.retrofit2:converter-scalars:2.5.0"
+    implementation "com.squareup.okhttp3:logging-interceptor:3.12.1"
+    implementation "org.ocpsoft.prettytime:prettytime:4.0.1.Final"
     implementation "com.vdurmont:emoji-java:4.0.0"
     implementation "com.pes.materialcolorpicker:library:1.2.5"
-
     implementation "io.noties.markwon:core:$markwon_version"
     implementation "io.noties.markwon:ext-latex:$markwon_version"
     implementation "io.noties.markwon:ext-strikethrough:$markwon_version"
@@ -61,11 +60,14 @@ dependencies {
     implementation "io.noties.markwon:simple-ext:$markwon_version"
     implementation "io.noties.markwon:syntax-highlight:$markwon_version"
     implementation "com.caverock:androidsvg:1.4"
-    implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.14"
-
+    implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.19"
     implementation "com.hendraanggrian.appcompat:socialview:0.2"
     implementation "com.hendraanggrian.appcompat:socialview-commons:0.2"
-
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+    implementation "com.github.HamidrezaAmz:BreadcrumbsView:0.2.9"
+    implementation "commons-io:commons-io:2.6"
+    implementation "com.github.chrisbanes:PhotoView:2.3.0"
+    implementation "com.pddstudio:highlightjs-android:1.5.0"
+    implementation "com.github.barteksc:android-pdf-viewer:3.2.0-beta.1"
 }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.mian.gitnex">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/app_logo"
@@ -9,10 +14,14 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/app_logo_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        tools:targetApi="n">
+        <activity android:name=".activities.MergePullRequestActivity" />
+        <activity
+            android:name=".activities.FileViewActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.NewFileActivity"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.RepoWatchersActivity"
             android:theme="@style/AppTheme.NoActionBar" />
@@ -50,7 +59,7 @@
             android:name=".activities.RepoDetailActivity"
             android:label="@string/title_activity_repo_detail"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".activities.MainActivity">
+        <activity android:name=".activities.MainActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -63,9 +72,7 @@
         <activity android:name=".activities.NewRepoActivity" />
         <activity android:name=".activities.NewOrganizationActivity" />
         <activity android:name=".activities.OpenRepoInBrowserActivity" />
+        <activity android:name=".activities.FileDiffActivity" />
     </application>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
 
 </manifest>

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

@@ -35,7 +35,7 @@ public class CollaboratorActions {
         Call<Collaborators> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, context)
                 .getApiInterface()
                 .deleteCollaborator(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, userName);
 
@@ -105,7 +105,7 @@ public class CollaboratorActions {
         Call<Permission> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, context)
                 .getApiInterface()
                 .addCollaborator(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, userName, permissionString);
 

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

@@ -37,7 +37,7 @@ public class IssueActions {
         Call<IssueComments> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, context)
                 .getApiInterface()
                 .patchIssueComment(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, commentId, commentBodyJson);
 
@@ -104,7 +104,7 @@ public class IssueActions {
         Call<JsonElement> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, context)
                 .getApiInterface()
                 .closeReopenIssue(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueStatJson);
 

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

@@ -0,0 +1,280 @@
+package org.mian.gitnex.actions;
+
+import android.content.Context;
+import android.util.Log;
+import androidx.annotation.NonNull;
+import com.google.gson.JsonElement;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.util.TinyDB;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class RepositoryActions {
+
+    public static void starRepository(final Context context) {
+
+        final TinyDB tinyDb = new TinyDB(context);
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+
+        Call<JsonElement> call;
+
+        call = RetrofitClient
+                .getInstance(instanceUrl, context)
+                .getApiInterface()
+                .starRepository(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<JsonElement>() {
+
+            @Override
+            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+                if(response.isSuccessful()) {
+                    if(response.code() == 204) {
+
+                        tinyDb.putBoolean("repoCreated", true);
+                        Toasty.info(context, context.getString(R.string.starRepositorySuccess));
+
+                    }
+                }
+                else if(response.code() == 401) {
+
+                    AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else if(response.code() == 403) {
+
+                    Toasty.info(context, context.getString(R.string.authorizeError));
+
+                }
+                else if(response.code() == 404) {
+
+                    Toasty.info(context, context.getString(R.string.apiNotFound));
+
+                }
+                else {
+
+                    Toasty.info(context, context.getString(R.string.genericError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+    public static void unStarRepository(final Context context) {
+
+        final TinyDB tinyDb = new TinyDB(context);
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+
+        Call<JsonElement> call;
+
+        call = RetrofitClient
+                .getInstance(instanceUrl, context)
+                .getApiInterface()
+                .unStarRepository(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<JsonElement>() {
+
+            @Override
+            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+                if(response.isSuccessful()) {
+                    if(response.code() == 204) {
+
+                        tinyDb.putBoolean("repoCreated", true);
+                        Toasty.info(context, context.getString(R.string.unStarRepositorySuccess));
+
+                    }
+                }
+                else if(response.code() == 401) {
+
+                    AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else if(response.code() == 403) {
+
+                    Toasty.info(context, context.getString(R.string.authorizeError));
+
+                }
+                else if(response.code() == 404) {
+
+                    Toasty.info(context, context.getString(R.string.apiNotFound));
+
+                }
+                else {
+
+                    Toasty.info(context, context.getString(R.string.genericError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+    public static void watchRepository(final Context context) {
+
+        final TinyDB tinyDb = new TinyDB(context);
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+
+        Call<JsonElement> call;
+
+        call = RetrofitClient
+                .getInstance(instanceUrl, context)
+                .getApiInterface()
+                .watchRepository(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<JsonElement>() {
+
+            @Override
+            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+                if(response.isSuccessful()) {
+                    if(response.code() == 200) {
+
+                        tinyDb.putBoolean("repoCreated", true);
+                        Toasty.info(context, context.getString(R.string.watchRepositorySuccess));
+
+                    }
+                }
+                else if(response.code() == 401) {
+
+                    AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else if(response.code() == 403) {
+
+                    Toasty.info(context, context.getString(R.string.authorizeError));
+
+                }
+                else if(response.code() == 404) {
+
+                    Toasty.info(context, context.getString(R.string.apiNotFound));
+
+                }
+                else {
+
+                    Toasty.info(context, context.getString(R.string.genericError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+    public static void unWatchRepository(final Context context) {
+
+        final TinyDB tinyDb = new TinyDB(context);
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+
+        Call<JsonElement> call;
+
+        call = RetrofitClient
+                .getInstance(instanceUrl, context)
+                .getApiInterface()
+                .unWatchRepository(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<JsonElement>() {
+
+            @Override
+            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+                if(response.code() == 204) {
+
+                    tinyDb.putBoolean("repoCreated", true);
+                    Toasty.info(context, context.getString(R.string.unWatchRepositorySuccess));
+
+                }
+                else if(response.code() == 401) {
+
+                    AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else if(response.code() == 403) {
+
+                    Toasty.info(context, context.getString(R.string.authorizeError));
+
+                }
+                else if(response.code() == 404) {
+
+                    Toasty.info(context, context.getString(R.string.apiNotFound));
+
+                }
+                else {
+
+                    Toasty.info(context, context.getString(R.string.genericError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+}

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -23,7 +22,6 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.models.UserSearch;
 import org.mian.gitnex.models.UserInfo;
-import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
 import java.util.List;
 
@@ -31,7 +29,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class AddCollaboratorToRepositoryActivity extends AppCompatActivity {
+public class AddCollaboratorToRepositoryActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     final Context ctx = this;
@@ -42,11 +40,13 @@ public class AddCollaboratorToRepositoryActivity extends AppCompatActivity {
     private RecyclerView mRecyclerView;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_add_collaborator_to_repository);
+    protected int getLayoutResourceId(){
+        return R.layout.activity_add_collaborator_to_repository;
+    }
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -81,7 +81,7 @@ public class AddCollaboratorToRepositoryActivity extends AppCompatActivity {
     public void loadUserSearchList(String instanceUrl, String token, String searchKeyword, final Context context, String loginUid) {
 
         Call<UserSearch> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getUserBySearch(Authorization.returnAuthentication(getApplicationContext(), loginUid, token), searchKeyword, 10);
 
@@ -101,7 +101,7 @@ public class AddCollaboratorToRepositoryActivity extends AppCompatActivity {
 
             @Override
             public void onFailure(@NonNull Call<UserSearch> call, @NonNull Throwable t) {
-                Log.i("onFailure", t.getMessage());
+                Log.i("onFailure", t.toString());
             }
 
         });

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

@@ -1,13 +1,11 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Window;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -18,7 +16,7 @@ import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.Issues;
 import org.mian.gitnex.models.MultiSelectModel;
-import org.mian.gitnex.models.UpdateIssueAssignee;
+import org.mian.gitnex.models.UpdateIssueAssignees;
 import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
@@ -29,7 +27,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class AddRemoveAssigneesActivity extends AppCompatActivity {
+public class AddRemoveAssigneesActivity extends BaseActivity {
 
     private ArrayList<MultiSelectModel> listOfCollaborators = new ArrayList<>();
     private ArrayList<Integer> issueAssigneesIds = new ArrayList<>();
@@ -38,11 +36,15 @@ public class AddRemoveAssigneesActivity extends AppCompatActivity {
     final Context ctx = this;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_add_remove_assignees;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(R.layout.activity_add_remove_assignees);
+        //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
 
         getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
 
@@ -65,7 +67,7 @@ public class AddRemoveAssigneesActivity extends AppCompatActivity {
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
@@ -90,7 +92,7 @@ public class AddRemoveAssigneesActivity extends AppCompatActivity {
 
                         // get current issue assignees
                         Call<Issues> callSingleIssueAssignees = RetrofitClient
-                                .getInstance(instanceUrl)
+                                .getInstance(instanceUrl, getApplicationContext())
                                 .getApiInterface()
                                 .getIssueByIndex(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);
 
@@ -234,14 +236,14 @@ public class AddRemoveAssigneesActivity extends AppCompatActivity {
 
     private void updateIssueAssignees(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String loginUid, int issueIndex, List<String> issueAssigneesList) {
 
-        UpdateIssueAssignee updateAssigneeJson = new UpdateIssueAssignee(issueAssigneesList);
+        UpdateIssueAssignees updateAssigneeJson = new UpdateIssueAssignees(issueAssigneesList);
 
         Call<JsonElement> call3;
 
         call3 = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .patchIssueAssignee(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);
+                .patchIssueAssignees(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);
 
         call3.enqueue(new Callback<JsonElement>() {
 

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -9,7 +8,6 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Window;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -27,7 +25,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class AddRemoveLabelsActivity extends AppCompatActivity {
+public class AddRemoveLabelsActivity extends BaseActivity {
 
     private ArrayList<MultiSelectModel> listOfLabels = new ArrayList<>();
     private ArrayList<Integer> issueLabelIds = new ArrayList<>();
@@ -36,10 +34,14 @@ public class AddRemoveLabelsActivity extends AppCompatActivity {
     final Context ctx = this;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_add_remove_labels;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(R.layout.activity_add_remove_labels);
+        //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
 
         getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
 
@@ -62,7 +64,7 @@ public class AddRemoveLabelsActivity extends AppCompatActivity {
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         Call<List<Labels>> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getlabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
@@ -87,7 +89,7 @@ public class AddRemoveLabelsActivity extends AppCompatActivity {
 
                         // get current issue labels
                         Call<List<Labels>> callSingleIssueLabels = RetrofitClient
-                                .getInstance(instanceUrl)
+                                .getInstance(instanceUrl, getApplicationContext())
                                 .getApiInterface()
                                 .getIssueLabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);
 
@@ -249,7 +251,7 @@ public class AddRemoveLabelsActivity extends AppCompatActivity {
         Labels patchIssueLabels = new Labels(issueLabels);
 
         Call<JsonElement> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .updateIssueLabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, patchIssueLabels);
 

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
@@ -35,7 +34,7 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class AdminGetUsersActivity extends AppCompatActivity implements AdminUsersBottomSheetFragment.BottomSheetListener {
+public class AdminGetUsersActivity extends BaseActivity implements AdminUsersBottomSheetFragment.BottomSheetListener {
 
     private View.OnClickListener onClickListener;
     final Context ctx = this;
@@ -45,10 +44,14 @@ public class AdminGetUsersActivity extends AppCompatActivity implements AdminUse
     private Boolean searchFilter = false;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_admin_get_users;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_admin_get_users);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");

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

@@ -0,0 +1,69 @@
+package org.mian.gitnex.activities;
+
+import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
+import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.FontsOverride;
+import org.mian.gitnex.util.TinyDB;
+
+/**
+ * Author M M Arif
+ */
+
+public abstract class BaseActivity extends AppCompatActivity {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        if(tinyDb.getInt("themeId") == 1) {
+            setTheme(R.style.AppThemeLight);
+        }
+        else {
+            setTheme(R.style.AppTheme);
+        }
+
+        super.onCreate(savedInstanceState);
+        setContentView(getLayoutResourceId());
+
+        if(tinyDb.getInt("customFontId") == 0) {
+
+            FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf");
+            FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf");
+            FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf");
+            FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 1) {
+
+            FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/manroperegular.ttf");
+            FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/manroperegular.ttf");
+            FontsOverride.setDefaultFont(this, "SERIF", "fonts/manroperegular.ttf");
+            FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/manroperegular.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 2) {
+
+            FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/sourcecodeproregular.ttf");
+            FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/sourcecodeproregular.ttf");
+            FontsOverride.setDefaultFont(this, "SERIF", "fonts/sourcecodeproregular.ttf");
+            FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/sourcecodeproregular.ttf");
+
+        }
+        else {
+
+            FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf");
+            FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf");
+            FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf");
+            FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf");
+
+        }
+
+    }
+
+    protected abstract int getLayoutResourceId();
+
+}
+
+

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -45,7 +44,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class CreateIssueActivity extends AppCompatActivity implements View.OnClickListener {
+public class CreateIssueActivity extends BaseActivity implements View.OnClickListener {
 
     private View.OnClickListener onClickListener;
     MultiSelectDialog multiSelectDialog;
@@ -68,15 +67,20 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli
     private ArrayAdapter<Mention> defaultMentionAdapter;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_issue;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_create_issue);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
+        final String loginFullName = tinyDb.getString("userFullname");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
@@ -109,7 +113,7 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli
         getMilestones(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
 
         getLabels(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
-        getCollaborators(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
+        getCollaborators(instanceUrl, instanceToken, repoOwner, repoName, loginUid, loginFullName);
 
         disableProcessButton();
 
@@ -217,7 +221,7 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli
         final String repoName = parts[1];
 
         Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
@@ -248,7 +252,7 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli
 
             @Override
             public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-                Log.i("onFailure", t.getMessage());
+                Log.i("onFailure", t.toString());
             }
 
         });
@@ -261,7 +265,7 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli
         Call<JsonElement> call3;
 
         call3 = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .createNewIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, createNewIssueJson);
 
@@ -325,7 +329,7 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli
 
         String msState = "open";
         Call<List<Milestones>> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getMilestones(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, msState);
 
@@ -339,13 +343,13 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli
 
                         List<Milestones> milestonesList_ = response.body();
 
-                        milestonesList.add(new Milestones(0,"No milestone"));
+                        milestonesList.add(new Milestones(0,getString(R.string.issueCreatedNoMilestone)));
                         assert milestonesList_ != null;
                         if(milestonesList_.size() > 0) {
                             for (int i = 0; i < milestonesList_.size(); i++) {
 
-                                //String mStone = getString(R.string.spinnerMilestoneText, milestonesList_.get(i).getTitle(), milestonesList_.get(i).getState());
-                                if(milestonesList_.get(i).getState().equals(getString(R.string.issueStatusOpen))) {
+                                //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()
@@ -376,13 +380,15 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli
 
     }
 
-    private void getCollaborators(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
+    private void getCollaborators(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid, String loginFullName) {
 
         Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
+        listOfAssignees.add(new MultiSelectModel(-1, loginFullName));
+
         call.enqueue(new Callback<List<Collaborators>>() {
 
             @Override
@@ -449,7 +455,7 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli
     private void getLabels(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
 
         Call<List<Labels>> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getlabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 

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

@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -28,12 +27,13 @@ import org.mian.gitnex.models.Labels;
 import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.viewmodels.LabelsViewModel;
+import java.util.Objects;
 
 /**
  * Author M M Arif
  */
 
-public class CreateLabelActivity extends AppCompatActivity {
+public class CreateLabelActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     private TextView colorPicker;
@@ -42,9 +42,13 @@ public class CreateLabelActivity extends AppCompatActivity {
     final Context ctx = this;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_label;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_create_label);
 
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
         String repoFullName = tinyDb.getString("repoFullName");
@@ -55,9 +59,9 @@ public class CreateLabelActivity extends AppCompatActivity {
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        if(getIntent().getStringExtra("labelAction") != null && getIntent().getStringExtra("labelAction").equals("delete")) {
+        if(getIntent().getStringExtra("labelAction") != null && Objects.requireNonNull(getIntent().getStringExtra("labelAction")).equals("delete")) {
 
-            deleteLabel(instanceUrl, instanceToken, repoOwner, repoName, Integer.valueOf(getIntent().getStringExtra("labelId")), loginUid);
+            deleteLabel(instanceUrl, instanceToken, repoOwner, repoName, Integer.valueOf(Objects.requireNonNull(getIntent().getStringExtra("labelId"))), loginUid);
             finish();
             return;
 
@@ -92,7 +96,7 @@ public class CreateLabelActivity extends AppCompatActivity {
             }
         });
 
-        if(getIntent().getStringExtra("labelAction") != null && getIntent().getStringExtra("labelAction").equals("edit")) {
+        if(getIntent().getStringExtra("labelAction") != null && Objects.requireNonNull(getIntent().getStringExtra("labelAction")).equals("edit")) {
 
             labelName.setText(getIntent().getStringExtra("labelTitle"));
             int labelColor_ = Color.parseColor("#" + getIntent().getStringExtra("labelColor"));
@@ -242,7 +246,7 @@ public class CreateLabelActivity extends AppCompatActivity {
         Call<CreateLabel> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .createLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, createLabelFunc);
 
@@ -296,7 +300,7 @@ public class CreateLabelActivity extends AppCompatActivity {
         Call<CreateLabel> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .patchLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, labelId, createLabelFunc);
 
@@ -369,7 +373,7 @@ public class CreateLabelActivity extends AppCompatActivity {
         Call<Labels> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .deleteLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, labelId);
 
@@ -382,7 +386,7 @@ public class CreateLabelActivity extends AppCompatActivity {
                     if(response.code() == 204) {
 
                         Toasty.info(getApplicationContext(), getString(R.string.labelDeleteText));
-                        LabelsViewModel.loadLabelsList(instanceUrl, instanceToken, repoOwner, repoName);
+                        LabelsViewModel.loadLabelsList(instanceUrl, instanceToken, repoOwner, repoName, getApplicationContext());
                         getIntent().removeExtra("labelAction");
                         getIntent().removeExtra("labelId");
 

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -26,7 +25,7 @@ import org.mian.gitnex.util.TinyDB;
  * Author M M Arif
  */
 
-public class CreateNewUserActivity extends AppCompatActivity {
+public class CreateNewUserActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     private EditText fullName;
@@ -37,10 +36,14 @@ public class CreateNewUserActivity extends AppCompatActivity {
     final Context ctx = this;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_new_user;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_create_new_user);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
@@ -127,7 +130,7 @@ public class CreateNewUserActivity extends AppCompatActivity {
         Call<UserInfo> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .createNewUser(instanceToken, createUser);
 

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -33,7 +32,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class CreateReleaseActivity extends AppCompatActivity {
+public class CreateReleaseActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     public ImageView closeActivity;
@@ -49,10 +48,14 @@ public class CreateReleaseActivity extends AppCompatActivity {
     List<Branches> branchesList = new ArrayList<>();
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_release;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_create_release);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
@@ -164,7 +167,7 @@ public class CreateReleaseActivity extends AppCompatActivity {
         Call<Releases> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .createNewRelease(token, repoOwner, repoName, createReleaseJson);
 
@@ -224,7 +227,7 @@ public class CreateReleaseActivity extends AppCompatActivity {
     private void getBranches(String instanceUrl, String instanceToken, final String repoOwner, final String repoName) {
 
         Call<List<Branches>> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getBranches(instanceToken, repoOwner, repoName);
 

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

@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -30,7 +29,7 @@ import android.util.Log;
  * Author M M Arif
  */
 
-public class CreateTeamByOrgActivity extends AppCompatActivity implements View.OnClickListener {
+public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClickListener {
 
     final Context ctx = CreateTeamByOrgActivity.this;
     private View.OnClickListener onClickListener;
@@ -44,6 +43,11 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
     private String[] permissionList = {"Read", "Write", "Admin"};
     public int permissionSelectedChoice = -1;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_team_by_org;
+    }
+
     private String[] accessControlsList = new String[] {
             "Code",
             "Issues",
@@ -67,9 +71,8 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
     };
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_create_team_by_org);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
@@ -89,7 +92,7 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
 
                 pBuilder.setTitle(R.string.newTeamPermission);
                 if(permissionSelectedChoice != -1) {
@@ -141,7 +144,7 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
                 teamAccessControlsArray.setText("");
                 pushAccessList = Arrays.asList(accessControlsList);
 
-                AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx);
 
                 aDialogBuilder.setMultiChoiceItems(accessControlsList, selectedAccessControlsTrueFalse, new DialogInterface.OnMultiChoiceClickListener() {
 
@@ -308,7 +311,7 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
         Call<Teams> call3;
 
         call3 = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .createTeamsByOrg(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), orgName, createNewTeamJson);
 

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

@@ -1,35 +1,58 @@
 package org.mian.gitnex.activities;
 
-import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import android.content.res.Resources;
 import android.os.Bundle;
-import android.text.method.LinkMovementMethod;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.TextView;
 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 AppCompatActivity {
+public class CreditsActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_credits;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_credits);
 
-        TextView creditKasun = findViewById(R.id.creditKasun);
         ImageView closeActivity = findViewById(R.id.close);
 
-        creditKasun.setMovementMethod(LinkMovementMethod.getInstance());
-
         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(getApplicationContext()));
+
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
+                DividerItemDecoration.VERTICAL);
+        mRecyclerView.addItemDecoration(dividerItemDecoration);
+
+        CreditsAdapter adapter = new CreditsAdapter(creditsList);
+        mRecyclerView.setAdapter(adapter);
+
     }
 
     private void initCloseListener() {

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -45,7 +44,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class EditIssueActivity extends AppCompatActivity implements View.OnClickListener {
+public class EditIssueActivity extends BaseActivity implements View.OnClickListener {
 
     final Context ctx = this;
     private View.OnClickListener onClickListener;
@@ -62,10 +61,14 @@ public class EditIssueActivity extends AppCompatActivity implements View.OnClick
     private ArrayAdapter<Mention> defaultMentionAdapter;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_edit_issue;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_edit_issue);
 
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
@@ -100,7 +103,13 @@ public class EditIssueActivity extends AppCompatActivity implements View.OnClick
         editIssueButton.setOnClickListener(this);
 
         if(!tinyDb.getString("issueNumber").isEmpty()) {
-            toolbar_title.setText(getString(R.string.editIssueNavHeader, String.valueOf(issueIndex)));
+
+            if(tinyDb.getString("issueType").equals("pr")) {
+                toolbar_title.setText(getString(R.string.editPrNavHeader, String.valueOf(issueIndex)));
+            }
+            else {
+                toolbar_title.setText(getString(R.string.editIssueNavHeader, String.valueOf(issueIndex)));
+            }
         }
 
         disableProcessButton();
@@ -122,7 +131,7 @@ public class EditIssueActivity extends AppCompatActivity implements View.OnClick
         final String repoName = parts[1];
 
         Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
@@ -153,7 +162,7 @@ public class EditIssueActivity extends AppCompatActivity implements View.OnClick
 
             @Override
             public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-                Log.i("onFailure", t.getMessage());
+                Log.i("onFailure", t.toString());
             }
 
         });
@@ -229,7 +238,7 @@ public class EditIssueActivity extends AppCompatActivity implements View.OnClick
         CreateIssue issueData = new CreateIssue(title, description, dueDate, editIssueMilestoneId);
 
         Call<JsonElement> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .patchIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, issueData);
 
@@ -240,7 +249,13 @@ public class EditIssueActivity extends AppCompatActivity implements View.OnClick
 
                 if(response.code() == 201) {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.editIssueSuccessMessage));
+                    if(tinyDb.getString("issueType").equals("pr")) {
+                        Toasty.info(getApplicationContext(), getString(R.string.editPrSuccessMessage));
+                    }
+                    else {
+                        Toasty.info(getApplicationContext(), getString(R.string.editIssueSuccessMessage));
+                    }
+
                     tinyDb.putBoolean("issueEdited", true);
                     tinyDb.putBoolean("resumeIssues", true);
                     finish();
@@ -307,7 +322,7 @@ public class EditIssueActivity extends AppCompatActivity implements View.OnClick
     private void getIssue(final String instanceUrl, final String instanceToken, final String loginUid, final String repoOwner, final String repoName, int issueIndex) {
 
         Call<Issues> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getIssueByIndex(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);
 
@@ -331,7 +346,7 @@ public class EditIssueActivity extends AppCompatActivity implements View.OnClick
                     if(response.body().getId() > 0) {
 
                         Call<List<Milestones>> call_ = RetrofitClient
-                                .getInstance(instanceUrl)
+                                .getInstance(instanceUrl, getApplicationContext())
                                 .getApiInterface()
                                 .getMilestones(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, msState);
 

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

@@ -0,0 +1,219 @@
+package org.mian.gitnex.activities;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import org.apache.commons.io.FilenameUtils;
+import org.mian.gitnex.R;
+import org.mian.gitnex.adapters.FilesDiffAdapter;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.FileDiffView;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class FileDiffActivity extends BaseActivity {
+
+    private View.OnClickListener onClickListener;
+    private TextView toolbar_title;
+    private RecyclerView mRecyclerView;
+    private ProgressBar mProgressBar;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_file_diff;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+        ImageView closeActivity = findViewById(R.id.close);
+        toolbar_title = findViewById(R.id.toolbar_title);
+        mRecyclerView = findViewById(R.id.recyclerView);
+        mProgressBar = findViewById(R.id.progress_bar);
+
+        mRecyclerView.setHasFixedSize(true);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+
+        toolbar_title.setText(R.string.processingText);
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        mProgressBar.setVisibility(View.VISIBLE);
+
+        String fileDiffName = tinyDb.getString("issueNumber")+".diff";
+
+        getFileContents(tinyDb.getString("instanceUrlWithProtocol"), repoOwner, repoName, fileDiffName);
+
+    }
+
+    private void getFileContents(String instanceUrl, String owner, String repo, String filename) {
+
+        Call<ResponseBody> call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .getFileDiffContents(owner, repo, filename);
+
+        call.enqueue(new Callback<ResponseBody>() {
+
+            @Override
+            public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
+
+                if (response.code() == 200) {
+
+                    try {
+                        assert response.body() != null;
+
+                        AppUtil appUtil = new AppUtil();
+                        List<FileDiffView> fileContentsArray = new ArrayList<>();
+
+                        String[] lines = response.body().string().split("diff");
+
+                        if(lines.length > 0) {
+
+                            for (int i = 1; i < lines.length; i++) {
+
+                                if(lines[i].contains("@@ -")) {
+
+                                    String[] level2nd = lines[i].split("@@ -"); // main content part of single diff view
+
+                                    String[] fileName_ = level2nd[0].split("\\+\\+\\+ b/"); // filename part
+                                    String fileNameFinal = fileName_[1];
+
+                                    String[] fileContents_ = level2nd[1].split("@@"); // file info / content part
+                                    String fileInfoFinal = fileContents_[0];
+                                    String fileContentsFinal = (fileContents_[1]);
+
+                                    if(level2nd.length > 2) {
+                                        for (int j = 2; j < level2nd.length; j++) {
+                                            fileContentsFinal += (level2nd[j]);
+                                        }
+                                    }
+
+                                    String fileExtension = FilenameUtils.getExtension(fileNameFinal);
+
+                                    String fileContentsFinalWithBlankLines = fileContentsFinal.replaceAll( ".*@@.*", "" );
+                                    String fileContentsFinalWithoutBlankLines = fileContentsFinal.replaceAll( ".*@@.*(\r?\n|\r)?", "" );
+                                    fileContentsFinalWithoutBlankLines = fileContentsFinalWithoutBlankLines.replaceAll( ".*\\ No newline at end of file.*(\r?\n|\r)?", "" );
+
+                                    fileContentsArray.add(new FileDiffView(fileNameFinal, appUtil.imageExtension(fileExtension), fileInfoFinal, fileContentsFinalWithoutBlankLines));
+                                }
+                                else {
+
+                                    String[] getFileName = lines[i].split("--git a/");
+
+                                    String[] getFileName_ = getFileName[1].split("b/");
+                                    String getFileNameFinal = getFileName_[0].trim();
+
+                                    String[] binaryFile = getFileName_[1].split("GIT binary patch");
+                                    String binaryFileRaw = binaryFile[1].substring(binaryFile[1].indexOf('\n')+1);
+                                    String binaryFileFinal = binaryFile[1].substring(binaryFileRaw.indexOf('\n')+1);
+
+                                    String fileExtension = FilenameUtils.getExtension(getFileNameFinal);
+
+                                    if(appUtil.imageExtension(FilenameUtils.getExtension(getFileNameFinal))) {
+
+                                        fileContentsArray.add(new FileDiffView(getFileNameFinal, appUtil.imageExtension(fileExtension), "", binaryFileFinal));
+                                    }
+
+                                }
+
+                            }
+
+                        }
+
+                        int filesCount = fileContentsArray.size();
+                        if(filesCount > 1) {
+                            toolbar_title.setText(getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)));
+                        }
+                        else {
+                            toolbar_title.setText(getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount)));
+                        }
+
+                        FilesDiffAdapter adapter = new FilesDiffAdapter(fileContentsArray, getApplicationContext());
+                        mRecyclerView.setAdapter(adapter);
+
+                        mProgressBar.setVisibility(View.GONE);
+
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+
+                }
+                else if(response.code() == 401) {
+
+                    AlertDialogs.authorizationTokenRevokedDialog(getApplicationContext(), getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else if(response.code() == 403) {
+
+                    Toasty.info(getApplicationContext(), getApplicationContext().getString(R.string.authorizeError));
+
+                }
+                else if(response.code() == 404) {
+
+                    Toasty.info(getApplicationContext(), getApplicationContext().getString(R.string.apiNotFound));
+
+                }
+                else {
+
+                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                getIntent().removeExtra("singleFileName");
+                finish();
+            }
+        };
+    }
+
+
+}

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

@@ -0,0 +1,393 @@
+package org.mian.gitnex.activities;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.BitmapFactory;
+import android.graphics.Typeface;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.text.method.ScrollingMovementMethod;
+import android.util.Base64;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import com.github.barteksc.pdfviewer.PDFView;
+import com.github.barteksc.pdfviewer.util.FitPolicy;
+import com.github.chrisbanes.photoview.PhotoView;
+import com.pddstudio.highlightjs.HighlightJsView;
+import com.pddstudio.highlightjs.models.Theme;
+import org.apache.commons.io.FilenameUtils;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.fragments.BottomSheetFileViewerFragment;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Files;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Objects;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class FileViewActivity extends BaseActivity implements BottomSheetFileViewerFragment.BottomSheetListener {
+
+    private View.OnClickListener onClickListener;
+    private TextView singleFileContents;
+    private LinearLayout singleFileContentsFrame;
+    private HighlightJsView singleCodeContents;
+    private PhotoView imageView;
+    final Context ctx = this;
+    private ProgressBar mProgressBar;
+    private byte[] imageData;
+    private PDFView pdfView;
+    private LinearLayout pdfViewFrame;
+    private byte[] decodedPdf;
+    private Boolean pdfNightMode;
+    private static final int PERMISSION_REQUEST_CODE = 1;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_file_view;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+        ImageView closeActivity = findViewById(R.id.close);
+        singleFileContents = findViewById(R.id.singleFileContents);
+        singleCodeContents = findViewById(R.id.singleCodeContents);
+        imageView = findViewById(R.id.imageView);
+        mProgressBar = findViewById(R.id.progress_bar);
+        pdfView = findViewById(R.id.pdfView);
+        pdfViewFrame = findViewById(R.id.pdfViewFrame);
+        singleFileContentsFrame = findViewById(R.id.singleFileContentsFrame);
+
+        String singleFileName = getIntent().getStringExtra("singleFileName");
+
+        TextView toolbar_title = findViewById(R.id.toolbar_title);
+        toolbar_title.setMovementMethod(new ScrollingMovementMethod());
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        tinyDb.putString("downloadFileContents", "");
+
+        try {
+
+            singleFileName = URLDecoder.decode(singleFileName, "UTF-8");
+            singleFileName = singleFileName.replaceAll("//", "/");
+            singleFileName = singleFileName.startsWith("/") ? singleFileName.substring(1) : singleFileName;
+
+        }
+        catch (UnsupportedEncodingException e) {
+
+            assert singleFileName != null;
+            Log.i("singleFileName", singleFileName);
+
+        }
+
+        toolbar_title.setText(singleFileName);
+
+        getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName);
+
+    }
+
+    private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename) {
+
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        Call<Files> call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .getSingleFileContents(token, owner, repo, filename);
+
+        call.enqueue(new Callback<Files>() {
+
+            @Override
+            public void onResponse(@NonNull Call<Files> call, @NonNull retrofit2.Response<Files> response) {
+
+                if (response.code() == 200) {
+
+                    AppUtil appUtil = new AppUtil();
+                    assert response.body() != null;
+
+                    if(!response.body().getContent().equals("")) {
+
+                        String fileExtension = FilenameUtils.getExtension(filename);
+                        mProgressBar.setVisibility(View.GONE);
+
+                        // download file meta
+                        tinyDb.putString("downloadFileName", filename);
+                        tinyDb.putString("downloadFileContents", response.body().getContent());
+
+                        if(appUtil.imageExtension(fileExtension)) { // file is image
+
+                            singleFileContentsFrame.setVisibility(View.GONE);
+                            singleCodeContents.setVisibility(View.GONE);
+                            pdfViewFrame.setVisibility(View.GONE);
+                            imageView.setVisibility(View.VISIBLE);
+
+                            imageData = Base64.decode(response.body().getContent(), Base64.DEFAULT);
+                            Drawable imageDrawable = new BitmapDrawable(getResources(), BitmapFactory.decodeByteArray(imageData, 0, imageData.length));
+                            imageView.setImageDrawable(imageDrawable);
+
+                        }
+                        else if (appUtil.sourceCodeExtension(fileExtension)) { // file is sourcecode
+
+                            imageView.setVisibility(View.GONE);
+                            singleFileContentsFrame.setVisibility(View.GONE);
+                            pdfViewFrame.setVisibility(View.GONE);
+                            singleCodeContents.setVisibility(View.VISIBLE);
+
+                            singleCodeContents.setTheme(Theme.GRUVBOX_DARK);
+                            singleCodeContents.setShowLineNumbers(true);
+                            singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));
+
+                        }
+                        else if (appUtil.pdfExtension(fileExtension)) { // file is pdf
+
+                            imageView.setVisibility(View.GONE);
+                            singleFileContentsFrame.setVisibility(View.GONE);
+                            singleCodeContents.setVisibility(View.GONE);
+                            pdfViewFrame.setVisibility(View.VISIBLE);
+
+                            pdfNightMode = tinyDb.getBoolean("enablePdfMode");
+
+                            decodedPdf = Base64.decode(response.body().getContent(), Base64.DEFAULT);
+                            pdfView.fromBytes(decodedPdf)
+                                    .enableSwipe(true)
+                                    .swipeHorizontal(false)
+                                    .enableDoubletap(true)
+                                    .defaultPage(0)
+                                    .enableAnnotationRendering(false)
+                                    .password(null)
+                                    .scrollHandle(null)
+                                    .enableAntialiasing(true)
+                                    .spacing(0)
+                                    .autoSpacing(true)
+                                    .pageFitPolicy(FitPolicy.WIDTH)
+                                    .fitEachPage(true)
+                                    .pageSnap(false)
+                                    .pageFling(true)
+                                    .nightMode(pdfNightMode)
+                                    .load();
+
+                        }
+                        else if (appUtil.excludeFilesInFileViewerExtension(fileExtension)) { // files need to be excluded
+
+                            imageView.setVisibility(View.GONE);
+                            singleCodeContents.setVisibility(View.GONE);
+                            pdfViewFrame.setVisibility(View.GONE);
+                            singleFileContentsFrame.setVisibility(View.VISIBLE);
+
+                            singleFileContents.setText(getResources().getString(R.string.excludeFilesInFileviewer));
+                            singleFileContents.setGravity(Gravity.CENTER);
+                            singleFileContents.setTypeface(null, Typeface.BOLD);
+
+                        }
+                        else { // file type not known - plain text view
+
+                            imageView.setVisibility(View.GONE);
+                            singleCodeContents.setVisibility(View.GONE);
+                            pdfViewFrame.setVisibility(View.GONE);
+                            singleFileContentsFrame.setVisibility(View.VISIBLE);
+
+                            singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));
+
+                        }
+
+                    }
+                    else {
+                        singleFileContents.setText("");
+                        mProgressBar.setVisibility(View.GONE);
+                    }
+
+                }
+                else if(response.code() == 401) {
+
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else if(response.code() == 403) {
+
+                    Toasty.info(ctx, ctx.getString(R.string.authorizeError));
+
+                }
+                else if(response.code() == 404) {
+
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+
+                }
+                else {
+
+                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<Files> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        int id = item.getItemId();
+
+        switch (id) {
+            case android.R.id.home:
+                finish();
+                return true;
+            case R.id.genericMenu:
+                BottomSheetFileViewerFragment bottomSheet = new BottomSheetFileViewerFragment();
+                bottomSheet.show(getSupportFragmentManager(), "fileViewerBottomSheet");
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+
+    }
+
+    @Override
+    public void onButtonClicked(String text) {
+
+        switch (text) {
+            case "downloadFile":
+
+                if (Build.VERSION.SDK_INT >= 23)
+                {
+                    if (checkPermission())
+                    {
+                        requestFileDownload();
+                    }
+                    else {
+                        requestPermission();
+                    }
+                }
+                else
+                {
+                    requestFileDownload();
+                }
+                break;
+
+        }
+
+    }
+
+    private void requestFileDownload() {
+
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        if(!tinyDb.getString("downloadFileContents").isEmpty()) {
+
+            File outputFileName = new File(tinyDb.getString("downloadFileName"));
+            final File downloadFilePath = new File(Environment.getExternalStorageDirectory().getPath() + "/Download/" + outputFileName.getName());
+
+            byte[] pdfAsBytes = Base64.decode(tinyDb.getString("downloadFileContents"), 0);
+            FileOutputStream fileOutputStream = null;
+
+            try {
+
+                fileOutputStream = new FileOutputStream(downloadFilePath, false);
+                Objects.requireNonNull(fileOutputStream).write(pdfAsBytes);
+                fileOutputStream.flush();
+                fileOutputStream.close();
+                Toasty.info(getApplicationContext(), getString(R.string.downloadFileSaved));
+
+            }
+            catch (IOException e) {
+                Log.e("errorFileDownloading", Objects.requireNonNull(e.getMessage()));
+            }
+
+        }
+        else {
+            Toasty.error(getApplicationContext(), getString(R.string.waitLoadingDownloadFile));
+        }
+
+    }
+
+    private boolean checkPermission() {
+        int result = ContextCompat.checkSelfPermission(this, android.Manifest.permission.WRITE_EXTERNAL_STORAGE);
+        return result == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void requestPermission() {
+        ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.WRITE_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        switch (requestCode) {
+            case PERMISSION_REQUEST_CODE:
+                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    Log.i("PermissionsCheck", "Permission Granted");
+                }
+                else {
+                    Log.e("PermissionsCheck", "Permission Denied");
+                }
+                break;
+        }
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                getIntent().removeExtra("singleFileName");
+                finish();
+            }
+        };
+    }
+
+}

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

@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
@@ -36,6 +35,7 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.Html;
 import android.text.Spanned;
 import android.util.Log;
 import android.view.Gravity;
@@ -80,7 +80,7 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class IssueDetailActivity extends AppCompatActivity {
+public class IssueDetailActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private IssueCommentsAdapter adapter;
@@ -100,10 +100,14 @@ public class IssueDetailActivity extends AppCompatActivity {
     private LinearLayout assigneesLayout;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_issue_detail;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_issue_detail);
 
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
@@ -132,6 +136,8 @@ public class IssueDetailActivity extends AppCompatActivity {
         assigneesLayout = findViewById(R.id.frameAssignees);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
+        TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
+
         setSupportActionBar(toolbar);
         Objects.requireNonNull(getSupportActionBar()).setTitle(repoName);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -152,12 +158,37 @@ public class IssueDetailActivity extends AppCompatActivity {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        IssueCommentsViewModel.loadIssueComments(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);
+                        IssueCommentsViewModel.loadIssueComments(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, getApplicationContext());
                     }
                 }, 500);
             }
         });
 
+        Typeface myTypeface;
+        if(tinyDb.getInt("customFontId") == 0) {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 1) {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 2) {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
+
+        }
+        else {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
+
+        }
+
+        toolbarTitle.setTypeface(myTypeface);
+        toolbarTitle.setText(repoName);
+
         getSingleIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
         fetchDataAsync(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
 
@@ -206,7 +237,7 @@ public class IssueDetailActivity extends AppCompatActivity {
             scrollViewComments.post(new Runnable() {
                 @Override
                 public void run() {
-                    IssueCommentsViewModel.loadIssueComments(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);
+                    IssueCommentsViewModel.loadIssueComments(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, getApplicationContext());
 
                     new Handler().postDelayed(new Runnable() {
                         @Override
@@ -224,7 +255,7 @@ public class IssueDetailActivity extends AppCompatActivity {
             scrollViewComments.post(new Runnable() {
                 @Override
                 public void run() {
-                    IssueCommentsViewModel.loadIssueComments(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);
+                    IssueCommentsViewModel.loadIssueComments(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, getApplicationContext());
                     tinyDb.putBoolean("commentEdited", false);
                 }
             });
@@ -264,7 +295,7 @@ public class IssueDetailActivity extends AppCompatActivity {
 
         IssueCommentsViewModel issueCommentsModel = ViewModelProviders.of(this).get(IssueCommentsViewModel.class);
 
-        issueCommentsModel.getIssueCommentList(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), owner, repo, index).observe(this, new Observer<List<IssueComments>>() {
+        issueCommentsModel.getIssueCommentList(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), owner, repo, index, getApplicationContext()).observe(this, new Observer<List<IssueComments>>() {
             @Override
             public void onChanged(@Nullable List<IssueComments> issueCommentsMain) {
                 adapter = new IssueCommentsAdapter(getApplicationContext(), issueCommentsMain);
@@ -278,7 +309,7 @@ public class IssueDetailActivity extends AppCompatActivity {
 
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
         Call<Issues> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getIssueByIndex(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);
 
@@ -358,7 +389,8 @@ public class IssueDetailActivity extends AppCompatActivity {
                         tinyDb.putString("issueTitle", singleIssue.getTitle());
 
                         Picasso.get().load(singleIssue.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
-                        issueTitle.setText(getString(R.string.issueTitleWithId, singleIssue.getNumber(), singleIssue.getTitle()));
+                        String issueNumber_ = "<font color='" + getApplicationContext().getResources().getColor(R.color.lightGray) + "'>" + getApplicationContext().getResources().getString(R.string.hash) + singleIssue.getNumber() + "</font>";
+                        issueTitle.setText(Html.fromHtml(issueNumber_ + " " + singleIssue.getTitle()));
                         String cleanIssueDescription = singleIssue.getBody().trim();
                         Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueDescription));
                         markwon.setParsedMarkdown(issueDescription, UserMentions.UserMentionsFunc(getApplicationContext(), bodyWithMD, cleanIssueDescription));

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

@@ -1,9 +1,9 @@
 package org.mian.gitnex.activities;
 
 import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import android.content.res.Resources;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
@@ -15,21 +15,28 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.RadioGroup;
 import android.widget.Spinner;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import com.tooltip.Tooltip;
+import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.VersionCheck;
+import org.mian.gitnex.models.GiteaVersion;
+import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.models.UserTokens;
 import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.R;
 import org.mian.gitnex.util.TinyDB;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 import okhttp3.Credentials;
-import okhttp3.Headers;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -37,31 +44,42 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class LoginActivity extends AppCompatActivity implements View.OnClickListener {
+public class LoginActivity extends BaseActivity implements View.OnClickListener {
 
-    private Button login_button;
-    private EditText instance_url, login_uid, login_passwd, otpCode;
+    private Button loginButton;
+    private EditText instanceUrlET, loginUidET, loginPassword, otpCode, loginTokenCode;
     private Spinner protocolSpinner;
+    private TextView otpInfo;
+    private RadioGroup loginMethod;
+    final Context ctx = this;
+    private String device_id = "token";
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_login;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_login);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
-        login_button = findViewById(R.id.login_button);
-        instance_url = findViewById(R.id.instance_url);
-        login_uid = findViewById(R.id.login_uid);
-        login_passwd = findViewById(R.id.login_passwd);
+        loginButton = findViewById(R.id.login_button);
+        instanceUrlET = findViewById(R.id.instance_url);
+        loginUidET = findViewById(R.id.login_uid);
+        loginPassword = findViewById(R.id.login_passwd);
         otpCode = findViewById(R.id.otpCode);
+        otpInfo = findViewById(R.id.otpInfo);
         ImageView info_button = findViewById(R.id.info);
-        final TextView viewTextGiteaVersion = findViewById(R.id.appVersion);
+        final TextView viewTextAppVersion = findViewById(R.id.appVersion);
         protocolSpinner = findViewById(R.id.httpsSpinner);
+        loginMethod = findViewById(R.id.loginMethod);
+        loginTokenCode = findViewById(R.id.loginTokenCode);
 
-        viewTextGiteaVersion.setText(AppUtil.getAppVersion(getApplicationContext()));
+        viewTextAppVersion.setText(AppUtil.getAppVersion(getApplicationContext()));
 
         Resources res = getResources();
         String[] allProtocols = res.getStringArray(R.array.protocolValues);
@@ -94,12 +112,31 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
 
         }
 
+        loginMethod.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+                if(checkedId == R.id.loginUsernamePassword){
+                    loginUidET.setVisibility(View.VISIBLE);
+                    loginPassword.setVisibility(View.VISIBLE);
+                    otpCode.setVisibility(View.VISIBLE);
+                    otpInfo.setVisibility(View.VISIBLE);
+                    loginTokenCode.setVisibility(View.GONE);
+                } else {
+                    loginUidET.setVisibility(View.GONE);
+                    loginPassword.setVisibility(View.GONE);
+                    otpCode.setVisibility(View.GONE);
+                    otpInfo.setVisibility(View.GONE);
+                    loginTokenCode.setVisibility(View.VISIBLE);
+                }
+            }
+        });
+
         //login_button.setOnClickListener(this);
         if(!tinyDb.getString("instanceUrlRaw").isEmpty()) {
-            instance_url.setText(tinyDb.getString("instanceUrlRaw"));
+            instanceUrlET.setText(tinyDb.getString("instanceUrlRaw"));
         }
         if(!tinyDb.getString("loginUid").isEmpty()) {
-            login_uid.setText(tinyDb.getString("loginUid"));
+            loginUidET.setText(tinyDb.getString("loginUid"));
         }
 
         if(tinyDb.getBoolean("loggedInMode")) {
@@ -109,20 +146,23 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
 
         }
 
-        login_button.setOnClickListener(loginListener);
+        loginButton.setOnClickListener(loginListener);
+
+        if(!tinyDb.getString("uniqueAppId").isEmpty()) {
+            device_id = tinyDb.getString("uniqueAppId");
+        }
+        else {
+            device_id = UUID.randomUUID().toString();
+            tinyDb.putString("uniqueAppId", device_id);
+        }
 
     }
 
     @Override
     public void onClick(View v) {
 
-        switch(v.getId()) {
-
-            case R.id.login_button:
-                login();
-                break;
-            default:
-
+        if (v.getId() == R.id.login_button) {
+            login();
         }
 
     }
@@ -131,7 +171,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
         public void onClick(View v) {
 
             disableProcessButton();
-            login_button.setText(R.string.processingText);
+            loginButton.setText(R.string.processingText);
             login();
 
         }
@@ -159,126 +199,350 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
         AppUtil appUtil = new AppUtil();
         boolean connToInternet = AppUtil.haveNetworkConnection(LoginActivity.this);
 
-        String instanceUrl = instance_url.getText().toString().trim();
-        String loginUid = login_uid.getText().toString();
-        String loginPass = login_passwd.getText().toString();
+        String instanceUrl = instanceUrlET.getText().toString().trim();
+        String loginUid = loginUidET.getText().toString();
+        String loginPass = loginPassword.getText().toString();
         String protocol = protocolSpinner.getSelectedItem().toString();
         String loginOTP_ = otpCode.getText().toString().trim();
+        int loginMethodType = loginMethod.getCheckedRadioButtonId();
+        String loginToken_ = loginTokenCode.getText().toString().trim();
 
-        if(instanceUrl.contains("@")) {
+        if(loginMethodType == R.id.loginUsernamePassword) {
 
-            String[] urlForHttpAuth = instanceUrl.split("@");
+            if(instanceUrl.contains("@")) {
 
-            tinyDb.putString("basicAuthPassword", loginPass);
-            tinyDb.putBoolean("basicAuthFlag", true);
+                String[] urlForHttpAuth = instanceUrl.split("@");
 
-            instanceUrl = urlForHttpAuth[1];
-            loginUid = urlForHttpAuth[0];
+                tinyDb.putString("basicAuthPassword", loginPass);
+                tinyDb.putBoolean("basicAuthFlag", true);
 
-        }
-
-        String instanceHost;
-        if(AppUtil.httpCheck(instanceUrl)) {
-
-            URI uri = null;
-            try {
-                uri = new URI(instanceUrl);
-            } catch (URISyntaxException e) {
-                e.printStackTrace();
-            }
-            assert uri != null;
-            instanceHost = uri.getHost();
-
-        }
-        else {
-            instanceHost = instanceUrl;
-        }
-
-        String instanceUrlWithProtocol;
-        if(protocol.toLowerCase().equals("https")) {
-            instanceUrl = "https://" + instanceHost + "/api/v1/";
-            instanceUrlWithProtocol = "https://" + instanceHost;
-        }
-        else {
-            instanceUrl = "http://" + instanceHost + "/api/v1/";
-            instanceUrlWithProtocol = "https://" + instanceHost;
-        }
-
-        tinyDb.putString("instanceUrlRaw", instanceHost);
-        tinyDb.putString("loginUid", loginUid);
-        tinyDb.putString("instanceUrl", instanceUrl);
-        tinyDb.putString("instanceUrlWithProtocol", instanceUrlWithProtocol);
-
-        if(connToInternet) {
-
-            if(instance_url.getText().toString().equals("")) {
-
-                Toasty.info(getApplicationContext(), getString(R.string.emptyFieldURL));
-                enableProcessButton();
-                login_button.setText(R.string.btnLogin);
-                return;
-
-            }
-            if(loginUid.equals("")) {
-
-                Toasty.info(getApplicationContext(), getString(R.string.emptyFieldUsername));
-                enableProcessButton();
-                login_button.setText(R.string.btnLogin);
-                return;
-
-            }
-            if(login_passwd.getText().toString().equals("")) {
-
-                Toasty.info(getApplicationContext(), getString(R.string.emptyFieldPassword));
-                enableProcessButton();
-                login_button.setText(R.string.btnLogin);
-                return;
+                instanceUrl = urlForHttpAuth[1];
+                loginUid = urlForHttpAuth[0];
 
             }
 
-            int loginOTP = 0;
-            if(loginOTP_.length() == 6) {
+            String instanceHost;
+            if(AppUtil.httpCheck(instanceUrl)) {
 
-                if(appUtil.checkIntegers(loginOTP_)) {
-
-                    loginOTP = Integer.valueOf(loginOTP_);
+                URI uri = null;
+                try {
+                    uri = new URI(instanceUrl);
+                } catch (URISyntaxException e) {
+                    e.printStackTrace();
                 }
-                else {
+                assert uri != null;
+                instanceHost = uri.getHost();
 
-                    Toasty.info(getApplicationContext(), getString(R.string.loginOTPTypeError));
+            }
+            else {
+                instanceHost = instanceUrl;
+            }
+
+            String instanceUrlWithProtocol;
+            if(protocol.toLowerCase().equals("https")) {
+                instanceUrl = "https://" + instanceHost + "/api/v1/";
+                instanceUrlWithProtocol = "https://" + instanceHost;
+            }
+            else {
+                instanceUrl = "http://" + instanceHost + "/api/v1/";
+                instanceUrlWithProtocol = "https://" + instanceHost;
+            }
+
+            tinyDb.putString("instanceUrlRaw", instanceHost);
+            tinyDb.putString("loginUid", loginUid);
+            tinyDb.putString("instanceUrl", instanceUrl);
+            tinyDb.putString("instanceUrlWithProtocol", instanceUrlWithProtocol);
+
+            if(connToInternet) {
+
+                if(instanceUrlET.getText().toString().equals("")) {
+
+                    Toasty.info(getApplicationContext(), getString(R.string.emptyFieldURL));
                     enableProcessButton();
-                    login_button.setText(R.string.btnLogin);
+                    loginButton.setText(R.string.btnLogin);
+                    return;
+
+                }
+                if(loginUid.equals("")) {
+
+                    Toasty.info(getApplicationContext(), getString(R.string.emptyFieldUsername));
+                    enableProcessButton();
+                    loginButton.setText(R.string.btnLogin);
+                    return;
+
+                }
+                if(loginPassword.getText().toString().equals("")) {
+
+                    Toasty.info(getApplicationContext(), getString(R.string.emptyFieldPassword));
+                    enableProcessButton();
+                    loginButton.setText(R.string.btnLogin);
                     return;
 
                 }
 
-            }
+                int loginOTP = 0;
+                if(loginOTP_.length() == 6) {
 
-            letTheUserIn(instanceUrl, loginUid, loginPass, loginOTP);
+                    if(appUtil.checkIntegers(loginOTP_)) {
+
+                        loginOTP = Integer.parseInt(loginOTP_);
+                    }
+                    else {
+
+                        Toasty.info(getApplicationContext(), getString(R.string.loginOTPTypeError));
+                        enableProcessButton();
+                        loginButton.setText(R.string.btnLogin);
+                        return;
+
+                    }
+
+                }
+
+                versionCheck(instanceUrl, loginUid, loginPass, loginOTP, loginToken_, 1);
+
+            }
+            else {
+
+                Toasty.info(getApplicationContext(), getString(R.string.checkNetConnection));
+
+            }
 
         }
         else {
 
-            Toasty.info(getApplicationContext(), getString(R.string.checkNetConnection));
+            String instanceHost;
+            if(AppUtil.httpCheck(instanceUrl)) {
+
+                URI uri = null;
+                try {
+                    uri = new URI(instanceUrl);
+                } catch (URISyntaxException e) {
+                    e.printStackTrace();
+                }
+                assert uri != null;
+                instanceHost = uri.getHost();
+
+            }
+            else {
+                instanceHost = instanceUrl;
+            }
+
+            String instanceUrlWithProtocol;
+            if(protocol.toLowerCase().equals("https")) {
+                instanceUrl = "https://" + instanceHost + "/api/v1/";
+                instanceUrlWithProtocol = "https://" + instanceHost;
+            }
+            else {
+                instanceUrl = "http://" + instanceHost + "/api/v1/";
+                instanceUrlWithProtocol = "https://" + instanceHost;
+            }
+
+            tinyDb.putString("instanceUrlRaw", instanceHost);
+            //tinyDb.putString("loginUid", loginUid);
+            tinyDb.putString("instanceUrl", instanceUrl);
+            tinyDb.putString("instanceUrlWithProtocol", instanceUrlWithProtocol);
+
+            if(connToInternet) {
+
+                if (instanceUrlET.getText().toString().equals("")) {
+
+                    Toasty.info(getApplicationContext(), getString(R.string.emptyFieldURL));
+                    enableProcessButton();
+                    loginButton.setText(R.string.btnLogin);
+                    return;
+
+                }
+                if (loginToken_.equals("")) {
+
+                    Toasty.info(getApplicationContext(), getString(R.string.loginTokenError));
+                    enableProcessButton();
+                    loginButton.setText(R.string.btnLogin);
+                    return;
+
+                }
+
+                versionCheck(instanceUrl, loginUid, loginPass, 123, loginToken_, 2);
+            }
+            else {
+
+                Toasty.info(getApplicationContext(), getString(R.string.checkNetConnection));
+
+            }
 
         }
 
     }
 
+    private void versionCheck(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP, final String loginToken_, final int loginType) {
+
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        Call<GiteaVersion> callVersion = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .getGiteaVersion();
+
+        callVersion.enqueue(new Callback<GiteaVersion>() {
+
+            @Override
+            public void onResponse(@NonNull final Call<GiteaVersion> callVersion, @NonNull retrofit2.Response<GiteaVersion> responseVersion) {
+
+                if (responseVersion.code() == 200) {
+
+                    GiteaVersion version = responseVersion.body();
+                    assert version != null;
+
+                    VersionCheck vt = VersionCheck.check(getString(R.string.versionLow), getString(R.string.versionHigh), version.getVersion());
+
+                    switch (vt) {
+                        case UNSUPPORTED_NEW:
+                            //Toasty.info(getApplicationContext(), getString(R.string.versionUnsupportedNew));
+                        case SUPPORTED_LATEST:
+                        case SUPPORTED_OLD:
+                        case DEVELOPMENT:
+                            login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
+                            return;
+                        case UNSUPPORTED_OLD:
+
+                            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx);
+
+                            alertDialogBuilder
+                                    .setTitle(getString(R.string.versionAlertDialogHeader))
+                                    .setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion()))
+                                    .setCancelable(true)
+                                    .setIcon(R.drawable.ic_warning)
+                                    .setNegativeButton(getString(R.string.cancelButton), new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            dialog.dismiss();
+                                            enableProcessButton();
+                                        }
+                                    })
+                                    .setPositiveButton(getString(R.string.textContinue), new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+
+                                            dialog.dismiss();
+                                            login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
+
+                                        }
+                                    });
+
+                            AlertDialog alertDialog = alertDialogBuilder.create();
+
+                            alertDialog.show();
+                            return;
+                        default: // UNKNOWN
+                            Toasty.info(getApplicationContext(), getString(R.string.versionUnknow));
+                            enableProcessButton();
+
+                    }
+
+                }
+                else if (responseVersion.code() == 403) {
+                    login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
+                }
+            }
+
+            private void login(int loginType, String instanceUrl, String loginUid, String loginPass, int loginOTP, String loginToken_) {
+                if (loginType == 1) {
+                    letTheUserIn(instanceUrl, loginUid, loginPass, loginOTP);
+                }
+                else if (loginType == 2) { // token
+                    letTheUserInViaToken(instanceUrl, loginToken_);
+                }
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<GiteaVersion> callVersion, Throwable t) {
+
+                Log.e("onFailure-version", t.toString());
+
+            }
+
+        });
+
+    }
+
+    private void letTheUserInViaToken(String instanceUrl, final String loginToken_) {
+
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        Call<UserInfo> call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .getUserInfo("token " + loginToken_);
+
+        call.enqueue(new Callback<UserInfo>() {
+
+            @Override
+            public void onResponse(@NonNull Call<UserInfo> call, @NonNull retrofit2.Response<UserInfo> response) {
+
+                UserInfo userDetails = response.body();
+
+                if (response.isSuccessful()) {
+
+                    if (response.code() == 200) {
+                        
+                        tinyDb.putBoolean("loggedInMode", true);
+                        assert userDetails != null;
+                        tinyDb.putString(userDetails.getLogin() + "-token", loginToken_);
+                        tinyDb.putString("loginUid", userDetails.getLogin());
+
+                        enableProcessButton();
+                        loginButton.setText(R.string.btnLogin);
+                        startActivity(new Intent(LoginActivity.this, MainActivity.class));
+                        finish();
+
+                    }
+
+                }
+                else if(response.code() == 401) {
+
+                    String toastError = getResources().getString(R.string.unauthorizedApiError);
+                    Toasty.info(getApplicationContext(), toastError);
+
+                    enableProcessButton();
+                    loginButton.setText(R.string.btnLogin);
+
+                }
+                else {
+
+                    String toastError = getResources().getString(R.string.genericApiStatusError) + response.code();
+                    Toasty.info(getApplicationContext(), toastError);
+
+                    enableProcessButton();
+                    loginButton.setText(R.string.btnLogin);
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+                Toasty.info(getApplicationContext(), getResources().getString(R.string.genericError));
+                enableProcessButton();
+                loginButton.setText(R.string.btnLogin);
+            }
+        });
+
+    }
+
     private void letTheUserIn(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP) {
 
-        final String credential = Credentials.basic(loginUid, loginPass);
+        final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
 
         Call<List<UserTokens>> call;
         if(loginOTP != 0) {
             call = RetrofitClient
-                    .getInstance(instanceUrl)
+                    .getInstance(instanceUrl, getApplicationContext())
                     .getApiInterface()
                     .getUserTokensWithOTP(credential, loginOTP, loginUid);
         }
         else {
             call = RetrofitClient
-                    .getInstance(instanceUrl)
+                    .getInstance(instanceUrl, getApplicationContext())
                     .getApiInterface()
                     .getUserTokens(credential, loginUid);
         }
@@ -290,7 +554,8 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
 
                 List<UserTokens> userTokens = response.body();
                 final TinyDB tinyDb = new TinyDB(getApplicationContext());
-                Headers responseHeaders = response.headers();
+                final AppUtil appUtil = new AppUtil();
+                //Headers responseHeaders = response.headers();
 
                 if (response.isSuccessful()) {
 
@@ -300,29 +565,46 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
 
                         assert userTokens != null;
                         if (userTokens.size() > 0) {
-                            for (int i = 0; i < userTokens.size(); i++) {
-                                if (userTokens.get(i).getSha1().equals(tinyDb.getString(loginUid + "-token"))) {
-                                    setTokenFlag = true;
-                                    break;
+
+                            if(userTokens.get(0).getToken_last_eight() != null) {
+
+                                for (int i = 0; i < userTokens.size(); i++) {
+                                    if (userTokens.get(i).getToken_last_eight().equals(tinyDb.getString(loginUid + "-token-last-eight"))) {
+                                        setTokenFlag = true;
+                                        break;
+                                    }
+                                    //Log.i("Tokens: ", userTokens.get(i).getToken_last_eight());
                                 }
-                                //Log.i("Tokens: ", userTokens.get(i).getSha1());
+
                             }
+                            else {
+
+                                for (int i = 0; i < userTokens.size(); i++) {
+                                    if (userTokens.get(i).getSha1().equals(tinyDb.getString(loginUid + "-token"))) {
+                                        setTokenFlag = true;
+                                        break;
+                                    }
+                                    //Log.i("Tokens: ", userTokens.get(i).getSha1());
+                                }
+
+                            }
+
                         }
 
                         if(tinyDb.getString(loginUid + "-token").isEmpty() || !setTokenFlag) {
 
-                            UserTokens createUserToken = new UserTokens("gitnex-app-token");
+                            UserTokens createUserToken = new UserTokens("gitnex-app-" + device_id);
 
                             Call<UserTokens> callCreateToken;
                             if(loginOTP != 0) {
                                 callCreateToken = RetrofitClient
-                                        .getInstance(instanceUrl)
+                                        .getInstance(instanceUrl, getApplicationContext())
                                         .getApiInterface()
                                         .createNewTokenWithOTP(credential, loginOTP, loginUid, createUserToken);
                             }
                             else {
                                 callCreateToken = RetrofitClient
-                                        .getInstance(instanceUrl)
+                                        .getInstance(instanceUrl, getApplicationContext())
                                         .getApiInterface()
                                         .createNewToken(credential, loginUid, createUserToken);
                             }
@@ -332,7 +614,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
                                 @Override
                                 public void onResponse(@NonNull Call<UserTokens> callCreateToken, @NonNull retrofit2.Response<UserTokens> responseCreate) {
 
-                                    if (responseCreate.isSuccessful()) {
+                                    if(responseCreate.isSuccessful()) {
 
                                         if(responseCreate.code() == 201) {
 
@@ -345,6 +627,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
                                                 tinyDb.remove("loginPass");
                                                 tinyDb.putBoolean("loggedInMode", true);
                                                 tinyDb.putString(loginUid + "-token", newToken.getSha1());
+                                                tinyDb.putString(loginUid + "-token-last-eight", appUtil.getLastCharactersOfWord(newToken.getSha1(), 8));
                                                 //Log.i("Tokens", "new:" + newToken.getSha1() + " old:" + tinyDb.getString(loginUid + "-token"));
 
                                                 startActivity(new Intent(LoginActivity.this, MainActivity.class));
@@ -357,10 +640,10 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
                                     }
                                     else if(responseCreate.code() == 500) {
 
-                                        String toastError = getResources().getString(R.string.genericApiStatusError) + String.valueOf(responseCreate.code());
+                                        String toastError = getResources().getString(R.string.genericApiStatusError) + responseCreate.code();
                                         Toasty.info(getApplicationContext(), toastError);
                                         enableProcessButton();
-                                        login_button.setText(R.string.btnLogin);
+                                        loginButton.setText(R.string.btnLogin);
 
                                     }
 
@@ -387,20 +670,20 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
                 }
                 else if(response.code() == 500) {
 
-                    String toastError = getResources().getString(R.string.genericApiStatusError) + String.valueOf(response.code());
+                    String toastError = getResources().getString(R.string.genericApiStatusError) + response.code();
                     Toasty.info(getApplicationContext(), toastError);
                     enableProcessButton();
-                    login_button.setText(R.string.btnLogin);
+                    loginButton.setText(R.string.btnLogin);
 
                 }
                 else {
 
-                    String toastError = getResources().getString(R.string.genericApiStatusError) + String.valueOf(response.code());
+                    String toastError = getResources().getString(R.string.genericApiStatusError) + response.code();
                     //Log.i("error message else4", String.valueOf(response.code()));
 
                     Toasty.info(getApplicationContext(), toastError);
                     enableProcessButton();
-                    login_button.setText(R.string.btnLogin);
+                    loginButton.setText(R.string.btnLogin);
 
                 }
 
@@ -411,7 +694,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
                 Log.e("onFailure-login", t.toString());
                 Toasty.info(getApplicationContext(), getResources().getString(R.string.malformedJson));
                 enableProcessButton();
-                login_button.setText(R.string.btnLogin);
+                loginButton.setText(R.string.btnLogin);
             }
         });
 
@@ -419,21 +702,21 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
 
     private void disableProcessButton() {
 
-        login_button.setEnabled(false);
+        loginButton.setEnabled(false);
         GradientDrawable shape =  new GradientDrawable();
         shape.setCornerRadius( 8 );
         shape.setColor(getResources().getColor(R.color.hintColor));
-        login_button.setBackground(shape);
+        loginButton.setBackground(shape);
 
     }
 
     private void enableProcessButton() {
 
-        login_button.setEnabled(true);
+        loginButton.setEnabled(true);
         GradientDrawable shape =  new GradientDrawable();
         shape.setCornerRadius( 8 );
         shape.setColor(getResources().getColor(R.color.btnBackground));
-        login_button.setBackground(shape);
+        loginButton.setBackground(shape);
 
     }
 

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

@@ -5,10 +5,13 @@ import android.content.Context;
 import android.content.Intent;
 import androidx.annotation.NonNull;
 import com.google.android.material.navigation.NavigationView;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
@@ -21,6 +24,7 @@ import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.fragments.AboutFragment;
+import org.mian.gitnex.fragments.ExploreRepositoriesFragment;
 import org.mian.gitnex.fragments.MyRepositoriesFragment;
 import org.mian.gitnex.fragments.NavSubMenuBottomSheetFragment;
 import org.mian.gitnex.fragments.OrganizationsFragment;
@@ -29,6 +33,7 @@ import org.mian.gitnex.fragments.StarredRepositoriesFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.GiteaVersion;
 import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
@@ -43,17 +48,25 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
+public class MainActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener {
 
     private DrawerLayout drawer;
     private TextView userFullName;
     private TextView userEmail;
     private ImageView userAvatar;
+    private TextView toolbarTitle;
     final Context ctx = this;
+    private Typeface myTypeface;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_main;
+    }
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
         tinyDb.putBoolean("noConnection", false);
         //userAvatar = findViewById(R.id.userAvatar);
@@ -84,17 +97,62 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
         if(!tinyDb.getBoolean("loggedInMode")) {
             logout();
             return;
         }
 
-        androidx.appcompat.widget.Toolbar toolbar = findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
+
+        if(tinyDb.getInt("customFontId") == 0) {
+
+            myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 1) {
+
+            myTypeface = Typeface.createFromAsset(getAssets(), "fonts/manroperegular.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 2) {
+
+            myTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodeproregular.ttf");
+
+        }
+        else {
+
+            myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf");
+
+        }
+
+        toolbarTitle.setTypeface(myTypeface);
         setSupportActionBar(toolbar);
 
+        FragmentManager fm = getSupportFragmentManager();
+        Fragment fragmentById = fm.findFragmentById(R.id.fragment_container);
+        if (fragmentById instanceof SettingsFragment) {
+            toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
+        }
+        else if (fragmentById instanceof MyRepositoriesFragment) {
+            toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
+        }
+        else if (fragmentById instanceof StarredRepositoriesFragment) {
+            toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
+        }
+        else if (fragmentById instanceof OrganizationsFragment) {
+            toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
+        }
+        else if (fragmentById instanceof ExploreRepositoriesFragment) {
+            toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
+        }
+        else if (fragmentById instanceof ProfileFragment) {
+            toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
+        }
+        else if (fragmentById instanceof AboutFragment) {
+            toolbarTitle.setText(getResources().getString(R.string.pageTitleAbout));
+        }
+
         drawer = findViewById(R.id.drawer_layout);
         NavigationView navigationView = findViewById(R.id.nav_view);
         navigationView.setNavigationItemSelectedListener(this);
@@ -110,7 +168,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar,
                 R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-        toggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.white));
+        toggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.darkGreen));
         drawer.addDrawerListener(toggle);
 
         drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
@@ -123,41 +181,40 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
             @Override
             public void onDrawerOpened(@NonNull View drawerView) {
 
-                boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
-                if(!connToInternet) {
-
-                    if(!tinyDb.getBoolean("noConnection")) {
-                        Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
-                    }
-
-                    tinyDb.putBoolean("noConnection", true);
-
-                    String userEmailNav = tinyDb.getString("userEmail");
-                    String userFullNameNav = tinyDb.getString("userFullname");
-                    String userAvatarNav = tinyDb.getString("userAvatar");
-
-                    userEmail = hView.findViewById(R.id.userEmail);
-                    if (!userEmailNav.equals("")) {
-                        userEmail.setText(userEmailNav);
-                    }
-
-                    userFullName = hView.findViewById(R.id.userFullname);
-                    if (!userFullNameNav.equals("")) {
-                        userFullName.setText(userFullNameNav);
-                    }
-
-                    userAvatar = hView.findViewById(R.id.userAvatar);
-                    if (!userAvatarNav.equals("")) {
-                        Picasso.get().load(userAvatarNav).networkPolicy(NetworkPolicy.OFFLINE).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(userAvatar);
-                    }
-
-                } else {
-
-                    displayUserInfo(instanceUrl, instanceToken, loginUid);
+                if(tinyDb.getBoolean("noConnection")) {
+                    Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
                     tinyDb.putBoolean("noConnection", false);
-
                 }
 
+                String userEmailNav = tinyDb.getString("userEmail");
+                String userFullNameNav = tinyDb.getString("userFullname");
+                String userAvatarNav = tinyDb.getString("userAvatar");
+
+                userEmail = hView.findViewById(R.id.userEmail);
+                if (!userEmailNav.equals("")) {
+                    userEmail.setText(userEmailNav);
+                    userEmail.setTypeface(myTypeface);
+                }
+
+                userFullName = hView.findViewById(R.id.userFullname);
+                if (!userFullNameNav.equals("")) {
+                    userFullName.setText(userFullNameNav);
+                    userFullName.setTypeface(myTypeface);
+                }
+
+                userAvatar = hView.findViewById(R.id.userAvatar);
+                if (!userAvatarNav.equals("")) {
+                    Picasso.get().load(userAvatarNav).networkPolicy(NetworkPolicy.OFFLINE).transform(new RoundedTransformation(8, 0)).resize(160, 160).centerCrop().into(userAvatar);
+                }
+
+                userAvatar.setOnClickListener(new View.OnClickListener() {
+                    public void onClick(View v) {
+                        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
+                                new ProfileFragment()).commit();
+                        drawer.closeDrawers();
+                    }
+                });
+
             }
 
             @Override
@@ -175,31 +232,37 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
         if(savedInstanceState == null) {
             if(tinyDb.getInt("homeScreenId") == 0) {
+                toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new MyRepositoriesFragment()).commit();
                 navigationView.setCheckedItem(R.id.nav_home);
             }
             else if(tinyDb.getInt("homeScreenId") == 1) {
+                toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new StarredRepositoriesFragment()).commit();
                 navigationView.setCheckedItem(R.id.nav_starred_repos);
             }
             else if(tinyDb.getInt("homeScreenId") == 2) {
+                toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new OrganizationsFragment()).commit();
                 navigationView.setCheckedItem(R.id.nav_organizations);
             }
             else if(tinyDb.getInt("homeScreenId") == 3) {
+                toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new RepositoriesFragment()).commit();
                 navigationView.setCheckedItem(R.id.nav_repositories);
             }
             else if(tinyDb.getInt("homeScreenId") == 4) {
+                toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new ProfileFragment()).commit();
                 navigationView.setCheckedItem(R.id.nav_profile);
             }
             else {
+                toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new MyRepositoriesFragment()).commit();
                 navigationView.setCheckedItem(R.id.nav_home);
@@ -217,6 +280,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         } else {
 
             displayUserInfo(instanceUrl, instanceToken, loginUid);
+            giteaVersion(instanceUrl);
             tinyDb.putBoolean("noConnection", false);
 
         }
@@ -244,22 +308,28 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
         switch (menuItem.getItemId()) {
             case R.id.nav_home:
+                toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new MyRepositoriesFragment()).commit();
                 break;
             case R.id.nav_organizations:
+                toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new OrganizationsFragment()).commit();
                 break;
             case R.id.nav_profile:
+                toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new ProfileFragment()).commit();
                 break;
             case R.id.nav_repositories:
+                toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new RepositoriesFragment()).commit();
+
                 break;
             case R.id.nav_settings:
+                toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new SettingsFragment()).commit();
                 break;
@@ -268,6 +338,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                 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;
@@ -275,9 +346,16 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                 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();
                 break;
+            case R.id.nav_explore:
+                toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
+                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
+                        new ExploreRepositoriesFragment()).commit();
+                break;
+
         }
 
         drawer.closeDrawer(GravityCompat.START);
@@ -306,12 +384,48 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     }
 
+    private void giteaVersion(final String instanceUrl) {
+
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        Call<GiteaVersion> callVersion = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .getGiteaVersion();
+
+        callVersion.enqueue(new Callback<GiteaVersion>() {
+
+            @Override
+            public void onResponse(@NonNull final Call<GiteaVersion> callVersion, @NonNull retrofit2.Response<GiteaVersion> responseVersion) {
+
+                if (responseVersion.code() == 200) {
+
+                    GiteaVersion version = responseVersion.body();
+                    assert version != null;
+
+                    tinyDb.putString("giteaVersion", version.getVersion());
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<GiteaVersion> callVersion, @NonNull Throwable t) {
+
+                Log.e("onFailure-version", t.toString());
+
+            }
+
+        });
+
+    }
+
     private void displayUserInfo(String instanceUrl, String token, String loginUid) {
 
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         Call<UserInfo> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getUserInfo(Authorization.returnAuthentication(getApplicationContext(), loginUid, token));
 
@@ -339,7 +453,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                             tinyDb.putString("userFullname", userDetails.getFullname());
                         }
                         else {
-                            tinyDb.putString("userFullname", "...");
+                            tinyDb.putString("userFullname", userDetails.getLogin());
                         }
 
                         tinyDb.putString("userEmail", userDetails.getEmail());
@@ -354,9 +468,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
                         userAvatar = hView.findViewById(R.id.userAvatar);
                         if (!Objects.requireNonNull(userDetails).getAvatar().equals("")) {
-                            Picasso.get().load(userDetails.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(userAvatar);
+                            Picasso.get().load(userDetails.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(160, 160).centerCrop().into(userAvatar);
                         } else {
-                            userAvatar.setImageResource(R.mipmap.ic_launcher_round);
+                            userAvatar.setImageResource(R.mipmap.app_logo_round);
                         }
 
                         userFullName = hView.findViewById(R.id.userFullname);

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

@@ -0,0 +1,261 @@
+package org.mian.gitnex.activities;
+
+import androidx.annotation.NonNull;
+import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+import com.hendraanggrian.appcompat.socialview.Mention;
+import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
+import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Collaborators;
+import org.mian.gitnex.models.MergePullRequest;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+/**
+ * Author M M Arif
+ */
+
+public class MergePullRequestActivity extends BaseActivity {
+
+    public ImageView closeActivity;
+    private View.OnClickListener onClickListener;
+
+    final Context ctx = this;
+
+    private SocialAutoCompleteTextView mergePR;
+    private ArrayAdapter<Mention> defaultMentionAdapter;
+    private Button mergeButton;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_merge_pull_request;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        mergePR = findViewById(R.id.mergePR);
+        mergePR.setShowSoftInputOnFocus(true);
+
+        defaultMentionAdapter = new MentionArrayAdapter<>(this);
+        loadCollaboratorsList();
+
+        mergePR.setMentionAdapter(defaultMentionAdapter);
+
+        closeActivity = findViewById(R.id.close);
+        TextView toolbar_title = findViewById(R.id.toolbar_title);
+
+        if(!tinyDb.getString("issueTitle").isEmpty()) {
+            toolbar_title.setText(tinyDb.getString("issueTitle"));
+        }
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        mergeButton = findViewById(R.id.mergeButton);
+
+        if(!connToInternet) {
+
+            disableProcessButton();
+
+        } else {
+
+            mergeButton.setOnClickListener(mergePullRequest);
+
+        }
+
+    }
+
+    public void loadCollaboratorsList() {
+
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+
+        Call<List<Collaborators>> call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<List<Collaborators>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
+
+                if (response.isSuccessful()) {
+
+                    assert response.body() != null;
+                    String fullName = "";
+                    for (int i = 0; i < response.body().size(); i++) {
+                        if(!response.body().get(i).getFull_name().equals("")) {
+                            fullName = response.body().get(i).getFull_name();
+                        }
+                        defaultMentionAdapter.add(
+                                new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
+                    }
+
+                }
+                else {
+
+                    Log.i("onResponse", String.valueOf(response.code()));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
+                Log.i("onFailure", t.toString());
+            }
+
+        });
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
+    }
+
+    private View.OnClickListener mergePullRequest = new View.OnClickListener() {
+        public void onClick(View v) {
+            processMergePullRequest();
+        }
+    };
+
+    private void processMergePullRequest() {
+
+        String mergePRDT = mergePR.getText().toString();
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+
+        if(!connToInternet) {
+
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            return;
+
+        }
+
+        disableProcessButton();
+        String doWhat = "merge";
+        mergeFunction(doWhat, mergePRDT);
+
+    }
+
+    private void mergeFunction(String doWhat, String mergePRDT) {
+
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final int prIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+
+        MergePullRequest mergePR = new MergePullRequest(doWhat, mergePRDT, null);
+
+        Call<ResponseBody> call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .mergePullRequest(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, prIndex, mergePR);
+
+        call.enqueue(new Callback<ResponseBody>() {
+
+            @Override
+            public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
+
+                if(response.code() == 200) {
+
+                    Toasty.info(getApplicationContext(), getString(R.string.mergePRSuccessMsg));
+                    tinyDb.putBoolean("prMerged", true);
+                    tinyDb.putBoolean("resumePullRequests", 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(getApplicationContext(), getString(R.string.mergePR404ErrorMsg));
+
+                }
+                else {
+
+                    enableProcessButton();
+                    Toasty.info(getApplicationContext(), getString(R.string.genericError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+                enableProcessButton();
+            }
+
+        });
+
+    }
+
+    private void disableProcessButton() {
+
+        mergeButton.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        mergeButton.setBackground(shape);
+
+    }
+
+    private void enableProcessButton() {
+
+        mergeButton.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        mergeButton.setBackground(shape);
+
+    }
+
+}

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

@@ -13,7 +13,6 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Spinner;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -33,7 +32,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class NewFileActivity extends AppCompatActivity {
+public class NewFileActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -49,10 +48,14 @@ public class NewFileActivity extends AppCompatActivity {
     List<Branches> branchesList = new ArrayList<>();
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_file;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_new_file);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
@@ -204,7 +207,7 @@ public class NewFileActivity extends AppCompatActivity {
         }
 
         Call<JsonElement> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .createNewFile(token, repoOwner, repoName, fileName, createNewFileJsonStr);
 
@@ -256,7 +259,7 @@ public class NewFileActivity extends AppCompatActivity {
     private void getBranches(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
 
         Call<List<Branches>> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getBranches(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.app.DatePickerDialog;
@@ -18,6 +17,7 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.VersionCheck;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Milestones;
 import org.mian.gitnex.util.AppUtil;
@@ -28,7 +28,7 @@ import java.util.Calendar;
  * Author M M Arif
  */
 
-public class NewMilestoneActivity extends AppCompatActivity implements View.OnClickListener {
+public class NewMilestoneActivity extends BaseActivity implements View.OnClickListener {
 
     private EditText milestoneDueDate;
     private View.OnClickListener onClickListener;
@@ -38,9 +38,13 @@ public class NewMilestoneActivity extends AppCompatActivity implements View.OnCl
     final Context ctx = this;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_milestone;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_new_milestone);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
@@ -117,15 +121,16 @@ public class NewMilestoneActivity extends AppCompatActivity implements View.OnCl
             }
         }
 
-        if(newMilestoneDueDate.equals("")) {
-
+        String finalMilestoneDueDate = null;
+        if(!newMilestoneDueDate.isEmpty()) {
+            finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate)));
+        } else if (VersionCheck.compareVersion("1.10.0", tinyDb.getString("giteaVersion")) > 1) {
+            // if Gitea version is less than 1.10.0 DueDate is required
             Toasty.info(getApplicationContext(), getString(R.string.milestoneDateEmpty));
             return;
-
         }
 
         disableProcessButton();
-        String finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate)));
         createNewMilestone(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate);
 
     }
@@ -137,7 +142,7 @@ public class NewMilestoneActivity extends AppCompatActivity implements View.OnCl
         Call<Milestones> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .createMilestone(token, repoOwner, repoName, createMilestone);
 

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

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -25,7 +24,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class NewOrganizationActivity extends AppCompatActivity {
+public class NewOrganizationActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -36,9 +35,13 @@ public class NewOrganizationActivity extends AppCompatActivity {
     final Context ctx = this;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_organization;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_new_organization);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
@@ -134,7 +137,7 @@ public class NewOrganizationActivity extends AppCompatActivity {
         UserOrganizations createOrganization = new UserOrganizations(orgName, null, orgDesc, null, null);
 
         Call<UserOrganizations> call = RetrofitClient
-            .getInstance(instanceUrl)
+            .getInstance(instanceUrl, getApplicationContext())
             .getApiInterface()
             .createNewOrganization(token, createOrganization);
 

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

@@ -5,7 +5,6 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
@@ -33,7 +32,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class NewRepoActivity extends AppCompatActivity {
+public class NewRepoActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -47,9 +46,13 @@ public class NewRepoActivity extends AppCompatActivity {
     List<OrgOwner> orgsList = new ArrayList<>();
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_repo;
+    }
+    
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_new_repo);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
@@ -162,7 +165,7 @@ public class NewRepoActivity extends AppCompatActivity {
         if(repoOwner.equals(loginUid)) {
 
             call = RetrofitClient
-                    .getInstance(instanceUrl)
+                    .getInstance(instanceUrl, getApplicationContext())
                     .getApiInterface()
                     .createNewUserRepository(token, createRepository);
 
@@ -170,7 +173,7 @@ public class NewRepoActivity extends AppCompatActivity {
         else {
 
             call = RetrofitClient
-                    .getInstance(instanceUrl)
+                    .getInstance(instanceUrl, getApplicationContext())
                     .getApiInterface()
                     .createNewUserOrgRepository(token, repoOwner, createRepository);
 
@@ -225,7 +228,7 @@ public class NewRepoActivity extends AppCompatActivity {
     private void getOrgs(String instanceUrl, String instanceToken, final String userLogin) {
 
         Call<List<OrgOwner>> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getOrgOwners(instanceToken);
 

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

@@ -2,17 +2,20 @@ package org.mian.gitnex.activities;
 
 import com.google.android.material.tabs.TabLayout;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import android.content.Intent;
+import android.graphics.Typeface;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.fragments.MembersByOrgFragment;
 import org.mian.gitnex.fragments.OrgBottomSheetFragment;
@@ -26,17 +29,23 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class OrgDetailActivity extends AppCompatActivity implements OrgBottomSheetFragment.BottomSheetListener {
+public class OrgDetailActivity extends BaseActivity implements OrgBottomSheetFragment.BottomSheetListener {
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_org_detail;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_org_detail);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         String orgName = tinyDb.getString("orgName");
 
         Toolbar toolbar = findViewById(R.id.toolbar);
+        TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
+
         setSupportActionBar(toolbar);
         Objects.requireNonNull(getSupportActionBar()).setTitle(orgName);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -48,6 +57,44 @@ public class OrgDetailActivity extends AppCompatActivity implements OrgBottomShe
 
         TabLayout tabLayout = findViewById(R.id.tabs);
 
+        Typeface myTypeface;
+        if(tinyDb.getInt("customFontId") == 0) {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 1) {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 2) {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
+
+        }
+        else {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
+
+        }
+
+        toolbarTitle.setTypeface(myTypeface);
+        toolbarTitle.setText(orgName);
+
+        ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
+        int tabsCount = vg.getChildCount();
+        for (int j = 0; j < tabsCount; j++) {
+            ViewGroup vgTab = (ViewGroup) vg.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.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
         tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
 

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import android.os.Bundle;
@@ -16,12 +15,13 @@ import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.viewmodels.TeamMembersByOrgViewModel;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Author M M Arif
  */
 
-public class OrgTeamMembersActivity extends AppCompatActivity {
+public class OrgTeamMembersActivity extends BaseActivity {
 
     private TextView noDataMembers;
     private View.OnClickListener onClickListener;
@@ -29,9 +29,13 @@ public class OrgTeamMembersActivity extends AppCompatActivity {
     private GridView mGridView;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_org_team_members;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_org_team_members);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -46,7 +50,7 @@ public class OrgTeamMembersActivity extends AppCompatActivity {
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
-        if(getIntent().getStringExtra("teamTitle") != null && !getIntent().getStringExtra("teamTitle").equals("")) {
+        if(getIntent().getStringExtra("teamTitle") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamTitle")).equals("")) {
             toolbarTitle.setText(getIntent().getStringExtra("teamTitle"));
         }
         else {
@@ -54,7 +58,7 @@ public class OrgTeamMembersActivity extends AppCompatActivity {
         }
 
         String teamId;
-        if(getIntent().getStringExtra("teamId") != null && !getIntent().getStringExtra("teamId").equals("")){
+        if(getIntent().getStringExtra("teamId") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamId")).equals("")){
             teamId = getIntent().getStringExtra("teamId");
         }
         else {
@@ -64,6 +68,7 @@ public class OrgTeamMembersActivity extends AppCompatActivity {
         getIntent().getStringExtra("teamId");
         //Log.i("teamId", getIntent().getStringExtra("teamId"));
 
+        assert teamId != null;
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), Integer.valueOf(teamId));
 
     }
@@ -72,7 +77,7 @@ public class OrgTeamMembersActivity extends AppCompatActivity {
 
         TeamMembersByOrgViewModel teamMembersModel = new ViewModelProvider(this).get(TeamMembersByOrgViewModel.class);
 
-        teamMembersModel.getMembersByOrgList(instanceUrl, instanceToken, teamId).observe(this, new Observer<List<UserInfo>>() {
+        teamMembersModel.getMembersByOrgList(instanceUrl, instanceToken, teamId, getApplicationContext()).observe(this, new Observer<List<UserInfo>>() {
             @Override
             public void onChanged(@Nullable List<UserInfo> teamMembersListMain) {
                 adapter = new TeamMembersByOrgAdapter(getApplicationContext(), teamMembersListMain);

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -30,7 +29,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class ProfileEmailActivity extends AppCompatActivity {
+public class ProfileEmailActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     private EditText userEmail;
@@ -38,9 +37,13 @@ public class ProfileEmailActivity extends AppCompatActivity {
     private Button addEmailButton;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_profile_email;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_profile_email);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
@@ -114,7 +117,7 @@ public class ProfileEmailActivity extends AppCompatActivity {
         Call<JsonElement> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .addNewEmail(token, addEmailFunc);
 

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -33,7 +32,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class ReplyToIssueActivity extends AppCompatActivity {
+public class ReplyToIssueActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -45,10 +44,14 @@ public class ReplyToIssueActivity extends AppCompatActivity {
     private Button replyButton;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_reply_to_issue;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_reply_to_issue);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
         TinyDB tinyDb = new TinyDB(getApplicationContext());
@@ -83,6 +86,7 @@ public class ReplyToIssueActivity extends AppCompatActivity {
 
             replyButton.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View v) {
+                    disableProcessButton();
                     IssueActions.editIssueComment(ctx, Integer.valueOf(commentId), addComment.getText().toString());
                 }
 
@@ -117,7 +121,7 @@ public class ReplyToIssueActivity extends AppCompatActivity {
         final String repoName = parts[1];
 
         Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
@@ -211,7 +215,7 @@ public class ReplyToIssueActivity extends AppCompatActivity {
         Issues issueComment = new Issues(newReplyDT);
 
         Call<Issues> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .replyCommentToIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, issueComment);
 
@@ -225,6 +229,7 @@ public class ReplyToIssueActivity extends AppCompatActivity {
                     Toasty.info(getApplicationContext(), getString(R.string.commentSuccess));
                     tinyDb.putBoolean("commentPosted", true);
                     tinyDb.putBoolean("resumeIssues", true);
+                    tinyDb.putBoolean("resumePullRequests", true);
                     finish();
 
                 }

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

@@ -1,8 +1,8 @@
 package org.mian.gitnex.activities;
 
 import com.google.android.material.tabs.TabLayout;
+import com.google.gson.JsonElement;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -13,6 +13,7 @@ import retrofit2.Callback;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.res.ColorStateList;
+import android.graphics.Typeface;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -20,20 +21,24 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.TextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.fragments.BranchesFragment;
 import org.mian.gitnex.fragments.ClosedIssuesFragment;
 import org.mian.gitnex.fragments.CollaboratorsFragment;
+import org.mian.gitnex.fragments.FilesFragment;
 import org.mian.gitnex.fragments.IssuesFragment;
 import org.mian.gitnex.fragments.LabelsFragment;
 import org.mian.gitnex.fragments.MilestonesFragment;
+import org.mian.gitnex.fragments.PullRequestsFragment;
 import org.mian.gitnex.fragments.ReleasesFragment;
 import org.mian.gitnex.fragments.RepoBottomSheetFragment;
 import org.mian.gitnex.fragments.RepoInfoFragment;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchRepository;
 import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
 import java.util.Objects;
@@ -43,14 +48,18 @@ import android.net.Uri;
  * Author M M Arif
  */
 
-public class RepoDetailActivity extends AppCompatActivity implements RepoBottomSheetFragment.BottomSheetListener {
+public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetFragment.BottomSheetListener {
 
     private TextView textViewBadge;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_repo_detail;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_repo_detail);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         String repoFullName = tinyDb.getString("repoFullName");
@@ -66,6 +75,8 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS
         AppUtil.setAppLocale(getResources(), appLocale);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
+        TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
+
         setSupportActionBar(toolbar);
         Objects.requireNonNull(getSupportActionBar()).setTitle(repoName1);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -77,6 +88,44 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS
 
         TabLayout tabLayout = findViewById(R.id.tabs);
 
+        Typeface myTypeface;
+        if(tinyDb.getInt("customFontId") == 0) {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 1) {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 2) {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
+
+        }
+        else {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
+
+        }
+
+        toolbarTitle.setTypeface(myTypeface);
+        toolbarTitle.setText(repoName1);
+
+        ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
+        int tabsCount = vg.getChildCount();
+        for (int j = 0; j < tabsCount; j++) {
+            ViewGroup vgTab = (ViewGroup) vg.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.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
         tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
 
@@ -87,15 +136,18 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS
             if(!tinyDb.getString("issuesCounter").isEmpty()) {
                 getRepoInfo(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1);
             }
-            Objects.requireNonNull(tabLayout.getTabAt(1)).setCustomView(tabHeader);
+            Objects.requireNonNull(tabLayout.getTabAt(2)).setCustomView(tabHeader);
 
-            TabLayout.Tab tabOpenIssues = tabLayout.getTabAt(1);
+            TabLayout.Tab tabOpenIssues = tabLayout.getTabAt(2);
             ColorStateList textColor = tabLayout.getTabTextColors();
             assert tabOpenIssues != null;
             TextView openIssueTabView = Objects.requireNonNull(tabOpenIssues.getCustomView()).findViewById(R.id.counterBadgeText);
             openIssueTabView.setTextColor(textColor);
 
         }
+
+        checkRepositoryStarStatus(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1);
+        checkRepositoryWatchStatus(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1);
     }
 
     @Override
@@ -199,21 +251,26 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS
             switch (position) {
                 case 0: // information
                     return RepoInfoFragment.newInstance(repoOwner, repoName);
-                case 1: // issues
+                case 1: // files
+                    return FilesFragment.newInstance(repoOwner, repoName);
+                case 2: // issues
                     fragment = new IssuesFragment();
                     break;
-                case 2: // closed issues
+                case 3: // closed issues
                     fragment = new ClosedIssuesFragment();
                     break;
-                case 3: // milestones
+                case 4: // pull requests
+                    fragment = new PullRequestsFragment();
+                    break;
+                case 5: // milestones
                     return MilestonesFragment.newInstance(repoOwner, repoName);
-                case 4: // labels
+                case 6: // labels
                     return LabelsFragment.newInstance(repoOwner, repoName);
-                case 5: // branches
+                case 7: // branches
                     return BranchesFragment.newInstance(repoOwner, repoName);
-                case 6: // releases
+                case 8: // releases
                     return ReleasesFragment.newInstance(repoOwner, repoName);
-                case 7: // collaborators
+                case 9: // collaborators
                     return CollaboratorsFragment.newInstance(repoOwner, repoName);
             }
             return fragment;
@@ -221,7 +278,7 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS
 
         @Override
         public int getCount() {
-            return 8;
+            return 10;
         }
 
     }
@@ -229,7 +286,7 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS
     private void getRepoInfo(String instanceUrl, String token, final String owner, String repo) {
 
         Call<UserRepositories> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getUserRepository(token, owner, repo);
 
@@ -264,4 +321,67 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS
 
     }
 
+    private void checkRepositoryStarStatus(String instanceUrl, String instanceToken, final String owner, String repo) {
+
+        Call<JsonElement> call;
+
+        call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .checkRepoStarStatus(instanceToken, owner, repo);
+
+        call.enqueue(new Callback<JsonElement>() {
+
+            @Override
+            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+                TinyDB tinyDb = new TinyDB(getApplicationContext());
+                tinyDb.putInt("repositoryStarStatus", response.code());
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+    private void checkRepositoryWatchStatus(String instanceUrl, String instanceToken, final String owner, String repo) {
+
+        Call<WatchRepository> call;
+
+        call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .checkRepoWatchStatus(instanceToken, owner, repo);
+
+        call.enqueue(new Callback<WatchRepository>() {
+
+            @Override
+            public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
+
+                TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+                if(response.code() == 200) {
+                    assert response.body() != null;
+                    if(response.body().getSubscribed()) {
+                        tinyDb.putBoolean("repositoryWatchStatus", true);
+                    }
+                }
+                else {
+                    tinyDb.putBoolean("repositoryWatchStatus", false);
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
 }

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

@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import android.os.Bundle;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import android.view.View;
@@ -22,7 +21,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class RepoStargazersActivity extends AppCompatActivity {
+public class RepoStargazersActivity extends BaseActivity {
 
     private TextView noDataStargazers;
     private View.OnClickListener onClickListener;
@@ -31,9 +30,13 @@ public class RepoStargazersActivity extends AppCompatActivity {
     private ProgressBar mProgressBar;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_repo_stargazers;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_repo_stargazers);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -64,7 +67,7 @@ public class RepoStargazersActivity extends AppCompatActivity {
 
         RepoStargazersViewModel repoStargazersModel = new ViewModelProvider(this).get(RepoStargazersViewModel.class);
 
-        repoStargazersModel.getRepoStargazers(instanceUrl, instanceToken, repoOwner, repoName).observe(this, new Observer<List<UserInfo>>() {
+        repoStargazersModel.getRepoStargazers(instanceUrl, instanceToken, repoOwner, repoName, getApplicationContext()).observe(this, new Observer<List<UserInfo>>() {
             @Override
             public void onChanged(@Nullable List<UserInfo> stargazersListMain) {
                 adapter = new RepoStargazersAdapter(getApplicationContext(), stargazersListMain);

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

@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import android.os.Bundle;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import android.view.View;
@@ -22,7 +21,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class RepoWatchersActivity extends AppCompatActivity {
+public class RepoWatchersActivity extends BaseActivity {
 
     private TextView noDataWatchers;
     private View.OnClickListener onClickListener;
@@ -31,9 +30,13 @@ public class RepoWatchersActivity extends AppCompatActivity {
     private ProgressBar mProgressBar;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_repo_watchers;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_repo_watchers);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -64,7 +67,7 @@ public class RepoWatchersActivity extends AppCompatActivity {
 
         RepoWatchersViewModel repoWatchersModel = new ViewModelProvider(this).get(RepoWatchersViewModel.class);
 
-        repoWatchersModel.getRepoWatchers(instanceUrl, instanceToken, repoOwner, repoName).observe(this, new Observer<List<UserInfo>>() {
+        repoWatchersModel.getRepoWatchers(instanceUrl, instanceToken, repoOwner, repoName, getApplicationContext()).observe(this, new Observer<List<UserInfo>>() {
             @Override
             public void onChanged(@Nullable List<UserInfo> watchersListMain) {
                 adapter = new RepoWatchersAdapter(getApplicationContext(), watchersListMain);

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

@@ -1,33 +1,57 @@
 package org.mian.gitnex.activities;
 
-import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import android.content.res.Resources;
 import android.os.Bundle;
-import android.text.method.LinkMovementMethod;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.TextView;
 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 AppCompatActivity {
+public class SponsorsActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_sponsors;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_sponsors);
 
         ImageView closeActivity = findViewById(R.id.close);
-        TextView liberaPaySponsorsThomas = findViewById(R.id.liberaPaySponsorsThomas);
-
-        liberaPaySponsorsThomas.setMovementMethod(LinkMovementMethod.getInstance());
 
         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(getApplicationContext()));
+
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
+                DividerItemDecoration.VERTICAL);
+        mRecyclerView.addItemDecoration(dividerItemDecoration);
+
+        SponsorsAdapter adapter = new SponsorsAdapter(sponsorsList);
+        mRecyclerView.setAdapter(adapter);
+
     }
 
     private void initCloseListener() {

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

@@ -11,6 +11,7 @@ import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
@@ -109,7 +110,7 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         private TextView issueTitle;
         private TextView issueCreatedTime;
         private TextView issueCommentsCount;
-        private ImageView issueType;
+        private RelativeLayout relativeLayoutFrame;
 
         IssuesHolder(View itemView) {
 
@@ -121,7 +122,7 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
             LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
             issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
-            issueType = itemView.findViewById(R.id.issueType);
+            relativeLayoutFrame = itemView.findViewById(R.id.relativeLayoutFrame);
 
             issueTitle.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -135,6 +136,7 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
                     TinyDB tinyDb = new TinyDB(context);
                     tinyDb.putString("issueNumber", issueNumber.getText().toString());
+                    tinyDb.putString("issueType", "issue");
                     context.startActivity(intent);
 
                 }
@@ -151,6 +153,7 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
                     TinyDB tinyDb = new TinyDB(context);
                     tinyDb.putString("issueNumber", issueNumber.getText().toString());
+                    tinyDb.putString("issueType", "issue");
                     context.startActivity(intent);
 
                 }
@@ -165,6 +168,13 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             final String locale = tinyDb.getString("locale");
             final String timeFormat = tinyDb.getString("dateFormat");
 
+            /*if(issuesModel.getPull_request() != null) {
+                if (issuesModel.getPull_request().isMerged()) {
+                    relativeLayoutFrame.setVisibility(View.GONE);
+                    relativeLayoutFrame.setLayoutParams(new RecyclerView.LayoutParams(0, 0));
+                }
+            }*/
+
             if (!issuesModel.getUser().getFull_name().equals("")) {
                 issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));
             } else {
@@ -177,14 +187,6 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
                 Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
             }
 
-            if (issuesModel.getPull_request() == null) {
-                issueType.setImageResource(R.drawable.ic_issues);
-                issueType.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueTypeIssue), context));
-            } else {
-                issueType.setImageResource(R.drawable.ic_merge);
-                issueType.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueTypePullRequest), context));
-            }
-
             String issueNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + issuesModel.getNumber() + "</font>";
             issueTitle.setText(Html.fromHtml(issueNumber_ + " " + issuesModel.getTitle()));
 

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

@@ -0,0 +1,59 @@
+package org.mian.gitnex.adapters;
+
+import android.text.SpannableStringBuilder;
+import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import org.mian.gitnex.R;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class CreditsAdapter extends RecyclerView.Adapter<CreditsAdapter.CreditsViewHolder> {
+
+    private List<CharSequence> creditsList;
+
+    static class CreditsViewHolder extends RecyclerView.ViewHolder {
+
+        private TextView creditText;
+
+        private CreditsViewHolder(View itemView) {
+            super(itemView);
+
+            creditText = itemView.findViewById(R.id.creditText);
+
+        }
+    }
+
+    public CreditsAdapter(List<CharSequence> creditsListMain) {
+        this.creditsList = creditsListMain;
+    }
+
+    @NonNull
+    @Override
+    public CreditsAdapter.CreditsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.credits, parent, false);
+        return new CreditsAdapter.CreditsViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull CreditsAdapter.CreditsViewHolder holder, int position) {
+
+        SpannableStringBuilder strBuilder = new SpannableStringBuilder(creditsList.get(position));
+        holder.creditText.setText((strBuilder));
+        holder.creditText.setMovementMethod(LinkMovementMethod.getInstance());
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return creditsList.size();
+    }
+
+}

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

@@ -0,0 +1,217 @@
+package org.mian.gitnex.adapters;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Typeface;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.recyclerview.widget.RecyclerView;
+import com.amulyakhare.textdrawable.TextDrawable;
+import com.amulyakhare.textdrawable.util.ColorGenerator;
+import com.squareup.picasso.Picasso;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
+import org.mian.gitnex.activities.RepoDetailActivity;
+import org.mian.gitnex.activities.RepoStargazersActivity;
+import org.mian.gitnex.activities.RepoWatchersActivity;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.util.TinyDB;
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Author M M Arif
+ */
+
+public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepositoriesAdapter.ReposSearchViewHolder> {
+
+
+    private List<UserRepositories> searchedReposList;
+    private Context mCtx;
+
+    public ExploreRepositoriesAdapter(List<UserRepositories> dataList, Context mCtx) {
+        this.mCtx = mCtx;
+        this.searchedReposList = dataList;
+    }
+
+    static class ReposSearchViewHolder extends RecyclerView.ViewHolder {
+
+        private ImageView image;
+        private TextView mTextView1;
+        private TextView mTextView2;
+        private TextView fullName;
+        private ImageView repoPrivatePublic;
+        private TextView repoStars;
+        private TextView repoForks;
+        private TextView repoOpenIssuesCount;
+
+        private ReposSearchViewHolder(View itemView) {
+            super(itemView);
+
+            mTextView1 = itemView.findViewById(R.id.repoName);
+            mTextView2 = itemView.findViewById(R.id.repoDescription);
+            image = itemView.findViewById(R.id.imageAvatar);
+            fullName = itemView.findViewById(R.id.repoFullName);
+            repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
+            repoStars = itemView.findViewById(R.id.repoStars);
+            repoForks = itemView.findViewById(R.id.repoForks);
+            repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+            ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+
+            itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    Context context = v.getContext();
+                    TextView repoFullName = v.findViewById(R.id.repoFullName);
+
+                    Intent intent = new Intent(context, RepoDetailActivity.class);
+                    intent.putExtra("repoFullName", repoFullName.getText().toString());
+
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("repoFullName", repoFullName.getText().toString());
+                    tinyDb.putBoolean("resumeIssues", true);
+                    context.startActivity(intent);
+
+                }
+            });
+
+            reposDropdownMenu.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    final Context context = v.getContext();
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+
+                    PopupMenu popupMenu = new PopupMenu(context, v);
+                    popupMenu.inflate(R.menu.repo_dotted_list_menu);
+
+                    Object menuHelper;
+                    Class[] argTypes;
+                    try {
+
+                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
+                        fMenuHelper.setAccessible(true);
+                        menuHelper = fMenuHelper.get(popupMenu);
+                        argTypes = new Class[] { boolean.class };
+                        Objects.requireNonNull(menuHelper).getClass().getDeclaredMethod("setForceShowIcon",
+                                argTypes).invoke(menuHelper, true);
+
+                    } catch (Exception e) {
+
+                        popupMenu.show();
+                        return;
+
+                    }
+
+                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                        @Override
+                        public boolean onMenuItemClick(MenuItem item) {
+                            switch (item.getItemId()) {
+                                case R.id.repoStargazers:
+
+                                    Intent intent = new Intent(context, RepoStargazersActivity.class);
+                                    intent.putExtra("repoFullNameForStars", fullName.getText());
+                                    context.startActivity(intent);
+                                    break;
+
+                                case R.id.repoWatchers:
+
+                                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
+                                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+                                    context.startActivity(intentW);
+                                    break;
+
+                                case R.id.repoOpenInBrowser:
+
+                                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+                                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
+                                    context.startActivity(intentOpenInBrowser);
+                                    break;
+
+                            }
+                            return false;
+                        }
+                    });
+
+                    popupMenu.show();
+
+                }
+            });
+
+        }
+
+    }
+
+    @NonNull
+    @Override
+    public ExploreRepositoriesAdapter.ReposSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.repos_list, parent, false);
+        return new ExploreRepositoriesAdapter.ReposSearchViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull final ExploreRepositoriesAdapter.ReposSearchViewHolder holder, int position) {
+
+        final UserRepositories currentItem = searchedReposList.get(position);
+
+
+        holder.mTextView2.setVisibility(View.GONE);
+
+        ColorGenerator generator = ColorGenerator.MATERIAL;
+        int color = generator.getColor(currentItem.getName());
+        String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
+
+        TextDrawable drawable = TextDrawable.builder()
+                .beginConfig()
+                .useFont(Typeface.DEFAULT)
+                .fontSize(18)
+                .toUpperCase()
+                .width(28)
+                .height(28)
+                .endConfig()
+                .buildRoundRect(firstCharacter, color, 3);
+
+        if (currentItem.getAvatar_url() != null) {
+            if (!currentItem.getAvatar_url().equals("")) {
+                Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
+            } else {
+                holder.image.setImageDrawable(drawable);
+            }
+        }
+        else {
+            holder.image.setImageDrawable(drawable);
+        }
+
+        holder.mTextView1.setText(currentItem.getName());
+        if (!currentItem.getDescription().equals("")) {
+            holder.mTextView2.setVisibility(View.VISIBLE);
+            holder.mTextView2.setText(currentItem.getDescription());
+        }
+        holder.fullName.setText(currentItem.getFullname());
+        if(currentItem.getPrivateFlag()) {
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+        }
+        else {
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+        }
+        holder.repoStars.setText(currentItem.getStars_count());
+        holder.repoForks.setText(currentItem.getForks_count());
+        holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return searchedReposList.size();
+    }
+}

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

@@ -0,0 +1,212 @@
+package org.mian.gitnex.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Filter;
+import android.widget.Filterable;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Files;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHolder> implements Filterable {
+
+    private List<Files> filesList;
+    private Context mCtx;
+    private List<Files> filesListFull;
+
+    private FilesAdapterListener filesListener;
+
+    public interface FilesAdapterListener {
+        void onClickDir(String str);
+        void onClickFile(String str);
+    }
+
+    class FilesViewHolder extends RecyclerView.ViewHolder {
+
+        private ImageView fileTypeImage;
+        private TextView fileName;
+        private TextView fileType;
+
+        private FilesViewHolder(View itemView) {
+
+            super(itemView);
+            fileName = itemView.findViewById(R.id.fileName);
+            fileTypeImage = itemView.findViewById(R.id.fileImage);
+            fileType = itemView.findViewById(R.id.fileType);
+
+            //ImageView filesDropdownMenu = itemView.findViewById(R.id.filesDropdownMenu);
+
+            fileName.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    Context context = v.getContext();
+
+                    if(fileType.getText().toString().equals("file")) {
+                        filesListener.onClickFile(fileName.getText().toString());
+                    }
+                    else if(fileType.getText().toString().equals("dir")) {
+                        filesListener.onClickDir(fileName.getText().toString());
+                    }
+                    else {
+                        Toasty.info(context, context.getString(R.string.filesGenericError));
+                    }
+
+                }
+            });
+
+
+            /*filesDropdownMenu.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    final Context context = v.getContext();
+                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+
+                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    popupMenu.inflate(R.menu.files_dotted_list_menu);
+
+                    Object menuHelper;
+                    Class[] argTypes;
+                    try {
+
+                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
+                        fMenuHelper.setAccessible(true);
+                        menuHelper = fMenuHelper.get(popupMenu);
+                        argTypes = new Class[] { boolean.class };
+                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
+                                argTypes).invoke(menuHelper, true);
+
+                    } catch (Exception e) {
+
+                        popupMenu.show();
+                        return;
+
+                    }
+
+                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                        @Override
+                        public boolean onMenuItemClick(MenuItem item) {
+                            switch (item.getItemId()) {
+                                case R.id.deleteFile:
+
+                                    Intent intent = new Intent(context, DeleteFileActivity.class);
+                                    intent.putExtra("repoFullNameForDeleteFile", fullName.getText());
+                                    context.startActivity(intent);
+                                    break;
+
+                                case R.id.editFile:
+
+                                    Intent intentW = new Intent(context, EditFileActivity.class);
+                                    intentW.putExtra("repoFullNameForEditFile", fullName.getText());
+                                    context.startActivity(intentW);
+                                    break;
+
+                                case R.id.openInBrowser:
+
+                                    Intent intentOpenInBrowser = new Intent(context, OpenFileInBrowserActivity.class);
+                                    intentOpenInBrowser.putExtra("fileFullNameBrowser", fullName.getText());
+                                    context.startActivity(intentOpenInBrowser);
+                                    break;
+
+                            }
+                            return false;
+                        }
+                    });
+
+                    popupMenu.show();
+
+                }
+            });*/
+
+        }
+    }
+
+    public FilesAdapter(Context mCtx, List<Files> filesListMain, FilesAdapterListener filesListener) {
+        this.mCtx = mCtx;
+        this.filesList = filesListMain;
+        filesListFull = new ArrayList<>(filesList);
+        this.filesListener = filesListener;
+    }
+
+    @NonNull
+    @Override
+    public FilesAdapter.FilesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.files_list, parent, false);
+        return new FilesAdapter.FilesViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull FilesAdapter.FilesViewHolder holder, int position) {
+
+        Files currentItem = filesList.get(position);
+
+        holder.fileType.setText(currentItem.getType());
+        holder.fileName.setText(currentItem.getName());
+
+        if(currentItem.getType().equals("file")) {
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_file_new));
+        }
+        else if(currentItem.getType().equals("dir")) {
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_folder_24));
+        }
+        else {
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_question_mark_24));
+        }
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return filesList.size();
+    }
+
+    @Override
+    public Filter getFilter() {
+        return filesFilter;
+    }
+
+    private Filter filesFilter = new Filter() {
+        @Override
+        protected FilterResults performFiltering(CharSequence constraint) {
+            List<Files> filteredList = new ArrayList<>();
+
+            if (constraint == null || constraint.length() == 0) {
+                filteredList.addAll(filesListFull);
+            } else {
+                String filterPattern = constraint.toString().toLowerCase().trim();
+
+                for (Files item : filesListFull) {
+                    if (item.getName().toLowerCase().contains(filterPattern) || item.getPath().toLowerCase().contains(filterPattern)) {
+                        filteredList.add(item);
+                    }
+                }
+            }
+
+            FilterResults results = new FilterResults();
+            results.values = filteredList;
+
+            return results;
+        }
+
+        @Override
+        protected void publishResults(CharSequence constraint, FilterResults results) {
+            filesList.clear();
+            filesList.addAll((List) results.values);
+            notifyDataSetChanged();
+        }
+    };
+
+}

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

@@ -0,0 +1,138 @@
+package org.mian.gitnex.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.models.FileDiffView;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class FilesDiffAdapter extends RecyclerView.Adapter<FilesDiffAdapter.FilesDiffViewHolder> {
+
+    private List<FileDiffView> dataList;
+    private Context ctx;
+
+    static class FilesDiffViewHolder extends RecyclerView.ViewHolder {
+
+        private TextView fileContents;
+        private TextView fileName;
+        private TextView fileInfo;
+        private ImageView fileImage;
+        private HorizontalScrollView fileContentsView;
+        private LinearLayout allLines;
+
+        private FilesDiffViewHolder(View itemView) {
+            super(itemView);
+
+            fileContents = itemView.findViewById(R.id.fileContents);
+            fileName = itemView.findViewById(R.id.fileName);
+            fileInfo = itemView.findViewById(R.id.fileInfo);
+            fileImage = itemView.findViewById(R.id.fileImage);
+            fileContentsView = itemView.findViewById(R.id.fileContentsView);
+            allLines = itemView.findViewById(R.id.allLinesLayout);
+
+        }
+    }
+
+    public FilesDiffAdapter(List<FileDiffView> dataListMain, Context ctx) {
+        this.dataList = dataListMain;
+        this.ctx = ctx;
+    }
+
+    @NonNull
+    @Override
+    public FilesDiffAdapter.FilesDiffViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.files_diffs_list, parent, false);
+        return new FilesDiffAdapter.FilesDiffViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull FilesDiffViewHolder holder, int position) {
+
+        FileDiffView data = dataList.get(position);
+
+        if(data.isFileType()) {
+
+            holder.fileName.setText(data.getFileName());
+
+            holder.fileInfo.setVisibility(View.GONE);
+
+            //byte[] imageData = Base64.decode(data.getFileContents(), Base64.DEFAULT);
+            //Drawable imageDrawable = new BitmapDrawable(ctx.getResources(), BitmapFactory.decodeByteArray(imageData, 0, imageData.length));
+            //holder.fileImage.setImageDrawable(imageDrawable);
+            holder.fileContentsView.setVisibility(View.GONE);
+
+        }
+        else {
+
+            String[] splitData = data.getFileContents().split("\\R");
+
+            for (String eachSplit : splitData) {
+
+                TextView textLine = new TextView(ctx);
+                textLine.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+
+                if (eachSplit.startsWith("+")) {
+
+                    textLine.setText(eachSplit);
+                    holder.allLines.addView(textLine);
+
+                    textLine.setTextColor(ctx.getResources().getColor(R.color.colorPrimary));
+                    textLine.setPadding(5, 5, 5, 5);
+                    textLine.setBackgroundColor(ctx.getResources().getColor(R.color.diffAddedColor));
+
+                }
+                else if (eachSplit.startsWith("-")) {
+
+                    textLine.setText(eachSplit);
+                    holder.allLines.addView(textLine);
+
+                    textLine.setTextColor(ctx.getResources().getColor(R.color.colorPrimary));
+                    textLine.setPadding(5, 5, 5, 5);
+                    textLine.setBackgroundColor(ctx.getResources().getColor(R.color.diffRemovedColor));
+
+                }
+                else {
+
+                    if(eachSplit.length() > 0) {
+                        textLine.setText(eachSplit);
+                        holder.allLines.addView(textLine);
+
+                        textLine.setTextColor(ctx.getResources().getColor(R.color.colorPrimary));
+                        textLine.setPadding(5, 5, 5, 5);
+                        textLine.setBackgroundColor(ctx.getResources().getColor(R.color.white));
+                    }
+
+                }
+
+            }
+
+            holder.fileName.setText(data.getFileName());
+            if(!data.getFileInfo().equals("")) {
+                holder.fileInfo.setText(ctx.getResources().getString(R.string.fileDiffInfoChanges, data.getFileInfo()));
+            }
+            else {
+                holder.fileInfo.setVisibility(View.GONE);
+            }
+
+        }
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList.size();
+    }
+
+}

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

@@ -90,9 +90,9 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.issue_comment_menu);
 
                     Object menuHelper;

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

@@ -11,6 +11,7 @@ import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
@@ -109,7 +110,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         private TextView issueTitle;
         private TextView issueCreatedTime;
         private TextView issueCommentsCount;
-        private ImageView issueType;
+        private RelativeLayout relativeLayoutFrame;
 
         IssuesHolder(View itemView) {
 
@@ -121,7 +122,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
             LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
             issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
-            issueType = itemView.findViewById(R.id.issueType);
+            relativeLayoutFrame = itemView.findViewById(R.id.relativeLayoutFrame);
 
             issueTitle.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -135,6 +136,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
                     TinyDB tinyDb = new TinyDB(context);
                     tinyDb.putString("issueNumber", issueNumber.getText().toString());
+                    tinyDb.putString("issueType", "issue");
                     context.startActivity(intent);
 
                 }
@@ -151,6 +153,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
                     TinyDB tinyDb = new TinyDB(context);
                     tinyDb.putString("issueNumber", issueNumber.getText().toString());
+                    tinyDb.putString("issueType", "issue");
                     context.startActivity(intent);
 
                 }
@@ -165,6 +168,13 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             final String locale = tinyDb.getString("locale");
             final String timeFormat = tinyDb.getString("dateFormat");
 
+            /*if(issuesModel.getPull_request() != null) {
+                if (!issuesModel.getPull_request().isMerged()) {
+                    relativeLayoutFrame.setVisibility(View.GONE);
+                    relativeLayoutFrame.setLayoutParams(new RecyclerView.LayoutParams(0, 0));
+                }
+            }*/
+
             if (!issuesModel.getUser().getFull_name().equals("")) {
                 issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));
             } else {
@@ -177,14 +187,6 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                 Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
             }
 
-            if (issuesModel.getPull_request() == null) {
-                issueType.setImageResource(R.drawable.ic_issues);
-                issueType.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueTypeIssue), context));
-            } else {
-                issueType.setImageResource(R.drawable.ic_merge);
-                issueType.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueTypePullRequest), context));
-            }
-
             String issueNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + issuesModel.getNumber() + "</font>";
             issueTitle.setText(Html.fromHtml(issueNumber_ + " " + issuesModel.getTitle()));
 

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

@@ -56,9 +56,9 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.labels_menu);
 
                     Object menuHelper;

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

@@ -50,6 +50,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
         private TextView repoStarsMy;
         private TextView repoForksMy;
         private TextView repoOpenIssuesCountMy;
+        private TextView repoType;
 
         private MyReposViewHolder(View itemView) {
             super(itemView);
@@ -62,6 +63,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
             repoForksMy = itemView.findViewById(R.id.repoForksMy);
             repoOpenIssuesCountMy = itemView.findViewById(R.id.repoOpenIssuesCountMy);
             ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+            repoType = itemView.findViewById(R.id.repoType);
 
             itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -74,6 +76,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 
                     TinyDB tinyDb = new TinyDB(context);
                     tinyDb.putString("repoFullName", fullNameMy.getText().toString());
+                    tinyDb.putString("repoType", repoType.getText().toString());
                     tinyDb.putBoolean("resumeIssues", true);
                     context.startActivity(intent);
 
@@ -85,9 +88,9 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
@@ -198,9 +201,11 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
         holder.fullNameMy.setText(currentItem.getFullname());
         if(currentItem.getPrivateFlag()) {
             holder.repoPrivatePublicMy.setImageResource(R.drawable.ic_lock_bold);
+            holder.repoType.setText(R.string.strPrivate);
         }
         else {
             holder.repoPrivatePublicMy.setImageResource(R.drawable.ic_public);
+            holder.repoType.setText(R.string.strPublic);
         }
         holder.repoStarsMy.setText(currentItem.getStars_count());
         holder.repoForksMy.setText(currentItem.getForks_count());

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

@@ -0,0 +1,279 @@
+package org.mian.gitnex.adapters;
+
+import android.annotation.SuppressLint;
+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.Filter;
+import android.widget.Filterable;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import com.squareup.picasso.Picasso;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.IssueDetailActivity;
+import org.mian.gitnex.helpers.ClickListener;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.models.PullRequests;
+import org.mian.gitnex.util.TinyDB;
+import org.ocpsoft.prettytime.PrettyTime;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * Author M M Arif
+ */
+
+public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable {
+
+    private Context context;
+    private final int TYPE_LOAD = 0;
+    private List<PullRequests> prList;
+    private List<PullRequests> prListFull;
+    private PullRequestsAdapter.OnLoadMoreListener loadMoreListener;
+    private boolean isLoading = false, isMoreDataAvailable = true;
+
+    public PullRequestsAdapter(Context context, List<PullRequests> prListMain) {
+
+        this.context = context;
+        this.prList = prListMain;
+        prListFull = new ArrayList<>(prList);
+
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+        LayoutInflater inflater = LayoutInflater.from(context);
+
+        if(viewType == TYPE_LOAD){
+            return new PullRequestsAdapter.PullRequestsHolder(inflater.inflate(R.layout.repo_pr_list, parent,false));
+        }
+        else {
+            return new PullRequestsAdapter.LoadHolder(inflater.inflate(R.layout.row_load,parent,false));
+        }
+
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+
+        if(position >= getItemCount()-1 && isMoreDataAvailable && !isLoading && loadMoreListener!=null) {
+
+            isLoading = true;
+            loadMoreListener.onLoadMore();
+
+        }
+
+        if(getItemViewType(position) == TYPE_LOAD) {
+
+            ((PullRequestsAdapter.PullRequestsHolder)holder).bindData(prList.get(position));
+
+        }
+
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+
+        if(prList.get(position).getTitle() != null) {
+            return TYPE_LOAD;
+        }
+        else {
+            return 1;
+        }
+
+    }
+
+    @Override
+    public int getItemCount() {
+
+        return prList.size();
+
+    }
+
+    class PullRequestsHolder extends RecyclerView.ViewHolder {
+
+        private TextView prNumber;
+        private ImageView assigneeAvatar;
+        private TextView prTitle;
+        private TextView prCreatedTime;
+        private TextView prCommentsCount;
+
+        PullRequestsHolder(View itemView) {
+
+            super(itemView);
+
+            prNumber = itemView.findViewById(R.id.prNumber);
+            assigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
+            prTitle = itemView.findViewById(R.id.prTitle);
+            prCommentsCount = itemView.findViewById(R.id.prCommentsCount);
+            LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
+            prCreatedTime = itemView.findViewById(R.id.prCreatedTime);
+
+            prTitle.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    Context context = v.getContext();
+
+                    Intent intent = new Intent(context, IssueDetailActivity.class);
+                    intent.putExtra("issueNumber", prNumber.getText());
+
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("issueNumber", prNumber.getText().toString());
+                    tinyDb.putString("issueType", "pr");
+                    context.startActivity(intent);
+
+                }
+            });
+            frameCommentsCount.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    Context context = v.getContext();
+
+                    Intent intent = new Intent(context, IssueDetailActivity.class);
+                    intent.putExtra("issueNumber", prNumber.getText());
+
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("issueNumber", prNumber.getText().toString());
+                    tinyDb.putString("issueType", "pr");
+                    context.startActivity(intent);
+
+                }
+            });
+
+        }
+
+        @SuppressLint("SetTextI18n")
+        void bindData(PullRequests prModel){
+
+            final TinyDB tinyDb = new TinyDB(context);
+            final String locale = tinyDb.getString("locale");
+            final String timeFormat = tinyDb.getString("dateFormat");
+
+            if (!prModel.getUser().getFull_name().equals("")) {
+                assigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.prCreator) + prModel.getUser().getFull_name(), context));
+            } else {
+                assigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.prCreator) + prModel.getUser().getLogin(), context));
+            }
+
+            if (prModel.getUser().getAvatar_url() != null) {
+                Picasso.get().load(prModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
+            } else {
+                Picasso.get().load(prModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
+            }
+
+            String prNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + prModel.getNumber() + "</font>";
+            prTitle.setText(Html.fromHtml(prNumber_ + " " + prModel.getTitle()));
+
+            prNumber.setText(String.valueOf(prModel.getNumber()));
+            prCommentsCount.setText(String.valueOf(prModel.getComments()));
+
+            switch (timeFormat) {
+                case "pretty": {
+                    PrettyTime prettyTime = new PrettyTime(new Locale(locale));
+                    String createdTime = prettyTime.format(prModel.getCreated_at());
+                    prCreatedTime.setText(createdTime);
+                    prCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(prModel.getCreated_at()), context));
+                    break;
+                }
+                case "normal": {
+                    DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+                    String createdTime = formatter.format(prModel.getCreated_at());
+                    prCreatedTime.setText(createdTime);
+                    break;
+                }
+                case "normal1": {
+                    DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+                    String createdTime = formatter.format(prModel.getCreated_at());
+                    prCreatedTime.setText(createdTime);
+                    break;
+                }
+            }
+
+        }
+
+    }
+
+    static class LoadHolder extends RecyclerView.ViewHolder {
+
+        LoadHolder(View itemView) {
+            super(itemView);
+        }
+
+    }
+
+    public void setMoreDataAvailable(boolean moreDataAvailable) {
+
+        isMoreDataAvailable = moreDataAvailable;
+
+    }
+
+    public void notifyDataChanged() {
+
+        notifyDataSetChanged();
+        isLoading = false;
+
+    }
+
+    public interface OnLoadMoreListener {
+
+        void onLoadMore();
+
+    }
+
+    public void setLoadMoreListener(PullRequestsAdapter.OnLoadMoreListener loadMoreListener) {
+
+        this.loadMoreListener = loadMoreListener;
+
+    }
+
+    @Override
+    public Filter getFilter() {
+        return prFilter;
+    }
+
+    private Filter prFilter = new Filter() {
+        @Override
+        protected FilterResults performFiltering(CharSequence constraint) {
+            List<PullRequests> filteredList = new ArrayList<>();
+
+            if (constraint == null || constraint.length() == 0) {
+                filteredList.addAll(prList);
+            } else {
+                String filterPattern = constraint.toString().toLowerCase().trim();
+
+                for (PullRequests item : prList) {
+                    if (item.getTitle().toLowerCase().contains(filterPattern) || item.getBody().toLowerCase().contains(filterPattern)) {
+                        filteredList.add(item);
+                    }
+                }
+            }
+
+            FilterResults results = new FilterResults();
+            results.values = filteredList;
+
+            return results;
+        }
+
+        @Override
+        protected void publishResults(CharSequence constraint, FilterResults results) {
+            prList.clear();
+            prList.addAll((List) results.values);
+            notifyDataSetChanged();
+        }
+    };
+
+}

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

@@ -2,6 +2,7 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,6 +13,7 @@ import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.util.TinyDB;
 import java.util.List;
 
 /**
@@ -23,7 +25,7 @@ public class RepoStargazersAdapter extends BaseAdapter {
     private List<UserInfo> stargazersList;
     private Context mCtx;
 
-    private class ViewHolder {
+    private static class ViewHolder {
 
         private ImageView memberAvatar;
         private TextView memberName;
@@ -62,7 +64,7 @@ public class RepoStargazersAdapter extends BaseAdapter {
 
         if (finalView == null) {
             finalView = LayoutInflater.from(mCtx).inflate(R.layout.repo_stargazers_list, null);
-            viewHolder = new RepoStargazersAdapter.ViewHolder(finalView);
+            viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
         else {
@@ -77,13 +79,46 @@ public class RepoStargazersAdapter extends BaseAdapter {
     private void initData(RepoStargazersAdapter.ViewHolder viewHolder, int position) {
 
         UserInfo currentItem = stargazersList.get(position);
-        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(viewHolder.memberAvatar);
+        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
+
+        final TinyDB tinyDb = new TinyDB(mCtx);
+        Typeface myTypeface;
+
+        if(tinyDb.getInt("customFontId") == 0) {
+
+            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 1) {
+
+            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 2) {
+
+            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
+
+        }
+        else {
+
+            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+
+        }
 
         if(!currentItem.getFullname().equals("")) {
             viewHolder.memberName.setText(currentItem.getFullname());
+            viewHolder.memberName.setTypeface(myTypeface);
         }
         else {
             viewHolder.memberName.setText(currentItem.getLogin());
+            viewHolder.memberName.setTypeface(myTypeface);
+        }
+
+        if(tinyDb.getInt("themeId") == 1) { //light
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
+        }
+        else { // dark
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
         }
 
     }

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

@@ -2,6 +2,7 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,6 +13,7 @@ import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.util.TinyDB;
 import java.util.List;
 
 /**
@@ -23,7 +25,7 @@ public class RepoWatchersAdapter extends BaseAdapter {
     private List<UserInfo> watchersList;
     private Context mCtx;
 
-    private class ViewHolder {
+    private static class ViewHolder {
 
         private ImageView memberAvatar;
         private TextView memberName;
@@ -62,7 +64,7 @@ public class RepoWatchersAdapter extends BaseAdapter {
 
         if (finalView == null) {
             finalView = LayoutInflater.from(mCtx).inflate(R.layout.repo_watchers_list, null);
-            viewHolder = new RepoWatchersAdapter.ViewHolder(finalView);
+            viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
         else {
@@ -77,13 +79,46 @@ public class RepoWatchersAdapter extends BaseAdapter {
     private void initData(RepoWatchersAdapter.ViewHolder viewHolder, int position) {
 
         UserInfo currentItem = watchersList.get(position);
-        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(viewHolder.memberAvatar);
+        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
+
+        final TinyDB tinyDb = new TinyDB(mCtx);
+        Typeface myTypeface;
+
+        if(tinyDb.getInt("customFontId") == 0) {
+
+            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 1) {
+
+            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 2) {
+
+            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
+
+        }
+        else {
+
+            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+
+        }
 
         if(!currentItem.getFullname().equals("")) {
             viewHolder.memberName.setText(currentItem.getFullname());
+            viewHolder.memberName.setTypeface(myTypeface);
         }
         else {
             viewHolder.memberName.setText(currentItem.getLogin());
+            viewHolder.memberName.setTypeface(myTypeface);
+        }
+
+        if(tinyDb.getInt("themeId") == 1) { //light
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
+        }
+        else { // dark
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
         }
 
     }

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

@@ -50,6 +50,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
         private TextView repoStars;
         private TextView repoForks;
         private TextView repoOpenIssuesCount;
+        private TextView repoType;
 
         private ReposViewHolder(View itemView) {
 
@@ -63,6 +64,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
             repoForks = itemView.findViewById(R.id.repoForks);
             repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
             ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+            repoType = itemView.findViewById(R.id.repoType);
 
             itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -70,12 +72,14 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 
                     Context context = v.getContext();
                     TextView repoFullName = v.findViewById(R.id.repoFullName);
+                    TextView repoType_ = v.findViewById(R.id.repoType);
 
                     Intent intent = new Intent(context, RepoDetailActivity.class);
                     intent.putExtra("repoFullName", repoFullName.getText().toString());
 
                     TinyDB tinyDb = new TinyDB(context);
                     tinyDb.putString("repoFullName", repoFullName.getText().toString());
+                    tinyDb.putString("repoType", repoType_.getText().toString());
                     tinyDb.putBoolean("resumeIssues", true);
                     context.startActivity(intent);
 
@@ -87,9 +91,9 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
@@ -100,6 +104,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
                         fMenuHelper.setAccessible(true);
                         menuHelper = fMenuHelper.get(popupMenu);
                         argTypes = new Class[] { boolean.class };
+                        assert menuHelper != null;
                         menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
                                 argTypes).invoke(menuHelper, true);
 
@@ -200,9 +205,11 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
         holder.fullName.setText(currentItem.getFullname());
         if(currentItem.getPrivateFlag()) {
             holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+            holder.repoType.setText(R.string.strPrivate);
         }
         else {
             holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+            holder.repoType.setText(R.string.strPublic);
         }
         holder.repoStars.setText(currentItem.getStars_count());
         holder.repoForks.setText(currentItem.getForks_count());

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

@@ -50,6 +50,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
         private TextView repoStars;
         private TextView repoForks;
         private TextView repoOpenIssuesCount;
+        private TextView repoType;
 
         private OrgReposViewHolder(View itemView) {
             super(itemView);
@@ -62,6 +63,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
             repoForks = itemView.findViewById(R.id.repoForks);
             repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
             ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+            repoType = itemView.findViewById(R.id.repoType);
 
             itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -74,6 +76,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
 
                     TinyDB tinyDb = new TinyDB(context);
                     tinyDb.putString("repoFullName", fullName.getText().toString());
+                    tinyDb.putString("repoType", repoType.getText().toString());
                     tinyDb.putBoolean("resumeIssues", true);
                     context.startActivity(intent);
 
@@ -85,9 +88,9 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
@@ -199,9 +202,11 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
         holder.fullName.setText(currentItem.getFullname());
         if(currentItem.getPrivateFlag()) {
             holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+            holder.repoType.setText(R.string.strPrivate);
         }
         else {
             holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+            holder.repoType.setText(R.string.strPublic);
         }
         holder.repoStars.setText(currentItem.getStars_count());
         holder.repoForks.setText(currentItem.getForks_count());

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

@@ -0,0 +1,59 @@
+package org.mian.gitnex.adapters;
+
+import android.text.SpannableStringBuilder;
+import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import org.mian.gitnex.R;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class SponsorsAdapter extends RecyclerView.Adapter<SponsorsAdapter.SponsorsViewHolder> {
+
+    private List<CharSequence> sponsorsList;
+
+    static class SponsorsViewHolder extends RecyclerView.ViewHolder {
+
+        private TextView sponsorText;
+
+        private SponsorsViewHolder(View itemView) {
+            super(itemView);
+
+            sponsorText = itemView.findViewById(R.id.sponsorText);
+
+        }
+    }
+
+    public SponsorsAdapter(List<CharSequence> sponsorsListMain) {
+        this.sponsorsList = sponsorsListMain;
+    }
+
+    @NonNull
+    @Override
+    public SponsorsAdapter.SponsorsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.sponsors, parent, false);
+        return new SponsorsAdapter.SponsorsViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull SponsorsAdapter.SponsorsViewHolder holder, int position) {
+
+        SpannableStringBuilder strBuilder = new SpannableStringBuilder(sponsorsList.get(position));
+        holder.sponsorText.setText((strBuilder));
+        holder.sponsorText.setMovementMethod(LinkMovementMethod.getInstance());
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return sponsorsList.size();
+    }
+
+}

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

@@ -50,6 +50,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
         private TextView repoStars;
         private TextView repoForks;
         private TextView repoOpenIssuesCount;
+        private TextView repoType;
 
         private StarredReposViewHolder(View itemView) {
             super(itemView);
@@ -62,6 +63,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
             repoForks = itemView.findViewById(R.id.repoForks);
             repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
             ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+            repoType = itemView.findViewById(R.id.repoType);
 
             itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -74,6 +76,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
 
                     TinyDB tinyDb = new TinyDB(context);
                     tinyDb.putString("repoFullName", fullName.getText().toString());
+                    tinyDb.putString("repoType", repoType.getText().toString());
                     tinyDb.putBoolean("resumeIssues", true);
                     context.startActivity(intent);
 
@@ -85,9 +88,9 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    Context context_ = new ContextThemeWrapper(context, R.style.AppThemeConfirmDialog);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
@@ -199,9 +202,11 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
         holder.fullName.setText(currentItem.getFullname());
         if(currentItem.getPrivateFlag()) {
             holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+            holder.repoType.setText(R.string.strPrivate);
         }
         else {
             holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+            holder.repoType.setText(R.string.strPublic);
         }
         holder.repoStars.setText(currentItem.getStars_count());
         holder.repoForks.setText(currentItem.getForks_count());

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

@@ -2,6 +2,7 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,6 +13,7 @@ import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.util.TinyDB;
 import java.util.List;
 
 /**
@@ -23,7 +25,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
     private List<UserInfo> teamMembersList;
     private Context mCtx;
 
-    private class ViewHolder {
+    private static class ViewHolder {
 
         private ImageView memberAvatar;
         private TextView memberName;
@@ -63,7 +65,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
 
         if (finalView == null) {
             finalView = LayoutInflater.from(mCtx).inflate(R.layout.members_by_team_by_org_list, null);
-            viewHolder = new TeamMembersByOrgAdapter.ViewHolder(finalView);
+            viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
         else {
@@ -80,11 +82,44 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
         UserInfo currentItem = teamMembersList.get(position);
         Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
 
+        final TinyDB tinyDb = new TinyDB(mCtx);
+        Typeface myTypeface;
+
+        if(tinyDb.getInt("customFontId") == 0) {
+
+            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 1) {
+
+            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 2) {
+
+            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
+
+        }
+        else {
+
+            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+
+        }
+
         if(!currentItem.getFullname().equals("")) {
             viewHolder.memberName.setText(currentItem.getFullname());
+            viewHolder.memberName.setTypeface(myTypeface);
         }
         else {
             viewHolder.memberName.setText(currentItem.getLogin());
+            viewHolder.memberName.setTypeface(myTypeface);
+        }
+
+        if(tinyDb.getInt("themeId") == 1) { //light
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
+        }
+        else { // dark
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
         }
 
     }

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

@@ -68,7 +68,7 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
 
                     final Context context = v.getContext();
 
-                    AlertDialog.Builder pBuilder = new AlertDialog.Builder(context, R.style.confirmDialog);
+                    AlertDialog.Builder pBuilder = new AlertDialog.Builder(context);
 
                     pBuilder.setTitle(R.string.newTeamPermission);
                     pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, new DialogInterface.OnClickListener() {
@@ -156,7 +156,7 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
             final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
             Call<Collaborators> call = RetrofitClient
-                    .getInstance(instanceUrl)
+                    .getInstance(instanceUrl, mCtx)
                     .getApiInterface()
                     .checkRepoCollaborator(Authorization.returnAuthentication(mCtx, loginUid, instanceToken), repoOwner, repoName, currentItem.getUsername());
 
@@ -191,7 +191,7 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
 
                 @Override
                 public void onFailure(@NonNull Call<Collaborators> call, @NonNull Throwable t) {
-                    Log.i("onFailure", t.getMessage());
+                    Log.i("onFailure", t.toString());
                 }
 
             });

app/src/main/java/org/mian/gitnex/clients/IssuesService.java

@@ -1,6 +1,15 @@
 package org.mian.gitnex.clients;
 
+import android.content.Context;
+import androidx.annotation.NonNull;
+import org.mian.gitnex.util.AppUtil;
+import java.io.File;
+import java.io.IOException;
+import okhttp3.Cache;
+import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -11,21 +20,40 @@ import retrofit2.converter.gson.GsonConverterFactory;
 
 public class IssuesService {
 
-    public static <S> S createService(Class<S> serviceClass, String instanceURL) {
+    public static <S> S createService(Class<S> serviceClass, String instanceURL, Context ctx) {
+
+        final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
+        File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
+        int cacheSize = 50 * 1024 * 1024; // 50MB
+        Cache cache = new Cache(httpCacheDirectory, cacheSize);
 
         HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
         logging.setLevel(HttpLoggingInterceptor.Level.BODY);
 
-        OkHttpClient.Builder httpClient = new OkHttpClient.Builder();
-
-        httpClient.addInterceptor(logging);
-
-        Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl(instanceURL)
-                .addConverterFactory(GsonConverterFactory.create())
-                //.client(httpClient.build())
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .cache(cache)
+                //.addInterceptor(logging)
+                .addInterceptor(new Interceptor() {
+                    @NonNull
+                    @Override public Response intercept(@NonNull Chain chain) throws IOException {
+                        Request request = chain.request();
+                        if (connToInternet) {
+                            request = request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build();
+                        } else {
+                            request = request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build();
+                        }
+                        return chain.proceed(request);
+                    }
+                })
                 .build();
 
+        Retrofit.Builder builder = new Retrofit.Builder()
+                .baseUrl(instanceURL)
+                .client(okHttpClient)
+                .addConverterFactory(GsonConverterFactory.create());
+
+        Retrofit retrofit = builder.build();
+
         return retrofit.create(serviceClass);
 
     }

app/src/main/java/org/mian/gitnex/clients/PullRequestsService.java

@@ -0,0 +1,61 @@
+package org.mian.gitnex.clients;
+
+import android.content.Context;
+import androidx.annotation.NonNull;
+import org.mian.gitnex.util.AppUtil;
+import java.io.File;
+import java.io.IOException;
+import okhttp3.Cache;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.logging.HttpLoggingInterceptor;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+/**
+ * Author M M Arif
+ */
+
+public class PullRequestsService {
+
+    public static <S> S createService(Class<S> serviceClass, String instanceURL, Context ctx) {
+
+        final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
+        File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
+        int cacheSize = 50 * 1024 * 1024; // 50MB
+        Cache cache = new Cache(httpCacheDirectory, cacheSize);
+
+        HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
+        logging.setLevel(HttpLoggingInterceptor.Level.BODY);
+
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .cache(cache)
+                //.addInterceptor(logging)
+                .addInterceptor(new Interceptor() {
+                    @NonNull
+                    @Override public Response intercept(@NonNull Chain chain) throws IOException {
+                        Request request = chain.request();
+                        if (connToInternet) {
+                            request = request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build();
+                        } else {
+                            request = request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build();
+                        }
+                        return chain.proceed(request);
+                    }
+                })
+                .build();
+
+        Retrofit.Builder builder = new Retrofit.Builder()
+                .baseUrl(instanceURL)
+                .client(okHttpClient)
+                .addConverterFactory(GsonConverterFactory.create());
+
+        Retrofit retrofit = builder.build();
+
+        return retrofit.create(serviceClass);
+
+    }
+
+}

app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java

@@ -1,7 +1,16 @@
 package org.mian.gitnex.clients;
 
+import android.content.Context;
+import androidx.annotation.NonNull;
 import org.mian.gitnex.interfaces.ApiInterface;
+import org.mian.gitnex.util.AppUtil;
+import java.io.File;
+import java.io.IOException;
+import okhttp3.Cache;
+import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -15,26 +24,45 @@ public class RetrofitClient {
 
     private Retrofit retrofit;
 
-    private RetrofitClient(String instanceUrl) {
+    private RetrofitClient(String instanceUrl, Context ctx) {
+
+        final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
+        int cacheSize = 50 * 1024 * 1024; // 50MB
+        File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
+        Cache cache = new Cache(httpCacheDirectory, cacheSize);
 
         HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
         logging.setLevel(HttpLoggingInterceptor.Level.BODY);
 
-        OkHttpClient.Builder httpClient = new OkHttpClient.Builder();
-
-        httpClient.addInterceptor(logging);
-
-        retrofit = new Retrofit.Builder()
-                .baseUrl(instanceUrl)
-                .addConverterFactory(ScalarsConverterFactory.create())
-                .addConverterFactory(GsonConverterFactory.create())
-                //.client(httpClient.build())
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .cache(cache)
+                //.addInterceptor(logging)
+                .addInterceptor(new Interceptor() {
+                    @NonNull
+                    @Override public Response intercept(@NonNull Chain chain) throws IOException {
+                        Request request = chain.request();
+                        if (connToInternet) {
+                            request = request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build();
+                        } else {
+                            request = request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build();
+                        }
+                        return chain.proceed(request);
+                    }
+                })
                 .build();
 
+        Retrofit.Builder builder = new Retrofit.Builder()
+                .baseUrl(instanceUrl)
+                .client(okHttpClient)
+                .addConverterFactory(ScalarsConverterFactory.create())
+                .addConverterFactory(GsonConverterFactory.create());
+
+        retrofit = builder.build();
+
     }
 
-    public static synchronized RetrofitClient getInstance(String instanceUrl) {
-        return new RetrofitClient(instanceUrl);
+    public static synchronized RetrofitClient getInstance(String instanceUrl, Context ctx) {
+        return new RetrofitClient(instanceUrl, ctx);
     }
 
     public ApiInterface getApiInterface() {

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

@@ -6,27 +6,17 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreditsActivity;
 import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.activities.SponsorsActivity;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.models.GiteaVersion;
 import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
 import java.util.Objects;
-import retrofit2.Response;
-import retrofit2.Call;
-import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -34,36 +24,27 @@ import retrofit2.Callback;
 
 public class AboutFragment extends Fragment {
 
-    private TextView viewTextGiteaVersion;
-    private ProgressBar mProgressBar;
-    private LinearLayout pageContent;
-
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
         View v = inflater.inflate(R.layout.fragment_about, container, false);
-        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleAbout));
 
         TinyDB tinyDb = new TinyDB(getContext());
-        String instanceUrl = tinyDb.getString("instanceUrl");
 
         final TextView appVerBuild;
         final TextView donationLink;
         final TextView donationLinkPatreon;
+        final TextView translateLink;
         final TextView creditsButton;
         final TextView sponsorsButton;
         final TextView appWebsite;
         final TextView appRepo;
 
-        pageContent = v.findViewById(R.id.aboutFrame);
-        pageContent.setVisibility(View.GONE);
-
-        mProgressBar = v.findViewById(R.id.progress_bar);
-
         appVerBuild = v.findViewById(R.id.appVerBuild);
-        viewTextGiteaVersion = v.findViewById(R.id.giteaVersion);
+        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);
@@ -90,6 +71,16 @@ public class AboutFragment extends Fragment {
             }
         });
 
+        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);
+            }
+        });
+
         appWebsite.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 Intent intent = new Intent();
@@ -122,67 +113,10 @@ public class AboutFragment extends Fragment {
             }
         });
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getContext());
-
-        if(!connToInternet) {
-
-            mProgressBar.setVisibility(View.GONE);
-            pageContent.setVisibility(View.VISIBLE);
-
-        } else {
-
-            giteaVer(instanceUrl);
-
-        }
+        String commit = getResources().getString(R.string.commitPage) + tinyDb.getString("giteaVersion");
+        viewTextGiteaVersion.setText(commit);
 
         return v;
     }
 
-    private void giteaVer(String instanceUrl) {
-
-        TinyDB tinyDb = new TinyDB(getContext());
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-
-        Call<GiteaVersion> call = RetrofitClient
-                .getInstance(instanceUrl)
-                .getApiInterface()
-                .getGiteaVersion(Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
-
-        call.enqueue(new Callback<GiteaVersion>() {
-
-            @Override
-            public void onResponse(@NonNull Call<GiteaVersion> call, @NonNull Response<GiteaVersion> response) {
-
-                if (response.isSuccessful()) {
-                    if (response.code() == 200) {
-
-                        GiteaVersion version = response.body();
-                        assert version != null;
-                        String commit = getResources().getString(R.string.commitPage) + version.getVersion();
-                        viewTextGiteaVersion.setText(commit);
-                        mProgressBar.setVisibility(View.GONE);
-                        pageContent.setVisibility(View.VISIBLE);
-
-                    }
-
-                }
-                else {
-
-                    String commit = getResources().getString(R.string.commitPage);
-                    viewTextGiteaVersion.setText(commit);
-                    mProgressBar.setVisibility(View.GONE);
-                    pageContent.setVisibility(View.VISIBLE);
-
-                }
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<GiteaVersion> call, @NonNull Throwable t) {
-                Log.e("onFailure", t.toString());
-            }
-        });
-
-    }
-
 }

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

@@ -0,0 +1,57 @@
+package org.mian.gitnex.fragments;
+
+import android.content.Context;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import org.mian.gitnex.R;
+
+/**
+ * Author M M Arif
+ */
+
+public class BottomSheetFileViewerFragment extends BottomSheetDialogFragment {
+
+    private BottomSheetFileViewerFragment.BottomSheetListener bmListener;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+        View v = inflater.inflate(R.layout.bottom_sheet_file_viewer, container, false);
+
+        TextView downloadFile = v.findViewById(R.id.downloadFile);
+
+        downloadFile.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                bmListener.onButtonClicked("downloadFile");
+                dismiss();
+            }
+        });
+
+        return v;
+    }
+
+    public interface BottomSheetListener {
+        void onButtonClicked(String text);
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        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/BranchesFragment.java

@@ -96,7 +96,7 @@ public class BranchesFragment extends Fragment {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        BranchesViewModel.loadBranchesList(instanceUrl, instanceToken, repoOwner, repoName);
+                        BranchesViewModel.loadBranchesList(instanceUrl, instanceToken, repoOwner, repoName, getContext());
                     }
                 }, 50);
             }
@@ -127,7 +127,7 @@ public class BranchesFragment extends Fragment {
 
         BranchesViewModel branchesModel = new ViewModelProvider(this).get(BranchesViewModel.class);
 
-        branchesModel.getBranchesList(instanceUrl, instanceToken, owner, repo).observe(this, new Observer<List<Branches>>() {
+        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);

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

@@ -28,7 +28,6 @@ import java.util.Objects;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -52,6 +51,8 @@ public class ClosedIssuesFragment extends Fragment {
     private int pageSize = 1;
     private TextView noDataIssuesClosed;
     private String issueState = "closed";
+    private int resultLimit = 50;
+    private String requestType = "issues";
 
     @Nullable
     @Override
@@ -87,7 +88,7 @@ public class ClosedIssuesFragment extends Fragment {
                     public void run() {
 
                         swipeRefresh.setRefreshing(false);
-                        loadInitial(instanceToken, repoOwner, repoName, issueState);
+                        loadInitial(instanceToken, repoOwner, repoName, issueState, resultLimit, requestType);
                         adapterClosed.notifyDataChanged();
 
                     }
@@ -106,7 +107,7 @@ public class ClosedIssuesFragment extends Fragment {
                         if(issuesListClosed.size() == 10 || pageSize == 10) {
 
                             int page = (issuesListClosed.size() + 10) / 10;
-                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, issueState);
+                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, issueState, resultLimit, requestType);
 
                         }
                         /*else {
@@ -120,15 +121,12 @@ public class ClosedIssuesFragment extends Fragment {
             }
         });
 
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(recyclerViewClosed.getContext(),
-                DividerItemDecoration.VERTICAL);
         recyclerViewClosed.setHasFixedSize(true);
-        recyclerViewClosed.addItemDecoration(dividerItemDecoration);
         recyclerViewClosed.setLayoutManager(new LinearLayoutManager(context));
         recyclerViewClosed.setAdapter(adapterClosed);
 
-        apiClosed = IssuesService.createService(ApiInterface.class, instanceUrl);
-        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState);
+        apiClosed = IssuesService.createService(ApiInterface.class, instanceUrl, getContext());
+        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState, resultLimit, requestType);
 
         return v;
 
@@ -148,16 +146,16 @@ public class ClosedIssuesFragment extends Fragment {
 
         if(tinyDb.getBoolean("resumeClosedIssues")) {
 
-            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState);
+            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState, resultLimit, requestType);
             tinyDb.putBoolean("resumeClosedIssues", false);
 
         }
 
     }
 
-    private void loadInitial(String token, String repoOwner, String repoName, String issueState) {
+    private void loadInitial(String token, String repoOwner, String repoName, String issueState, int resultLimit, String requestType) {
 
-        Call<List<Issues>> call = apiClosed.getClosedIssues(token, repoOwner, repoName,  1, issueState);
+        Call<List<Issues>> call = apiClosed.getClosedIssues(token, repoOwner, repoName,  1, issueState, resultLimit, requestType);
 
         call.enqueue(new Callback<List<Issues>>() {
 
@@ -190,20 +188,20 @@ public class ClosedIssuesFragment extends Fragment {
 
             @Override
             public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
-                Log.e(TAG, t.getMessage());
+                Log.e(TAG, t.toString());
             }
 
         });
 
     }
 
-    private void loadMore(String token, String repoOwner, String repoName, int page, String issueState){
+    private void loadMore(String token, String repoOwner, String repoName, int page, String issueState, int resultLimit, String requestType){
 
         //add loading progress view
         issuesListClosed.add(new Issues("load"));
         adapterClosed.notifyItemInserted((issuesListClosed.size() - 1));
 
-        Call<List<Issues>> call = apiClosed.getClosedIssues(token, repoOwner, repoName, page, issueState);
+        Call<List<Issues>> call = apiClosed.getClosedIssues(token, repoOwner, repoName, page, issueState, resultLimit, requestType);
 
         call.enqueue(new Callback<List<Issues>>() {
 
@@ -245,7 +243,7 @@ public class ClosedIssuesFragment extends Fragment {
             @Override
             public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
 
-                Log.e(TAG, t.getMessage());
+                Log.e(TAG, t.toString());
 
             }
 
@@ -263,11 +261,11 @@ public class ClosedIssuesFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-        searchView.setQueryHint(getContext().getString(R.string.strFilter));
+        //searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
-        if(!connToInternet) {
+        /*if(!connToInternet) {
             return;
-        }
+        }*/
 
         searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 

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

@@ -100,7 +100,7 @@ public class CollaboratorsFragment extends Fragment {
 
         CollaboratorsViewModel collaboratorsModel = new ViewModelProvider(this).get(CollaboratorsViewModel.class);
 
-        collaboratorsModel.getCollaboratorsList(instanceUrl, instanceToken, owner, repo).observe(this, new Observer<List<Collaborators>>() {
+        collaboratorsModel.getCollaboratorsList(instanceUrl, instanceToken, owner, repo, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Collaborators>>() {
             @Override
             public void onChanged(@Nullable List<Collaborators> collaboratorsListMain) {
                 adapter = new CollaboratorsAdapter(getContext(), collaboratorsListMain);

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

@@ -0,0 +1,216 @@
+package org.mian.gitnex.fragments;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+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.helpers.Authorization;
+import org.mian.gitnex.models.ExploreRepositories;
+import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.util.TinyDB;
+import java.util.List;
+import java.util.Objects;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+/**
++ * 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 String sort = "updated";
+    private String order = "desc";
+    private int limit = 50;
+
+    private OnFragmentInteractionListener mListener;
+
+    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);
+        }
+    }
+
+    @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);
+
+        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");
+
+        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);
+
+        mProgressBar.setVisibility(View.VISIBLE);
+
+        searchKeyword.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_SEND) {
+                    if(!searchKeyword.getText().toString().equals("")) {
+                        mProgressBar.setVisibility(View.VISIBLE);
+                        mRecyclerView.setVisibility(View.GONE);
+                        loadSearchReposList(instanceUrl, instanceToken, loginUid, searchKeyword.getText().toString(), repoTypeInclude, sort, order, getContext(), limit);
+                    }
+                }
+                return false;
+            }
+        });
+
+        int limitDefault = 10;
+        loadDefaultList(instanceUrl, instanceToken, loginUid, repoTypeInclude, sort, order, getContext(), limitDefault);
+
+        return v;
+
+    }
+
+    private void loadDefaultList(String instanceUrl, String instanceToken, String loginUid, Boolean repoTypeInclude, String sort, String order, final Context context, int limit) {
+
+        Call<ExploreRepositories> call = RetrofitClient
+                .getInstance(instanceUrl, getContext())
+                .getApiInterface()
+                .queryRepos(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), null, repoTypeInclude, sort, order, limit);
+
+        call.enqueue(new Callback<ExploreRepositories>() {
+
+            @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()));
+            }
+
+        });
+
+    }
+
+    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()));
+            }
+
+        });
+
+    }
+
+    private void getReposList(List<UserRepositories> dataList, Context context) {
+
+        ExploreRepositoriesAdapter adapter = new ExploreRepositoriesAdapter(dataList, context);
+
+        mRecyclerView.setVisibility(View.VISIBLE);
+
+        mRecyclerView.setHasFixedSize(true);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
+                DividerItemDecoration.VERTICAL);
+        mRecyclerView.addItemDecoration(dividerItemDecoration);
+
+        if(adapter.getItemCount() > 0) {
+
+            mRecyclerView.setAdapter(adapter);
+            noData.setVisibility(View.GONE);
+            mProgressBar.setVisibility(View.GONE);
+
+        }
+        else {
+
+            noData.setVisibility(View.VISIBLE);
+            mProgressBar.setVisibility(View.GONE);
+
+        }
+
+    }
+
+    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);
+    }
+}

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

@@ -0,0 +1,308 @@
+package org.mian.gitnex.fragments;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+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 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.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.FileViewActivity;
+import org.mian.gitnex.adapters.FilesAdapter;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.models.Files;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.viewmodels.FilesViewModel;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+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;
+
+/**
+ * Author M M Arif
+ */
+
+public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapterListener {
+
+    private ProgressBar mProgressBar;
+    private FilesAdapter adapter;
+    private RecyclerView mRecyclerView;
+    private TextView noDataFiles;
+    private LinearLayout filesFrame;
+    private TextView fileStructure;
+    private static String repoNameF = "param2";
+    private static String repoOwnerF = "param1";
+    private BreadcrumbsView mBreadcrumbsView;
+
+    private String repoName;
+    private String repoOwner;
+
+    private OnFragmentInteractionListener mListener;
+
+    public FilesFragment() {
+    }
+
+    public static FilesFragment newInstance(String param1, String param2) {
+        FilesFragment fragment = new FilesFragment();
+        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(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        View v = inflater.inflate(R.layout.fragment_files, 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");
+
+        noDataFiles = v.findViewById(R.id.noDataFiles);
+        filesFrame = v.findViewById(R.id.filesFrame);
+
+        fileStructure = v.findViewById(R.id.fileStructure);
+        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);
+
+        mBreadcrumbsView = v.findViewById(R.id.breadcrumbs_view);
+        mBreadcrumbsView.setItems(new ArrayList<>(Arrays.asList(
+                BreadcrumbItem.createSimpleItem(getResources().getString(R.string.filesBreadcrumbRoot))
+        )));
+
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
+
+        return  v;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    private static BreadcrumbItem createItem(String title) {
+        List<String> list = new ArrayList<>();
+        list.add(title);
+        return new BreadcrumbItem(list);
+    }
+
+    @Override
+    public void onClickDir(String dirName) {
+
+        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");
+
+        StringBuilder breadcrumbBuilder = new StringBuilder();
+
+        breadcrumbBuilder.append(fileStructure.getText().toString()).append("/").append(dirName);
+
+        fileStructure.setText(breadcrumbBuilder);
+
+        String dirName_ = fileStructure.getText().toString();
+        dirName_ = dirName_.startsWith("/") ? dirName_.substring(1) : dirName_;
+        final String finalDirName_ = dirName_;
+
+        mBreadcrumbsView.addItem(createItem(dirName));
+        mBreadcrumbsView.setCallback(new DefaultBreadcrumbsCallback<BreadcrumbItem>() {
+            @Override
+            public void onNavigateBack(BreadcrumbItem item, int position) {
+
+                if(position == 0) {
+                    fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
+                    fileStructure.setText("");
+                    return;
+                }
+
+                String filterDir = fileStructure.getText().toString();
+                String result = filterDir.substring(0, filterDir.indexOf(item.getSelectedItem()));
+                fileStructure.setText(result + item.getSelectedItem());
+
+                String currentIndex = (result + item.getSelectedItem()).substring(1);
+
+                fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, currentIndex);
+
+            }
+
+            @Override
+            public void onNavigateNewLocation(BreadcrumbItem newItem, int changedPosition) {
+
+            }
+        });
+
+        fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, finalDirName_);
+
+    }
+
+    @Override
+    public void onClickFile(String fileName) {
+
+        Intent intent = new Intent(getContext(), FileViewActivity.class);
+
+        if(!fileStructure.getText().toString().equals("Root")) {
+
+            intent.putExtra("singleFileName", fileStructure.getText().toString()+"/"+fileName);
+        }
+        else {
+
+            intent.putExtra("singleFileName", fileName);
+        }
+
+        Objects.requireNonNull(getContext()).startActivity(intent);
+    }
+
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo) {
+
+        mRecyclerView.setVisibility(View.GONE);
+        mProgressBar.setVisibility(View.VISIBLE);
+
+        FilesViewModel filesModel = new ViewModelProvider(this).get(FilesViewModel.class);
+
+        filesModel.getFilesList(instanceUrl, instanceToken, owner, repo, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Files>>() {
+            @Override
+            public void onChanged(@Nullable List<Files> filesListMain) {
+                adapter = new FilesAdapter(getContext(), filesListMain, FilesFragment.this);
+
+                mBreadcrumbsView.removeItemAfter(1);
+                if(adapter.getItemCount() > 0) {
+                    mRecyclerView.setVisibility(View.VISIBLE);
+                    mRecyclerView.setAdapter(adapter);
+                    filesFrame.setVisibility(View.VISIBLE);
+                    noDataFiles.setVisibility(View.GONE);
+                }
+                else {
+                    mRecyclerView.setVisibility(View.VISIBLE);
+                    adapter.notifyDataSetChanged();
+                    mRecyclerView.setAdapter(adapter);
+                    filesFrame.setVisibility(View.VISIBLE);
+                    noDataFiles.setVisibility(View.VISIBLE);
+                }
+                filesFrame.setVisibility(View.VISIBLE);
+                mProgressBar.setVisibility(View.GONE);
+            }
+        });
+
+    }
+
+    private void fetchDataAsyncSub(String instanceUrl, String instanceToken, String owner, String repo, String filesDir) {
+
+        mRecyclerView.setVisibility(View.GONE);
+        mProgressBar.setVisibility(View.VISIBLE);
+
+        FilesViewModel filesModel2 = new ViewModelProvider(this).get(FilesViewModel.class);
+
+        filesModel2.getFilesList2(instanceUrl, instanceToken, owner, repo, filesDir, getContext()).observe(this, new Observer<List<Files>>() {
+            @Override
+            public void onChanged(@Nullable List<Files> filesListMain2) {
+                adapter = new FilesAdapter(getContext(), filesListMain2, FilesFragment.this);
+                if(adapter.getItemCount() > 0) {
+                    mRecyclerView.setVisibility(View.VISIBLE);
+                    mRecyclerView.setAdapter(adapter);
+                    filesFrame.setVisibility(View.VISIBLE);
+                    noDataFiles.setVisibility(View.GONE);
+                }
+                else {
+                    mRecyclerView.setVisibility(View.VISIBLE);
+                    adapter.notifyDataSetChanged();
+                    mRecyclerView.setAdapter(adapter);
+                    filesFrame.setVisibility(View.VISIBLE);
+                    noDataFiles.setVisibility(View.VISIBLE);
+                }
+                filesFrame.setVisibility(View.VISIBLE);
+                mProgressBar.setVisibility(View.GONE);
+            }
+        });
+
+    }
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+
+        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+
+        inflater.inflate(R.menu.search_menu, menu);
+        super.onCreateOptionsMenu(menu, inflater);
+
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+        androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+        searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        //searchView.setQueryHint(getContext().getString(R.string.search));
+
+        /*if(!connToInternet) {
+            return;
+        }*/
+
+        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                if(mRecyclerView.getAdapter() != null) {
+                    adapter.getFilter().filter(newText);
+                }
+                return false;
+            }
+        });
+
+    }
+
+    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);
+    }
+}

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

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -51,6 +50,8 @@ public class IssuesFragment extends Fragment {
     private Context context;
     private int pageSize = 1;
     private TextView noDataIssues;
+    private int resultLimit = 50;
+    private String requestType = "issues";
 
     @Nullable
     @Override
@@ -86,7 +87,7 @@ public class IssuesFragment extends Fragment {
                     public void run() {
 
                         swipeRefresh.setRefreshing(false);
-                        loadInitial(instanceToken, repoOwner, repoName);
+                        loadInitial(instanceToken, repoOwner, repoName, resultLimit, requestType);
                         adapter.notifyDataChanged();
 
                     }
@@ -105,7 +106,7 @@ public class IssuesFragment extends Fragment {
                         if(issuesList.size() == 10 || pageSize == 10) {
 
                             int page = (issuesList.size() + 10) / 10;
-                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page);
+                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, requestType);
 
                         }
                         /*else {
@@ -119,15 +120,12 @@ public class IssuesFragment extends Fragment {
             }
         });
 
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(recyclerView.getContext(),
-                DividerItemDecoration.VERTICAL);
         recyclerView.setHasFixedSize(true);
-        recyclerView.addItemDecoration(dividerItemDecoration);
         recyclerView.setLayoutManager(new LinearLayoutManager(context));
         recyclerView.setAdapter(adapter);
 
-        api = IssuesService.createService(ApiInterface.class, instanceUrl);
-        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
+        api = IssuesService.createService(ApiInterface.class, instanceUrl, getContext());
+        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, requestType);
 
         return v;
 
@@ -147,16 +145,16 @@ public class IssuesFragment extends Fragment {
 
         if(tinyDb.getBoolean("resumeIssues")) {
 
-            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
+            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, requestType);
             tinyDb.putBoolean("resumeIssues", false);
 
         }
 
     }
 
-    private void loadInitial(String token, String repoOwner, String repoName) {
+    private void loadInitial(String token, String repoOwner, String repoName, int resultLimit, String requestType) {
 
-        Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName,  1);
+        Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName,  1, resultLimit, requestType);
 
         call.enqueue(new Callback<List<Issues>>() {
 
@@ -189,20 +187,20 @@ public class IssuesFragment extends Fragment {
 
             @Override
             public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
-                Log.e(TAG, t.getMessage());
+                Log.e(TAG, t.toString());
             }
 
         });
 
     }
 
-    private void loadMore(String token, String repoOwner, String repoName, int page){
+    private void loadMore(String token, String repoOwner, String repoName, int page, int resultLimit, String requestType){
 
         //add loading progress view
         issuesList.add(new Issues("load"));
         adapter.notifyItemInserted((issuesList.size() - 1));
 
-        Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName, page);
+        Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName, page, resultLimit, requestType);
 
         call.enqueue(new Callback<List<Issues>>() {
 
@@ -244,7 +242,7 @@ public class IssuesFragment extends Fragment {
             @Override
             public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
 
-                Log.e(TAG, t.getMessage());
+                Log.e(TAG, t.toString());
 
             }
 
@@ -262,11 +260,11 @@ public class IssuesFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-        searchView.setQueryHint(getContext().getString(R.string.strFilter));
+        //searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
-        if(!connToInternet) {
+        /*if(!connToInternet) {
             return;
-        }
+        }*/
 
         searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 

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

@@ -94,7 +94,7 @@ public class LabelsFragment extends Fragment {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        LabelsViewModel.loadLabelsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
+                        LabelsViewModel.loadLabelsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, getContext());
                     }
                 }, 200);
             }
@@ -119,7 +119,7 @@ public class LabelsFragment extends Fragment {
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         if(tinyDb.getBoolean("labelsRefresh")) {
-            LabelsViewModel.loadLabelsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
+            LabelsViewModel.loadLabelsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, getContext());
             tinyDb.putBoolean("labelsRefresh", false);
         }
     }
@@ -144,7 +144,7 @@ public class LabelsFragment extends Fragment {
 
         LabelsViewModel labelsModel = new ViewModelProvider(this).get(LabelsViewModel.class);
 
-        labelsModel.getLabelsList(instanceUrl, instanceToken, owner, repo).observe(this, new Observer<List<Labels>>() {
+        labelsModel.getLabelsList(instanceUrl, instanceToken, owner, repo, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Labels>>() {
             @Override
             public void onChanged(@Nullable List<Labels> labelsListMain) {
                 adapter = new LabelsAdapter(getContext(), labelsListMain);

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

@@ -83,7 +83,7 @@ public class MembersByOrgFragment extends Fragment {
 
         MembersByOrgViewModel membersModel= new ViewModelProvider(this).get(MembersByOrgViewModel.class);
 
-        membersModel.getMembersList(instanceUrl, instanceToken, owner).observe(this, new Observer<List<UserInfo>>() {
+        membersModel.getMembersList(instanceUrl, instanceToken, owner, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserInfo>>() {
             @Override
             public void onChanged(@Nullable List<UserInfo> membersListMain) {
                 adapter = new MembersByOrgAdapter(getContext(), membersListMain);
@@ -112,7 +112,7 @@ public class MembersByOrgFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-        searchView.setQueryHint(getContext().getString(R.string.strFilter));
+        //searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
         if(!connToInternet) {
             return;

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

@@ -104,7 +104,7 @@ public class MilestonesFragment extends Fragment {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        MilestonesViewModel.loadMilestonesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, msState);
+                        MilestonesViewModel.loadMilestonesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, msState, getContext());
                     }
                 }, 50);
             }
@@ -128,7 +128,7 @@ public class MilestonesFragment extends Fragment {
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         if(tinyDb.getBoolean("milestoneCreated")) {
-            MilestonesViewModel.loadMilestonesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, msState);
+            MilestonesViewModel.loadMilestonesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, msState, getContext());
             tinyDb.putBoolean("milestoneCreated", false);
         }
     }
@@ -153,7 +153,7 @@ public class MilestonesFragment extends Fragment {
 
         MilestonesViewModel msModel = new ViewModelProvider(this).get(MilestonesViewModel.class);
 
-        msModel.getMilestonesList(instanceUrl, instanceToken, owner, repo, msState).observe(this, new Observer<List<Milestones>>() {
+        msModel.getMilestonesList(instanceUrl, instanceToken, owner, repo, msState, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Milestones>>() {
             @Override
             public void onChanged(@Nullable List<Milestones> msListMain) {
                 adapter = new MilestonesAdapter(getContext(), msListMain);
@@ -183,11 +183,11 @@ public class MilestonesFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-        searchView.setQueryHint(getContext().getString(R.string.strFilter));
+        //searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
-        if(!connToInternet) {
+        /*if(!connToInternet) {
             return;
-        }
+        }*/
 
         searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
             @Override

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

@@ -24,7 +24,6 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.activities.NewRepoActivity;
 import org.mian.gitnex.adapters.MyReposListAdapter;
 import org.mian.gitnex.helpers.Authorization;
@@ -49,6 +48,9 @@ public class MyRepositoriesFragment extends Fragment {
     private ImageView createNewRepo;
     private TextView noDataMyRepo;
 
+    private int pageSize = 1;
+    private int resultLimit = 50;
+
     private String mParam1;
     private String mParam2;
 
@@ -83,12 +85,12 @@ public class MyRepositoriesFragment extends Fragment {
 
         final View v = inflater.inflate(R.layout.fragment_my_repositories, container, false);
         setHasOptionsMenu(true);
-        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleMyRepos));
 
         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 userLogin =  tinyDb.getString("userLogin");
 
         final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
 
@@ -131,27 +133,20 @@ public class MyRepositoriesFragment extends Fragment {
             }
         });
 
-        if(connToInternet) {
+        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        swipeRefresh.setRefreshing(false);
+                        MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext(),  pageSize, resultLimit);
+                    }
+                }, 50);
+            }
+        });
 
-            swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-                @Override
-                public void onRefresh() {
-                    new Handler().postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            swipeRefresh.setRefreshing(false);
-                            MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), loginUid);
-                        }
-                    }, 50);
-                }
-            });
-
-            fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), loginUid);
-
-        }
-        else {
-            mProgressBar.setVisibility(View.GONE);
-        }
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, pageSize, resultLimit);
 
         return v;
 
@@ -164,16 +159,20 @@ public class MyRepositoriesFragment extends Fragment {
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        final String userLogin =  tinyDb.getString("userLogin");
 
-        MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), loginUid);
+        if(tinyDb.getBoolean("repoCreated")) {
+            MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext(),  pageSize, resultLimit);
+            tinyDb.putBoolean("repoCreated", false);
+        }
 
     }
 
-    private void fetchDataAsync(String instanceUrl, String instanceToken, String username) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String userLogin, int  pageSize, int resultLimit) {
 
         MyRepositoriesViewModel myRepoModel = new ViewModelProvider(this).get(MyRepositoriesViewModel.class);
 
-        myRepoModel.getCurrentUserRepositories(instanceUrl, instanceToken, username).observe(this, new Observer<List<UserRepositories>>() {
+        myRepoModel.getCurrentUserRepositories(instanceUrl, instanceToken, userLogin, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
             @Override
             public void onChanged(@Nullable List<UserRepositories> myReposListMain) {
                 adapter = new MyReposListAdapter(getContext(), myReposListMain);
@@ -203,11 +202,11 @@ public class MyRepositoriesFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-        searchView.setQueryHint(getContext().getString(R.string.strFilter));
+        //searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
-        if(!connToInternet) {
+        /*if(!connToInternet) {
             return;
-        }
+        }*/
 
         searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
             @Override

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

@@ -88,7 +88,7 @@ public class OrganizationInfoFragment extends Fragment {
     private void getOrgInfo(String instanceUrl, String token, final String owner) {
 
         Call<Organization> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getContext())
                 .getApiInterface()
                 .getOrganization(token, owner);
 

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

@@ -23,7 +23,6 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.activities.NewOrganizationActivity;
 import org.mian.gitnex.adapters.OrganizationsListAdapter;
 import org.mian.gitnex.helpers.Authorization;
@@ -50,7 +49,6 @@ public class OrganizationsFragment extends Fragment {
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleOrganizations));
         final View v = inflater.inflate(R.layout.fragment_organizations, container, false);
         setHasOptionsMenu(true);
 
@@ -101,25 +99,20 @@ public class OrganizationsFragment extends Fragment {
             }
         });
 
-        if(connToInternet) {
-            swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-                @Override
-                public void onRefresh() {
-                    new Handler().postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            swipeRefresh.setRefreshing(false);
-                            OrganizationListViewModel.loadOrgsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
-                        }
-                    }, 50);
-                }
-            });
+        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        swipeRefresh.setRefreshing(false);
+                        OrganizationListViewModel.loadOrgsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
+                    }
+                }, 50);
+            }
+        });
 
-            fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
-        }
-        else {
-            mProgressBar.setVisibility(View.GONE);
-        }
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
 
         return v;
 
@@ -134,7 +127,7 @@ public class OrganizationsFragment extends Fragment {
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         if(tinyDb.getBoolean("orgCreated")) {
-            OrganizationListViewModel.loadOrgsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
+            OrganizationListViewModel.loadOrgsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
             tinyDb.putBoolean("orgCreated", false);
         }
     }
@@ -143,7 +136,7 @@ public class OrganizationsFragment extends Fragment {
 
         OrganizationListViewModel orgModel = new ViewModelProvider(this).get(OrganizationListViewModel.class);
 
-        orgModel.getUserOrgs(instanceUrl, instanceToken).observe(this, new Observer<List<UserOrganizations>>() {
+        orgModel.getUserOrgs(instanceUrl, instanceToken, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserOrganizations>>() {
             @Override
             public void onChanged(@Nullable List<UserOrganizations> orgsListMain) {
                 adapter = new OrganizationsListAdapter(getContext(), orgsListMain);
@@ -173,11 +166,11 @@ public class OrganizationsFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-        searchView.setQueryHint(getContext().getString(R.string.strFilter));
+        //searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
-        if(!connToInternet) {
+        /*if(!connToInternet) {
             return;
-        }
+        }*/
 
         searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
             @Override

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

@@ -95,7 +95,7 @@ public class ProfileEmailsFragment extends Fragment {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        ProfileEmailsViewModel.loadEmailsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
+                        ProfileEmailsViewModel.loadEmailsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
                     }
                 }, 200);
             }
@@ -111,7 +111,7 @@ public class ProfileEmailsFragment extends Fragment {
 
         ProfileEmailsViewModel profileEmailModel = new ViewModelProvider(this).get(ProfileEmailsViewModel.class);
 
-        profileEmailModel.getEmailsList(instanceUrl, instanceToken).observe(this, new Observer<List<Emails>>() {
+        profileEmailModel.getEmailsList(instanceUrl, instanceToken, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Emails>>() {
             @Override
             public void onChanged(@Nullable List<Emails> emailsListMain) {
                 adapter = new ProfileEmailsAdapter(getContext(), emailsListMain);

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

@@ -95,7 +95,7 @@ public class ProfileFollowersFragment extends Fragment {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        ProfileFollowersViewModel.loadFollowersList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
+                        ProfileFollowersViewModel.loadFollowersList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
                     }
                 }, 200);
             }
@@ -110,7 +110,7 @@ public class ProfileFollowersFragment extends Fragment {
 
         ProfileFollowersViewModel pfModel = new ViewModelProvider(this).get(ProfileFollowersViewModel.class);
 
-        pfModel.getFollowersList(instanceUrl, instanceToken).observe(this, new Observer<List<UserInfo>>() {
+        pfModel.getFollowersList(instanceUrl, instanceToken, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserInfo>>() {
             @Override
             public void onChanged(@Nullable List<UserInfo> pfListMain) {
                 adapter = new ProfileFollowersAdapter(getContext(), pfListMain);

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

@@ -95,7 +95,7 @@ public class ProfileFollowingFragment extends Fragment {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        ProfileFollowingViewModel.loadFollowingList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
+                        ProfileFollowingViewModel.loadFollowingList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
                     }
                 }, 200);
             }
@@ -110,7 +110,7 @@ public class ProfileFollowingFragment extends Fragment {
 
         ProfileFollowingViewModel pfModel = new ViewModelProvider(this).get(ProfileFollowingViewModel.class);
 
-        pfModel.getFollowingList(instanceUrl, instanceToken).observe(this, new Observer<List<UserInfo>>() {
+        pfModel.getFollowingList(instanceUrl, instanceToken, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserInfo>>() {
             @Override
             public void onChanged(@Nullable List<UserInfo> pfListMain) {
                 adapter = new ProfileFollowingAdapter(getContext(), pfListMain);

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.fragments;
 
 import android.content.Context;
+import android.graphics.Typeface;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -37,7 +38,6 @@ public class ProfileFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
         View v = inflater.inflate(R.layout.fragment_profile, container, false);
-        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleProfile));
         setHasOptionsMenu(true);
 
         TinyDB tinyDb = new TinyDB(getContext());
@@ -57,8 +57,43 @@ public class ProfileFragment extends Fragment {
         ViewPager mViewPager = v.findViewById(R.id.container);
         mViewPager.setAdapter(mSectionsPagerAdapter);
 
+        Typeface myTypeface;
+        if(tinyDb.getInt("customFontId") == 0) {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 1) {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/manroperegular.ttf");
+
+        }
+        else if (tinyDb.getInt("customFontId") == 2) {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
+
+        }
+        else {
+
+            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
+
+        }
+
         TabLayout tabLayout = v.findViewById(R.id.tabs);
 
+        ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
+        int tabsCount = vg.getChildCount();
+        for (int j = 0; j < tabsCount; j++) {
+            ViewGroup vgTab = (ViewGroup) vg.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.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
         tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
 

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

@@ -0,0 +1,294 @@
+package org.mian.gitnex.fragments;
+
+import android.content.Context;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.adapters.PullRequestsAdapter;
+import org.mian.gitnex.clients.PullRequestsService;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.interfaces.ApiInterface;
+import org.mian.gitnex.models.PullRequests;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
+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 PullRequestsFragment extends Fragment {
+
+    private ProgressBar mProgressBar;
+    private RecyclerView recyclerView;
+    private List<PullRequests> prList;
+    private PullRequestsAdapter adapter;
+    private ApiInterface apiPR;
+    private String TAG = "PullRequestsListFragment - ";
+    private Context context;
+    private int pageSize = 1;
+    private TextView noData;
+    private String prState = "open";
+    private int resultLimit = 50;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+        final View v = inflater.inflate(R.layout.fragment_pull_requests, container, false);
+        setHasOptionsMenu(true);
+
+        TinyDB tinyDb = new TinyDB(getContext());
+        String repoFullName = tinyDb.getString("repoFullName");
+        //Log.i("repoFullName", tinyDb.getString("repoFullName"));
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+        final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
+
+        context = getContext();
+        recyclerView = v.findViewById(R.id.recyclerView);
+        prList = new ArrayList<>();
+
+        mProgressBar = v.findViewById(R.id.progress_bar);
+        noData = v.findViewById(R.id.noData);
+
+        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+
+                        swipeRefresh.setRefreshing(false);
+                        loadInitial(instanceToken, repoOwner, repoName, pageSize, prState, resultLimit);
+                        adapter.notifyDataChanged();
+
+                    }
+                }, 200);
+            }
+        });
+
+        adapter = new PullRequestsAdapter(getContext(), prList);
+        adapter.setLoadMoreListener(new PullRequestsAdapter.OnLoadMoreListener() {
+            @Override
+            public void onLoadMore() {
+
+                recyclerView.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        if(prList.size() == 10 || pageSize == 10) {
+
+                            int page = (prList.size() + 10) / 10;
+                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, prState, resultLimit);
+
+                        }
+                        /*else {
+
+                            Toasty.info(context, getString(R.string.noMoreData));
+
+                        }*/
+                    }
+                });
+
+            }
+        });
+
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(recyclerView.getContext(),
+                DividerItemDecoration.VERTICAL);
+        recyclerView.setHasFixedSize(true);
+        recyclerView.addItemDecoration(dividerItemDecoration);
+        recyclerView.setLayoutManager(new LinearLayoutManager(context));
+        recyclerView.setAdapter(adapter);
+
+        apiPR = PullRequestsService.createService(ApiInterface.class, instanceUrl, getContext());
+        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState, resultLimit);
+
+        return v;
+
+    }
+
+    @Override
+    public void onResume() {
+
+        super.onResume();
+        TinyDB tinyDb = new TinyDB(getContext());
+        final String loginUid = tinyDb.getString("loginUid");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+        if(tinyDb.getBoolean("resumePullRequests")) {
+
+            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState, resultLimit);
+            tinyDb.putBoolean("resumePullRequests", false);
+
+        }
+
+    }
+
+    private void loadInitial(String token, String repoOwner, String repoName, int page, String prState, int resultLimit) {
+
+        Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState, resultLimit);
+
+        call.enqueue(new Callback<List<PullRequests>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<PullRequests>> call, @NonNull Response<List<PullRequests>> response) {
+
+                if(response.isSuccessful()) {
+
+                    assert response.body() != null;
+                    if(response.body().size() > 0) {
+
+                        prList.clear();
+                        prList.addAll(response.body());
+                        adapter.notifyDataChanged();
+                        noData.setVisibility(View.GONE);
+
+                    }
+                    else {
+                        prList.clear();
+                        adapter.notifyDataChanged();
+                        noData.setVisibility(View.VISIBLE);
+                    }
+                    mProgressBar.setVisibility(View.GONE);
+                }
+                else {
+                    Log.i(TAG, String.valueOf(response.code()));
+                }
+
+                Log.i("http", String.valueOf(response.code()));
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<PullRequests>> call, @NonNull Throwable t) {
+                Log.e(TAG, t.toString());
+            }
+
+        });
+
+    }
+
+    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));
+
+        Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState, resultLimit);
+
+        call.enqueue(new Callback<List<PullRequests>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<PullRequests>> call, @NonNull Response<List<PullRequests>> response) {
+
+                if(response.isSuccessful()){
+
+                    //remove loading view
+                    prList.remove(prList.size()-1);
+
+                    List<PullRequests> result = response.body();
+
+                    assert result != null;
+                    if(result.size() > 0) {
+
+                        pageSize = result.size();
+                        prList.addAll(result);
+
+                    }
+                    else {
+
+                        Toasty.info(context, getString(R.string.noMoreData));
+                        adapter.setMoreDataAvailable(false);
+
+                    }
+
+                    adapter.notifyDataChanged();
+
+                }
+                else {
+
+                    Log.e(TAG, String.valueOf(response.code()));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<PullRequests>> call, @NonNull Throwable t) {
+
+                Log.e(TAG, t.toString());
+
+            }
+
+        });
+    }
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+
+        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+
+        inflater.inflate(R.menu.search_menu, menu);
+        super.onCreateOptionsMenu(menu, inflater);
+
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+        androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+        searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        //searchView.setQueryHint(getContext().getString(R.string.strFilter));
+
+        /*if(!connToInternet) {
+            return;
+        }*/
+
+        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+
+                adapter.getFilter().filter(newText);
+                return false;
+
+            }
+
+        });
+
+    }
+
+}

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

@@ -95,7 +95,7 @@ public class ReleasesFragment extends Fragment {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        ReleasesViewModel.loadReleasesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
+                        ReleasesViewModel.loadReleasesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, getContext());
                     }
                 }, 50);
             }
@@ -117,7 +117,7 @@ public class ReleasesFragment extends Fragment {
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         if(tinyDb.getBoolean("updateReleases")) {
-            ReleasesViewModel.loadReleasesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
+            ReleasesViewModel.loadReleasesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, getContext());
             tinyDb.putBoolean("updateReleases", false);
         }
 
@@ -143,7 +143,7 @@ public class ReleasesFragment extends Fragment {
 
         ReleasesViewModel releasesModel = new ViewModelProvider(this).get(ReleasesViewModel.class);
 
-        releasesModel.getReleasesList(instanceUrl, instanceToken, owner, repo).observe(this, new Observer<List<Releases>>() {
+        releasesModel.getReleasesList(instanceUrl, instanceToken, owner, repo, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Releases>>() {
             @Override
             public void onChanged(@Nullable List<Releases> releasesListMain) {
                 adapter = new ReleasesAdapter(getContext(), releasesListMain);

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

@@ -8,6 +8,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import org.mian.gitnex.R;
+import org.mian.gitnex.actions.RepositoryActions;
 import org.mian.gitnex.util.TinyDB;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -34,6 +35,10 @@ public class RepoBottomSheetFragment extends BottomSheetDialogFragment {
         TextView createRelease = v.findViewById(R.id.createRelease);
         TextView openWebRepo = v.findViewById(R.id.openWebRepo);
         TextView newFile = v.findViewById(R.id.newFile);
+        TextView starRepository = v.findViewById(R.id.starRepository);
+        TextView unStarRepository = v.findViewById(R.id.unStarRepository);
+        TextView watchRepository = v.findViewById(R.id.watchRepository);
+        TextView unWatchRepository = v.findViewById(R.id.unWatchRepository);
 
         createLabel.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -97,6 +102,72 @@ public class RepoBottomSheetFragment extends BottomSheetDialogFragment {
             }
         });
 
+        if(tinyDb.getInt("repositoryStarStatus") == 204) { // star a repo
+
+            starRepository.setVisibility(View.GONE);
+
+            unStarRepository.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    RepositoryActions.unStarRepository(getContext());
+                    tinyDb.putInt("repositoryStarStatus", 404);
+                    dismiss();
+
+                }
+            });
+
+        }
+        else if(tinyDb.getInt("repositoryStarStatus") == 404) {
+
+            unStarRepository.setVisibility(View.GONE);
+
+            starRepository.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    RepositoryActions.starRepository(getContext());
+                    tinyDb.putInt("repositoryStarStatus", 204);
+                    dismiss();
+
+                }
+            });
+
+        }
+
+        if(tinyDb.getBoolean("repositoryWatchStatus")) { // watch a repo
+
+            watchRepository.setVisibility(View.GONE);
+
+            unWatchRepository.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    RepositoryActions.unWatchRepository(getContext());
+                    tinyDb.putBoolean("repositoryWatchStatus", false);
+                    dismiss();
+
+                }
+            });
+
+        }
+        else {
+
+            unWatchRepository.setVisibility(View.GONE);
+
+            watchRepository.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    RepositoryActions.watchRepository(getContext());
+                    tinyDb.putBoolean("repositoryWatchStatus", true);
+                    dismiss();
+
+                }
+            });
+
+        }
+
         return v;
     }
 

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

@@ -218,7 +218,7 @@ public class RepoInfoFragment extends Fragment {
         final TinyDB tinyDb = new TinyDB(getContext());
 
         Call<UserRepositories> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getContext())
                 .getApiInterface()
                 .getUserRepository(token, owner, repo);
 
@@ -303,7 +303,7 @@ public class RepoInfoFragment extends Fragment {
         final TinyDB tinyDb = new TinyDB(getContext());
 
         Call<String> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getContext())
                 .getApiInterface()
                 .getFileContents(token, owner, repo, filename);
 

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

@@ -45,6 +45,8 @@ public class RepositoriesByOrgFragment extends Fragment {
     private TextView noData;
     private static String orgNameF = "param2";
     private String orgName;
+    private int pageSize = 1;
+    private int resultLimit = 50;
 
     public RepositoriesByOrgFragment() {
     }
@@ -97,13 +99,13 @@ public class RepositoriesByOrgFragment extends Fragment {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName);
+                        RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext(), pageSize, resultLimit);
                     }
                 }, 200);
             }
         });
 
-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, pageSize, resultLimit);
 
         return v;
     }
@@ -117,15 +119,18 @@ public class RepositoriesByOrgFragment extends Fragment {
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName);
+        if(tinyDb.getBoolean("repoCreated")) {
+            RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext(), pageSize, resultLimit);
+            tinyDb.putBoolean("repoCreated", false);
+        }
 
     }
 
-    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, int pageSize, int resultLimit) {
 
         RepositoriesByOrgViewModel orgRepoModel = new ViewModelProvider(this).get(RepositoriesByOrgViewModel.class);
 
-        orgRepoModel.getRepositoriesByOrg(instanceUrl, instanceToken, owner).observe(this, new Observer<List<UserRepositories>>() {
+        orgRepoModel.getRepositoriesByOrg(instanceUrl, instanceToken, owner, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
             @Override
             public void onChanged(@Nullable List<UserRepositories> orgReposListMain) {
                 adapter = new RepositoriesByOrgAdapter(getContext(), orgReposListMain);
@@ -155,7 +160,7 @@ public class RepositoriesByOrgFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-        searchView.setQueryHint(getContext().getString(R.string.strFilter));
+        //searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
         if(!connToInternet) {
             return;

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

@@ -22,7 +22,6 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.activities.NewRepoActivity;
 import org.mian.gitnex.adapters.ReposListAdapter;
 import org.mian.gitnex.helpers.Authorization;
@@ -45,6 +44,8 @@ public class RepositoriesFragment extends Fragment {
     private ReposListAdapter adapter;
     private ImageView createNewRepo;
     private TextView noDataRepo;
+    private int pageSize = 1;
+    private int resultLimit = 50;
 
     @Nullable
     @Override
@@ -54,7 +55,6 @@ public class RepositoriesFragment extends Fragment {
 
         final View v = inflater.inflate(R.layout.fragment_repositories, container, false);
         setHasOptionsMenu(true);
-        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleRepositories));
 
         TinyDB tinyDb = new TinyDB(getContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -102,27 +102,20 @@ public class RepositoriesFragment extends Fragment {
             }
         });
 
-        if(connToInternet) {
+        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        swipeRefresh.setRefreshing(false);
+                        RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
+                    }
+                }, 50);
+            }
+        });
 
-            swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-                @Override
-                public void onRefresh() {
-                    new Handler().postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            swipeRefresh.setRefreshing(false);
-                            RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
-                        }
-                    }, 50);
-                }
-            });
-
-            fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
-
-        }
-        else {
-            mProgressBar.setVisibility(View.GONE);
-        }
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), pageSize, resultLimit);
 
         return v;
 
@@ -137,16 +130,16 @@ public class RepositoriesFragment extends Fragment {
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         if(tinyDb.getBoolean("repoCreated")) {
-            RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
+            RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
             tinyDb.putBoolean("repoCreated", false);
         }
     }
 
-    private void fetchDataAsync(String instanceUrl, String instanceToken) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken, int pageSize, int resultLimit) {
 
         RepositoriesListViewModel repoModel = new ViewModelProvider(this).get(RepositoriesListViewModel.class);
 
-        repoModel.getUserRepositories(instanceUrl, instanceToken).observe(this, new Observer<List<UserRepositories>>() {
+        repoModel.getUserRepositories(instanceUrl, instanceToken, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
             @Override
             public void onChanged(@Nullable List<UserRepositories> reposListMain) {
                 adapter = new ReposListAdapter(getContext(), reposListMain);
@@ -176,11 +169,11 @@ public class RepositoriesFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-        searchView.setQueryHint(getContext().getString(R.string.strFilter));
+        //searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
-        if(!connToInternet) {
+        /*if(!connToInternet) {
             return;
-        }
+        }*/
 
         searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
             @Override

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

@@ -13,7 +13,6 @@ import android.widget.LinearLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.util.TinyDB;
 import java.util.Objects;
@@ -30,7 +29,7 @@ public class SettingsFragment extends Fragment {
 
     private Context ctx = null;
 
-    private static String[] langList = {"English", "French", "German", "Russian"};
+    private static String[] langList = {"Arabic", "Chinese", "English", "Finnish", "French", "German", "Italian", "Latvian", "Persian", "Portuguese/Brazilian", "Russian", "Serbian", "Turkish", "Ukrainian"};
     private static int langSelectedChoice = 0;
 
     private static String[] timeList = {"Pretty", "Normal"};
@@ -42,11 +41,16 @@ public class SettingsFragment extends Fragment {
     private static String[] homeScreenList = {"My Repositories", "Starred Repositories", "Organizations", "Repositories", "Profile"};
     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"};
+    private static int themeSelectedChoice = 0;
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleSettings));
         View v = inflater.inflate(R.layout.fragment_settings, container, false);
         final TinyDB tinyDb = new TinyDB(getContext());
 
@@ -54,13 +58,18 @@ public class SettingsFragment extends Fragment {
         final TextView tvDateTimeSelected = v.findViewById(R.id.tvDateTimeSelected); // setter for time
         final TextView codeBlockSelected = v.findViewById(R.id.codeBlockSelected); // setter for code block
         final TextView homeScreenSelected = v.findViewById(R.id.homeScreenSelected); // setter for home screen
+        final TextView customFontSelected = v.findViewById(R.id.customFontSelected); // setter for custom font
+        final TextView themeSelected = v.findViewById(R.id.themeSelected); // setter for theme
 
         LinearLayout langFrame = v.findViewById(R.id.langFrame);
         LinearLayout timeFrame = v.findViewById(R.id.timeFrame);
         LinearLayout codeBlockFrame = v.findViewById(R.id.codeBlockFrame);
         LinearLayout homeScreenFrame = v.findViewById(R.id.homeScreenFrame);
+        LinearLayout customFontFrame = v.findViewById(R.id.customFontFrame);
+        LinearLayout themeFrame = v.findViewById(R.id.themeSelectionFrame);
 
         Switch issuesSwitch =  v.findViewById(R.id.switchIssuesBadge);
+        Switch pdfModeSwitch =  v.findViewById(R.id.switchPdfMode);
         TextView helpTranslate = v.findViewById(R.id.helpTranslate);
 
         helpTranslate.setOnClickListener(new View.OnClickListener() {
@@ -68,7 +77,7 @@ public class SettingsFragment extends Fragment {
                 Intent intent = new Intent();
                 intent.setAction(Intent.ACTION_VIEW);
                 intent.addCategory(Intent.CATEGORY_BROWSABLE);
-                intent.setData(Uri.parse(getResources().getString(R.string.appRepoContributingLink)));
+                intent.setData(Uri.parse(getResources().getString(R.string.crowdInLink)));
                 startActivity(intent);
             }
         });
@@ -89,6 +98,14 @@ public class SettingsFragment extends Fragment {
             homeScreenSelected.setText(tinyDb.getString("homeScreenStr"));
         }
 
+        if(!tinyDb.getString("customFontStr").isEmpty()) {
+            customFontSelected.setText(tinyDb.getString("customFontStr"));
+        }
+
+        if(!tinyDb.getString("themeStr").isEmpty()) {
+            themeSelected.setText(tinyDb.getString("themeStr"));
+        }
+
         if(langSelectedChoice == 0) {
             langSelectedChoice = tinyDb.getInt("langId");
         }
@@ -105,9 +122,27 @@ public class SettingsFragment extends Fragment {
             homeScreenSelectedChoice = tinyDb.getInt("homeScreenId");
         }
 
+        if(customFontSelectedChoice == 0) {
+            customFontSelectedChoice = tinyDb.getInt("customFontId");
+        }
+
+        if(themeSelectedChoice == 0) {
+            themeSelectedChoice = tinyDb.getInt("themeId");
+        }
+
         if(tinyDb.getBoolean("enableCounterIssueBadge")) {
             issuesSwitch.setChecked(true);
         }
+        else {
+            issuesSwitch.setChecked(false);
+        }
+
+        if(tinyDb.getBoolean("enablePdfMode")) {
+            pdfModeSwitch.setChecked(true);
+        }
+        else {
+            pdfModeSwitch.setChecked(false);
+        }
 
         // issues badge switcher
         issuesSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -124,12 +159,103 @@ public class SettingsFragment extends Fragment {
             }
         });
 
+        // pdf night mode switcher
+        pdfModeSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked) {
+                    tinyDb.putBoolean("enablePdfMode", true);
+                    tinyDb.putString("enablePdfModeInit", "yes");
+                    Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+                } else {
+                    tinyDb.putBoolean("enablePdfMode", false);
+                    tinyDb.putString("enablePdfModeInit", "yes");
+                    Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+                }
+            }
+        });
+
+        // theme selection dialog
+        themeFrame.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                AlertDialog.Builder tsBuilder = new AlertDialog.Builder(ctx);
+
+                tsBuilder.setTitle(R.string.themeSelectorDialogTitle);
+                if(themeSelectedChoice != -1) {
+                    tsBuilder.setCancelable(true);
+                }
+                else {
+                    tsBuilder.setCancelable(false);
+                }
+
+                tsBuilder.setSingleChoiceItems(themeList, themeSelectedChoice, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterfaceTheme, int i) {
+
+                        themeSelectedChoice = i;
+                        themeSelected.setText(themeList[i]);
+                        tinyDb.putString("themeStr", themeList[i]);
+                        tinyDb.putInt("themeId", i);
+
+                        Objects.requireNonNull(getActivity()).recreate();
+                        getActivity().overridePendingTransition(0, 0);
+                        dialogInterfaceTheme.dismiss();
+                        Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+
+                    }
+                });
+
+                AlertDialog cfDialog = tsBuilder.create();
+                cfDialog.show();
+
+            }
+        });
+
+        // custom font dialog
+        customFontFrame.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                AlertDialog.Builder cfBuilder = new AlertDialog.Builder(ctx);
+
+                cfBuilder.setTitle(R.string.settingsCustomFontSelectorDialogTitle);
+                if(customFontSelectedChoice != -1) {
+                    cfBuilder.setCancelable(true);
+                }
+                else {
+                    cfBuilder.setCancelable(false);
+                }
+
+                cfBuilder.setSingleChoiceItems(customFontList, customFontSelectedChoice, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterfaceCustomFont, int i) {
+
+                        customFontSelectedChoice = i;
+                        customFontSelected.setText(customFontList[i]);
+                        tinyDb.putString("customFontStr", customFontList[i]);
+                        tinyDb.putInt("customFontId", i);
+
+                        Objects.requireNonNull(getActivity()).recreate();
+                        getActivity().overridePendingTransition(0, 0);
+                        dialogInterfaceCustomFont.dismiss();
+                        Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+
+                    }
+                });
+
+                AlertDialog cfDialog = cfBuilder.create();
+                cfDialog.show();
+
+            }
+        });
+
         // home screen dialog
         homeScreenFrame.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder hsBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder hsBuilder = new AlertDialog.Builder(ctx);
 
                 hsBuilder.setTitle(R.string.settingshomeScreenSelectorDialogTitle);
                 if(homeScreenSelectedChoice != -1) {
@@ -165,7 +291,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder cBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder cBuilder = new AlertDialog.Builder(ctx);
 
                 cBuilder.setTitle(R.string.settingsCodeBlockSelectorDialogTitle);
                 if(codeBlockSelectedChoice != -1) {
@@ -224,7 +350,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder lBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder lBuilder = new AlertDialog.Builder(ctx);
 
                 lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
                 if(langSelectedChoice != -1) {
@@ -244,15 +370,45 @@ public class SettingsFragment extends Fragment {
                         tinyDb.putInt("langId", i);
 
                         switch (langList[i]) {
+                            case "Arabic":
+                                tinyDb.putString("locale", "ar");
+                                break;
+                            case "Chinese":
+                                tinyDb.putString("locale", "zh");
+                                break;
+                            case "Finnish":
+                                tinyDb.putString("locale", "fi");
+                                break;
                             case "French":
                                 tinyDb.putString("locale", "fr");
                                 break;
                             case "German":
                                 tinyDb.putString("locale", "de");
                                 break;
+                            case "Italian":
+                                tinyDb.putString("locale", "it");
+                                break;
+                            case "Latvian":
+                                tinyDb.putString("locale", "lv");
+                                break;
+                            case "Persian":
+                                tinyDb.putString("locale", "fa");
+                                break;
+                            case "Portuguese/Brazilian":
+                                tinyDb.putString("locale", "pt");
+                                break;
                             case "Russian":
                                 tinyDb.putString("locale", "ru");
                                 break;
+                            case "Serbian":
+                                tinyDb.putString("locale", "sr");
+                                break;
+                            case "Turkish":
+                                tinyDb.putString("locale", "tr");
+                                break;
+                            case "Ukrainian":
+                                tinyDb.putString("locale", "uk");
+                                break;
                             default:
                                 tinyDb.putString("locale", "en");
                                 break;
@@ -283,7 +439,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder tBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder tBuilder = new AlertDialog.Builder(ctx);
 
                 tBuilder.setTitle(R.string.settingsTimeSelectorDialogTitle);
                 if(timeSelectedChoice != -1) {

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

@@ -12,6 +12,8 @@ import org.mian.gitnex.actions.IssueActions;
 import org.mian.gitnex.activities.AddRemoveAssigneesActivity;
 import org.mian.gitnex.activities.AddRemoveLabelsActivity;
 import org.mian.gitnex.activities.EditIssueActivity;
+import org.mian.gitnex.activities.FileDiffActivity;
+import org.mian.gitnex.activities.MergePullRequestActivity;
 import org.mian.gitnex.activities.ReplyToIssueActivity;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.util.TinyDB;
@@ -19,6 +21,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import android.content.ClipboardManager;
 import android.content.ClipData;
+import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -41,6 +44,8 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
         TextView reOpenIssue = v.findViewById(R.id.reOpenIssue);
         TextView addRemoveAssignees = v.findViewById(R.id.addRemoveAssignees);
         TextView copyIssueUrl = v.findViewById(R.id.copyIssueUrl);
+        TextView openFilesDiff = v.findViewById(R.id.openFilesDiff);
+        TextView mergePullRequest = v.findViewById(R.id.mergePullRequest);
 
         replyToIssue.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -52,6 +57,52 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
             }
         });
 
+        if(tinyDB.getString("issueType").equals("pr")) {
+
+            editIssue.setText(R.string.editPrText);
+            copyIssueUrl.setText(R.string.copyPrUrlText);
+
+            if(tinyDB.getBoolean("prMerged")) {
+                mergePullRequest.setVisibility(View.GONE);
+            }
+            else {
+                mergePullRequest.setVisibility(View.VISIBLE);
+            }
+
+            if(tinyDB.getString("repoType").equals("public")) {
+                openFilesDiff.setVisibility(View.VISIBLE);
+            }
+            else {
+                openFilesDiff.setVisibility(View.GONE);
+            }
+
+        }
+        else {
+
+            mergePullRequest.setVisibility(View.GONE);
+
+        }
+
+        mergePullRequest.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                startActivity(new Intent(getContext(), MergePullRequestActivity.class));
+                dismiss();
+
+            }
+        });
+
+        openFilesDiff.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                startActivity(new Intent(getContext(), FileDiffActivity.class));
+                dismiss();
+
+            }
+        });
+
         editIssue.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -89,7 +140,7 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
                 // get url of repo
                 String repoFullName = tinyDB.getString("repoFullName");
                 String instanceUrlWithProtocol = "https://" + tinyDB.getString("instanceUrlRaw");
-                if(!tinyDB.getString("instanceUrlWithProtocol").isEmpty()) {
+                if (!tinyDB.getString("instanceUrlWithProtocol").isEmpty()) {
                     instanceUrlWithProtocol = tinyDB.getString("instanceUrlWithProtocol");
                 }
 
@@ -97,8 +148,9 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
                 String issueUrl = instanceUrlWithProtocol + "/" + repoFullName + "/issues/" + tinyDB.getString("issueNumber");
 
                 // copy to clipboard
-                ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(android.content.Context.CLIPBOARD_SERVICE);
+                ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(getContext()).getSystemService(android.content.Context.CLIPBOARD_SERVICE);
                 ClipData clip = ClipData.newPlainText("issueUrl", issueUrl);
+                assert clipboard != null;
                 clipboard.setPrimaryClip(clip);
 
                 dismiss();
@@ -108,35 +160,44 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
             }
         });
 
-        if(tinyDB.getString("issueState").equals("open")) { // close issue
+        if(tinyDB.getString("issueType").equals("issue")) {
 
-            reOpenIssue.setVisibility(View.GONE);
+            if (tinyDB.getString("issueState").equals("open")) { // close issue
 
-            closeIssue.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+                reOpenIssue.setVisibility(View.GONE);
 
-                    IssueActions.closeReopenIssue(getContext(), Integer.valueOf(tinyDB.getString("issueNumber")), "closed");
-                    dismiss();
+                closeIssue.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
 
-                }
-            });
+                        IssueActions.closeReopenIssue(getContext(), Integer.valueOf(tinyDB.getString("issueNumber")), "closed");
+                        dismiss();
+
+                    }
+                });
+
+            } else if (tinyDB.getString("issueState").equals("closed")) {
+
+                closeIssue.setVisibility(View.GONE);
+
+                reOpenIssue.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+
+                        IssueActions.closeReopenIssue(getContext(), Integer.valueOf(tinyDB.getString("issueNumber")), "open");
+                        dismiss();
+
+                    }
+                });
+
+            }
 
         }
-        else if(tinyDB.getString("issueState").equals("closed")) {
+        else {
 
+            reOpenIssue.setVisibility(View.GONE);
             closeIssue.setVisibility(View.GONE);
 
-            reOpenIssue.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-
-                    IssueActions.closeReopenIssue(getContext(), Integer.valueOf(tinyDB.getString("issueNumber")), "open");
-                    dismiss();
-
-                }
-            });
-
         }
 
         return v;

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

@@ -24,7 +24,6 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.activities.NewRepoActivity;
 import org.mian.gitnex.adapters.StarredReposListAdapter;
 import org.mian.gitnex.helpers.Authorization;
@@ -48,6 +47,8 @@ public class StarredRepositoriesFragment extends Fragment {
     private StarredReposListAdapter adapter;
     private ImageView createNewRepo;
     private TextView noData;
+    private int pageSize = 1;
+    private int resultLimit = 50;
 
     private OnFragmentInteractionListener mListener;
 
@@ -79,7 +80,6 @@ public class StarredRepositoriesFragment extends Fragment {
         View v = inflater.inflate(R.layout.fragment_starred_repositories, container, false);
         boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
         setHasOptionsMenu(true);
-        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleStarredRepos));
 
         TinyDB tinyDb = new TinyDB(getContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -127,27 +127,20 @@ public class StarredRepositoriesFragment extends Fragment {
             }
         });
 
-        if(connToInternet) {
+        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        swipeRefresh.setRefreshing(false);
+                        StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
+                    }
+                }, 50);
+            }
+        });
 
-            swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-                @Override
-                public void onRefresh() {
-                    new Handler().postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            swipeRefresh.setRefreshing(false);
-                            StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
-                        }
-                    }, 50);
-                }
-            });
-
-            fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
-
-        }
-        else {
-            mProgressBar.setVisibility(View.GONE);
-        }
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), pageSize, resultLimit);
 
         return v;
     }
@@ -160,15 +153,18 @@ public class StarredRepositoriesFragment extends Fragment {
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
+        if(tinyDb.getBoolean("repoCreated")) {
+            StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
+            tinyDb.putBoolean("repoCreated", false);
+        }
 
     }
 
-    private void fetchDataAsync(String instanceUrl, String instanceToken) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken, int pageSize, int resultLimit) {
 
         StarredRepositoriesViewModel starredRepoModel = new ViewModelProvider(this).get(StarredRepositoriesViewModel.class);
 
-        starredRepoModel.getUserStarredRepositories(instanceUrl, instanceToken).observe(this, new Observer<List<UserRepositories>>() {
+        starredRepoModel.getUserStarredRepositories(instanceUrl, instanceToken, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
             @Override
             public void onChanged(@Nullable List<UserRepositories> starredReposListMain) {
                 adapter = new StarredReposListAdapter(getContext(), starredReposListMain);
@@ -198,11 +194,11 @@ public class StarredRepositoriesFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-        searchView.setQueryHint(getContext().getString(R.string.strFilter));
+        //searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
-        if(!connToInternet) {
+        /*if(!connToInternet) {
             return;
-        }
+        }*/
 
         searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
             @Override

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

@@ -97,7 +97,7 @@ public class TeamsByOrgFragment extends Fragment {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        TeamsByOrgViewModel.loadTeamsByOrgList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName);
+                        TeamsByOrgViewModel.loadTeamsByOrgList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext());
                     }
                 }, 200);
             }
@@ -117,7 +117,7 @@ public class TeamsByOrgFragment extends Fragment {
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         if(tinyDb.getBoolean("resumeTeams")) {
-            TeamsByOrgViewModel.loadTeamsByOrgList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName);
+            TeamsByOrgViewModel.loadTeamsByOrgList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext());
             tinyDb.putBoolean("resumeTeams", false);
         }
     }
@@ -126,7 +126,7 @@ public class TeamsByOrgFragment extends Fragment {
 
         TeamsByOrgViewModel teamModel = new ViewModelProvider(this).get(TeamsByOrgViewModel.class);
 
-        teamModel.getTeamsByOrg(instanceUrl, instanceToken, owner).observe(this, new Observer<List<Teams>>() {
+        teamModel.getTeamsByOrg(instanceUrl, instanceToken, owner, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Teams>>() {
             @Override
             public void onChanged(@Nullable List<Teams> orgTeamsListMain) {
                 adapter = new TeamsByOrgAdapter(getContext(), orgTeamsListMain);
@@ -156,11 +156,11 @@ public class TeamsByOrgFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-        searchView.setQueryHint(getContext().getString(R.string.strFilter));
+        //searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
-        if(!connToInternet) {
+        /*if(!connToInternet) {
             return;
-        }
+        }*/
 
         searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
             @Override

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

@@ -18,7 +18,7 @@ public class AlertDialogs {
 
     public static void authorizationTokenRevokedDialog(final Context context, String title, String message, String copyNegativeButton, String copyPositiveButton) {
 
-        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context, R.style.confirmDialog);
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
 
         alertDialogBuilder
                 .setTitle(title)
@@ -52,7 +52,7 @@ public class AlertDialogs {
 
     public static void labelDeleteDialog(final Context context, final String labelTitle, final String labelId, String title, String message, String positiveButton, String negativeButton) {
 
-        new AlertDialog.Builder(context, R.style.confirmDialog)
+        new AlertDialog.Builder(context)
             .setTitle(title + labelTitle)
             .setMessage(message)
             .setIcon(R.drawable.ic_delete)
@@ -71,7 +71,7 @@ public class AlertDialogs {
 
     public static void collaboratorRemoveDialog(final Context context, final String userNameMain, String title, String message, String positiveButton, String negativeButton, final String searchKeyword) {
 
-        new AlertDialog.Builder(context, R.style.confirmDialog)
+        new AlertDialog.Builder(context)
                 .setTitle(title + userNameMain)
                 .setMessage(message)
                 .setIcon(R.drawable.ic_warning)

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

@@ -0,0 +1,43 @@
+package org.mian.gitnex.helpers;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.util.Log;
+import java.lang.reflect.Field;
+import java.util.Objects;
+
+/**
+ * Author M M Arif
+ */
+
+public class FontsOverride {
+
+    public static void setDefaultFont(Context context,
+                                      String staticTypefaceFieldName, String fontAssetName) {
+
+        final Typeface regular = Typeface.createFromAsset(context.getAssets(),
+                fontAssetName);
+        replaceFont(staticTypefaceFieldName, regular);
+
+    }
+
+    private static void replaceFont(String staticTypefaceFieldName,
+                                    final Typeface newTypeface) {
+
+        try {
+
+            final Field staticField = Typeface.class
+                    .getDeclaredField(staticTypefaceFieldName);
+            staticField.setAccessible(true);
+            staticField.set(null, newTypeface);
+
+        }
+        catch (NoSuchFieldException | IllegalAccessException e) {
+
+            Log.e("error", Objects.requireNonNull(e.getMessage()));
+
+        }
+
+    }
+
+}

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

@@ -28,4 +28,19 @@ public class Toasty {
 
     }
 
+    public static void error(Context context, String message) {
+
+        LayoutInflater inflater = LayoutInflater.from(context);
+        View view = inflater.inflate( context.getResources().getLayout(R.layout.custom_toast_error), null );
+
+        TextView text = view.findViewById(R.id.toastText);
+        text.setText(message);
+
+        Toast toast = new Toast(context);
+        toast.setDuration(Toast.LENGTH_LONG);
+        toast.setView(view);
+        toast.show();
+
+    }
+
 }

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

@@ -0,0 +1,135 @@
+package org.mian.gitnex.helpers;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Author 6543
+ */
+
+public enum VersionCheck {
+
+    UNKNOWN,
+    SUPPORTED_LATEST,
+    SUPPORTED_OLD,
+    DEVELOPMENT,
+    UNSUPPORTED_OLD,
+    UNSUPPORTED_NEW;
+
+    public static VersionCheck check(String min, String last, String value) {
+
+        final Pattern pattern_stable_release = Pattern.compile("^(\\d)\\.(\\d+)\\.(\\d+)$");
+        final Pattern pattern_dev_release = Pattern.compile("^(\\d).(\\d+).(\\d+)(\\D)(.+)");
+        Matcher match;
+
+        if (!pattern_stable_release.matcher(min).find() || !pattern_stable_release.matcher(last).find()) {
+            throw new IllegalArgumentException("VersionCheck: wrong format for min or last version given");
+        }
+
+        match = pattern_stable_release.matcher(value);
+        if (match.find()) {
+
+            switch (correlate(min, last, match.group())){
+                case 0:
+                    return UNSUPPORTED_OLD;
+                case 1:
+                    return SUPPORTED_OLD;
+                case 2:
+                    return SUPPORTED_LATEST;
+                default:
+                    return UNSUPPORTED_NEW;
+            }
+
+        }
+
+        match = pattern_dev_release.matcher(value);
+        if (match.find()) {
+
+            match = Pattern.compile("^(\\d)\\.(\\d+)\\.(\\d+)").matcher(value);
+            match.find();
+
+            if (correlate(min, last, match.group())>0) {
+                return DEVELOPMENT;
+            }
+            else {
+                return UNSUPPORTED_OLD;
+            }
+
+        }
+
+        return UNKNOWN;
+
+    }
+
+    //helper
+    // 0 to less
+    // 1 in range
+    // 2 at the top
+    // 3 above
+    private static int correlate(String min, String last, String value){
+        int min_check = compareVersion(value,min);
+        int max_check = compareVersion(value,last);
+        int range_check = compareVersion(min,last);
+
+        switch (range_check) {
+            case 2:
+                throw new IllegalArgumentException("Minimum Version higher than Last Version");
+            case 1: //min == last
+                switch (min_check) {
+                    case 0:
+                        return 0;
+                    case 1:
+                        return 2;
+                    default:
+                        return 3;
+                }
+            default:
+                if (max_check >1) return 3;
+                if (max_check == 1) return 2;
+                if (min_check < 1) return 0;
+                return 1;
+        }
+
+    }
+
+    /**
+     * @description compare doted formatted Versions
+     * @param A doted formatted Versions
+     * @param B doted formatted Versions
+     * @return 0|1|2
+     * 0 = less
+     * 1 = same
+     * 2 = more
+     */
+    public static int compareVersion(String A, String B) {
+        //throw new IllegalArgumentException
+        if((!A.matches("[0-9]+(\\.[0-9]+)*")) || (!B.matches("[0-9]+(\\.[0-9]+)*"))) throw new IllegalArgumentException("Invalid version format");
+
+        if (A.contains(".") || B.contains(".")) {
+            // example 2 vs 1.3
+            if (!(A.contains(".") && B.contains("."))) {
+                if (A.contains(".")) {
+                    return compareVersion(A,B + ".0");
+                }
+                if (B.contains(".")) {
+                    return compareVersion(A + ".0",B);
+                }
+            }
+
+            //normal compare
+            int a = Integer.parseInt(A.substring(0,A.indexOf(".")));
+            int b = Integer.parseInt(B.substring(0,B.indexOf(".")));
+            if (a < b) return 0;
+            if (a == b) return compareVersion(A.substring(A.indexOf(".")+1),B.substring(B.indexOf(".")+1));
+            return 2; //if (a > b)
+        }
+        else {
+            int a = Integer.parseInt(A);
+            int b = Integer.parseInt(B);
+            if (a < b) return 0;
+            if (a == b) return 1;
+            return 2; //if (a > b)
+        }
+    }
+
+}

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

@@ -3,8 +3,12 @@ package org.mian.gitnex.interfaces;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.models.AddEmail;
 import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.models.ExploreRepositories;
+import org.mian.gitnex.models.Files;
+import org.mian.gitnex.models.MergePullRequest;
 import org.mian.gitnex.models.NewFile;
-import org.mian.gitnex.models.UpdateIssueAssignee;
+import org.mian.gitnex.models.PullRequests;
+import org.mian.gitnex.models.UpdateIssueAssignees;
 import org.mian.gitnex.models.UpdateIssueState;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.CreateIssue;
@@ -26,7 +30,9 @@ import org.mian.gitnex.models.UserOrganizations;
 import org.mian.gitnex.models.UserRepositories;
 import org.mian.gitnex.models.UserSearch;
 import org.mian.gitnex.models.UserTokens;
+import org.mian.gitnex.models.WatchRepository;
 import java.util.List;
+import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.DELETE;
@@ -45,7 +51,7 @@ import retrofit2.http.Query;
 public interface ApiInterface {
 
     @GET("version") // gitea version API
-    Call<GiteaVersion> getGiteaVersion(@Header("Authorization") String token);
+    Call<GiteaVersion> getGiteaVersion();
 
     @GET("user") // username, full name, email
     Call<UserInfo> getUserInfo(@Header("Authorization") String token);
@@ -75,7 +81,7 @@ public interface ApiInterface {
     Call<List<OrgOwner>> getOrgOwners(@Header("Authorization") String token);
 
     @GET("user/repos") // get user repositories
-    Call<List<UserRepositories>> getUserRepositories(@Header("Authorization") String token);
+    Call<List<UserRepositories>> getUserRepositories(@Header("Authorization") String token, @Query("page") int page, @Query("limit") int limit);
 
     @POST("user/repos") // create new repository
     Call<OrganizationRepository> createNewUserRepository(@Header("Authorization") String token, @Body OrganizationRepository jsonStr);
@@ -84,10 +90,10 @@ public interface ApiInterface {
     Call<UserRepositories> getUserRepository(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
 
     @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);
+    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);
 
     @GET("repos/{owner}/{repo}/issues") // get closed issues by repo
-    Call<List<Issues>> getClosedIssues(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("state") String issueState);
+    Call<List<Issues>> getClosedIssues(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("state") String issueState, @Query("limit") int limit, @Query("type") String requestType);
 
     @GET("repos/{owner}/{repo}/issues/{index}") // get issue by id
     Call<Issues> getIssueByIndex(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int issueIndex);
@@ -120,7 +126,7 @@ public interface ApiInterface {
     Call<List<Labels>> getlabels(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
 
     @GET("users/{username}/repos") // get current logged in user repositories
-    Call<List<UserRepositories>> getCurrentUserRepositories(@Header("Authorization") String token, @Path("username") String username);
+    Call<List<UserRepositories>> getCurrentUserRepositories(@Header("Authorization") String token, @Path("username") String username, @Query("page") int page, @Query("limit") int limit);
 
     @POST("repos/{owner}/{repo}/labels") // create label
     Call<CreateLabel> createLabel(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Body CreateLabel jsonStr);
@@ -132,10 +138,10 @@ public interface ApiInterface {
     Call<CreateLabel> patchLabel(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int labelIndex, @Body CreateLabel jsonStr);
 
     @GET("user/starred") // get user starred repositories
-    Call<List<UserRepositories>> getUserStarredRepos(@Header("Authorization") String token);
+    Call<List<UserRepositories>> getUserStarredRepos(@Header("Authorization") String token, @Query("page") int page, @Query("limit") int limit);
 
     @GET("orgs/{orgName}/repos") // get repositories by org
-    Call<List<UserRepositories>> getReposByOrg(@Header("Authorization") String token, @Path("orgName") String orgName);
+    Call<List<UserRepositories>> getReposByOrg(@Header("Authorization") String token, @Path("orgName") String orgName, @Query("page") int page, @Query("limit") int limit);
 
     @GET("orgs/{orgName}/teams") // get teams by org
     Call<List<Teams>> getTeamsByOrg(@Header("Authorization") String token, @Path("orgName") String orgName);
@@ -201,7 +207,7 @@ public interface ApiInterface {
     Call<Releases> createNewRelease(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Body Releases jsonStr);
 
     @PATCH("repos/{owner}/{repo}/issues/{issueIndex}") // patch issue assignees
-    Call<JsonElement> patchIssueAssignee(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("issueIndex") int issueIndex, @Body UpdateIssueAssignee jsonStr);
+    Call<JsonElement> patchIssueAssignees(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("issueIndex") int issueIndex, @Body UpdateIssueAssignees jsonStr);
 
     @GET("admin/users") // get all users
     Call<List<UserInfo>> adminGetUsers(@Header("Authorization") String token);
@@ -212,6 +218,45 @@ public interface ApiInterface {
     @GET("repos/{owner}/{repo}/subscribers") // get all repo watchers
     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);
+
     @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);
-}
+
+    @GET("repos/{owner}/{repo}/contents") // get all the files and dirs of a repository
+    Call<List<Files>> getFiles(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
+
+    @GET("repos/{owner}/{repo}/contents/{file}") // get single file contents
+    Call<Files> getSingleFileContents(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("file") String file);
+
+    @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);
+
+    @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);
+
+    @PUT("user/starred/{owner}/{repo}") // star a repository
+    Call<JsonElement> starRepository(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
+
+    @DELETE("user/starred/{owner}/{repo}") // un star a repository
+    Call<JsonElement> unStarRepository(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
+
+    @GET("repos/{owner}/{repo}/subscription") // check watch status of a repository
+    Call<WatchRepository> checkRepoWatchStatus(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
+
+    @PUT("repos/{owner}/{repo}/subscription") // watch a repository
+    Call<JsonElement> watchRepository(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
+
+    @DELETE("repos/{owner}/{repo}/subscription") // un watch a repository
+    Call<JsonElement> unWatchRepository(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
+
+    @GET("repos/{owner}/{repo}/pulls") // get repository pull requests
+    Call<List<PullRequests>> getPullRequests(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("state") String state, @Query("limit") int limit);
+
+    @GET("{owner}/{repo}/pulls/{filename}") // get pull diff file contents
+    Call<ResponseBody> getFileDiffContents(@Path("owner") String owner, @Path("repo") String repo, @Path("filename") String fileName);
+
+    @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);
+}

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

@@ -8,7 +8,6 @@ import java.util.List;
 
 public class CreateIssue {
 
-    private String assignee;
     private String body;
     private boolean closed;
     private String due_date;
@@ -19,7 +18,6 @@ public class CreateIssue {
     private int[] labels;
 
     public CreateIssue(String assignee, String body, boolean closed, String due_date, int milestone, String title, List<String> assignees, int[] labels) {
-        this.assignee = assignee;
         this.body = body;
         this.closed = closed;
         this.due_date = due_date;