Merge branch 'release-2.3.2' of gitnex/GitNex into release-2.3

prepare release 2.3.2
Merge branch 'fix-234' of gitnex/GitNex into release-2.3
2019-12-25 19:25:38 +00:00 · 2019-12-26 00:22:22 +05:00 · 2019-12-25 19:11:03 +00:00 · 2019-12-25 18:48:12 +05:00 · 2019-12-25 10:49:20 +00:00 · 2019-12-24 21:22:40 +01:00
285 changed files with 14832 additions and 2662 deletions
--- a/.drone.yml
+++ b/.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
--- a/.gitignore
+++ b/.gitignore
@ -180,6 +180,9 @@ crashlytics.properties
 crashlytics-build.properties
 fabric.properties

+# Crowdin
+crowdin.yml
+
 ### AndroidStudio Patch ###

 !/gradle/wrapper/gradle-wrapper.jar
--- a/CHANGELOG.md
+++ b/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)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -3,14 +3,14 @@
 Please take a few minutes to read this document to make the process of contribution more easy and healthy for all involved.

 ## Pull Requests
-Patches, enhancements, features are always welcome. The MR should focus on the scope of work and avoid many unnecessary commits. Please provide as much detail and context as possible to explain the work submitted.
+Patches, enhancements, features are always welcome. The PR should focus on the scope of work and avoid many unnecessary commits. Please provide as much detail and context as possible to explain the work submitted.

 Please ask if you are not sure about the scope of work to be submitted to avoid waste of time spent on the work.

-**How to submit MR/PR**  
+**How to submit a PR**  
 Fork this repository. Pull the forked repository from your namespace to your local machine. Create new branch and work on the bug/feature/enhancement you would like to submit. Push it to your forked version. From there create Pull Request(PR) against **master** branch.

-**IMPORTANT:** By submitting MR, you agree to allow GitNex to license your work under the same license as that used by GitNex.
+**IMPORTANT:** By submitting PR, you agree to allow GitNex to license your work under the same license as that used by GitNex.

 ## Issues and Reports
 *1st of please be polite and gentle while commenting or creating new issue to maintain a healthy environment.*
@ -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). 
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -0,0 +1,35 @@
+# 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
+ * 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:
--- a/README.md
+++ b/README.md
@ -1,6 +1,10 @@
 [![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/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"/>](https://liberapay.com/mmarif/donate)
+[<img alt="Become a Patroen" src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" height="40"/>](https://www.patreon.com/mmarif)
+[<img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="40"/>](https://liberapay.com/mmarif/donate)

 # GitNex - Android client for Gitea

@ -10,12 +14,14 @@ GitNex is licensed under GPLv3 License. See the LICENSE file for the full licens
 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) [Download APK](https://gitea.com/mmarif/GitNex/releases)
+[<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/gitnex/GitNex/releases)

 ## Note about Gitea version
-Please make sure that you are on Gitea **1.7.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 Gitea **1.10.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.

-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.
@ -23,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.
@ -65,5 +83,11 @@ 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

 [Follow me on Fediverse - mastodon.social/@mmarif](https://mastodon.social/@mmarif)
--- a/app/build.gradle
+++ b/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 45
-        versionName "1.5.0"
+        targetSdkVersion 29
+        versionCode 82
+        versionName "2.3.2"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
@ -23,45 +23,50 @@ android {
 }

 dependencies {
-    def lifecycle_version = "2.2.0-alpha01"
-    final def markwon_version = "3.0.0"
+    def lifecycle_version = "2.2.0-rc02"
+    final def markwon_version = "4.1.1"

    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
-    implementation 'com.google.android.material:material:1.1.0-alpha07'
-    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-alpha02"
+    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 "ru.noties.markwon:core:$markwon_version"
-    implementation "ru.noties.markwon:ext-strikethrough:$markwon_version"
-    implementation "ru.noties.markwon:ext-tables:$markwon_version"
-    implementation "ru.noties.markwon:ext-tasklist:$markwon_version"
-    implementation "ru.noties.markwon:syntax-highlight:$markwon_version"
-    implementation "ru.noties.markwon:image-okhttp:$markwon_version"
-    implementation "ru.noties.markwon:html:$markwon_version"
-    implementation "ru.noties.markwon:recycler:$markwon_version"
-    implementation "ru.noties.markwon:recycler-table:$markwon_version"
-    implementation "ru.noties.markwon:image-gif:$markwon_version"
-    implementation "ru.noties.markwon:image-svg:$markwon_version"
-
+    implementation "io.noties.markwon:core:$markwon_version"
+    implementation "io.noties.markwon:ext-latex:$markwon_version"
+    implementation "io.noties.markwon:ext-strikethrough:$markwon_version"
+    implementation "io.noties.markwon:ext-tables:$markwon_version"
+    implementation "io.noties.markwon:ext-tasklist:$markwon_version"
+    implementation "io.noties.markwon:html:$markwon_version"
+    implementation "io.noties.markwon:image:$markwon_version"
+    implementation "io.noties.markwon:image-picasso:$markwon_version"
+    implementation "io.noties.markwon:linkify:$markwon_version"
+    implementation "io.noties.markwon:recycler:$markwon_version"
+    implementation "io.noties.markwon:recycler-table:$markwon_version"
+    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.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"
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -13,7 +13,20 @@
        android:roundIcon="@mipmap/app_logo_round"
        android:supportsRtl="true"
        android:theme="@style/AppTheme">
-        <activity android:name=".activities.AdminGetUsersActivity"></activity>
+        <activity android:name=".activities.MergePullRequestActivity"></activity>
+        <activity
+            android:name=".activities.FileViewActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".activities.NewFileActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".activities.RepoWatchersActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".activities.RepoStargazersActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity android:name=".activities.AdminGetUsersActivity" />
        <activity
            android:name=".activities.AddRemoveAssigneesActivity"
            android:theme="@style/Theme.AppCompat.Light.Dialog" />
@ -56,6 +69,8 @@
            android:launchMode="singleTask" />
        <activity android:name=".activities.NewRepoActivity" />
        <activity android:name=".activities.NewOrganizationActivity" />
+        <activity android:name=".activities.OpenRepoInBrowserActivity" />
+        <activity android:name=".activities.FileDiffActivity" />
    </application>

 </manifest>
--- a/app/src/main/java/org/mian/gitnex/actions/CollaboratorActions.java
+++ b/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);

--- a/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
+++ b/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);

--- a/app/src/main/java/org/mian/gitnex/actions/RepositoryActions.java
+++ b/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());
+            }
+        });
+
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
@ -23,9 +23,9 @@ 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;
+import java.util.Objects;

 /**
 * Author M M Arif
@ -46,8 +46,6 @@ public class AddCollaboratorToRepositoryActivity extends AppCompatActivity {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_add_collaborator_to_repository);

-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
-
        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
@ -81,7 +79,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 +99,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());
            }

        });
--- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
@ -65,7 +65,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 +90,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);

@ -239,7 +239,7 @@ public class AddRemoveAssigneesActivity extends AppCompatActivity {
        Call<JsonElement> call3;

        call3 = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
                .patchIssueAssignee(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);

--- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
@ -62,7 +62,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 +87,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 +249,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);

--- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
@ -40,6 +40,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
+import java.util.Objects;

 /**
 * Author M M Arif
@ -217,7 +218,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 +249,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 +262,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);

@ -323,10 +324,11 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli

    private void getMilestones(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {

+        String msState = "open";
        Call<List<Milestones>> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
-                .getMilestones(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+                .getMilestones(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, msState);

        call.enqueue(new Callback<List<Milestones>>() {

@ -338,13 +340,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()
@ -378,7 +380,7 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli
    private void getCollaborators(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {

        Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);

@ -448,7 +450,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);

--- a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
@ -28,6 +28,7 @@ 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
@ -55,9 +56,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 +93,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 +243,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 +297,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 +370,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 +383,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");

--- a/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
@ -127,7 +127,7 @@ public class CreateNewUserActivity extends AppCompatActivity {
        Call<UserInfo> call;

        call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
                .createNewUser(instanceToken, createUser);

--- a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
@ -164,7 +164,7 @@ public class CreateReleaseActivity extends AppCompatActivity {
        Call<Releases> call;

        call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
                .createNewRelease(token, repoOwner, repoName, createReleaseJson);

@ -224,7 +224,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);

--- a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
@ -308,7 +308,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);

--- a/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
@ -1,12 +1,18 @@
 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
@ -22,14 +28,28 @@ public class CreditsActivity extends AppCompatActivity {
        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() {
--- a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
@ -56,6 +56,8 @@ public class EditIssueActivity extends AppCompatActivity implements View.OnClick
    private Button editIssueButton;
    private Spinner editIssueMilestoneSpinner;

+    private String msState = "open";
+
    List<Milestones> milestonesList = new ArrayList<>();
    private ArrayAdapter<Mention> defaultMentionAdapter;

@ -98,8 +100,14 @@ public class EditIssueActivity extends AppCompatActivity implements View.OnClick
        editIssueButton.setOnClickListener(this);

        if(!tinyDb.getString("issueNumber").isEmpty()) {
+
+            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();
        getIssue(instanceUrl, instanceToken, loginUid, repoOwner, repoName, issueIndex);
@ -120,7 +128,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);

@ -151,7 +159,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());
            }

        });
@ -227,7 +235,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);

@ -238,7 +246,13 @@ public class EditIssueActivity extends AppCompatActivity implements View.OnClick

                if(response.code() == 201) {

+                    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();
@ -305,7 +319,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);

@ -329,9 +343,9 @@ 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);
+                                .getMilestones(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, msState);

                        final int finalMsId = msId;

--- a/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java
@ -0,0 +1,212 @@
+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.app.AppCompatActivity;
+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 AppCompatActivity {
+
+    private View.OnClickListener onClickListener;
+    private TextView toolbar_title;
+    private RecyclerView mRecyclerView;
+    private ProgressBar mProgressBar;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_file_diff);
+        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);
+
+                                    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();
+            }
+        };
+    }
+
+
+}
--- a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
@ -0,0 +1,205 @@
+package org.mian.gitnex.activities;
+
+import android.content.Context;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.text.method.ScrollingMovementMethod;
+import android.util.Base64;
+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.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+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.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.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class FileViewActivity extends AppCompatActivity {
+
+    private View.OnClickListener onClickListener;
+    private TextView singleFileContents;
+    private HighlightJsView singleCodeContents;
+    private PhotoView imageView;
+    final Context ctx = this;
+    private ProgressBar mProgressBar;
+    private byte[] imageData;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_file_view);
+        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);
+        singleFileContents.setVisibility(View.GONE);
+        mProgressBar = findViewById(R.id.progress_bar);
+
+        String singleFileName = getIntent().getStringExtra("singleFileName");
+
+        TextView toolbar_title = findViewById(R.id.toolbar_title);
+        toolbar_title.setMovementMethod(new ScrollingMovementMethod());
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        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) {
+
+        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);
+
+                        if(appUtil.imageExtension(fileExtension)) { // file is image
+
+                            singleFileContents.setVisibility(View.GONE);
+                            singleCodeContents.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);
+                            singleFileContents.setVisibility(View.GONE);
+                            singleCodeContents.setVisibility(View.VISIBLE);
+
+                            singleCodeContents.setTheme(Theme.GRUVBOX_DARK);
+                            singleCodeContents.setShowLineNumbers(true);
+                            singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));
+
+                        }
+                        else { // file type not known - plain text view
+
+                            imageView.setVisibility(View.GONE);
+                            singleCodeContents.setVisibility(View.GONE);
+                            singleFileContents.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());
+            }
+        });
+
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                getIntent().removeExtra("singleFileName");
+                finish();
+            }
+        };
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
@ -10,26 +10,33 @@ import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import okhttp3.OkHttpClient;
+import io.noties.markwon.AbstractMarkwonPlugin;
+import io.noties.markwon.Markwon;
+import io.noties.markwon.core.CorePlugin;
+import io.noties.markwon.core.MarkwonTheme;
+import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
+import io.noties.markwon.ext.tables.TablePlugin;
+import io.noties.markwon.ext.tasklist.TaskListPlugin;
+import io.noties.markwon.html.HtmlPlugin;
+import io.noties.markwon.image.AsyncDrawable;
+import io.noties.markwon.image.DefaultMediaDecoder;
+import io.noties.markwon.image.ImageItem;
+import io.noties.markwon.image.ImagesPlugin;
+import io.noties.markwon.image.SchemeHandler;
+import io.noties.markwon.image.gif.GifMediaDecoder;
+import io.noties.markwon.image.svg.SvgMediaDecoder;
+import io.noties.markwon.linkify.LinkifyPlugin;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import ru.noties.markwon.AbstractMarkwonPlugin;
-import ru.noties.markwon.Markwon;
-import ru.noties.markwon.core.CorePlugin;
-import ru.noties.markwon.core.MarkwonTheme;
-import ru.noties.markwon.ext.strikethrough.StrikethroughPlugin;
-import ru.noties.markwon.ext.tables.TablePlugin;
-import ru.noties.markwon.ext.tasklist.TaskListPlugin;
-import ru.noties.markwon.html.HtmlPlugin;
-import ru.noties.markwon.image.ImagesPlugin;
-import ru.noties.markwon.image.gif.GifPlugin;
-import ru.noties.markwon.image.okhttp.OkHttpImagesPlugin;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.Spanned;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.Menu;
@ -63,6 +70,8 @@ import org.mian.gitnex.viewmodels.IssueCommentsViewModel;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
@ -143,7 +152,7 @@ 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);
            }
@ -197,7 +206,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
@ -215,7 +224,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);
                }
            });
@ -255,7 +264,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);
@ -269,7 +278,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);

@ -286,22 +295,60 @@ public class IssueDetailActivity extends AppCompatActivity {

                        final Markwon markwon = Markwon.builder(Objects.requireNonNull(getApplicationContext()))
                                .usePlugin(CorePlugin.create())
-                                .usePlugin(OkHttpImagesPlugin.create(new OkHttpClient()))
-                                .usePlugin(ImagesPlugin.createWithAssets(getApplicationContext()))
+                                .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
+                                    @Override
+                                    public void configureImages(@NonNull ImagesPlugin plugin) {
+                                        plugin.addSchemeHandler(new SchemeHandler() {
+                                            @NonNull
+                                            @Override
+                                            public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+
+                                                final int resourceId = getApplicationContext().getResources().getIdentifier(
+                                                        raw.substring("drawable://".length()),
+                                                        "drawable",
+                                                        getApplicationContext().getPackageName());
+
+                                                final Drawable drawable = getApplicationContext().getDrawable(resourceId);
+
+                                                assert drawable != null;
+                                                return ImageItem.withResult(drawable);
+                                            }
+
+                                            @NonNull
+                                            @Override
+                                            public Collection<String> supportedSchemes() {
+                                                return Collections.singleton("drawable");
+                                            }
+                                        });
+                                        plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
+                                            @Nullable
+                                            @Override
+                                            public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
+                                                return null;
+                                            }
+                                        });
+                                        plugin.addMediaDecoder(GifMediaDecoder.create(false));
+                                        plugin.addMediaDecoder(SvgMediaDecoder.create(getApplicationContext().getResources()));
+                                        plugin.addMediaDecoder(SvgMediaDecoder.create());
+                                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create(getApplicationContext().getResources()));
+                                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
+                                    }
+
+                                }))
                                .usePlugin(new AbstractMarkwonPlugin() {
                                    @Override
                                    public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
                                        builder
                                                .codeTextColor(tinyDb.getInt("codeBlockColor"))
                                                .codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
-                                                .linkColor(getApplicationContext().getResources().getColor(R.color.lightBlue));
+                                                .linkColor(getResources().getColor(R.color.lightBlue));
                                    }
                                })
                                .usePlugin(TablePlugin.create(getApplicationContext()))
                                .usePlugin(TaskListPlugin.create(getApplicationContext()))
                                .usePlugin(HtmlPlugin.create())
-                                .usePlugin(GifPlugin.create())
                                .usePlugin(StrikethroughPlugin.create())
+                                .usePlugin(LinkifyPlugin.create())
                                .build();

                        TinyDB tinyDb = new TinyDB(getApplicationContext());
@ -310,11 +357,11 @@ public class IssueDetailActivity extends AppCompatActivity {
                        tinyDb.putString("issueState", singleIssue.getState());
                        tinyDb.putString("issueTitle", singleIssue.getTitle());

-                        Picasso.get().load(singleIssue.getUser().getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(assigneeAvatar);
+                        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 cleanIssueDescription = singleIssue.getBody().trim();
-                        final CharSequence bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueDescription));
-                        issueDescription.setText(UserMentions.UserMentionsFunc(getApplicationContext(), bodyWithMD, cleanIssueDescription));
+                        Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueDescription));
+                        markwon.setParsedMarkdown(issueDescription, UserMentions.UserMentionsFunc(getApplicationContext(), bodyWithMD, cleanIssueDescription));

                        RelativeLayout.LayoutParams paramsDesc = (RelativeLayout.LayoutParams)issueDescription.getLayoutParams();

@ -327,7 +374,7 @@ public class IssueDetailActivity extends AppCompatActivity {

                                ImageView assigneesView = new ImageView(getApplicationContext());

-                                Picasso.get().load(singleIssue.getAssignees().get(i).getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(80, 80).centerCrop().into(assigneesView);
+                                Picasso.get().load(singleIssue.getAssignees().get(i).getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(100, 100).centerCrop().into(assigneesView);

                                assigneesLayout.addView(assigneesView);
                                assigneesView.setLayoutParams(params1);
@ -431,7 +478,7 @@ public class IssueDetailActivity extends AppCompatActivity {
                            case "pretty": {
                                PrettyTime prettyTime = new PrettyTime(new Locale(locale));
                                String createdTime = prettyTime.format(singleIssue.getCreated_at());
-                                issueCreatedTime.setText(getString(R.string.createdTime, createdTime));
+                                issueCreatedTime.setText(createdTime);
                                issueCreatedTime.setVisibility(View.VISIBLE);
                                issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(singleIssue.getCreated_at()), getApplicationContext()));
                                break;
@ -439,14 +486,14 @@ public class IssueDetailActivity extends AppCompatActivity {
                            case "normal": {
                                DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
                                String createdTime = formatter.format(singleIssue.getCreated_at());
-                                issueCreatedTime.setText(getString(R.string.createdTime, createdTime));
+                                issueCreatedTime.setText(createdTime);
                                issueCreatedTime.setVisibility(View.VISIBLE);
                                break;
                            }
                            case "normal1": {
                                DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
                                String createdTime = formatter.format(singleIssue.getCreated_at());
-                                issueCreatedTime.setText(getString(R.string.createdTime, createdTime));
+                                issueCreatedTime.setText(createdTime);
                                issueCreatedTime.setVisibility(View.VISIBLE);
                                break;
                            }
--- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
+++ b/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 androidx.appcompat.app.AppCompatActivity;
 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.util.List;
 import java.util.Objects;
+import java.util.UUID;
 import okhttp3.Credentials;
-import okhttp3.Headers;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -39,9 +46,13 @@ import retrofit2.Callback;

 public class LoginActivity extends AppCompatActivity 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) {
@ -52,16 +63,19 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
        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 +108,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 +142,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:
+        if (v.getId() == R.id.login_button) {
            login();
-                break;
-            default:
-
        }

    }
@ -131,7 +167,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,11 +195,15 @@ 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(loginMethodType == R.id.loginUsernamePassword) {

            if(instanceUrl.contains("@")) {

@ -194,24 +234,28 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
                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("")) {
+                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;

                }
@ -219,15 +263,15 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList

                    Toasty.info(getApplicationContext(), getString(R.string.emptyFieldUsername));
                    enableProcessButton();
-                login_button.setText(R.string.btnLogin);
+                    loginButton.setText(R.string.btnLogin);
                    return;

                }
-            if(login_passwd.getText().toString().equals("")) {
+                if(loginPassword.getText().toString().equals("")) {

                    Toasty.info(getApplicationContext(), getString(R.string.emptyFieldPassword));
                    enableProcessButton();
-                login_button.setText(R.string.btnLogin);
+                    loginButton.setText(R.string.btnLogin);
                    return;

                }
@ -243,14 +287,14 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList

                        Toasty.info(getApplicationContext(), getString(R.string.loginOTPTypeError));
                        enableProcessButton();
-                    login_button.setText(R.string.btnLogin);
+                        loginButton.setText(R.string.btnLogin);
                        return;

                    }

                }

-            letTheUserIn(instanceUrl, loginUid, loginPass, loginOTP);
+                versionCheck(instanceUrl, loginUid, loginPass, loginOTP, loginToken_, 1);

            }
            else {
@ -259,6 +303,226 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList

            }

+        }
+        else {
+
+            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, R.style.confirmDialog);
+
+                            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) {
@ -268,13 +532,13 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
        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);
        }
@ -286,7 +550,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()) {

@ -296,6 +561,20 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList

                        assert userTokens != null;
                        if (userTokens.size() > 0) {
+
+                            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());
+                                }
+
+                            }
+                            else {
+
                                for (int i = 0; i < userTokens.size(); i++) {
                                    if (userTokens.get(i).getSha1().equals(tinyDb.getString(loginUid + "-token"))) {
                                        setTokenFlag = true;
@ -303,22 +582,25 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
                                    }
                                    //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);
                            }
@ -341,6 +623,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));
@ -353,10 +636,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);

                                    }

@ -383,20 +666,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);

                }

@ -407,7 +690,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);
            }
        });

@ -415,21 +698,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);

    }

--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
@ -21,6 +21,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 +30,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;
@ -123,14 +125,12 @@ 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")) {
+                if(tinyDb.getBoolean("noConnection")) {
                    Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+                    tinyDb.putBoolean("noConnection", false);
                }

-                    tinyDb.putBoolean("noConnection", true);
+                //tinyDb.putBoolean("noConnection", true);

                String userEmailNav = tinyDb.getString("userEmail");
                String userFullNameNav = tinyDb.getString("userFullname");
@ -148,15 +148,16 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On

                userAvatar = hView.findViewById(R.id.userAvatar);
                if (!userAvatarNav.equals("")) {
-                        Picasso.get().load(userAvatarNav).networkPolicy(NetworkPolicy.OFFLINE).transform(new RoundedTransformation(100, 0)).resize(180, 180).centerCrop().into(userAvatar);
+                    Picasso.get().load(userAvatarNav).networkPolicy(NetworkPolicy.OFFLINE).transform(new RoundedTransformation(8, 0)).resize(160, 160).centerCrop().into(userAvatar);
                }

-                } else {
-
-                    displayUserInfo(instanceUrl, instanceToken, loginUid);
-                    tinyDb.putBoolean("noConnection", false);
-
+                userAvatar.setOnClickListener(new View.OnClickListener() {
+                    public void onClick(View v) {
+                        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
+                                new ProfileFragment()).commit();
+                        drawer.closeDrawers();
                    }
+                });

            }

@ -217,6 +218,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
        } else {

            displayUserInfo(instanceUrl, instanceToken, loginUid);
+            giteaVersion(instanceUrl);
            tinyDb.putBoolean("noConnection", false);

        }
@ -278,6 +280,11 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new StarredRepositoriesFragment()).commit();
                break;
+            case R.id.nav_explore:
+                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
+                        new ExploreRepositoriesFragment()).commit();
+                break;
+
        }

        drawer.closeDrawer(GravityCompat.START);
@ -306,12 +313,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, 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));

@ -330,13 +373,16 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                    if (response.code() == 200) {

                        assert userDetails != null;
+                        if(userDetails.getIs_admin() != null) {
+                            tinyDb.putBoolean("userIsAdmin", userDetails.getIs_admin());
+                        }
                        tinyDb.putString("userLogin", userDetails.getLogin());
                        tinyDb.putInt("userId", userDetails.getId());
                        if(!userDetails.getFullname().equals("")) {
                            tinyDb.putString("userFullname", userDetails.getFullname());
                        }
                        else {
-                            tinyDb.putString("userFullname", "...");
+                            tinyDb.putString("userFullname", userDetails.getLogin());
                        }

                        tinyDb.putString("userEmail", userDetails.getEmail());
@ -351,9 +397,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(100, 0)).resize(180, 180).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);
--- a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
@ -0,0 +1,258 @@
+package org.mian.gitnex.activities;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+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 AppCompatActivity {
+
+    public ImageView closeActivity;
+    private View.OnClickListener onClickListener;
+
+    final Context ctx = this;
+
+    private SocialAutoCompleteTextView mergePR;
+    private ArrayAdapter<Mention> defaultMentionAdapter;
+    private Button mergeButton;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_merge_pull_request);
+
+        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);
+
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/activities/NewFileActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/NewFileActivity.java
@ -0,0 +1,335 @@
+package org.mian.gitnex.activities;
+
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+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;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.models.NewFile;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
+import java.util.ArrayList;
+import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class NewFileActivity extends AppCompatActivity {
+
+    public ImageView closeActivity;
+    private View.OnClickListener onClickListener;
+    private Button newFileCreate;
+
+    private EditText newFileName;
+    private EditText newFileContent;
+    private EditText newFileBranchName;
+    private EditText newFileCommitMessage;
+    private Spinner newFileBranchesSpinner;
+    final Context ctx = this;
+
+    List<Branches> branchesList = new ArrayList<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new_file);
+
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+        closeActivity = findViewById(R.id.close);
+        newFileName = findViewById(R.id.newFileName);
+        newFileContent = findViewById(R.id.newFileContent);
+        newFileBranchName = findViewById(R.id.newFileBranchName);
+        newFileCommitMessage = findViewById(R.id.newFileCommitMessage);
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        newFileCreate = findViewById(R.id.newFileCreate);
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        newFileBranchesSpinner = findViewById(R.id.newFileBranchesSpinner);
+        newFileBranchesSpinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+        getBranches(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
+
+        newFileBranchesSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
+        {
+            public void onItemSelected(AdapterView<?> arg0,
+                                       View arg1, int arg2, long arg3)
+            {
+                Branches bModelValue = (Branches) newFileBranchesSpinner.getSelectedItem();
+                Log.i("bModelSelected", bModelValue.toString());
+
+                if(bModelValue.toString().equals("No branch")) {
+                    newFileBranchName.setEnabled(true);
+                }
+                else {
+                    newFileBranchName.setEnabled(false);
+                    newFileBranchName.setText("");
+                }
+
+            }
+
+            public void onNothingSelected(AdapterView<?> arg0) {}
+        });
+
+        disableProcessButton();
+
+        if(!connToInternet) {
+
+            newFileCreate.setEnabled(false);
+            GradientDrawable shape =  new GradientDrawable();
+            shape.setCornerRadius( 8 );
+            shape.setColor(getResources().getColor(R.color.hintColor));
+            newFileCreate.setBackground(shape);
+
+        } else {
+
+            newFileCreate.setOnClickListener(createFileListener);
+
+        }
+
+    }
+
+    private View.OnClickListener createFileListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processNewFile();
+        }
+    };
+
+    private void processNewFile() {
+
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        AppUtil appUtil = new AppUtil();
+        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];
+
+        String newFileName_ = newFileName.getText().toString();
+        String newFileContent_ = newFileContent.getText().toString();
+        String newFileBranchName_ = newFileBranchName.getText().toString();
+        String newFileCommitMessage_ = newFileCommitMessage.getText().toString();
+
+        Branches currentBranch = (Branches) newFileBranchesSpinner.getSelectedItem();
+
+        if(!connToInternet) {
+
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            return;
+
+        }
+
+        if(newFileName_.equals("") || newFileContent_.equals("") || newFileCommitMessage_.equals("")) {
+
+            Toasty.info(getApplicationContext(), getString(R.string.newFileRequiredFields));
+            return;
+
+        }
+
+        if(currentBranch.toString().equals("No branch")) {
+
+            if(newFileBranchName_.equals("")) {
+                Toasty.info(getApplicationContext(), getString(R.string.newFileRequiredFieldNewBranchName));
+                return;
+            }
+            else {
+                if(!appUtil.checkStringsWithDash(newFileBranchName_)) {
+
+                    Toasty.info(getApplicationContext(), getString(R.string.newFileInvalidBranchName));
+                    return;
+
+                }
+            }
+
+        }
+
+        if(appUtil.charactersLength(newFileCommitMessage_) > 255) {
+
+            Toasty.info(getApplicationContext(), getString(R.string.newFileCommitMessageError));
+
+        }
+        else {
+
+            disableProcessButton();
+            createNewFile(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newFileName_, appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString());
+
+        }
+
+    }
+
+    private void createNewFile(final String instanceUrl, final String token, String repoOwner, String repoName, String fileName, String fileContent, String fileBranchName, String fileCommitMessage, String currentBranch) {
+
+        NewFile createNewFileJsonStr;
+        if(currentBranch.equals("No branch")) {
+            createNewFileJsonStr = new NewFile("", fileContent, fileCommitMessage, fileBranchName);
+        }
+        else {
+            createNewFileJsonStr = new NewFile(currentBranch, fileContent, fileCommitMessage, "");
+        }
+
+        Call<JsonElement> call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .createNewFile(token, repoOwner, repoName, fileName, createNewFileJsonStr);
+
+        call.enqueue(new Callback<JsonElement>() {
+
+            @Override
+            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+                if(response.code() == 201) {
+
+                    enableProcessButton();
+                    Toasty.info(getApplicationContext(), getString(R.string.newFileSuccessMessage));
+                    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.apiNotFound));
+                    }
+                    else {
+                        enableProcessButton();
+                        Toasty.info(getApplicationContext(), getString(R.string.orgCreatedError));
+                    }
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+                enableProcessButton();
+            }
+        });
+
+    }
+
+    private void getBranches(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
+
+        Call<List<Branches>> call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .getBranches(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<List<Branches>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Branches>> call, @NonNull retrofit2.Response<List<Branches>> response) {
+
+                if(response.isSuccessful()) {
+                    if(response.code() == 200) {
+
+                        List<Branches> branchesList_ = response.body();
+
+                        branchesList.add(new Branches("No branch"));
+                        assert branchesList_ != null;
+                        if(branchesList_.size() > 0) {
+                            for (int i = 0; i < branchesList_.size(); i++) {
+
+                                Branches data = new Branches(
+                                        branchesList_.get(i).getName()
+                                );
+                                branchesList.add(data);
+
+                            }
+                        }
+
+                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(getApplicationContext(),
+                                R.layout.spinner_item, branchesList);
+
+                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
+                        newFileBranchesSpinner.setAdapter(adapter);
+                        enableProcessButton();
+
+                    }
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Branches>> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
+    }
+
+    private void disableProcessButton() {
+
+        newFileCreate.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        newFileCreate.setBackground(shape);
+
+    }
+
+    private void enableProcessButton() {
+
+        newFileCreate.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        newFileCreate.setBackground(shape);
+
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java
@ -137,7 +137,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);

--- a/app/src/main/java/org/mian/gitnex/activities/NewOrganizationActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/NewOrganizationActivity.java
@ -134,7 +134,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);

--- a/app/src/main/java/org/mian/gitnex/activities/NewRepoActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/NewRepoActivity.java
@ -162,7 +162,7 @@ public class NewRepoActivity extends AppCompatActivity {
        if(repoOwner.equals(loginUid)) {

            call = RetrofitClient
-                    .getInstance(instanceUrl)
+                    .getInstance(instanceUrl, getApplicationContext())
                    .getApiInterface()
                    .createNewUserRepository(token, createRepository);

@ -170,7 +170,7 @@ public class NewRepoActivity extends AppCompatActivity {
        else {

            call = RetrofitClient
-                    .getInstance(instanceUrl)
+                    .getInstance(instanceUrl, getApplicationContext())
                    .getApiInterface()
                    .createNewUserOrgRepository(token, repoOwner, createRepository);

@ -225,7 +225,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);

--- a/app/src/main/java/org/mian/gitnex/activities/OpenRepoInBrowserActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OpenRepoInBrowserActivity.java
@ -0,0 +1,35 @@
+package org.mian.gitnex.activities;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
+import org.mian.gitnex.util.TinyDB;
+
+/**
+ * Author M M Arif
+ */
+
+public class OpenRepoInBrowserActivity extends AppCompatActivity {
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        String instanceUrlWithProtocol = "https://" + tinyDb.getString("instanceUrlRaw");
+        if (!tinyDb.getString("instanceUrlWithProtocol").isEmpty()) {
+            instanceUrlWithProtocol = tinyDb.getString("instanceUrlWithProtocol");
+        }
+
+        String repoFullNameBrowser = getIntent().getStringExtra("repoFullNameBrowser");
+        Uri url = Uri.parse(instanceUrlWithProtocol + "/" + repoFullNameBrowser);
+        Intent i = new Intent(Intent.ACTION_VIEW, url);
+        startActivity(i);
+        finish();
+
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/activities/OrgTeamMembersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrgTeamMembersActivity.java
@ -3,9 +3,8 @@ package org.mian.gitnex.activities;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.GridView;
 import android.widget.ImageView;
@ -63,7 +62,7 @@ public class OrgTeamMembersActivity extends AppCompatActivity {
        }

        getIntent().getStringExtra("teamId");
-        Log.i("teamId", getIntent().getStringExtra("teamId"));
+        //Log.i("teamId", getIntent().getStringExtra("teamId"));

        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), Integer.valueOf(teamId));

@ -71,9 +70,9 @@ public class OrgTeamMembersActivity extends AppCompatActivity {

    private void fetchDataAsync(String instanceUrl, String instanceToken, int teamId) {

-        TeamMembersByOrgViewModel teamMembersModel = ViewModelProviders.of(this).get(TeamMembersByOrgViewModel.class);
+        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);
--- a/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java
@ -114,7 +114,7 @@ public class ProfileEmailActivity extends AppCompatActivity {
        Call<JsonElement> call;

        call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
                .addNewEmail(token, addEmailFunc);

--- a/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
@ -83,6 +83,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 +118,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 +212,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 +226,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();

                }
--- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
@ -1,6 +1,7 @@
 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;
@ -10,7 +11,9 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import retrofit2.Call;
 import retrofit2.Callback;
+import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.content.res.ColorStateList;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@ -24,17 +27,21 @@ 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;
+import android.net.Uri;

 /**
 * Author M M Arif
@ -79,14 +86,23 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS

        if(tinyDb.getBoolean("enableCounterIssueBadge")) {

-            View tabHeader = LayoutInflater.from(this).inflate(R.layout.badge, null);
+            @SuppressLint("InflateParams") View tabHeader = LayoutInflater.from(this).inflate(R.layout.badge, null);
            textViewBadge = tabHeader.findViewById(R.id.counterBadge);
            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(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
@ -107,7 +123,6 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS
        }
    }

-
    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        MenuInflater inflater = getMenuInflater();
@ -153,6 +168,20 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS
            case "createRelease":
                startActivity(new Intent(RepoDetailActivity.this, CreateReleaseActivity.class));
                break;
+            case "openWebRepo":
+                TinyDB tinyDb = new TinyDB(getApplicationContext());
+                String repoFullName = tinyDb.getString("repoFullName");
+                String instanceUrlWithProtocol = "https://" + tinyDb.getString("instanceUrlRaw");
+                if(!tinyDb.getString("instanceUrlWithProtocol").isEmpty()) {
+                    instanceUrlWithProtocol = tinyDb.getString("instanceUrlWithProtocol");
+                }
+                Uri url = Uri.parse(instanceUrlWithProtocol + "/" + repoFullName);
+                Intent i = new Intent(Intent.ACTION_VIEW, url);
+                startActivity(i);
+                break;
+            case "newFile":
+                startActivity(new Intent(RepoDetailActivity.this, NewFileActivity.class));
+                break;
        }

    }
@ -160,7 +189,7 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS
    public class SectionsPagerAdapter extends FragmentStatePagerAdapter {

        SectionsPagerAdapter(FragmentManager fm) {
-            super(fm);
+            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
        }

        @NonNull
@ -177,21 +206,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;
@ -199,7 +233,7 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS

        @Override
        public int getCount() {
-            return 8;
+            return 10;
        }

    }
@ -207,7 +241,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);

@ -242,4 +276,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());
+            }
+        });
+
+    }
+
 }
--- a/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
@ -0,0 +1,95 @@
+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;
+import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.adapters.RepoStargazersAdapter;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.viewmodels.RepoStargazersViewModel;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class RepoStargazersActivity extends AppCompatActivity {
+
+    private TextView noDataStargazers;
+    private View.OnClickListener onClickListener;
+    private RepoStargazersAdapter adapter;
+    private GridView mGridView;
+    private ProgressBar mProgressBar;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_repo_stargazers);
+
+        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");
+
+        ImageView closeActivity = findViewById(R.id.close);
+        TextView toolbarTitle = findViewById(R.id.toolbar_title);
+        noDataStargazers = findViewById(R.id.noDataStargazers);
+        mGridView = findViewById(R.id.gridView);
+        mProgressBar = findViewById(R.id.progress_bar);
+
+        String repoFullNameForStars = getIntent().getStringExtra("repoFullNameForStars");
+        String[] parts = repoFullNameForStars.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        toolbarTitle.setText(R.string.repoStargazersInMenu);
+
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+
+    }
+
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String repoOwner, String repoName) {
+
+        RepoStargazersViewModel repoStargazersModel = new ViewModelProvider(this).get(RepoStargazersViewModel.class);
+
+        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);
+                if(adapter.getCount() > 0) {
+                    mGridView.setAdapter(adapter);
+                    noDataStargazers.setVisibility(View.GONE);
+                }
+                else {
+                    adapter.notifyDataSetChanged();
+                    mGridView.setAdapter(adapter);
+                    noDataStargazers.setVisibility(View.VISIBLE);
+                }
+                mProgressBar.setVisibility(View.GONE);
+            }
+        });
+
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java
@ -0,0 +1,95 @@
+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;
+import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.adapters.RepoWatchersAdapter;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.viewmodels.RepoWatchersViewModel;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class RepoWatchersActivity extends AppCompatActivity {
+
+    private TextView noDataWatchers;
+    private View.OnClickListener onClickListener;
+    private RepoWatchersAdapter adapter;
+    private GridView mGridView;
+    private ProgressBar mProgressBar;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_repo_watchers);
+
+        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");
+
+        ImageView closeActivity = findViewById(R.id.close);
+        TextView toolbarTitle = findViewById(R.id.toolbar_title);
+        noDataWatchers = findViewById(R.id.noDataWatchers);
+        mGridView = findViewById(R.id.gridView);
+        mProgressBar = findViewById(R.id.progress_bar);
+
+        String repoFullNameForWatchers = getIntent().getStringExtra("repoFullNameForWatchers");
+        String[] parts = repoFullNameForWatchers.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        toolbarTitle.setText(R.string.repoWatchersInMenu);
+
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+
+    }
+
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String repoOwner, String repoName) {
+
+        RepoWatchersViewModel repoWatchersModel = new ViewModelProvider(this).get(RepoWatchersViewModel.class);
+
+        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);
+                if(adapter.getCount() > 0) {
+                    mGridView.setAdapter(adapter);
+                    noDataWatchers.setVisibility(View.GONE);
+                }
+                else {
+                    adapter.notifyDataSetChanged();
+                    mGridView.setAdapter(adapter);
+                    noDataWatchers.setVisibility(View.VISIBLE);
+                }
+                mProgressBar.setVisibility(View.GONE);
+            }
+        });
+
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
@ -1,10 +1,18 @@
 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.view.View;
 import android.widget.ImageView;
 import org.mian.gitnex.R;
+import org.mian.gitnex.adapters.SponsorsAdapter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;

 /**
 * Author M M Arif
@ -23,6 +31,24 @@ public class SponsorsActivity extends AppCompatActivity {

        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() {
--- a/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
@ -98,7 +98,7 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
            holder.userRole.setVisibility(View.GONE);
        }

-        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(100, 0)).resize(140, 140).centerCrop().into(holder.userAvatar);
+        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
    }

    @Override
--- a/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java
@ -1,12 +1,13 @@
 package org.mian.gitnex.adapters;

 import android.content.Context;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.UrlHelper;
 import org.mian.gitnex.models.Branches;
 import org.mian.gitnex.util.TinyDB;
 import java.util.List;
@ -66,7 +67,9 @@ public class BranchesAdapter extends RecyclerView.Adapter<BranchesAdapter.Branch
            holder.branchCommitAuthor.setText(mCtx.getResources().getString(R.string.commitAuthor, currentItem.getCommit().getAuthor().getUsername()));
        }

-        holder.branchCommitHash.setText(mCtx.getResources().getString(R.string.commitHash, UrlHelper.cleanUrl(instanceUrl), currentItem.getCommit().getUrl()));
+        holder.branchCommitHash.setText(
+                Html.fromHtml("<a href='" + currentItem.getCommit().getUrl() + "'>" + mCtx.getResources().getString(R.string.commitLinkBranchesTab) + "</a> "));
+        holder.branchCommitHash.setMovementMethod(LinkMovementMethod.getInstance());

    }

--- a/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java
@ -3,22 +3,22 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
+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.RelativeLayout;
 import android.widget.TextView;
 import com.squareup.picasso.Picasso;
-import com.vdurmont.emoji.EmojiParser;
 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.helpers.UserMentions;
 import org.mian.gitnex.models.Issues;
 import org.mian.gitnex.util.TinyDB;
 import org.ocpsoft.prettytime.PrettyTime;
@ -27,22 +27,8 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import java.util.Objects;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import okhttp3.OkHttpClient;
-import ru.noties.markwon.AbstractMarkwonPlugin;
-import ru.noties.markwon.Markwon;
-import ru.noties.markwon.core.CorePlugin;
-import ru.noties.markwon.core.MarkwonTheme;
-import ru.noties.markwon.ext.strikethrough.StrikethroughPlugin;
-import ru.noties.markwon.ext.tables.TablePlugin;
-import ru.noties.markwon.ext.tables.TableTheme;
-import ru.noties.markwon.ext.tasklist.TaskListPlugin;
-import ru.noties.markwon.html.HtmlPlugin;
-import ru.noties.markwon.image.ImagesPlugin;
-import ru.noties.markwon.image.gif.GifPlugin;
-import ru.noties.markwon.image.okhttp.OkHttpImagesPlugin;

 /**
 * Author M M Arif
@ -122,11 +108,9 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
        private TextView issueNumber;
        private ImageView issueAssigneeAvatar;
        private TextView issueTitle;
-        private TextView issueDescription;
-        //private ImageView issueState;
        private TextView issueCreatedTime;
        private TextView issueCommentsCount;
-        private ImageView issueType;
+        private RelativeLayout relativeLayoutFrame;

        IssuesHolder(View itemView) {

@ -135,11 +119,10 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
            issueNumber = itemView.findViewById(R.id.issueNumber);
            issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
            issueTitle = itemView.findViewById(R.id.issueTitle);
-            issueDescription = itemView.findViewById(R.id.issueDescription);
            issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
-            //issueState = itemView.findViewById(R.id.issueStatus);
+            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
@ -153,11 +136,12 @@ 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);

                }
            });
-            issueDescription.setOnClickListener(new View.OnClickListener() {
+            frameCommentsCount.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {

@ -169,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);

                }
@ -183,25 +168,12 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
            final String locale = tinyDb.getString("locale");
            final String timeFormat = tinyDb.getString("dateFormat");

-            final Markwon markwon = Markwon.builder(Objects.requireNonNull(context))
-                    .usePlugin(CorePlugin.create())
-                    .usePlugin(OkHttpImagesPlugin.create(new OkHttpClient()))
-                    .usePlugin(ImagesPlugin.createWithAssets(context))
-                    .usePlugin(new AbstractMarkwonPlugin() {
-                        @Override
-                        public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
-                            builder
-                                    .codeTextColor(tinyDb.getInt("codeBlockColor"))
-                                    .codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
-                                    .linkColor(context.getResources().getColor(R.color.lightBlue));
+            /*if(issuesModel.getPull_request() != null) {
+                if (issuesModel.getPull_request().isMerged()) {
+                    relativeLayoutFrame.setVisibility(View.GONE);
+                    relativeLayoutFrame.setLayoutParams(new RecyclerView.LayoutParams(0, 0));
                }
-                    })
-                    .usePlugin(TablePlugin.create(context))
-                    .usePlugin(TaskListPlugin.create(context))
-                    .usePlugin(HtmlPlugin.create())
-                    .usePlugin(GifPlugin.create())
-                    .usePlugin(StrikethroughPlugin.create())
-                    .build();
+            }*/

            if (!issuesModel.getUser().getFull_name().equals("")) {
                issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));
@ -210,41 +182,17 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
            }

            if (issuesModel.getUser().getAvatar_url() != null) {
-                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(issueAssigneeAvatar);
+                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
            } else {
-                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(issueAssigneeAvatar);
+                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()));

-            issueTitle.setText(context.getResources().getString(R.string.hash) + issuesModel.getNumber() + " " + issuesModel.getTitle());
            issueNumber.setText(String.valueOf(issuesModel.getNumber()));
            issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));

-            if (!issuesModel.getBody().equals("")) {
-                String cleanIssueDescription = issuesModel.getBody().trim();
-                issueDescription.setVisibility(View.VISIBLE);
-                final CharSequence bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueDescription));
-                issueDescription.setText(UserMentions.UserMentionsFunc(context, bodyWithMD, cleanIssueDescription));
-            }
-            else {
-                issueDescription.setText("");
-                issueDescription.setVisibility(View.GONE);
-            }
-            /*if (issuesModel.getState().equals("open")) {
-                issueState.setImageResource(R.drawable.ic_issue_open);
-                issueState.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueStatusTextOpen), context));
-            } else {
-                issueState.setImageResource(R.drawable.ic_issue_closed);
-                issueState.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueStatusTextClosed), context));
-            }*/
-
            switch (timeFormat) {
                case "pretty": {
                    PrettyTime prettyTime = new PrettyTime(new Locale(locale));
--- a/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
@ -77,7 +77,7 @@ public class CollaboratorsAdapter extends BaseAdapter  {
    private void initData(ViewHolder viewHolder, int position) {

        Collaborators currentItem = collaboratorsList.get(position);
-        Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(viewHolder.collaboratorAvatar);
+        Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.collaboratorAvatar);

        if(!currentItem.getFull_name().equals("")) {
            viewHolder.collaboratorName.setText(currentItem.getFull_name());
--- a/app/src/main/java/org/mian/gitnex/adapters/CreditsAdapter.java
+++ b/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();
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
@ -0,0 +1,216 @@
+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;
+
+/**
+ * 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 };
+                        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();
+    }
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
+++ b/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();
+        }
+    };
+
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesDiffAdapter.java
+++ b/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();
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
@ -3,7 +3,9 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@ -14,8 +16,8 @@ import com.squareup.picasso.Picasso;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.ReplyToIssueActivity;
-import org.mian.gitnex.helpers.UserMentions;
 import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.helpers.UserMentions;
 import org.mian.gitnex.models.IssueComments;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.util.TinyDB;
@ -24,26 +26,32 @@ import org.ocpsoft.prettytime.PrettyTime;
 import java.lang.reflect.Field;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
-import okhttp3.OkHttpClient;
-import ru.noties.markwon.AbstractMarkwonPlugin;
-import ru.noties.markwon.Markwon;
-import ru.noties.markwon.core.CorePlugin;
-import ru.noties.markwon.core.MarkwonTheme;
-import ru.noties.markwon.ext.strikethrough.StrikethroughPlugin;
-import ru.noties.markwon.ext.tables.TablePlugin;
-import ru.noties.markwon.ext.tables.TableTheme;
-import ru.noties.markwon.ext.tasklist.TaskListPlugin;
-import ru.noties.markwon.html.HtmlPlugin;
-import ru.noties.markwon.image.ImagesPlugin;
-import ru.noties.markwon.image.gif.GifPlugin;
-import ru.noties.markwon.image.okhttp.OkHttpImagesPlugin;
+import io.noties.markwon.AbstractMarkwonPlugin;
+import io.noties.markwon.Markwon;
+import io.noties.markwon.core.CorePlugin;
+import io.noties.markwon.core.MarkwonTheme;
+import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
+import io.noties.markwon.ext.tables.TablePlugin;
+import io.noties.markwon.ext.tasklist.TaskListPlugin;
+import io.noties.markwon.html.HtmlPlugin;
+import io.noties.markwon.image.AsyncDrawable;
+import io.noties.markwon.image.DefaultMediaDecoder;
+import io.noties.markwon.image.ImageItem;
+import io.noties.markwon.image.ImagesPlugin;
+import io.noties.markwon.image.SchemeHandler;
+import io.noties.markwon.image.gif.GifMediaDecoder;
+import io.noties.markwon.image.svg.SvgMediaDecoder;
+import io.noties.markwon.linkify.LinkifyPlugin;

 /**
 * Author M M Arif
@ -171,34 +179,72 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
        }

        if (currentItem.getUser().getAvatar_url() != null) {
-            Picasso.get().load(currentItem.getUser().getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(holder.issueCommenterAvatar);
+            Picasso.get().load(currentItem.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.issueCommenterAvatar);
        } else {
-            Picasso.get().load(currentItem.getUser().getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(holder.issueCommenterAvatar);
+            Picasso.get().load(currentItem.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.issueCommenterAvatar);
        }

        String cleanIssueComments = currentItem.getBody().trim();

        final Markwon markwon = Markwon.builder(Objects.requireNonNull(mCtx))
                .usePlugin(CorePlugin.create())
-                .usePlugin(OkHttpImagesPlugin.create(new OkHttpClient()))
-                .usePlugin(ImagesPlugin.create(mCtx))
+                .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
+                    @Override
+                    public void configureImages(@NonNull ImagesPlugin plugin) {
+                        plugin.addSchemeHandler(new SchemeHandler() {
+                            @NonNull
+                            @Override
+                            public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+
+                                final int resourceId = mCtx.getResources().getIdentifier(
+                                        raw.substring("drawable://".length()),
+                                        "drawable",
+                                        mCtx.getPackageName());
+
+                                final Drawable drawable = mCtx.getDrawable(resourceId);
+
+                                assert drawable != null;
+                                return ImageItem.withResult(drawable);
+                            }
+
+                            @NonNull
+                            @Override
+                            public Collection<String> supportedSchemes() {
+                                return Collections.singleton("drawable");
+                            }
+                        });
+                        plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
+                            @Nullable
+                            @Override
+                            public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
+                                return null;
+                            }
+                        });
+                        plugin.addMediaDecoder(GifMediaDecoder.create(false));
+                        plugin.addMediaDecoder(SvgMediaDecoder.create(mCtx.getResources()));
+                        plugin.addMediaDecoder(SvgMediaDecoder.create());
+                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create(mCtx.getResources()));
+                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
+                    }
+                }))
                .usePlugin(new AbstractMarkwonPlugin() {
                    @Override
                    public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
                        builder
                                .codeTextColor(tinyDb.getInt("codeBlockColor"))
-                                .codeBackgroundColor(tinyDb.getInt("codeBlockBackground"));
+                                .codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
+                                .linkColor(mCtx.getResources().getColor(R.color.lightBlue));
                    }
                })
                .usePlugin(TablePlugin.create(mCtx))
                .usePlugin(TaskListPlugin.create(mCtx))
                .usePlugin(HtmlPlugin.create())
-                .usePlugin(GifPlugin.create())
                .usePlugin(StrikethroughPlugin.create())
+                .usePlugin(LinkifyPlugin.create())
                .build();

-        final CharSequence bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueComments));
-        holder.issueComment.setText(UserMentions.UserMentionsFunc(mCtx, bodyWithMD, cleanIssueComments));
+        Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueComments));
+        markwon.setParsedMarkdown(holder.issueComment, UserMentions.UserMentionsFunc(mCtx, bodyWithMD, cleanIssueComments));

        String edited;

--- a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
@ -3,22 +3,22 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
+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.RelativeLayout;
 import android.widget.TextView;
 import com.squareup.picasso.Picasso;
-import com.vdurmont.emoji.EmojiParser;
 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.helpers.UserMentions;
 import org.mian.gitnex.models.Issues;
 import org.mian.gitnex.util.TinyDB;
 import org.ocpsoft.prettytime.PrettyTime;
@ -27,22 +27,8 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import java.util.Objects;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import okhttp3.OkHttpClient;
-import ru.noties.markwon.AbstractMarkwonPlugin;
-import ru.noties.markwon.Markwon;
-import ru.noties.markwon.core.CorePlugin;
-import ru.noties.markwon.core.MarkwonTheme;
-import ru.noties.markwon.ext.strikethrough.StrikethroughPlugin;
-import ru.noties.markwon.ext.tables.TablePlugin;
-import ru.noties.markwon.ext.tables.TableTheme;
-import ru.noties.markwon.ext.tasklist.TaskListPlugin;
-import ru.noties.markwon.html.HtmlPlugin;
-import ru.noties.markwon.image.ImagesPlugin;
-import ru.noties.markwon.image.gif.GifPlugin;
-import ru.noties.markwon.image.okhttp.OkHttpImagesPlugin;

 /**
 * Author M M Arif
@ -122,11 +108,9 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
        private TextView issueNumber;
        private ImageView issueAssigneeAvatar;
        private TextView issueTitle;
-        private TextView issueDescription;
-        //private ImageView issueState;
        private TextView issueCreatedTime;
        private TextView issueCommentsCount;
-        private ImageView issueType;
+        private RelativeLayout relativeLayoutFrame;

        IssuesHolder(View itemView) {

@ -135,11 +119,10 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
            issueNumber = itemView.findViewById(R.id.issueNumber);
            issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
            issueTitle = itemView.findViewById(R.id.issueTitle);
-            issueDescription = itemView.findViewById(R.id.issueDescription);
            issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
-            //issueState = itemView.findViewById(R.id.issueStatus);
+            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
@ -153,11 +136,12 @@ 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);

                }
            });
-            issueDescription.setOnClickListener(new View.OnClickListener() {
+            frameCommentsCount.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {

@ -169,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);

                }
@ -183,25 +168,12 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
            final String locale = tinyDb.getString("locale");
            final String timeFormat = tinyDb.getString("dateFormat");

-            final Markwon markwon = Markwon.builder(Objects.requireNonNull(context))
-                    .usePlugin(CorePlugin.create())
-                    .usePlugin(OkHttpImagesPlugin.create(new OkHttpClient()))
-                    .usePlugin(ImagesPlugin.createWithAssets(context))
-                    .usePlugin(new AbstractMarkwonPlugin() {
-                        @Override
-                        public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
-                            builder
-                                    .codeTextColor(tinyDb.getInt("codeBlockColor"))
-                                    .codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
-                                    .linkColor(context.getResources().getColor(R.color.lightBlue));
+            /*if(issuesModel.getPull_request() != null) {
+                if (!issuesModel.getPull_request().isMerged()) {
+                    relativeLayoutFrame.setVisibility(View.GONE);
+                    relativeLayoutFrame.setLayoutParams(new RecyclerView.LayoutParams(0, 0));
                }
-                    })
-                    .usePlugin(TablePlugin.create(context))
-                    .usePlugin(TaskListPlugin.create(context))
-                    .usePlugin(HtmlPlugin.create())
-                    .usePlugin(GifPlugin.create())
-                    .usePlugin(StrikethroughPlugin.create())
-                    .build();
+            }*/

            if (!issuesModel.getUser().getFull_name().equals("")) {
                issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));
@ -210,41 +182,17 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
            }

            if (issuesModel.getUser().getAvatar_url() != null) {
-                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(issueAssigneeAvatar);
+                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
            } else {
-                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(issueAssigneeAvatar);
+                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()));

-            issueTitle.setText(context.getResources().getString(R.string.hash) + issuesModel.getNumber() + " " + issuesModel.getTitle());
            issueNumber.setText(String.valueOf(issuesModel.getNumber()));
            issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));

-            if (!issuesModel.getBody().equals("")) {
-                String cleanIssueDescription = issuesModel.getBody().trim();
-                issueDescription.setVisibility(View.VISIBLE);
-                final CharSequence bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueDescription));
-                issueDescription.setText(UserMentions.UserMentionsFunc(context, bodyWithMD, cleanIssueDescription));
-            }
-            else {
-                issueDescription.setText("");
-                issueDescription.setVisibility(View.GONE);
-            }
-            /*if (issuesModel.getState().equals("open")) {
-                issueState.setImageResource(R.drawable.ic_issue_open);
-                issueState.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueStatusTextOpen), context));
-            } else {
-                issueState.setImageResource(R.drawable.ic_issue_closed);
-                issueState.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueStatusTextClosed), context));
-            }*/
-
            switch (timeFormat) {
                case "pretty": {
                    PrettyTime prettyTime = new PrettyTime(new Locale(locale));
--- a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
@ -3,7 +3,6 @@ package org.mian.gitnex.adapters;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@ -42,13 +41,12 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
        private TextView labelId;
        private TextView labelColor;
        private ImageView labelsView;
-        private ImageView labelsOptionsMenu;

        private LabelsViewHolder(View itemView) {
            super(itemView);

            labelsView = itemView.findViewById(R.id.labelsView);
-            labelsOptionsMenu = itemView.findViewById(R.id.labelsOptionsMenu);
+            ImageView labelsOptionsMenu = itemView.findViewById(R.id.labelsOptionsMenu);
            labelTitle = itemView.findViewById(R.id.labelTitle);
            labelId = itemView.findViewById(R.id.labelId);
            labelColor = itemView.findViewById(R.id.labelColor);
@ -146,6 +144,7 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
        TextDrawable drawable = TextDrawable.builder()
                .beginConfig()
                //.useFont(Typeface.DEFAULT)
+                .bold()
                .textColor(new ColorInverter().getContrastColor(color))
                .fontSize(36)
                .width(LabelWidthCalculator.customWidth(getMaxLabelLength()))
--- a/app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java
@ -83,7 +83,7 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
    private void initData(MembersByOrgAdapter.ViewHolder viewHolder, int position) {

        UserInfo currentItem = membersList.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(120, 120).centerCrop().into(viewHolder.memberAvatar);

        if(!currentItem.getFullname().equals("")) {
            viewHolder.memberName.setText(currentItem.getFullname());
--- a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
@ -3,12 +3,16 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.text.Spanned;
 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.ProgressBar;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.vdurmont.emoji.EmojiParser;
@ -21,25 +25,31 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-import okhttp3.OkHttpClient;
-import ru.noties.markwon.AbstractMarkwonPlugin;
-import ru.noties.markwon.Markwon;
-import ru.noties.markwon.core.CorePlugin;
-import ru.noties.markwon.core.MarkwonTheme;
-import ru.noties.markwon.ext.strikethrough.StrikethroughPlugin;
-import ru.noties.markwon.ext.tables.TablePlugin;
-import ru.noties.markwon.ext.tables.TableTheme;
-import ru.noties.markwon.ext.tasklist.TaskListPlugin;
-import ru.noties.markwon.html.HtmlPlugin;
-import ru.noties.markwon.image.ImagesPlugin;
-import ru.noties.markwon.image.gif.GifPlugin;
-import ru.noties.markwon.image.okhttp.OkHttpImagesPlugin;
+import io.noties.markwon.AbstractMarkwonPlugin;
+import io.noties.markwon.Markwon;
+import io.noties.markwon.core.CorePlugin;
+import io.noties.markwon.core.MarkwonTheme;
+import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
+import io.noties.markwon.ext.tables.TablePlugin;
+import io.noties.markwon.ext.tasklist.TaskListPlugin;
+import io.noties.markwon.html.HtmlPlugin;
+import io.noties.markwon.image.AsyncDrawable;
+import io.noties.markwon.image.DefaultMediaDecoder;
+import io.noties.markwon.image.ImageItem;
+import io.noties.markwon.image.ImagesPlugin;
+import io.noties.markwon.image.SchemeHandler;
+import io.noties.markwon.image.gif.GifMediaDecoder;
+import io.noties.markwon.image.svg.SvgMediaDecoder;
+import io.noties.markwon.linkify.LinkifyPlugin;

 /**
 * Author M M Arif
@ -59,6 +69,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
        private TextView msClosedIssues;
        private TextView msDueDate;
        private ImageView msStatus;
+        private ProgressBar msProgress;

        private MilestonesViewHolder(View itemView) {
            super(itemView);
@ -69,8 +80,9 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
            msOpenIssues = itemView.findViewById(R.id.milestoneIssuesOpen);
            msClosedIssues = itemView.findViewById(R.id.milestoneIssuesClosed);
            msDueDate = itemView.findViewById(R.id.milestoneDueDate);
+            msProgress = itemView.findViewById(R.id.milestoneProgress);

-            /*issueTitle.setOnClickListener(new View.OnClickListener() {
+            /*msTitle.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {

@ -113,8 +125,45 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi

        final Markwon markwon = Markwon.builder(Objects.requireNonNull(mCtx))
                .usePlugin(CorePlugin.create())
-                .usePlugin(OkHttpImagesPlugin.create(new OkHttpClient()))
-                .usePlugin(ImagesPlugin.createWithAssets(mCtx))
+                .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
+                    @Override
+                    public void configureImages(@NonNull ImagesPlugin plugin) {
+                        plugin.addSchemeHandler(new SchemeHandler() {
+                            @NonNull
+                            @Override
+                            public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+
+                                final int resourceId = mCtx.getResources().getIdentifier(
+                                        raw.substring("drawable://".length()),
+                                        "drawable",
+                                        mCtx.getPackageName());
+
+                                final Drawable drawable = mCtx.getDrawable(resourceId);
+
+                                assert drawable != null;
+                                return ImageItem.withResult(drawable);
+                            }
+
+                            @NonNull
+                            @Override
+                            public Collection<String> supportedSchemes() {
+                                return Collections.singleton("drawable");
+                            }
+                        });
+                        plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
+                            @Nullable
+                            @Override
+                            public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
+                                return null;
+                            }
+                        });
+                        plugin.addMediaDecoder(GifMediaDecoder.create(false));
+                        plugin.addMediaDecoder(SvgMediaDecoder.create(mCtx.getResources()));
+                        plugin.addMediaDecoder(SvgMediaDecoder.create());
+                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create(mCtx.getResources()));
+                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
+                    }
+                }))
                .usePlugin(new AbstractMarkwonPlugin() {
                    @Override
                    public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
@ -127,11 +176,12 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
                .usePlugin(TablePlugin.create(mCtx))
                .usePlugin(TaskListPlugin.create(mCtx))
                .usePlugin(HtmlPlugin.create())
-                .usePlugin(GifPlugin.create())
                .usePlugin(StrikethroughPlugin.create())
+                .usePlugin(LinkifyPlugin.create())
                .build();

-        holder.msTitle.setText(currentItem.getTitle());
+        Spanned msTitle = markwon.toMarkdown(currentItem.getTitle());
+        markwon.setParsedMarkdown(holder.msTitle, msTitle);
        //holder.msStatus.setText(currentItem.getState());

        if(currentItem.getState().equals("open")) {
@ -183,6 +233,24 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
        holder.msClosedIssues.setText(String.valueOf(currentItem.getClosed_issues()));
        holder.msClosedIssues.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.milestoneClosedIssues, currentItem.getClosed_issues()), mCtx));

+        if ((currentItem.getOpen_issues() + currentItem.getClosed_issues()) > 0) {
+
+            if (currentItem.getOpen_issues() == 0) {
+                holder.msProgress.setProgress(100);
+                holder.msProgress.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.milestoneCompletion, 100), mCtx));
+            }
+            else {
+                int msCompletion = 100 * currentItem.getClosed_issues() / (currentItem.getOpen_issues() + currentItem.getClosed_issues());
+                holder.msProgress.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.milestoneCompletion, msCompletion), mCtx));
+                holder.msProgress.setProgress(msCompletion);
+            }
+
+        }
+        else {
+            holder.msProgress.setProgress(0);
+            holder.msProgress.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.milestoneCompletion, 0), mCtx));
+        }
+
        if(currentItem.getDue_on() != null) {

            if (timeFormat.equals("normal") || timeFormat.equals("pretty")) {
@ -216,7 +284,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi

        }
        else {
-            holder.msDueDate.setVisibility(View.INVISIBLE);
+            holder.msDueDate.setVisibility(View.GONE);
        }

    }
--- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
@ -4,6 +4,7 @@ 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.Filter;
@ -12,13 +13,21 @@ import android.widget.ImageView;
 import android.widget.TextView;
 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.ArrayList;
 import java.util.List;
 import androidx.annotation.NonNull;
+import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;

 /**
@ -39,8 +48,9 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
        private TextView fullNameMy;
        private ImageView repoPrivatePublicMy;
        private TextView repoStarsMy;
-        private TextView repoWatchersMy;
+        private TextView repoForksMy;
        private TextView repoOpenIssuesCountMy;
+        private TextView repoType;

        private MyReposViewHolder(View itemView) {
            super(itemView);
@ -50,8 +60,10 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
            fullNameMy = itemView.findViewById(R.id.repoFullNameMy);
            repoPrivatePublicMy = itemView.findViewById(R.id.imageRepoTypeMy);
            repoStarsMy = itemView.findViewById(R.id.repoStarsMy);
-            repoWatchersMy = itemView.findViewById(R.id.repoWatchersMy);
+            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
@ -64,12 +76,76 @@ 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);

                }
            });

+            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 };
+                        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", fullNameMy.getText());
+                                    context.startActivity(intent);
+                                    break;
+
+                                case R.id.repoWatchers:
+
+                                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
+                                    intentW.putExtra("repoFullNameForWatchers", fullNameMy.getText());
+                                    context.startActivity(intentW);
+                                    break;
+
+                                case R.id.repoOpenInBrowser:
+
+                                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+                                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullNameMy.getText());
+                                    context.startActivity(intentOpenInBrowser);
+                                    break;
+
+                            }
+                            return false;
+                        }
+                    });
+
+                    popupMenu.show();
+
+                }
+            });
+
        }
    }

@ -94,19 +170,29 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.

        ColorGenerator generator = ColorGenerator.MATERIAL;
        int color = generator.getColor(currentItem.getName());
-        String charac = String.valueOf(currentItem.getName().charAt(0));
+        String firstCharacter = String.valueOf(currentItem.getName().charAt(0));

        TextDrawable drawable = TextDrawable.builder()
                .beginConfig()
                .useFont(Typeface.DEFAULT)
-                .fontSize(16)
+                .fontSize(18)
                .toUpperCase()
                .width(28)
                .height(28)
                .endConfig()
-                .buildRound(charac, color);
+                .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.imageMy);
+            } else {
                holder.imageMy.setImageDrawable(drawable);
+            }
+        }
+        else {
+            holder.imageMy.setImageDrawable(drawable);
+        }
+
        holder.mTextView1My.setText(currentItem.getName());
        if (!currentItem.getDescription().equals("")) {
            holder.mTextView2My.setVisibility(View.VISIBLE);
@ -115,12 +201,14 @@ 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.repoWatchersMy.setText(currentItem.getWatchers_count());
+        holder.repoForksMy.setText(currentItem.getForks_count());
        holder.repoOpenIssuesCountMy.setText(currentItem.getOpen_issues_count());

    }
--- a/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
@ -76,11 +76,10 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
    @Override
    public void onBindViewHolder(@NonNull OrganizationsViewHolder holder, int position) {

-
        UserOrganizations currentItem = orgList.get(position);
        holder.mTextView2.setVisibility(View.GONE);

-        Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(holder.image);
+        Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
        holder.mTextView1.setText(currentItem.getUsername());
        if (!currentItem.getDescription().equals("")) {
            holder.mTextView2.setVisibility(View.VISIBLE);
--- a/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java
@ -65,7 +65,7 @@ public class ProfileFollowersAdapter extends RecyclerView.Adapter<ProfileFollowe
            holder.userName.setVisibility(View.GONE);
        }

-        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(100, 0)).resize(140, 140).centerCrop().into(holder.userAvatar);
+        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
    }

    @Override
--- a/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java
@ -65,7 +65,7 @@ public class ProfileFollowingAdapter extends RecyclerView.Adapter<ProfileFollowi
            holder.userName.setVisibility(View.GONE);
        }

-        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(100, 0)).resize(140, 140).centerCrop().into(holder.userAvatar);
+        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
    }

    @Override
--- a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
+++ b/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();
+        }
+    };
+
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
@ -1,7 +1,11 @@
 package org.mian.gitnex.adapters;

 import android.content.Context;
-import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.text.Html;
+import android.text.Spanned;
+import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@ -11,22 +15,30 @@ import com.amulyakhare.textdrawable.TextDrawable;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
 import org.mian.gitnex.models.Releases;
+import org.mian.gitnex.util.TinyDB;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-import okhttp3.OkHttpClient;
-import ru.noties.markwon.AbstractMarkwonPlugin;
-import ru.noties.markwon.Markwon;
-import ru.noties.markwon.core.CorePlugin;
-import ru.noties.markwon.core.MarkwonTheme;
-import ru.noties.markwon.ext.strikethrough.StrikethroughPlugin;
-import ru.noties.markwon.ext.tables.TablePlugin;
-import ru.noties.markwon.ext.tasklist.TaskListPlugin;
-import ru.noties.markwon.html.HtmlPlugin;
-import ru.noties.markwon.image.ImagesPlugin;
-import ru.noties.markwon.image.gif.GifPlugin;
-import ru.noties.markwon.image.okhttp.OkHttpImagesPlugin;
+import io.noties.markwon.AbstractMarkwonPlugin;
+import io.noties.markwon.Markwon;
+import io.noties.markwon.core.CorePlugin;
+import io.noties.markwon.core.MarkwonTheme;
+import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
+import io.noties.markwon.ext.tables.TablePlugin;
+import io.noties.markwon.ext.tasklist.TaskListPlugin;
+import io.noties.markwon.html.HtmlPlugin;
+import io.noties.markwon.image.AsyncDrawable;
+import io.noties.markwon.image.DefaultMediaDecoder;
+import io.noties.markwon.image.ImageItem;
+import io.noties.markwon.image.ImagesPlugin;
+import io.noties.markwon.image.SchemeHandler;
+import io.noties.markwon.image.gif.GifMediaDecoder;
+import io.noties.markwon.image.svg.SvgMediaDecoder;
+import io.noties.markwon.linkify.LinkifyPlugin;

 /**
 * Author M M Arif
@ -75,6 +87,8 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
    @Override
    public void onBindViewHolder(@NonNull ReleasesAdapter.ReleasesViewHolder holder, int position) {

+        final TinyDB tinyDb = new TinyDB(mCtx);
+
        Releases currentItem = releasesList.get(position);

        holder.releaseTitle.setText(currentItem.getName());
@ -113,34 +127,77 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas

        final Markwon markwon = Markwon.builder(Objects.requireNonNull(mCtx))
                .usePlugin(CorePlugin.create())
-                .usePlugin(OkHttpImagesPlugin.create(new OkHttpClient()))
-                .usePlugin(ImagesPlugin.createWithAssets(mCtx))
+                .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
+                    @Override
+                    public void configureImages(@NonNull ImagesPlugin plugin) {
+                        plugin.addSchemeHandler(new SchemeHandler() {
+                            @NonNull
+                            @Override
+                            public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+
+                                final int resourceId = mCtx.getResources().getIdentifier(
+                                        raw.substring("drawable://".length()),
+                                        "drawable",
+                                        mCtx.getPackageName());
+
+                                final Drawable drawable = mCtx.getDrawable(resourceId);
+
+                                assert drawable != null;
+                                return ImageItem.withResult(drawable);
+                            }
+
+                            @NonNull
+                            @Override
+                            public Collection<String> supportedSchemes() {
+                                return Collections.singleton("drawable");
+                            }
+                        });
+                        plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
+                            @Nullable
+                            @Override
+                            public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
+                                return null;
+                            }
+                        });
+                        plugin.addMediaDecoder(GifMediaDecoder.create(false));
+                        plugin.addMediaDecoder(SvgMediaDecoder.create(mCtx.getResources()));
+                        plugin.addMediaDecoder(SvgMediaDecoder.create());
+                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create(mCtx.getResources()));
+                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
+                    }
+                }))
                .usePlugin(new AbstractMarkwonPlugin() {
                    @Override
                    public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
                        builder
-                                .codeTextColor(Color.GREEN)
-                                .codeBackgroundColor(Color.BLACK)
+                                .codeTextColor(tinyDb.getInt("codeBlockColor"))
+                                .codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
                                .linkColor(mCtx.getResources().getColor(R.color.lightBlue));
                    }
                })
                .usePlugin(TablePlugin.create(mCtx))
                .usePlugin(TaskListPlugin.create(mCtx))
                .usePlugin(HtmlPlugin.create())
-                .usePlugin(GifPlugin.create())
                .usePlugin(StrikethroughPlugin.create())
+                .usePlugin(LinkifyPlugin.create())
                .build();

-        final CharSequence bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(currentItem.getBody()));
+        Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(currentItem.getBody()));

        if(!currentItem.getBody().equals("")) {
-            holder.releaseDescription.setText(bodyWithMD);
+            markwon.setParsedMarkdown(holder.releaseDescription, bodyWithMD);
        }
        else {
            holder.releaseDescription.setVisibility(View.GONE);
        }
-        holder.releaseZipDownload.setText(currentItem.getZipball_url());
-        holder.releaseTarDownload.setText(currentItem.getTarball_url());
+
+        holder.releaseZipDownload.setText(
+                Html.fromHtml("<a href='" + currentItem.getZipball_url() + "'>" + mCtx.getResources().getString(R.string.zipArchiveDownloadReleasesTab) + "</a> "));
+        holder.releaseZipDownload.setMovementMethod(LinkMovementMethod.getInstance());
+
+        holder.releaseTarDownload.setText(
+                Html.fromHtml("<a href='" + currentItem.getTarball_url() + "'>" + mCtx.getResources().getString(R.string.tarArchiveDownloadReleasesTab) + "</a> "));
+        holder.releaseTarDownload.setMovementMethod(LinkMovementMethod.getInstance());

    }

--- a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
@ -0,0 +1,91 @@
+package org.mian.gitnex.adapters;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+import com.squareup.picasso.Picasso;
+import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.models.UserInfo;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class RepoStargazersAdapter extends BaseAdapter {
+
+    private List<UserInfo> stargazersList;
+    private Context mCtx;
+
+    private class ViewHolder {
+
+        private ImageView memberAvatar;
+        private TextView memberName;
+
+        ViewHolder(View v) {
+            memberAvatar  = v.findViewById(R.id.memberAvatar);
+            memberName  = v.findViewById(R.id.memberName);
+        }
+    }
+
+    public RepoStargazersAdapter(Context mCtx, List<UserInfo> membersListMain) {
+        this.mCtx = mCtx;
+        this.stargazersList = membersListMain;
+    }
+
+    @Override
+    public int getCount() {
+        return stargazersList.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return null;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+
+    @SuppressLint("InflateParams")
+    @Override
+    public View getView(int position, View finalView, ViewGroup parent) {
+
+        RepoStargazersAdapter.ViewHolder viewHolder;
+
+        if (finalView == null) {
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.repo_stargazers_list, null);
+            viewHolder = new RepoStargazersAdapter.ViewHolder(finalView);
+            finalView.setTag(viewHolder);
+        }
+        else {
+            viewHolder = (RepoStargazersAdapter.ViewHolder) finalView.getTag();
+        }
+
+        initData(viewHolder, position);
+        return finalView;
+
+    }
+
+    private void initData(RepoStargazersAdapter.ViewHolder viewHolder, int position) {
+
+        UserInfo currentItem = stargazersList.get(position);
+        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
+
+        if(!currentItem.getFullname().equals("")) {
+            viewHolder.memberName.setText(currentItem.getFullname());
+        }
+        else {
+            viewHolder.memberName.setText(currentItem.getLogin());
+        }
+
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
@ -0,0 +1,91 @@
+package org.mian.gitnex.adapters;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+import com.squareup.picasso.Picasso;
+import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.models.UserInfo;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class RepoWatchersAdapter extends BaseAdapter {
+
+    private List<UserInfo> watchersList;
+    private Context mCtx;
+
+    private class ViewHolder {
+
+        private ImageView memberAvatar;
+        private TextView memberName;
+
+        ViewHolder(View v) {
+            memberAvatar  = v.findViewById(R.id.memberAvatar);
+            memberName  = v.findViewById(R.id.memberName);
+        }
+    }
+
+    public RepoWatchersAdapter(Context mCtx, List<UserInfo> membersListMain) {
+        this.mCtx = mCtx;
+        this.watchersList = membersListMain;
+    }
+
+    @Override
+    public int getCount() {
+        return watchersList.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return null;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+
+    @SuppressLint("InflateParams")
+    @Override
+    public View getView(int position, View finalView, ViewGroup parent) {
+
+        RepoWatchersAdapter.ViewHolder viewHolder;
+
+        if (finalView == null) {
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.repo_watchers_list, null);
+            viewHolder = new RepoWatchersAdapter.ViewHolder(finalView);
+            finalView.setTag(viewHolder);
+        }
+        else {
+            viewHolder = (RepoWatchersAdapter.ViewHolder) finalView.getTag();
+        }
+
+        initData(viewHolder, position);
+        return finalView;
+
+    }
+
+    private void initData(RepoWatchersAdapter.ViewHolder viewHolder, int position) {
+
+        UserInfo currentItem = watchersList.get(position);
+        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
+
+        if(!currentItem.getFullname().equals("")) {
+            viewHolder.memberName.setText(currentItem.getFullname());
+        }
+        else {
+            viewHolder.memberName.setText(currentItem.getLogin());
+        }
+
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@ -4,8 +4,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import androidx.annotation.NonNull;
+import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Filter;
@ -14,10 +17,16 @@ import android.widget.ImageView;
 import android.widget.TextView;
 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.ArrayList;
 import java.util.List;

@ -39,10 +48,12 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
        private TextView fullName;
        private ImageView repoPrivatePublic;
        private TextView repoStars;
-        private TextView repoWatchers;
+        private TextView repoForks;
        private TextView repoOpenIssuesCount;
+        private TextView repoType;

        private ReposViewHolder(View itemView) {
+
            super(itemView);
            mTextView1 = itemView.findViewById(R.id.repoName);
            mTextView2 = itemView.findViewById(R.id.repoDescription);
@ -50,26 +61,94 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
            fullName = itemView.findViewById(R.id.repoFullName);
            repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
            repoStars = itemView.findViewById(R.id.repoStars);
-            repoWatchers = itemView.findViewById(R.id.repoWatchers);
+            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
                public void onClick(View v) {

                    Context context = v.getContext();
-                    TextView repoFullName = (TextView) v.findViewById(R.id.repoFullName);
+                    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);

                }
            });
+
+            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 };
+                        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();
+
+                }
+            });
+
        }
    }

@ -94,19 +173,29 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo

        ColorGenerator generator = ColorGenerator.MATERIAL;
        int color = generator.getColor(currentItem.getName());
-        String charac = String.valueOf(currentItem.getName().charAt(0));
+        String firstCharacter = String.valueOf(currentItem.getName().charAt(0));

        TextDrawable drawable = TextDrawable.builder()
                .beginConfig()
                .useFont(Typeface.DEFAULT)
-                .fontSize(16)
+                .fontSize(18)
                .toUpperCase()
                .width(28)
                .height(28)
                .endConfig()
-                .buildRound(charac, color);
+                .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);
@ -115,12 +204,14 @@ 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.repoWatchers.setText(currentItem.getWatchers_count());
+        holder.repoForks.setText(currentItem.getForks_count());
        holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());

    }
--- a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
@ -4,6 +4,7 @@ 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.Filter;
@ -12,13 +13,21 @@ import android.widget.ImageView;
 import android.widget.TextView;
 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.ArrayList;
 import java.util.List;
 import androidx.annotation.NonNull;
+import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;

 /**
@ -39,8 +48,9 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
        private TextView fullName;
        private ImageView repoPrivatePublic;
        private TextView repoStars;
-        private TextView repoWatchers;
+        private TextView repoForks;
        private TextView repoOpenIssuesCount;
+        private TextView repoType;

        private OrgReposViewHolder(View itemView) {
            super(itemView);
@ -50,8 +60,10 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
            fullName = itemView.findViewById(R.id.repoFullName);
            repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
            repoStars = itemView.findViewById(R.id.repoStars);
-            repoWatchers = itemView.findViewById(R.id.repoWatchers);
+            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
@ -64,12 +76,76 @@ 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);

                }
            });

+            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 };
+                        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();
+
+                }
+            });
+
        }

    }
@ -95,19 +171,29 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB

        ColorGenerator generator = ColorGenerator.MATERIAL;
        int color = generator.getColor(currentItem.getName());
-        String charac = String.valueOf(currentItem.getName().charAt(0));
+        String firstCharacter = String.valueOf(currentItem.getName().charAt(0));

        TextDrawable drawable = TextDrawable.builder()
                .beginConfig()
                .useFont(Typeface.DEFAULT)
-                .fontSize(16)
+                .fontSize(18)
                .toUpperCase()
                .width(28)
                .height(28)
                .endConfig()
-                .buildRound(charac, color);
+                .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);
@ -116,12 +202,14 @@ 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.repoWatchers.setText(currentItem.getWatchers_count());
+        holder.repoForks.setText(currentItem.getForks_count());
        holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());

    }
--- a/app/src/main/java/org/mian/gitnex/adapters/SponsorsAdapter.java
+++ b/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();
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
@ -4,6 +4,7 @@ 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.Filter;
@ -12,13 +13,21 @@ import android.widget.ImageView;
 import android.widget.TextView;
 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.ArrayList;
 import java.util.List;
 import androidx.annotation.NonNull;
+import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;

 /**
@ -39,8 +48,9 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
        private TextView fullName;
        private ImageView repoPrivatePublic;
        private TextView repoStars;
-        private TextView repoWatchers;
+        private TextView repoForks;
        private TextView repoOpenIssuesCount;
+        private TextView repoType;

        private StarredReposViewHolder(View itemView) {
            super(itemView);
@ -50,8 +60,10 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
            fullName = itemView.findViewById(R.id.repoFullName);
            repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
            repoStars = itemView.findViewById(R.id.repoStars);
-            repoWatchers = itemView.findViewById(R.id.repoWatchers);
+            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
@ -64,12 +76,76 @@ 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);

                }
            });

+            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 };
+                        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();
+
+                }
+            });
+
        }

    }
@ -95,19 +171,29 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi

        ColorGenerator generator = ColorGenerator.MATERIAL;
        int color = generator.getColor(currentItem.getName());
-        String charac = String.valueOf(currentItem.getName().charAt(0));
+        String firstCharacter = String.valueOf(currentItem.getName().charAt(0));

        TextDrawable drawable = TextDrawable.builder()
                .beginConfig()
                .useFont(Typeface.DEFAULT)
-                .fontSize(16)
+                .fontSize(18)
                .toUpperCase()
                .width(28)
                .height(28)
                .endConfig()
-                .buildRound(charac, color);
+                .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);
@ -116,12 +202,14 @@ 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.repoWatchers.setText(currentItem.getWatchers_count());
+        holder.repoForks.setText(currentItem.getForks_count());
        holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());

    }
--- a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
@ -78,7 +78,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
    private void initData(TeamMembersByOrgAdapter.ViewHolder viewHolder, int position) {

        UserInfo currentItem = teamMembersList.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);

        if(!currentItem.getFullname().equals("")) {
            viewHolder.memberName.setText(currentItem.getFullname());
--- a/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
@ -141,7 +141,7 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
        }

        if (!currentItem.getAvatar().equals("")) {
-            Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(holder.userAvatar);
+            Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
        }

        if(getItemCount() > 0) {
@ -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());
                }

            });
--- a/app/src/main/java/org/mian/gitnex/clients/IssuesService.java
+++ b/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);

    }
--- a/app/src/main/java/org/mian/gitnex/clients/PullRequestsService.java
+++ b/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);
+
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java
+++ b/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() {
--- a/app/src/main/java/org/mian/gitnex/fragments/AboutFragment.java
+++ b/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,28 @@ 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 +72,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 +114,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());
-            }
-        });
-
-    }
-
 }
--- a/app/src/main/java/org/mian/gitnex/fragments/BranchesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BranchesFragment.java
@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -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);
            }
@ -125,9 +125,9 @@ public class BranchesFragment extends Fragment {

    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo) {

-        BranchesViewModel branchesModel = ViewModelProviders.of(this).get(BranchesViewModel.class);
+        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);
--- a/app/src/main/java/org/mian/gitnex/fragments/ClosedIssuesFragment.java
+++ b/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;
@ -120,14 +119,11 @@ 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);
+        apiClosed = IssuesService.createService(ApiInterface.class, instanceUrl, getContext());
        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState);

        return v;
@ -190,7 +186,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());
            }

        });
@ -245,7 +241,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,10 +259,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));

-        if(!connToInternet) {
+        /*if(!connToInternet) {
            return;
-        }
+        }*/

        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {

--- a/app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java
@ -6,11 +6,12 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.GridView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.CollaboratorsAdapter;
@ -26,6 +27,7 @@ import java.util.List;

 public class CollaboratorsFragment extends Fragment {

+    private ProgressBar mProgressBar;
    private CollaboratorsAdapter adapter;
    private GridView mGridView;
    private TextView noDataCollaborators;
@ -69,6 +71,8 @@ public class CollaboratorsFragment extends Fragment {
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
        noDataCollaborators = v.findViewById(R.id.noDataCollaborators);

+        mProgressBar = v.findViewById(R.id.progress_bar);
+
        mGridView = v.findViewById(R.id.gridView);

        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
@ -94,9 +98,9 @@ public class CollaboratorsFragment extends Fragment {

    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo) {

-        CollaboratorsViewModel collaboratorsModel = ViewModelProviders.of(this).get(CollaboratorsViewModel.class);
+        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);
@ -109,6 +113,7 @@ public class CollaboratorsFragment extends Fragment {
                    mGridView.setAdapter(adapter);
                    noDataCollaborators.setVisibility(View.VISIBLE);
                }
+                mProgressBar.setVisibility(View.GONE);
            }
        });

--- a/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java
@ -0,0 +1,186 @@
+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.activities.MainActivity;
+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.AppUtil;
+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) {
+
+        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+
+        final View v = inflater.inflate(R.layout.fragment_explore_repo, container, false);
+        //setHasOptionsMenu(true);
+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleExplore));
+
+        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);
+
+        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;
+            }
+        });
+
+        return v;
+
+    }
+
+    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);
+    }
+}
--- a/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
@ -0,0 +1,305 @@
+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());
+                fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, finalDirName_);
+
+            }
+
+            @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);
+    }
+}
--- a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java
+++ b/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;
@ -119,14 +118,11 @@ 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);
+        api = IssuesService.createService(ApiInterface.class, instanceUrl, getContext());
        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);

        return v;
@ -189,7 +185,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());
            }

        });
@ -244,7 +240,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,10 +258,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));

-        if(!connToInternet) {
+        /*if(!connToInternet) {
            return;
-        }
+        }*/

        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {

--- a/app/src/main/java/org/mian/gitnex/fragments/LabelsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/LabelsFragment.java
@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -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);
        }
    }
@ -142,9 +142,9 @@ public class LabelsFragment extends Fragment {

    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo) {

-        LabelsViewModel labelsModel = ViewModelProviders.of(this).get(LabelsViewModel.class);
+        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);
--- a/app/src/main/java/org/mian/gitnex/fragments/MembersByOrgFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MembersByOrgFragment.java
@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@ -81,9 +81,9 @@ public class MembersByOrgFragment extends Fragment {

    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner) {

-        MembersByOrgViewModel membersModel = ViewModelProviders.of(this).get(MembersByOrgViewModel.class);
+        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,6 +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));

        if(!connToInternet) {
            return;
@ -125,7 +126,9 @@ public class MembersByOrgFragment extends Fragment {

            @Override
            public boolean onQueryTextChange(String newText) {
+                if(mGridView.getAdapter() != null) {
                    adapter.getFilter().filter(newText);
+                }
                return false;
            }
        });
--- a/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -46,6 +46,7 @@ public class MilestonesFragment extends Fragment {

    private String repoName;
    private String repoOwner;
+    private String msState = "all";

    private OnFragmentInteractionListener mListener;

@ -103,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);
+                        MilestonesViewModel.loadMilestonesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, msState, getContext());
                    }
                }, 50);
            }
@ -127,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);
+            MilestonesViewModel.loadMilestonesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, msState, getContext());
            tinyDb.putBoolean("milestoneCreated", false);
        }
    }
@ -150,9 +151,9 @@ public class MilestonesFragment extends Fragment {

    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo) {

-        MilestonesViewModel msModel = ViewModelProviders.of(this).get(MilestonesViewModel.class);
+        MilestonesViewModel msModel = new ViewModelProvider(this).get(MilestonesViewModel.class);

-        msModel.getMilestonesList(instanceUrl, instanceToken, owner, repo).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);
@ -182,10 +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));

-        if(!connToInternet) {
+        /*if(!connToInternet) {
            return;
-        }
+        }*/

        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
            @Override
@ -195,7 +197,9 @@ public class MilestonesFragment extends Fragment {

            @Override
            public boolean onQueryTextChange(String newText) {
+                if(mRecyclerView.getAdapter() != null) {
                    adapter.getFilter().filter(newText);
+                }
                return false;
            }
        });
--- a/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java
@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -89,6 +89,7 @@ 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");

        final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);

@ -131,8 +132,6 @@ public class MyRepositoriesFragment extends Fragment {
            }
        });

-        if(connToInternet) {
-
        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
            @Override
            public void onRefresh() {
@ -140,18 +139,13 @@ public class MyRepositoriesFragment extends Fragment {
                    @Override
                    public void run() {
                        swipeRefresh.setRefreshing(false);
-                            MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), loginUid);
+                        MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext());
                    }
                }, 50);
            }
        });

-            fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), loginUid);
-
-        }
-        else {
-            mProgressBar.setVisibility(View.GONE);
-        }
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin);

        return v;

@ -164,16 +158,17 @@ 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);
+        MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext());

    }

-    private void fetchDataAsync(String instanceUrl, String instanceToken, String username) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String userLogin) {

-        MyRepositoriesViewModel myRepoModel = ViewModelProviders.of(this).get(MyRepositoriesViewModel.class);
+        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()).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
            @Override
            public void onChanged(@Nullable List<UserRepositories> myReposListMain) {
                adapter = new MyReposListAdapter(getContext(), myReposListMain);
@ -203,10 +198,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));

-        if(!connToInternet) {
+        /*if(!connToInternet) {
            return;
-        }
+        }*/

        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
            @Override
@ -216,7 +212,9 @@ public class MyRepositoriesFragment extends Fragment {

            @Override
            public boolean onQueryTextChange(String newText) {
+                if(mRecyclerView.getAdapter() != null) {
                    adapter.getFilter().filter(newText);
+                }
                return false;
            }
        });
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
+++ b/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);

@ -104,7 +104,7 @@ public class OrganizationInfoFragment extends Fragment {
                    if (response.code() == 200) {

                        assert orgInfo != null;
-                        Picasso.get().load(orgInfo.getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(orgAvatar);
+                        Picasso.get().load(orgInfo.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(orgAvatar);
                        orgDescInfo.setText(orgInfo.getDescription());
                        orgWebsiteInfo.setText(orgInfo.getWebsite());
                        orgLocationInfo.setText(orgInfo.getLocation());
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java
@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -101,7 +101,6 @@ public class OrganizationsFragment extends Fragment {
            }
        });

-        if(connToInternet) {
        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
            @Override
            public void onRefresh() {
@ -109,17 +108,13 @@ public class OrganizationsFragment extends Fragment {
                    @Override
                    public void run() {
                        swipeRefresh.setRefreshing(false);
-                            OrganizationListViewModel.loadOrgsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
+                        OrganizationListViewModel.loadOrgsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
                    }
                }, 50);
            }
        });

        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
-        }
-        else {
-            mProgressBar.setVisibility(View.GONE);
-        }

        return v;

@ -134,16 +129,16 @@ 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);
        }
    }

    private void fetchDataAsync(String instanceUrl, String instanceToken) {

-        OrganizationListViewModel orgModel = ViewModelProviders.of(this).get(OrganizationListViewModel.class);
+        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,10 +168,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));

-        if(!connToInternet) {
+        /*if(!connToInternet) {
            return;
-        }
+        }*/

        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
            @Override
@ -186,7 +182,9 @@ public class OrganizationsFragment extends Fragment {

            @Override
            public boolean onQueryTextChange(String newText) {
+                if(mRecyclerView.getAdapter() != null) {
                    adapter.getFilter().filter(newText);
+                }
                return false;
            }
        });
--- a/app/src/main/java/org/mian/gitnex/fragments/ProfileEmailsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ProfileEmailsFragment.java
@ -5,7 +5,7 @@ import android.os.Bundle;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -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);
            }
@ -109,9 +109,9 @@ public class ProfileEmailsFragment extends Fragment {

    private void fetchDataAsync(String instanceUrl, String instanceToken) {

-        ProfileEmailsViewModel profileEmailModel = ViewModelProviders.of(this).get(ProfileEmailsViewModel.class);
+        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);
--- a/app/src/main/java/org/mian/gitnex/fragments/ProfileFollowersFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ProfileFollowersFragment.java
@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -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);
            }
@ -108,9 +108,9 @@ public class ProfileFollowersFragment extends Fragment {

    private void fetchDataAsync(String instanceUrl, String instanceToken) {

-        ProfileFollowersViewModel pfModel = ViewModelProviders.of(this).get(ProfileFollowersViewModel.class);
+        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);
--- a/app/src/main/java/org/mian/gitnex/fragments/ProfileFollowingFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ProfileFollowingFragment.java
@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -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);
            }
@ -108,9 +108,9 @@ public class ProfileFollowingFragment extends Fragment {

    private void fetchDataAsync(String instanceUrl, String instanceToken) {

-        ProfileFollowingViewModel pfModel = ViewModelProviders.of(this).get(ProfileFollowingViewModel.class);
+        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);
--- a/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java
@ -48,7 +48,7 @@ public class ProfileFragment extends Fragment {
        TextView userEmail = v.findViewById(R.id.userEmail);

        userFullName.setText(tinyDb.getString("userFullname"));
-        Picasso.get().load(tinyDb.getString("userAvatar")).transform(new RoundedTransformation(100, 0)).resize(180, 180).centerCrop().into(userAvatar);
+        Picasso.get().load(tinyDb.getString("userAvatar")).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(userAvatar);
        userLogin.setText(getString(R.string.usernameWithAt, tinyDb.getString("userLogin")));
        userEmail.setText(tinyDb.getString("userEmail"));

--- a/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java
@ -0,0 +1,293 @@
+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";
+
+    @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);
+                        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);
+
+                        }
+                        /*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);
+
+        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);
+            tinyDb.putBoolean("resumePullRequests", false);
+
+        }
+
+    }
+
+    private void loadInitial(String token, String repoOwner, String repoName, int page, String prState) {
+
+        Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState);
+
+        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){
+
+        //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);
+
+        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;
+
+            }
+
+        });
+
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java
@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -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);
        }

@ -141,9 +141,9 @@ public class ReleasesFragment extends Fragment {

    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo) {

-        ReleasesViewModel releasesModel = ViewModelProviders.of(this).get(ReleasesViewModel.class);
+        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);
--- a/app/src/main/java/org/mian/gitnex/fragments/RepoBottomSheetFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepoBottomSheetFragment.java
@ -8,6 +8,8 @@ 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;

@ -24,11 +26,19 @@ public class RepoBottomSheetFragment extends BottomSheetDialogFragment {
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
        View v = inflater.inflate(R.layout.repo_bottom_sheet_layout, container, false);

+        final TinyDB tinyDb = new TinyDB(getContext());
+
        TextView createLabel = v.findViewById(R.id.createLabel);
        TextView createIssue = v.findViewById(R.id.createNewIssue);
        TextView createMilestone = v.findViewById(R.id.createNewMilestone);
        TextView addCollaborator = v.findViewById(R.id.addCollaborator);
        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
@ -38,6 +48,8 @@ public class RepoBottomSheetFragment extends BottomSheetDialogFragment {
            }
        });

+        if(tinyDb.getBoolean("hasIssues")) {
+            createIssue.setVisibility(View.VISIBLE);
            createIssue.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {
@ -45,6 +57,10 @@ public class RepoBottomSheetFragment extends BottomSheetDialogFragment {
                    dismiss();
                }
            });
+        }
+        else {
+            createIssue.setVisibility(View.GONE);
+        }

        createMilestone.setOnClickListener(new View.OnClickListener() {
            @Override
@ -70,6 +86,88 @@ public class RepoBottomSheetFragment extends BottomSheetDialogFragment {
            }
        });

+        openWebRepo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                bmListener.onButtonClicked("openWebRepo");
+                dismiss();
+            }
+        });
+
+        newFile.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                bmListener.onButtonClicked("newFile");
+                dismiss();
+            }
+        });
+
+        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;
    }

--- a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
@ -1,26 +1,31 @@
 package org.mian.gitnex.fragments;

 import android.content.Context;
-import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import okhttp3.OkHttpClient;
+import io.noties.markwon.AbstractMarkwonPlugin;
+import io.noties.markwon.Markwon;
+import io.noties.markwon.core.CorePlugin;
+import io.noties.markwon.core.MarkwonTheme;
+import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
+import io.noties.markwon.ext.tables.TablePlugin;
+import io.noties.markwon.ext.tasklist.TaskListPlugin;
+import io.noties.markwon.html.HtmlPlugin;
+import io.noties.markwon.image.AsyncDrawable;
+import io.noties.markwon.image.DefaultMediaDecoder;
+import io.noties.markwon.image.ImageItem;
+import io.noties.markwon.image.ImagesPlugin;
+import io.noties.markwon.image.SchemeHandler;
+import io.noties.markwon.image.gif.GifMediaDecoder;
+import io.noties.markwon.image.svg.SvgMediaDecoder;
+import io.noties.markwon.linkify.LinkifyPlugin;
 import retrofit2.Call;
 import retrofit2.Callback;
-import ru.noties.markwon.AbstractMarkwonPlugin;
-import ru.noties.markwon.Markwon;
-import ru.noties.markwon.core.CorePlugin;
-import ru.noties.markwon.core.MarkwonTheme;
-import ru.noties.markwon.ext.strikethrough.StrikethroughPlugin;
-import ru.noties.markwon.ext.tables.TablePlugin;
-import ru.noties.markwon.ext.tables.TableTheme;
-import ru.noties.markwon.ext.tasklist.TaskListPlugin;
-import ru.noties.markwon.html.HtmlPlugin;
-import ru.noties.markwon.image.ImagesPlugin;
-import ru.noties.markwon.image.gif.GifPlugin;
-import ru.noties.markwon.image.okhttp.OkHttpImagesPlugin;
+import android.text.Spanned;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@ -42,6 +47,8 @@ import org.mian.gitnex.util.TinyDB;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Locale;
 import java.util.Objects;

@ -208,8 +215,10 @@ public class RepoInfoFragment extends Fragment {

    private void getRepoInfo(String instanceUrl, String token, final String owner, String repo, final String locale, final String timeFormat) {

+        final TinyDB tinyDb = new TinyDB(getContext());
+
        Call<UserRepositories> call = RetrofitClient
-                .getInstance(instanceUrl)
+                .getInstance(instanceUrl, getContext())
                .getApiInterface()
                .getUserRepository(token, owner, repo);

@ -220,6 +229,8 @@ public class RepoInfoFragment extends Fragment {

                UserRepositories repoInfo = response.body();

+                if (isAdded()) {
+
                    if (response.isSuccessful()) {

                        if (response.code() == 200) {
@ -236,6 +247,13 @@ public class RepoInfoFragment extends Fragment {
                            repoRepoUrlInfo.setText(repoInfo.getHtml_url());
                            repoForksCountInfo.setText(repoInfo.getForks_count());

+                            if(repoInfo.getHas_issues() != null) {
+                                tinyDb.putBoolean("hasIssues", repoInfo.getHas_issues());
+                            }
+                            else {
+                                tinyDb.putBoolean("hasIssues", true);
+                            }
+
                            switch (timeFormat) {
                                case "pretty": {
                                    PrettyTime prettyTime = new PrettyTime(new Locale(locale));
@ -270,6 +288,8 @@ public class RepoInfoFragment extends Fragment {

                }

+            }
+
            @Override
            public void onFailure(@NonNull Call<UserRepositories> call, @NonNull Throwable t) {
                Log.e("onFailure", t.toString());
@ -283,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);

@ -292,12 +312,51 @@ public class RepoInfoFragment extends Fragment {
            @Override
            public void onResponse(@NonNull Call<String> call, @NonNull retrofit2.Response<String> response) {

+                if (isAdded()) {
+
                    if (response.code() == 200) {

                        final Markwon markwon = Markwon.builder(Objects.requireNonNull(getContext()))
                            .usePlugin(CorePlugin.create())
-                            .usePlugin(OkHttpImagesPlugin.create(new OkHttpClient()))
-                            .usePlugin(ImagesPlugin.createWithAssets(getContext()))
+                            .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
+                                @Override
+                                public void configureImages(@NonNull ImagesPlugin plugin) {
+                                    plugin.addSchemeHandler(new SchemeHandler() {
+                                        @NonNull
+                                        @Override
+                                        public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+
+                                            final int resourceId = getContext().getResources().getIdentifier(
+                                                    raw.substring("drawable://".length()),
+                                                    "drawable",
+                                                    getContext().getPackageName());
+
+                                            final Drawable drawable = getContext().getDrawable(resourceId);
+
+                                            assert drawable != null;
+                                            return ImageItem.withResult(drawable);
+                                        }
+
+                                        @NonNull
+                                        @Override
+                                        public Collection<String> supportedSchemes() {
+                                            return Collections.singleton("drawable");
+                                        }
+                                    });
+                                    plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
+                                        @Nullable
+                                        @Override
+                                        public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
+                                            return null;
+                                        }
+                                    });
+                                    plugin.addMediaDecoder(GifMediaDecoder.create(false));
+                                    plugin.addMediaDecoder(SvgMediaDecoder.create(getContext().getResources()));
+                                    plugin.addMediaDecoder(SvgMediaDecoder.create());
+                                    plugin.defaultMediaDecoder(DefaultMediaDecoder.create(getContext().getResources()));
+                                    plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
+                                }
+                            }))
                            .usePlugin(new AbstractMarkwonPlugin() {
                                @Override
                                public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
@ -310,41 +369,40 @@ public class RepoInfoFragment extends Fragment {
                            .usePlugin(TablePlugin.create(getContext()))
                            .usePlugin(TaskListPlugin.create(getContext()))
                            .usePlugin(HtmlPlugin.create())
-                            .usePlugin(GifPlugin.create())
                            .usePlugin(StrikethroughPlugin.create())
+                            .usePlugin(LinkifyPlugin.create())
                            .build();

-                    CharSequence bodyWithMD = null;
+                        Spanned bodyWithMD = null;
                        if (response.body() != null) {
                            bodyWithMD = markwon.toMarkdown(response.body());
                        }
-                    repoFileContents.setText(bodyWithMD);
+                        assert bodyWithMD != null;
+                        markwon.setParsedMarkdown(repoFileContents, bodyWithMD);

-                }
-                else if(response.code() == 401) {
+
+                    } 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) {
+                    } else if (response.code() == 403) {

                        Toasty.info(ctx, ctx.getString(R.string.authorizeError));

-                }
-                else if(response.code() == 404) {
+                    } else if (response.code() == 404) {

                        fileContentsFrameHeader.setVisibility(View.GONE);
                        fileContentsFrame.setVisibility(View.GONE);

-                }
-                else {
+                    } else {

                        Toasty.info(getContext(), getString(R.string.genericError));

                    }
+                }

            }

--- a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java
@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -97,7 +97,7 @@ 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());
                    }
                }, 200);
            }
@ -117,15 +117,15 @@ 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);
+        RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext());

    }

    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner) {

-        RepositoriesByOrgViewModel orgRepoModel = ViewModelProviders.of(this).get(RepositoriesByOrgViewModel.class);
+        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()).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
            @Override
            public void onChanged(@Nullable List<UserRepositories> orgReposListMain) {
                adapter = new RepositoriesByOrgAdapter(getContext(), orgReposListMain);
@ -155,6 +155,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));

        if(!connToInternet) {
            return;
@ -168,7 +169,9 @@ public class RepositoriesByOrgFragment extends Fragment {

            @Override
            public boolean onQueryTextChange(String newText) {
+                if(mRecyclerView.getAdapter() != null) {
                    adapter.getFilter().filter(newText);
+                }
                return false;
            }
        });
--- a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java
@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -102,8 +102,6 @@ public class RepositoriesFragment extends Fragment {
            }
        });

-        if(connToInternet) {
-
        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
            @Override
            public void onRefresh() {
@ -111,7 +109,7 @@ public class RepositoriesFragment extends Fragment {
                    @Override
                    public void run() {
                        swipeRefresh.setRefreshing(false);
-                            RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
+                        RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
                    }
                }, 50);
            }
@ -119,11 +117,6 @@ public class RepositoriesFragment extends Fragment {

        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));

-        }
-        else {
-            mProgressBar.setVisibility(View.GONE);
-        }
-
        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());
            tinyDb.putBoolean("repoCreated", false);
        }
    }

    private void fetchDataAsync(String instanceUrl, String instanceToken) {

-        RepositoriesListViewModel repoModel = ViewModelProviders.of(this).get(RepositoriesListViewModel.class);
+        RepositoriesListViewModel repoModel = new ViewModelProvider(this).get(RepositoriesListViewModel.class);

-        repoModel.getUserRepositories(instanceUrl, instanceToken).observe(this, new Observer<List<UserRepositories>>() {
+        repoModel.getUserRepositories(instanceUrl, instanceToken, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
            @Override
            public void onChanged(@Nullable List<UserRepositories> reposListMain) {
                adapter = new ReposListAdapter(getContext(), reposListMain);
@ -176,10 +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));

-        if(!connToInternet) {
+        /*if(!connToInternet) {
            return;
-        }
+        }*/

        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
            @Override
@ -189,7 +183,9 @@ public class RepositoriesFragment extends Fragment {

            @Override
            public boolean onQueryTextChange(String newText) {
+                if(mRecyclerView.getAdapter() != null) {
                    adapter.getFilter().filter(newText);
+                }
                return false;
            }
        });
--- a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
@ -30,7 +30,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", "Persian", "Portuguese/Brazilian", "Russian", "Serbian", "Turkish", "Ukrainian"};
    private static int langSelectedChoice = 0;

    private static String[] timeList = {"Pretty", "Normal"};
@ -68,7 +68,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);
            }
        });
@ -185,10 +185,6 @@ public class SettingsFragment extends Fragment {
                        tinyDb.putInt("codeBlockId", i);

                        switch (codeBlockList[i]) {
-                            case "Green - Black":
-                                tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorLightGreen));
-                                tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
-                                break;
                            case "White - Black":
                                tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.white));
                                tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
@ -248,8 +244,14 @@ public class SettingsFragment extends Fragment {
                        tinyDb.putInt("langId", i);

                        switch (langList[i]) {
-                            case "English":
-                                tinyDb.putString("locale", "en");
+                            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");
@ -257,9 +259,27 @@ public class SettingsFragment extends Fragment {
                            case "German":
                                tinyDb.putString("locale", "de");
                                break;
+                            case "Italian":
+                                tinyDb.putString("locale", "it");
+                                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;
@ -309,16 +329,10 @@ public class SettingsFragment extends Fragment {
                        tinyDb.putString("timeStr", timeList[i]);
                        tinyDb.putInt("timeId", i);

-                        switch (timeList[i]) {
-                            case "Pretty":
-                                tinyDb.putString("dateFormat", "pretty");
-                                break;
-                            case "Normal":
+                        if ("Normal".equals(timeList[i])) {
                            tinyDb.putString("dateFormat", "normal");
-                                break;
-                            default:
+                        } else {
                            tinyDb.putString("dateFormat", "pretty");
-                                break;
                        }

                        dialogInterfaceTime.dismiss();
--- a/app/src/main/java/org/mian/gitnex/fragments/SingleIssueBottomSheetFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SingleIssueBottomSheetFragment.java
@ -12,10 +12,16 @@ 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;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import android.content.ClipboardManager;
+import android.content.ClipData;
+import java.util.Objects;

 /**
 * Author M M Arif
@ -37,6 +43,9 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
        TextView closeIssue = v.findViewById(R.id.closeIssue);
        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
@ -48,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) {
@ -78,6 +133,35 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
            }
        });

+        copyIssueUrl.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                // get url of repo
+                String repoFullName = tinyDB.getString("repoFullName");
+                String instanceUrlWithProtocol = "https://" + tinyDB.getString("instanceUrlRaw");
+                if (!tinyDB.getString("instanceUrlWithProtocol").isEmpty()) {
+                    instanceUrlWithProtocol = tinyDB.getString("instanceUrlWithProtocol");
+                }
+
+                // get issue Url
+                String issueUrl = instanceUrlWithProtocol + "/" + repoFullName + "/issues/" + tinyDB.getString("issueNumber");
+
+                // copy to clipboard
+                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();
+
+                Toasty.info(getContext(), getContext().getString(R.string.copyIssueUrlToastMsg));
+
+            }
+        });
+
+        if(tinyDB.getString("issueType").equals("issue")) {
+
            if (tinyDB.getString("issueState").equals("open")) { // close issue

                reOpenIssue.setVisibility(View.GONE);
@ -92,8 +176,7 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
                    }
                });

-        }
-        else if(tinyDB.getString("issueState").equals("closed")) {
+            } else if (tinyDB.getString("issueState").equals("closed")) {

                closeIssue.setVisibility(View.GONE);

@ -109,6 +192,14 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {

            }

+        }
+        else {
+
+            reOpenIssue.setVisibility(View.GONE);
+            closeIssue.setVisibility(View.GONE);
+
+        }
+
        return v;
    }

--- a/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java
@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -127,8 +127,6 @@ public class StarredRepositoriesFragment extends Fragment {
            }
        });

-        if(connToInternet) {
-
        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
            @Override
            public void onRefresh() {
@ -136,7 +134,7 @@ public class StarredRepositoriesFragment extends Fragment {
                    @Override
                    public void run() {
                        swipeRefresh.setRefreshing(false);
-                            StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
+                        StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
                    }
                }, 50);
            }
@ -144,11 +142,6 @@ public class StarredRepositoriesFragment extends Fragment {

        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));

-        }
-        else {
-            mProgressBar.setVisibility(View.GONE);
-        }
-
        return v;
    }

@ -160,15 +153,15 @@ 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));
+        StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());

    }

    private void fetchDataAsync(String instanceUrl, String instanceToken) {

-        StarredRepositoriesViewModel starredRepoModel = ViewModelProviders.of(this).get(StarredRepositoriesViewModel.class);
+        StarredRepositoriesViewModel starredRepoModel = new ViewModelProvider(this).get(StarredRepositoriesViewModel.class);

-        starredRepoModel.getUserStarredRepositories(instanceUrl, instanceToken).observe(this, new Observer<List<UserRepositories>>() {
+        starredRepoModel.getUserStarredRepositories(instanceUrl, instanceToken, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
            @Override
            public void onChanged(@Nullable List<UserRepositories> starredReposListMain) {
                adapter = new StarredReposListAdapter(getContext(), starredReposListMain);
@ -198,10 +191,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));

-        if(!connToInternet) {
+        /*if(!connToInternet) {
            return;
-        }
+        }*/

        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
            @Override
@ -211,7 +205,9 @@ public class StarredRepositoriesFragment extends Fragment {

            @Override
            public boolean onQueryTextChange(String newText) {
+                if(mRecyclerView.getAdapter() != null) {
                    adapter.getFilter().filter(newText);
+                }
                return false;
            }
        });
--- a/app/src/main/java/org/mian/gitnex/fragments/TeamsByOrgFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/TeamsByOrgFragment.java
@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -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,16 +117,16 @@ 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);
        }
    }

    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner) {

-        TeamsByOrgViewModel teamModel = ViewModelProviders.of(this).get(TeamsByOrgViewModel.class);
+        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,10 +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));

-        if(!connToInternet) {
+        /*if(!connToInternet) {
            return;
-        }
+        }*/

        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
            @Override
@ -169,7 +170,9 @@ public class TeamsByOrgFragment extends Fragment {

            @Override
            public boolean onQueryTextChange(String newText) {
+                if(mRecyclerView.getAdapter() != null) {
                    adapter.getFilter().filter(newText);
+                }
                return false;
            }
        });
--- a/app/src/main/java/org/mian/gitnex/helpers/VersionCheck.java
+++ b/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)
+        }
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java
+++ b/app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java
@ -3,6 +3,11 @@ 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.PullRequests;
 import org.mian.gitnex.models.UpdateIssueAssignee;
 import org.mian.gitnex.models.UpdateIssueState;
 import org.mian.gitnex.models.Collaborators;
@ -25,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;
@ -44,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);
@ -98,7 +105,7 @@ public interface ApiInterface {
    Call<Issues> replyCommentToIssue(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int issueIndex, @Body Issues jsonStr);

    @GET("repos/{owner}/{repo}/milestones") // get milestones by repo
-    Call<List<Milestones>> getMilestones(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
+    Call<List<Milestones>> getMilestones(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Query("state") String state);

    @GET("repos/{owner}/{repo}/branches") // get branches
    Call<List<Branches>> getBranches(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
@ -204,4 +211,52 @@ public interface ApiInterface {

    @GET("admin/users") // get all users
    Call<List<UserInfo>> adminGetUsers(@Header("Authorization") String token);
+
+    @GET("repos/{owner}/{repo}/stargazers") // get all repo stars
+    Call<List<UserInfo>> getRepoStargazers(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
+
+    @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);
+
+    @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);
 }
--- a/app/src/main/java/org/mian/gitnex/models/ExploreRepositories.java
+++ b/app/src/main/java/org/mian/gitnex/models/ExploreRepositories.java
@ -0,0 +1,22 @@
+package org.mian.gitnex.models;
+
+import java.util.ArrayList;
+
+/**
+ * Author M M Arif
+ */
+
+public class ExploreRepositories {
+
+    private ArrayList<UserRepositories> data;
+    private Boolean ok;
+
+    public ArrayList<UserRepositories> getSearchedData() {
+        return data;
+    }
+
+    public Boolean getOk() {
+        return ok;
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/models/FileDiffView.java
+++ b/app/src/main/java/org/mian/gitnex/models/FileDiffView.java
@ -0,0 +1,39 @@
+package org.mian.gitnex.models;
+
+/**
+ * Author M M Arif
+ */
+
+public class FileDiffView {
+
+    private String fileName;
+    private boolean fileType;
+    private String fileInfo;
+    private String fileContents;
+
+    public FileDiffView(String fileName, boolean fileType, String fileInfo, String fileContents)
+    {
+
+        this.fileName = fileName;
+        this.fileType = fileType;
+        this.fileInfo = fileInfo;
+        this.fileContents = fileContents;
+
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public boolean isFileType() {
+        return fileType;
+    }
+
+    public String getFileInfo() {
+        return fileInfo;
+    }
+
+    public String getFileContents() {
+        return fileContents;
+    }
+}
--- a/Show More
+++ b/Show More