Merge pull request 'Release 2.5.1' (#479) from prepare-release-2.5.1 into release-2.5

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

.drone.yml

@@ -1,59 +1,21 @@
 ---
 kind: pipeline
-type: docker
+name: gitnex-ci-test
-name: tests
 
 steps:
 
-  - name: unit-tests
+  - name: test
     image: nextcloudci/android:android-49
-    depends_on: [ clone ]
     commands:
       - ./gradlew test
 
-  - name: check-formatting
-    image: zosiab/eclint:latest
-    depends_on: [ clone ]
-    commands:
-      - git pull origin master
-      - eclint check $(git diff --name-only origin/master)
-
-  # This may be used in the future, because it makes of intellij's native code inspection/formatting capabilities.
-  # Additional information: https://www.jetbrains.com/help/idea/command-line-formatter.html
-  #
-  #  - name: do-or-check-formatting
-  #    image: dlsniper/docker-intellij
-  #    depends_on: [ clone ]
-  #    commands:
-  #      - /opt/intellij/bin/idea.sh inspect/format ...
-
 trigger:
   event:
     - pull_request
 
 ---
 kind: pipeline
-type: docker
+name: gitnex-ci-build
-name: code-analysis
-
-steps:
-
-  - name: check-global-formatting
-    image: zosiab/eclint:latest
-    depends_on: [ clone ]
-    commands:
-      - eclint check $(git ls-files)
-
-trigger:
-  event:
-    - push
-  branch:
-    - master
-
----
-kind: pipeline
-type: docker
-name: build
 
 steps:
 
@@ -85,11 +47,8 @@ steps:
       WEBDAV_USERNAME: GitNexBot
       WEBDAV_PASSWORD:
         from_secret: NC_TOKEN
-      PLUGIN_FILE: 'signed.apk'
+      PLUGIN_FILE: signed.apk
-      PLUGIN_TIMEOUT: 180
+      PLUGIN_DESTINATION: https://cloud.swatian.com/remote.php/dav/files/GitNexBot/GitNex-Builds/latest.apk
-      PLUGIN_ATTEMPTS: 5
-      PLUGIN_DESTINATION: 'https://cloud.swatian.com/remote.php/dav/files/GitNexBot/GitNex-Builds/latest.apk'
-      PLUGIN_CUSTOM_ARGUMENTS: '--progress-bar'
 
 trigger:
   event:

.editorconfig

@@ -1,22 +0,0 @@
-[*]
-charset = utf-8
-end_of_line = lf
-indent_size = 4
-indent_style = space
-insert_final_newline = true
-trim_trailing_whitespace = true
-max_line_length = 150
-
-[*.java]
-indent_style = tab
-max_line_length = 220
-line_comment = //
-block_comment_start = /*
-block_comment = *
-block_comment_end = */
-
-[*.json]
-indent_size = 2
-
-[{*.yml,*.yaml}]
-indent_size = 2

.gitea/issue_template.md

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

CHANGELOG.md

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

CONTRIBUTING.md

@@ -10,7 +10,7 @@ Please ask if you are not sure about the scope of work to be submitted to avoid
 **Code Standards**
 Please follow the code standards, this will help other developers to understand your code too.  
 It also helps maintaining the code afterwards.  
-It is documented in the Wiki: [Code-Standards](https://codeberg.org/gitnex/GitNex/wiki/Code-Standards)
+It is documented in the Wiki: [Code-Standards](https://gitea.com/gitnex/GitNex/wiki/Code-Standards)
 
 **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.

README.md

@@ -1,24 +1,28 @@
-[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://codeberg.org/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://codeberg.org/gitnex/GitNex/releases) [![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex) [![Join the Discord chat at https://discord.gg/FbSS4rf](https://img.shields.io/discord/632219664587685908.svg)](https://discord.gg/FbSS4rf)
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+[![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)
+[![Join the Discord chat at https://discord.gg/FbSS4rf](https://img.shields.io/discord/632219664587685908.svg)](https://discord.gg/FbSS4rf)
 
-[<img alt="Become a Patroen" src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" height="40"/>](https://www.patreon.com/mmarif) [<img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="40"/>](https://liberapay.com/mmarif/donate)
+[<img alt="Become a Patroen" src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" height="40"/>](https://www.patreon.com/mmarif)
+[<img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="40"/>](https://liberapay.com/mmarif/donate)
 
 # GitNex - Android client for Gitea
 
 GitNex is a free, open-source Android client for Git repository management tool Gitea. Gitea is a community managed fork of Gogs, lightweight code hosting solution written in Go.
 
-GitNex is licensed under GPLv3 License. See the LICENSE file for the full license text. No trackers are used and source code is available here for anyone to audit.
+GitNex is licensed under GPLv3 License. See the LICENSE file for the full license text.
+No trackers are used and source code is available here for anyone to audit.
 
 ## Downloads
 [<img alt='Get it on F-droid' src='https://gitlab.com/fdroid/artwork/raw/master/badge/get-it-on.png' height="80"/>](https://f-droid.org/en/packages/org.mian.gitnex/)
 [<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=org.mian.gitnex)
-[<img alt='Download APK' src='https://gitnex.com/img/download-apk.png' height="80"/>](https://cloud.swatian.com/s/QoDFzMxmnf2FfYw)
+[<img alt='Download APK' src='https://gitnex.com/img/download-apk.png' height="80"/>](https://gitea.com/gitnex/GitNex/releases)
-
-Download latest build from master: [https://cloud.swatian.com/s/Cq592xGEfnsGAAW](https://cloud.swatian.com/s/Cq592xGEfnsGAAW)
 
 ## Note about Gitea version
 Please make sure that you are on latest stable release or later for better app experience.
 
-Check the versions [compatibility page](https://codeberg.org/gitnex/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.
@@ -32,36 +36,37 @@ Option 2 - Open terminal(Linux) and cd to the project dir. Run `./gradlew build`
 - Issues list
 - Pull requests
 - Merge pull request
-- [MANY MORE](https://codeberg.org/gitnex/GitNex/wiki/Features)
+- [MANY MORE](https://gitea.com/gitnex/GitNex/wiki/Features)
 
 ## Contributing
-[CONTRIBUTING](https://codeberg.org/gitnex/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://codeberg.org/gitnex/GitNex/issues) to add it to the project.
+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:
 
-<img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/001.png" alt="001.png" width="200"/>  | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/002.png" alt="002.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/003.png" alt="003.png" width="200"/> | <img src="https://codeberg.org/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/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://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/005.png" alt="005.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/006.png" alt="006.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/007.png" alt="007.png" width="200"/>  | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/008.png" alt="008.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://codeberg.org/gitnex/GitNex/wiki/FAQ)
+[Faq](https://gitea.com/gitnex/GitNex/wiki/FAQ)
 
 ## Links
 [Website](https://gitnex.com)
 
-[Wiki](https://codeberg.org/gitnex/GitNex/wiki/Home)
+[Wiki](https://gitea.com/gitnex/GitNex/wiki/Home)
 
 [Website Repository](https://gitlab.com/mmarif4u/gitnex-website)
 
-[Troubleshoot Guide](https://codeberg.org/gitnex/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.
@@ -86,7 +91,7 @@ Open source libraries
 - Caverock/androidsvg
 - Droidsonroids.gif/android-gif-drawable
 - Barteksc/AndroidPdfViewer
+- Mikepenz/fastadapter
 - Ge0rg/MemorizingTrustManager
-- Dimezis/BlurView
 
 [Follow me on Fediverse - mastodon.social/@mmarif](https://mastodon.social/@mmarif)

app/build.gradle

@@ -6,13 +6,10 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 296
+        versionCode 251
-        versionName "3.0.0-rc2"
+        versionName "2.5.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
-    viewBinding {
-        enabled = true
-    }
     buildTypes {
         release {
             minifyEnabled false
@@ -38,26 +35,27 @@ configurations {
 dependencies {
     def lifecycle_version = "2.2.0"
     def markwon_version = '4.3.1'
+    def fastadapter = "3.3.1"
     def acra = "5.5.0"
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "androidx.appcompat:appcompat:1.3.0-alpha01"
+    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "com.google.android.material:material:1.3.0-alpha01"
+    implementation "com.google.android.material:material:1.2.0-alpha06"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     testImplementation "junit:junit:4.13"
     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:4.7.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.5.0'
     implementation "com.google.code.gson:gson:2.8.6"
     implementation "com.squareup.picasso:picasso:2.71828"
     implementation "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1"
     implementation 'com.squareup.retrofit2:retrofit:2.8.1'
     implementation 'com.squareup.retrofit2:converter-gson:2.8.1'
     implementation 'com.squareup.retrofit2:converter-scalars:2.8.1'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.7.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.5.0'
-    implementation 'org.ocpsoft.prettytime:prettytime:4.0.5.Final'
+    implementation 'org.ocpsoft.prettytime:prettytime:4.0.4.Final'
     implementation "com.vdurmont:emoji-java:5.1.1"
     implementation "com.pes.materialcolorpicker:library:1.2.5"
     implementation "io.noties.markwon:core:$markwon_version"
@@ -82,10 +80,14 @@ dependencies {
     implementation "com.github.HamidrezaAmz:BreadcrumbsView:0.2.9"
     implementation "commons-io:commons-io:20030203.000550"
     implementation "com.github.chrisbanes:PhotoView:2.3.0"
+    implementation "com.pddstudio:highlightjs-android:1.5.0"
     implementation "com.github.barteksc:android-pdf-viewer:3.2.0-beta.1"
+    //noinspection GradleDependency
+    implementation "com.mikepenz:fastadapter:$fastadapter"
+    implementation "com.mikepenz:fastadapter-commons:$fastadapter"
+    implementation "com.mikepenz:fastadapter-extensions:$fastadapter"
     implementation "ch.acra:acra-mail:$acra"
     implementation "ch.acra:acra-limiter:$acra"
     implementation "ch.acra:acra-notification:$acra"
-    implementation 'com.eightbitlab:blurview:1.6.3'
 
 }

app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
         android:allowBackup="true"
@@ -74,12 +75,6 @@
         <activity android:name=".activities.FileDiffActivity" />
         <activity android:name=".activities.CommitsActivity" />
         <activity android:name=".helpers.ssl.MemorizingActivity" android:theme="@android:style/Theme.Material.Dialog" />
-        <activity android:name=".activities.SettingsAppearanceActivity" />
-        <activity android:name=".activities.SettingsFileViewerActivity" />
-        <activity android:name=".activities.SettingsSecurityActivity" />
-        <activity android:name=".activities.SettingsTranslationActivity" />
-        <activity android:name=".activities.SettingsReportsActivity" />
-        <activity android:name=".activities.AddNewTeamMemberActivity" />
     </application>
 
 </manifest>

app/src/main/assets/highlightjs/highlightjs-line-numbers.min.js

@@ -1 +0,0 @@
-!function(e){"use strict";function t(){"complete"===document.readyState?n():e.addEventListener("DOMContentLoaded",n)}function n(){try{var e=document.querySelectorAll("code.hljs");for(var t in e)e.hasOwnProperty(t)&&r(e[t])}catch(n){console.error("LineNumbers error: ",n)}}function r(e){if("object"==typeof e){var t=e.parentNode,n=o(t.textContent);if(n>1){for(var r="",c=0;n>c;c++)r+=c+1+"\n";var l=document.createElement("code");l.className="hljs hljs-line-numbers",l.style["float"]="left",l.textContent=r,t.insertBefore(l,e)}}}function o(e){if(0===e.length)return 0;var t=/\r\n|\r|\n/g,n=e.match(t);return n=n?n.length:0,e[e.length-1].match(t)||(n+=1),n}"undefined"==typeof e.hljs?console.error("highlight.js not detected!"):(e.hljs.initLineNumbersOnLoad=t,e.hljs.lineNumbersBlock=r)}(window);

app/src/main/assets/highlightjs/themes/androidstudio.css

@@ -1,66 +0,0 @@
-/*
-Date: 24 Fev 2015
-Author: Pedro Oliveira <kanytu@gmail . com>
-*/
-
-.hljs {
-  color: #a9b7c6;
-  background: #282b2e;
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-}
-
-.hljs-number,
-.hljs-literal,
-.hljs-symbol,
-.hljs-bullet {
-  color: #6897BB;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-deletion {
-  color: #cc7832;
-}
-
-.hljs-variable,
-.hljs-template-variable,
-.hljs-link {
-  color: #629755;
-}
-
-.hljs-comment,
-.hljs-quote {
-  color: #808080;
-}
-
-.hljs-meta {
-  color: #bbb529;
-}
-
-.hljs-string,
-.hljs-attribute,
-.hljs-addition {
-  color: #6A8759;
-}
-
-.hljs-section,
-.hljs-title,
-.hljs-type {
-  color: #ffc66d;
-}
-
-.hljs-name,
-.hljs-selector-id,
-.hljs-selector-class {
-  color: #e8bf6a;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}

app/src/main/assets/highlightjs/themes/arduino-light.css

@@ -1,87 +0,0 @@
-/*
-
-Arduino® Light Theme - Stefania Mellai <s.mellai@arduino.cc>
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  background: #FFFFFF;
-}
-
-.hljs,
-.hljs-subst {
-  color: #434f54;
-}
-
-.hljs-keyword,
-.hljs-attribute,
-.hljs-selector-tag,
-.hljs-doctag,
-.hljs-name {
-  color: #00979D;
-}
-
-.hljs-built_in,
-.hljs-literal,
-.hljs-bullet,
-.hljs-code,
-.hljs-addition {
-  color: #D35400;
-}
-
-.hljs-regexp,
-.hljs-symbol,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-link,
-.hljs-selector-attr,
-.hljs-selector-pseudo {
-  color: #00979D;
-}
-
-.hljs-type,
-.hljs-string,
-.hljs-selector-id,
-.hljs-selector-class,
-.hljs-quote,
-.hljs-template-tag,
-.hljs-deletion {
-  color: #005C5F;
-}
-
-.hljs-title,
-.hljs-section {
-  color: #880000;
-  font-weight: bold;
-}
-
-.hljs-comment {
-  color: rgba(149,165,166,.8);
-}
-
-.hljs-meta-keyword {
-  color: #728E00;
-}
-
-.hljs-meta {
-  color: #434f54;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}
-
-.hljs-function {
-  color: #728E00;
-}
-
-.hljs-number {
-  color: #8A7B52;  
-}

app/src/main/assets/highlightjs/themes/far.css

@@ -1,71 +0,0 @@
-/*
-
-FAR Style (c) MajestiC <majestic2k@gmail.com>
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  background: #000080;
-}
-
-.hljs,
-.hljs-subst {
-  color: #0ff;
-}
-
-.hljs-string,
-.hljs-attribute,
-.hljs-symbol,
-.hljs-bullet,
-.hljs-built_in,
-.hljs-builtin-name,
-.hljs-template-tag,
-.hljs-template-variable,
-.hljs-addition {
-  color: #ff0;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-section,
-.hljs-type,
-.hljs-name,
-.hljs-selector-id,
-.hljs-selector-class,
-.hljs-variable {
-  color: #fff;
-}
-
-.hljs-comment,
-.hljs-quote,
-.hljs-doctag,
-.hljs-deletion {
-  color: #888;
-}
-
-.hljs-number,
-.hljs-regexp,
-.hljs-literal,
-.hljs-link {
-  color: #0f0;
-}
-
-.hljs-meta {
-  color: #008080;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-title,
-.hljs-section,
-.hljs-name,
-.hljs-strong {
-  font-weight: bold;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}

app/src/main/assets/highlightjs/themes/github.css

@@ -1,99 +0,0 @@
-/*
-
-github.com style (c) Vasily Polovnyov <vast@whiteants.net>
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  color: #333;
-  background: #f8f8f8;
-}
-
-.hljs-comment,
-.hljs-quote {
-  color: #998;
-  font-style: italic;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-subst {
-  color: #333;
-  font-weight: bold;
-}
-
-.hljs-number,
-.hljs-literal,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-tag .hljs-attr {
-  color: #008080;
-}
-
-.hljs-string,
-.hljs-doctag {
-  color: #d14;
-}
-
-.hljs-title,
-.hljs-section,
-.hljs-selector-id {
-  color: #900;
-  font-weight: bold;
-}
-
-.hljs-subst {
-  font-weight: normal;
-}
-
-.hljs-type,
-.hljs-class .hljs-title {
-  color: #458;
-  font-weight: bold;
-}
-
-.hljs-tag,
-.hljs-name,
-.hljs-attribute {
-  color: #000080;
-  font-weight: normal;
-}
-
-.hljs-regexp,
-.hljs-link {
-  color: #009926;
-}
-
-.hljs-symbol,
-.hljs-bullet {
-  color: #990073;
-}
-
-.hljs-built_in,
-.hljs-builtin-name {
-  color: #0086b3;
-}
-
-.hljs-meta {
-  color: #999;
-  font-weight: bold;
-}
-
-.hljs-deletion {
-  background: #fdd;
-}
-
-.hljs-addition {
-  background: #dfd;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}

app/src/main/assets/highlightjs/themes/ir-black.css

@@ -1,73 +0,0 @@
-/*
-  IR_Black style (c) Vasily Mikhailitchenko <vaskas@programica.ru>
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  background: #000;
-  color: #f8f8f8;
-}
-
-.hljs-comment,
-.hljs-quote,
-.hljs-meta {
-  color: #7c7c7c;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-tag,
-.hljs-name {
-  color: #96cbfe;
-}
-
-.hljs-attribute,
-.hljs-selector-id {
-  color: #ffffb6;
-}
-
-.hljs-string,
-.hljs-selector-attr,
-.hljs-selector-pseudo,
-.hljs-addition {
-  color: #a8ff60;
-}
-
-.hljs-subst {
-  color: #daefa3;
-}
-
-.hljs-regexp,
-.hljs-link {
-  color: #e9c062;
-}
-
-.hljs-title,
-.hljs-section,
-.hljs-type,
-.hljs-doctag {
-  color: #ffffb6;
-}
-
-.hljs-symbol,
-.hljs-bullet,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-literal {
-  color: #c6c5fe;
-}
-
-.hljs-number,
-.hljs-deletion {
-  color:#ff73fd;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}

app/src/main/assets/highlightjs/themes/monokai-sublime.css

@@ -1,83 +0,0 @@
-/*
-
-Monokai Sublime style. Derived from Monokai by noformnocontent http://nn.mit-license.org/
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  background: #23241f;
-}
-
-.hljs,
-.hljs-tag,
-.hljs-subst {
-  color: #f8f8f2;
-}
-
-.hljs-strong,
-.hljs-emphasis {
-  color: #a8a8a2;
-}
-
-.hljs-bullet,
-.hljs-quote,
-.hljs-number,
-.hljs-regexp,
-.hljs-literal,
-.hljs-link {
-  color: #ae81ff;
-}
-
-.hljs-code,
-.hljs-title,
-.hljs-section,
-.hljs-selector-class {
-  color: #a6e22e;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-name,
-.hljs-attr {
-  color: #f92672;
-}
-
-.hljs-symbol,
-.hljs-attribute {
-  color: #66d9ef;
-}
-
-.hljs-params,
-.hljs-class .hljs-title {
-  color: #f8f8f2;
-}
-
-.hljs-string,
-.hljs-type,
-.hljs-built_in,
-.hljs-builtin-name,
-.hljs-selector-id,
-.hljs-selector-attr,
-.hljs-selector-pseudo,
-.hljs-addition,
-.hljs-variable,
-.hljs-template-variable {
-  color: #e6db74;
-}
-
-.hljs-comment,
-.hljs-deletion,
-.hljs-meta {
-  color: #75715e;
-}

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

@@ -2,7 +2,8 @@ package org.mian.gitnex.actions;
 
 import android.content.Context;
 import android.util.Log;
-import androidx.annotation.NonNull;
+import android.view.View;
+import android.widget.TextView;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.ReplyToIssueActivity;
@@ -10,9 +11,10 @@ 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.IssueComments;
 import org.mian.gitnex.models.UpdateIssueState;
+import org.mian.gitnex.models.IssueComments;
 import org.mian.gitnex.util.TinyDB;
+import androidx.annotation.NonNull;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -22,259 +24,273 @@ import retrofit2.Callback;
 
 public class IssueActions {
 
-	public static void editIssueComment(final Context ctx, final int commentId, final String commentBody) {
+    public static void editIssueComment(final Context ctx, final int commentId, final String commentBody) {
 
-		final TinyDB tinyDb = new TinyDB(ctx);
+        final TinyDB tinyDb = new TinyDB(ctx);
-		final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
+        final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-		String repoFullName = tinyDb.getString("repoFullName");
+        String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
+        String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
+        final String repoOwner = parts[0];
-		final String repoName = parts[1];
+        final String repoName = parts[1];
 
-		IssueComments commentBodyJson = new IssueComments(commentBody);
+        IssueComments commentBodyJson = new IssueComments(commentBody);
-		Call<IssueComments> call;
+        Call<IssueComments> call;
 
-		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().patchIssueComment(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, commentId, commentBodyJson);
+        call = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .patchIssueComment(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, commentId, commentBodyJson);
 
-		call.enqueue(new Callback<IssueComments>() {
+        call.enqueue(new Callback<IssueComments>() {
 
-			@Override
+            @Override
-			public void onResponse(@NonNull Call<IssueComments> call, @NonNull retrofit2.Response<IssueComments> response) {
+            public void onResponse(@NonNull Call<IssueComments> call, @NonNull retrofit2.Response<IssueComments> response) {
 
-				if(response.isSuccessful()) {
+                if(response.isSuccessful()) {
-					if(response.code() == 200) {
+                    if(response.code() == 200) {
 
-						tinyDb.putBoolean("commentEdited", true);
+                        tinyDb.putBoolean("commentEdited", true);
-						Toasty.info(ctx, ctx.getString(R.string.editCommentUpdatedText));
+                        Toasty.info(ctx, ctx.getString(R.string.editCommentUpdatedText));
-						((ReplyToIssueActivity) ctx).finish();
+                        ((ReplyToIssueActivity)ctx).finish();
 
-					}
+                    }
-				}
+                }
-				else if(response.code() == 401) {
+                else if(response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle), ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 
-				}
+                }
-				else if(response.code() == 403) {
+                else if(response.code() == 403) {
 
-					Toasty.info(ctx, ctx.getString(R.string.authorizeError));
+                    Toasty.info(ctx, ctx.getString(R.string.authorizeError));
 
-				}
+                }
-				else if(response.code() == 404) {
+                else if(response.code() == 404) {
 
-					Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
 
-				}
+                }
-				else {
+                else {
 
-					Toasty.info(ctx, ctx.getString(R.string.genericError));
+                    Toasty.info(ctx, ctx.getString(R.string.genericError));
 
-				}
+                }
 
-			}
+            }
 
-			@Override
+            @Override
-			public void onFailure(@NonNull Call<IssueComments> call, @NonNull Throwable t) {
+            public void onFailure(@NonNull Call<IssueComments> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
 
-				Log.e("onFailure", t.toString());
+    }
-			}
-		});
 
-	}
+    public static void closeReopenIssue(final Context ctx, final int issueIndex, final String issueState) {
 
-	public static void closeReopenIssue(final Context ctx, final int issueIndex, final String issueState) {
+        final TinyDB tinyDb = new TinyDB(ctx);
+        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 TinyDB tinyDb = new TinyDB(ctx);
+        UpdateIssueState issueStatJson = new UpdateIssueState(issueState);
-		final String instanceUrl = tinyDb.getString("instanceUrl");
+        Call<JsonElement> call;
-		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];
 
-		UpdateIssueState issueStatJson = new UpdateIssueState(issueState);
+        call = RetrofitClient
-		Call<JsonElement> call;
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .closeReopenIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueStatJson);
 
-		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().closeReopenIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueStatJson);
+        call.enqueue(new Callback<JsonElement>() {
 
-		call.enqueue(new Callback<JsonElement>() {
+            @Override
+            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
 
-			@Override
+                if(response.isSuccessful()) {
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+                    if(response.code() == 201) {
 
-				if(response.isSuccessful()) {
+                        tinyDb.putBoolean("resumeIssues", true);
-					if(response.code() == 201) {
+                        tinyDb.putBoolean("resumeClosedIssues", true);
 
-						tinyDb.putBoolean("resumeIssues", true);
+                        if(issueState.equals("closed")) {
-						tinyDb.putBoolean("resumeClosedIssues", true);
 
-						if(issueState.equals("closed")) {
+                            Toasty.info(ctx, ctx.getString(R.string.issueStateClosed));
+                            tinyDb.putString("issueState", "closed");
 
-							Toasty.info(ctx, ctx.getString(R.string.issueStateClosed));
+                        }
-							tinyDb.putString("issueState", "closed");
+                        else if(issueState.equals("open")) {
 
-						}
+                            Toasty.info(ctx, ctx.getString(R.string.issueStateReopened));
-						else if(issueState.equals("open")) {
+                            tinyDb.putString("issueState", "open");
 
-							Toasty.info(ctx, ctx.getString(R.string.issueStateReopened));
+                        }
-							tinyDb.putString("issueState", "open");
 
-						}
+                    }
+                }
+                else if(response.code() == 401) {
 
-					}
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
-				}
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
-				else if(response.code() == 401) {
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 
-					AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle), ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+                }
+                else if(response.code() == 403) {
 
-				}
+                    Toasty.info(ctx, ctx.getString(R.string.authorizeError));
-				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 if(response.code() == 404) {
 
-					Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+                }
+                else {
 
-				}
+                    Toasty.info(ctx, ctx.getString(R.string.genericError));
-				else {
 
-					Toasty.info(ctx, ctx.getString(R.string.genericError));
+                }
 
-				}
+            }
 
-			}
+            @Override
+            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
 
-			@Override
+    }
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
 
-				Log.e("onFailure", t.toString());
+    public static void subscribe(final Context ctx, final TextView subscribeIssue, final TextView unsubscribeIssue) {
-			}
-		});
 
-	}
+        final TinyDB tinyDB = new TinyDB(ctx);
 
-	public static void subscribe(final Context ctx) {
+        final String instanceUrl = tinyDB.getString("instanceUrl");
+        String repoFullName = tinyDB.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String loginUid = tinyDB.getString("loginUid");
+        final String userLogin = tinyDB.getString("userLogin");
+        final String token = "token " + tinyDB.getString(loginUid + "-token");
+        final int issueNr = Integer.parseInt(tinyDB.getString("issueNumber"));
 
-		final TinyDB tinyDB = new TinyDB(ctx);
+        Call<Void> call;
 
-		final String instanceUrl = tinyDB.getString("instanceUrl");
+        call = RetrofitClient
-		String[] repoFullName = tinyDB.getString("repoFullName").split("/");
+                .getInstance(instanceUrl, ctx)
-		if(repoFullName.length != 2) {
+                .getApiInterface()
-			return;
+                .addIssueSubscriber(token, repoOwner, repoName, issueNr, userLogin);
-		}
-		final String userLogin = tinyDB.getString("userLogin");
-		final String token = "token " + tinyDB.getString(tinyDB.getString("loginUid") + "-token");
-		final int issueNr = Integer.parseInt(tinyDB.getString("issueNumber"));
 
-		Call<Void> call;
+        call.enqueue(new Callback<Void>() {
 
-		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().addIssueSubscriber(token, repoFullName[0], repoFullName[1], issueNr, userLogin);
+            @Override
+            public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-		call.enqueue(new Callback<Void>() {
+                if(response.isSuccessful()) {
 
-			@Override
+                    if(response.code() == 201) {
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-				if(response.isSuccessful()) {
+                        unsubscribeIssue.setVisibility(View.VISIBLE);
+                        subscribeIssue.setVisibility(View.GONE);
+                        Toasty.info(ctx, ctx.getString(R.string.issueSubscribtion));
+                        tinyDB.putString("issueSubscriptionState", "unsubscribeToIssue");
 
-					if(response.code() == 201) {
+                    }
 
-						Toasty.info(ctx, ctx.getString(R.string.subscribedSuccessfully));
+                }
-						tinyDB.putBoolean("issueSubscribed", true);
+                else if(response.code() == 401) {
 
-					}
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
-					else if(response.code() == 200) {
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 
-						tinyDB.putBoolean("issueSubscribed", true);
+                }
-						Toasty.info(ctx, ctx.getString(R.string.alreadySubscribed));
+                else {
 
-					}
+                    Toasty.info(ctx, ctx.getString(R.string.issueSubscribtionError));
 
-				}
+                }
-				else if(response.code() == 401) {
 
-					AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle), ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+            }
 
-				}
+            @Override
-				else {
+            public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+                Toasty.info(ctx, ctx.getString(R.string.issueSubscribtionError));
+            }
+        });
 
-					Toasty.info(ctx, ctx.getString(R.string.subscriptionError));
+    }
 
-				}
+    public static void unsubscribe(final Context ctx, final TextView subscribeIssue, final TextView unsubscribeIssue) {
 
-			}
+        final TinyDB tinyDB = new TinyDB(ctx);
 
-			@Override
+        final String instanceUrl = tinyDB.getString("instanceUrl");
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+        String repoFullName = tinyDB.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String loginUid = tinyDB.getString("loginUid");
+        final String userLogin = tinyDB.getString("userLogin");
+        final String token = "token " + tinyDB.getString(loginUid + "-token");
+        final int issueNr = Integer.parseInt(tinyDB.getString("issueNumber"));
 
-				Toasty.info(ctx, ctx.getString(R.string.unsubscribedSuccessfully));
+        Call<Void> call;
-			}
-		});
 
-	}
+        call = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .delIssueSubscriber(token, repoOwner, repoName, issueNr, userLogin);
 
-	public static void unsubscribe(final Context ctx) {
+        call.enqueue(new Callback<Void>() {
 
-		final TinyDB tinyDB = new TinyDB(ctx);
+            @Override
+            public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
 
-		final String instanceUrl = tinyDB.getString("instanceUrl");
+                if(response.isSuccessful()) {
-		String[] repoFullName = tinyDB.getString("repoFullName").split("/");
-		if(repoFullName.length != 2) {
-			return;
-		}
-		final String userLogin = tinyDB.getString("userLogin");
-		final String token = "token " + tinyDB.getString(tinyDB.getString("loginUid") + "-token");
-		final int issueNr = Integer.parseInt(tinyDB.getString("issueNumber"));
 
-		Call<Void> call;
+                    if(response.code() == 201) {
 
-		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().delIssueSubscriber(token, repoFullName[0], repoFullName[1], issueNr, userLogin);
+                        unsubscribeIssue.setVisibility(View.GONE);
+                        subscribeIssue.setVisibility(View.VISIBLE);
+                        Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtion));
+                        tinyDB.putString("issueSubscriptionState", "subscribeToIssue");
 
-		call.enqueue(new Callback<Void>() {
+                    }
 
-			@Override
+                }
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+                else if(response.code() == 401) {
 
-				if(response.isSuccessful()) {
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 
-					if(response.code() == 201) {
+                }
+                else {
 
-						Toasty.info(ctx, ctx.getString(R.string.unsubscribedSuccessfully));
+                    Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtionError));
-						tinyDB.putBoolean("issueSubscribed", false);
 
-					}
+                }
-					else if(response.code() == 200) {
 
-						tinyDB.putBoolean("issueSubscribed", false);
+            }
-						Toasty.info(ctx, ctx.getString(R.string.alreadyUnsubscribed));
 
-					}
+            @Override
-
+            public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-				}
+                Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtionError));
-				else if(response.code() == 401) {
+            }
-
+        });
-					AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle), ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+    }
-
-				}
-				else {
-
-					Toasty.info(ctx, ctx.getString(R.string.unsubscriptionError));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.info(ctx, ctx.getString(R.string.unsubscriptionError));
-			}
-		});
-	}
 
 }

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

@@ -7,9 +7,11 @@ 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.Milestones;
 import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.viewmodels.MilestonesViewModel;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -49,6 +51,7 @@ public class MilestoneActions {
 				if(response.isSuccessful()) {
 
 					Toasty.info(ctx, ctx.getString(R.string.milestoneStatusUpdate));
+					MilestonesViewModel.loadMilestonesList(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, token), repoOwner, repoName, "all", ctx);
 
 				}
 				else if(response.code() == 401) {
@@ -107,6 +110,7 @@ public class MilestoneActions {
 				if(response.isSuccessful()) {
 
 					Toasty.info(ctx, ctx.getString(R.string.milestoneStatusUpdate));
+					MilestonesViewModel.loadMilestonesList(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, token), repoOwner, repoName, "all", ctx);
 
 				}
 				else if(response.code() == 401) {

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

@@ -1,154 +0,0 @@
-package org.mian.gitnex.actions;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import com.google.gson.JsonElement;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.AddNewTeamMemberActivity;
-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 TeamActions {
-
-	public static void removeTeamMember(final Context context, String userName, int teamId) {
-
-		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");
-
-		Call<JsonElement> call;
-
-		call = RetrofitClient
-				.getInstance(instanceUrl, context)
-				.getApiInterface()
-				.removeTeamMember(Authorization.returnAuthentication(context, loginUid, instanceToken), teamId, userName);
-
-		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("teamActionFlag", true);
-						Toasty.info(context, context.getString(R.string.memberRemovedMessage));
-						((AddNewTeamMemberActivity)context).finish();
-
-					}
-
-				}
-				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) {
-
-				Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
-
-			}
-		});
-
-	}
-
-	public static void addTeamMember(final Context context, String userName, int teamId) {
-
-		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");
-
-		Call<JsonElement> call;
-
-		call = RetrofitClient
-				.getInstance(instanceUrl, context)
-				.getApiInterface()
-				.addTeamMember(Authorization.returnAuthentication(context, loginUid, instanceToken), teamId, userName);
-
-		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("teamActionFlag", true);
-						Toasty.info(context, context.getString(R.string.memberAddedMessage));
-						((AddNewTeamMemberActivity)context).finish();
-
-					}
-
-				}
-				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) {
-
-				Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
-
-			}
-		});
-
-	}
-
-}

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

@@ -34,7 +34,6 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     final Context ctx = this;
-    private Context appCtx;
     private TextView addCollaboratorSearch;
     private TextView noData;
     private ProgressBar mProgressBar;
@@ -48,13 +47,11 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         String repoFullName = tinyDb.getString("repoFullName");
@@ -74,26 +71,26 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
-        addCollaboratorSearch.setOnEditorActionListener((v, actionId, event) -> {
+        addCollaboratorSearch.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-
+            @Override
-            if (actionId == EditorInfo.IME_ACTION_SEND) {
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if(!addCollaboratorSearch.getText().toString().equals("")) {
+                if (actionId == EditorInfo.IME_ACTION_SEND) {
-                    loadUserSearchList(instanceUrl, instanceToken, addCollaboratorSearch.getText().toString(), loginUid);
+                    if(!addCollaboratorSearch.getText().toString().equals("")) {
+                        loadUserSearchList(instanceUrl, instanceToken, addCollaboratorSearch.getText().toString(), getApplicationContext(), loginUid);
+                    }
                 }
+                return false;
             }
-
-            return false;
-
         });
 
     }
 
-    public void loadUserSearchList(String instanceUrl, String token, String searchKeyword, String loginUid) {
+    public void loadUserSearchList(String instanceUrl, String token, String searchKeyword, final Context context, String loginUid) {
 
         Call<UserSearch> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .getUserBySearch(Authorization.returnAuthentication(ctx, loginUid, token), searchKeyword, 10);
+                .getUserBySearch(Authorization.returnAuthentication(getApplicationContext(), loginUid, token), searchKeyword, 10);
 
         call.enqueue(new Callback<UserSearch>() {
 
@@ -102,7 +99,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
 
                 if (response.isSuccessful()) {
                     assert response.body() != null;
-                    getUsersList(response.body().getData(), ctx);
+                    getUsersList(response.body().getData(), context);
                 } else {
                     Log.i("onResponse", String.valueOf(response.code()));
                 }
@@ -122,7 +119,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
         UserSearchAdapter adapter = new UserSearchAdapter(dataList, context);
 
         mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
         DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
                 DividerItemDecoration.VERTICAL);
         mRecyclerView.addItemDecoration(dividerItemDecoration);
@@ -142,7 +139,12 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
     }
 
     private void initCloseListener() {
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
     }
 
 

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

@@ -1,164 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.adapters.UserSearchForTeamMemberAdapter;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.models.UserInfo;
-import org.mian.gitnex.models.UserSearch;
-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;
-
-public class AddNewTeamMemberActivity extends BaseActivity {
-
-	private View.OnClickListener onClickListener;
-	final Context ctx = this;
-	private Context appCtx;
-	private TextView addNewTeamMember;
-	private TextView noData;
-	private ProgressBar mProgressBar;
-
-	private RecyclerView mRecyclerView;
-	private List<UserInfo> dataList;
-	private UserSearchForTeamMemberAdapter adapter;
-
-	private String teamId;
-
-	@Override
-	protected int getLayoutResourceId() {
-		return R.layout.activity_add_new_team_member;
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-		appCtx = getApplicationContext();
-
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-		TinyDB tinyDb = new TinyDB(appCtx);
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-
-		ImageView closeActivity = findViewById(R.id.close);
-		addNewTeamMember = findViewById(R.id.addNewTeamMeber);
-		mRecyclerView = findViewById(R.id.recyclerViewUserSearch);
-		mProgressBar = findViewById(R.id.progress_bar);
-		noData = findViewById(R.id.noData);
-
-		addNewTeamMember.requestFocus();
-		assert imm != null;
-		imm.showSoftInput(addNewTeamMember, InputMethodManager.SHOW_IMPLICIT);
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		if(getIntent().getStringExtra("teamId") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamId")).equals("")) {
-			teamId = getIntent().getStringExtra("teamId");
-		}
-		else {
-			teamId = "0";
-		}
-
-		mRecyclerView.setHasFixedSize(true);
-		mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
-
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),	DividerItemDecoration.VERTICAL);
-		mRecyclerView.addItemDecoration(dividerItemDecoration);
-
-		dataList = new ArrayList<>();
-
-		addNewTeamMember.addTextChangedListener(new TextWatcher() {
-
-			@Override
-			public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-				if(!addNewTeamMember.getText().toString().equals("")) {
-
-					adapter = new UserSearchForTeamMemberAdapter(dataList, ctx, Integer.parseInt(teamId));
-					loadUserSearchList(instanceUrl, instanceToken, addNewTeamMember.getText().toString(), loginUid, teamId);
-
-				}
-
-			}
-
-			@Override
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-			}
-
-			@Override
-			public void afterTextChanged(Editable s) {
-			}
-
-		});
-
-	}
-
-	public void loadUserSearchList(String instanceUrl, String token, String searchKeyword, String loginUid, String teamId) {
-
-		Call<UserSearch> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserBySearch(Authorization.returnAuthentication(ctx, loginUid, token), searchKeyword, 10);
-
-		call.enqueue(new Callback<UserSearch>() {
-
-			@Override
-			public void onResponse(@NonNull Call<UserSearch> call, @NonNull Response<UserSearch> response) {
-
-				if(response.isSuccessful()) {
-
-					assert response.body() != null;
-					if(response.body().getData().size() > 0) {
-
-						dataList.clear();
-						dataList.addAll(response.body().getData());
-						mRecyclerView.setAdapter(adapter);
-						noData.setVisibility(View.GONE);
-						mProgressBar.setVisibility(View.GONE);
-
-					}
-					else {
-
-						noData.setVisibility(View.VISIBLE);
-						mProgressBar.setVisibility(View.GONE);
-
-					}
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<UserSearch> call, @NonNull Throwable t) {
-				Log.e("onFailure", t.toString());
-			}
-
-		});
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> finish();
-	}
-
-}

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

@@ -34,7 +34,6 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
     private Boolean assigneesFlag = false;
     private MultiSelectDialog multiSelectDialogAssignees;
     final Context ctx = this;
-    private Context appCtx;
 
     @Override
     protected int getLayoutResourceId(){
@@ -45,12 +44,11 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
         //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
 
         getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         String repoFullName = tinyDb.getString("repoFullName");
@@ -66,12 +64,12 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
 
     private void getAssignees(final String instanceUrl, final String instanceToken, final String repoOwner, final String repoName, final int issueIndex, final String loginUid) {
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<List<Collaborators>>() {
 
@@ -94,9 +92,9 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
 
                         // get current issue assignees
                         Call<Issues> callSingleIssueAssignees = RetrofitClient
-                                .getInstance(instanceUrl, ctx)
+                                .getInstance(instanceUrl, getApplicationContext())
                                 .getApiInterface()
-                                .getIssueByIndex(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
+                                .getIssueByIndex(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);
 
                         callSingleIssueAssignees.enqueue(new Callback<Issues>() {
 
@@ -143,7 +141,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
 
                                                         Log.i("selectedNames", String.valueOf(selectedNames));
 
-                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
+                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
                                                         tinyDb.putBoolean("singleIssueUpdate", true);
                                                         CloseActivity();
                                                     }
@@ -169,7 +167,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
                                                     @Override
                                                     public void onSelected(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {
 
-                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
+                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
                                                         tinyDb.putBoolean("singleIssueUpdate", true);
                                                         CloseActivity();
 
@@ -217,7 +215,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
                     }
                     else {
 
-                        Toasty.info(ctx, getString(R.string.genericError));
+                        Toasty.info(getApplicationContext(), getString(R.string.genericError));
 
                     }
                 }
@@ -243,9 +241,9 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
         Call<JsonElement> call3;
 
         call3 = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .patchIssueAssignees(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);
+                .patchIssueAssignees(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);
 
         call3.enqueue(new Callback<JsonElement>() {
 
@@ -277,7 +275,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
                 }
                 else {
 
-                    Toasty.info(ctx, getString(R.string.genericError));
+                    Toasty.info(getApplicationContext(), getString(R.string.genericError));
 
                 }
 

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

@@ -32,7 +32,6 @@ public class AddRemoveLabelsActivity extends BaseActivity {
     private Boolean labelsFlag = false;
     private MultiSelectDialog multiSelectDialogLabels;
     final Context ctx = this;
-    private Context appCtx;
 
     @Override
     protected int getLayoutResourceId(){
@@ -41,14 +40,12 @@ public class AddRemoveLabelsActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
         //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
 
         getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         String repoFullName = tinyDb.getString("repoFullName");
@@ -64,12 +61,12 @@ public class AddRemoveLabelsActivity extends BaseActivity {
 
     private void getLabels(final String instanceUrl, final String instanceToken, final String repoOwner, final String repoName, final int issueIndex, final String loginUid) {
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         Call<List<Labels>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .getlabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+                .getlabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<List<Labels>>() {
 
@@ -92,9 +89,9 @@ public class AddRemoveLabelsActivity extends BaseActivity {
 
                         // get current issue labels
                         Call<List<Labels>> callSingleIssueLabels = RetrofitClient
-                                .getInstance(instanceUrl, ctx)
+                                .getInstance(instanceUrl, getApplicationContext())
                                 .getApiInterface()
-                                .getIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
+                                .getIssueLabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);
 
                         callSingleIssueLabels.enqueue(new Callback<List<Labels>>() {
 
@@ -145,7 +142,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                                                             integers = new int[0];
                                                         }
 
-                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
+                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
                                                         tinyDb.putBoolean("singleIssueUpdate", true);
                                                         CloseActivity();
                                                     }
@@ -186,7 +183,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                                                             integers = new int[0];
                                                         }
 
-                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
+                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
                                                         tinyDb.putBoolean("singleIssueUpdate", true);
                                                         CloseActivity();
 
@@ -234,7 +231,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                     }
                     else {
 
-                        Toasty.info(ctx, getString(R.string.genericError));
+                        Toasty.info(getApplicationContext(), getString(R.string.genericError));
 
                     }
                 }
@@ -254,9 +251,9 @@ public class AddRemoveLabelsActivity extends BaseActivity {
         Labels patchIssueLabels = new Labels(issueLabels);
 
         Call<JsonElement> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .updateIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, patchIssueLabels);
+                .updateIssueLabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, patchIssueLabels);
 
         call.enqueue(new Callback<JsonElement>() {
 
@@ -288,7 +285,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                 }
                 else {
 
-                    Toasty.info(ctx, getString(R.string.genericError));
+                    Toasty.info(getApplicationContext(), getString(R.string.genericError));
 
                 }
 

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

@@ -38,7 +38,6 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
 
     private View.OnClickListener onClickListener;
     final Context ctx = this;
-    private Context appCtx;
     private AdminGetUsersAdapter adapter;
     private RecyclerView mRecyclerView;
     private TextView noDataUsers;
@@ -53,9 +52,8 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        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");
@@ -73,7 +71,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
         closeActivity.setOnClickListener(onClickListener);
 
         mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
 
         DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
                 DividerItemDecoration.VERTICAL);
@@ -86,13 +84,13 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        AdminGetUsersViewModel.loadUsersList(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken));
+                        AdminGetUsersViewModel.loadUsersList(getApplicationContext(), instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken));
                     }
                 }, 500);
             }
         });
 
-        fetchDataAsync(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken));
+        fetchDataAsync(getApplicationContext(), instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken));
 
     }
 
@@ -103,7 +101,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
         usersModel.getUsersList(ctx, instanceUrl, instanceToken).observe(this, new Observer<List<UserInfo>>() {
             @Override
             public void onChanged(@Nullable List<UserInfo> usersListMain) {
-                adapter = new AdminGetUsersAdapter(ctx, usersListMain);
+                adapter = new AdminGetUsersAdapter(getApplicationContext(), usersListMain);
                 if(adapter.getItemCount() > 0) {
                     mRecyclerView.setVisibility(View.VISIBLE);
                     mRecyclerView.setAdapter(adapter);
@@ -132,7 +130,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
             public void run() {
                 if(searchFilter) {
 
-                    boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+                    boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getApplicationContext()));
 
                     inflater.inflate(R.menu.search_menu, menu);
 

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

@@ -31,29 +31,24 @@ public abstract class BaseActivity extends AppCompatActivity {
 
 		final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
-		switch(tinyDb.getInt("themeId")) {
+		if(tinyDb.getInt("themeId") == 1) {
+			setTheme(R.style.AppThemeLight);
+		}
+		else if(tinyDb.getInt("themeId") == 2) {
 
-			case 1:
+			boolean timeSetterFlag = TimeHelper.timeBetweenHours(18, 6); // 6pm to 6am
-				setTheme(R.style.AppThemeLight);
-				break;
 
-			case 2:
+			if(timeSetterFlag) {
-				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
-					setTheme(R.style.AppTheme);
-				}
-				else {
-					setTheme(R.style.AppThemeLight);
-				}
-				break;
-
-			default:
 				setTheme(R.style.AppTheme);
-				break;
+			}
+			else {
+				setTheme(R.style.AppThemeLight);
+			}
 
 		}
-
+		else {
-		String appLocale = tinyDb.getString("locale");
+			setTheme(R.style.AppTheme);
-		AppUtil.setAppLocale(getResources(), appLocale);
+		}
 
 		super.onCreate(savedInstanceState);
 		setContentView(getLayoutResourceId());
@@ -95,14 +90,6 @@ public abstract class BaseActivity extends AppCompatActivity {
 			tinyDb.putString("crashReportingEnabledInit", "yes");
 		}
 
-		// default cache setter
-		if(tinyDb.getString("cacheSizeStr").isEmpty()) {
-			tinyDb.putString("cacheSizeStr", getResources().getString(R.string.cacheSizeDataSelectionSelectedText));
-		}
-		if(tinyDb.getString("cacheSizeImagesStr").isEmpty()) {
-			tinyDb.putString("cacheSizeImagesStr", getResources().getString(R.string.cacheSizeImagesSelectionSelectedText));
-		}
-
 		if (tinyDb.getBoolean("crashReportingEnabled")) {
 
 			CoreConfigurationBuilder ACRABuilder = new CoreConfigurationBuilder(this);

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

@@ -1,6 +1,5 @@
 package org.mian.gitnex.activities;
 
-import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.method.ScrollingMovementMethod;
@@ -14,272 +13,312 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import com.mikepenz.fastadapter.IItemAdapter;
+import com.mikepenz.fastadapter.adapters.ItemAdapter;
+import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter;
+import com.mikepenz.fastadapter.listeners.ItemFilterListener;
+import com.mikepenz.fastadapter_extensions.items.ProgressItem;
+import com.mikepenz.fastadapter_extensions.scroll.EndlessRecyclerOnScrollListener;
 import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.adapters.CommitsAdapter;
-import org.mian.gitnex.clients.AppApiService;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.StaticGlobalVariables;
-import org.mian.gitnex.helpers.Version;
-import org.mian.gitnex.interfaces.ApiInterface;
 import org.mian.gitnex.models.Commits;
 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;
+import static com.mikepenz.fastadapter.adapters.ItemAdapter.items;
 
 /**
  * Author M M Arif
  */
 
-public class CommitsActivity extends BaseActivity {
+public class CommitsActivity extends BaseActivity implements ItemFilterListener<CommitsAdapter> {
 
-	final Context ctx = this;
+    private View.OnClickListener onClickListener;
-	private Context appCtx;
+    private TextView noData;
-	private View.OnClickListener onClickListener;
+    private ProgressBar progressBar;
-	private TextView noData;
+    private SwipeRefreshLayout swipeRefreshLayout;
-	private ProgressBar progressBar;
+    private String TAG = "CommitsActivity - ";
-	private String TAG = "CommitsActivity";
+    private int resultLimit = 50;
-	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
+    private boolean loadNextFlag = false;
-	private int pageSize = 1;
 
-	private RecyclerView recyclerView;
+    private List<CommitsAdapter> items = new ArrayList<>();
-	private List<Commits> commitsList;
+    private FastItemAdapter<CommitsAdapter> fastItemAdapter;
-	private CommitsAdapter adapter;
+    private ItemAdapter footerAdapter;
-	private ApiInterface api;
+    private EndlessRecyclerOnScrollListener endlessRecyclerOnScrollListener;
 
-	@Override
+    @Override
-	protected int getLayoutResourceId() {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_commits;
+    }
 
-		return R.layout.activity_commits;
+    @Override
-	}
+    public void onCreate(Bundle savedInstanceState) {
 
-	@Override
+        super.onCreate(savedInstanceState);
-	public void onCreate(Bundle savedInstanceState) {
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
 
-		super.onCreate(savedInstanceState);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
-		appCtx = getApplicationContext();
+        final String instanceUrl = tinyDb.getString("instanceUrl");
-		Toolbar toolbar = findViewById(R.id.toolbar);
+        final String loginUid = tinyDb.getString("loginUid");
-		setSupportActionBar(toolbar);
+        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];
 
-		TinyDB tinyDb = new TinyDB(appCtx);
+        String branchName = getIntent().getStringExtra("branchName");
-		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 branchName = getIntent().getStringExtra("branchName");
+        TextView toolbar_title = findViewById(R.id.toolbar_title);
+        toolbar_title.setMovementMethod(new ScrollingMovementMethod());
+        toolbar_title.setText(branchName);
 
-		TextView toolbar_title = findViewById(R.id.toolbar_title);
+        ImageView closeActivity = findViewById(R.id.close);
-		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
+        noData = findViewById(R.id.noDataCommits);
-		toolbar_title.setText(branchName);
+        progressBar = findViewById(R.id.progress_bar);
+        swipeRefreshLayout = findViewById(R.id.pullToRefresh);
 
-		ImageView closeActivity = findViewById(R.id.close);
+        RecyclerView recyclerView = findViewById(R.id.recyclerView);
-		noData = findViewById(R.id.noDataCommits);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
-		progressBar = findViewById(R.id.progress_bar);
+        recyclerView.setHasFixedSize(true);
-		SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);
 
-		initCloseListener();
+        initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
+        closeActivity.setOnClickListener(onClickListener);
 
-		// if gitea is 1.12 or higher use the new limit (resultLimitNewGiteaInstances)
+        fastItemAdapter = new FastItemAdapter<>();
-		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12")) {
+        fastItemAdapter.withSelectable(true);
-			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
-		}
 
-		recyclerView = findViewById(R.id.recyclerView);
+        footerAdapter = items();
-		commitsList = new ArrayList<>();
+        //noinspection unchecked
+        fastItemAdapter.addAdapter(1, footerAdapter);
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+        fastItemAdapter.getItemFilter().withFilterPredicate((IItemAdapter.Predicate<CommitsAdapter>) (item, constraint) -> item.getCommitTitle().toLowerCase().contains(Objects.requireNonNull(constraint).toString().toLowerCase()));
 
-			swipeRefresh.setRefreshing(false);
+        fastItemAdapter.getItemFilter().withItemFilterListener(this);
-			loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName, resultLimit);
-			adapter.notifyDataChanged();
 
-		}, 200));
+        recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+        recyclerView.setItemAnimator(new DefaultItemAnimator());
+        recyclerView.setAdapter(fastItemAdapter);
 
-		adapter = new CommitsAdapter(ctx, commitsList);
+        endlessRecyclerOnScrollListener = new EndlessRecyclerOnScrollListener(footerAdapter) {
-		adapter.setLoadMoreListener(() -> recyclerView.post(() -> {
 
-			if(commitsList.size() == resultLimit || pageSize == resultLimit) {
+            @Override
+            public void onLoadMore(final int currentPage) {
 
-				int page = (commitsList.size() + resultLimit) / resultLimit;
+                loadNext(instanceUrl, instanceToken, repoOwner, repoName, currentPage, branchName);
-				loadMore(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, page, branchName, resultLimit);
 
-			}
+            }
 
-		}));
+        };
 
-		recyclerView.setHasFixedSize(true);
+        swipeRefreshLayout.setOnRefreshListener(() -> {
-		recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
-		recyclerView.setAdapter(adapter);
 
-		api = AppApiService.createService(ApiInterface.class, instanceUrl, ctx);
+            progressBar.setVisibility(View.VISIBLE);
-		loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName, resultLimit);
+            fastItemAdapter.clear();
+            endlessRecyclerOnScrollListener.resetPageCount();
+            swipeRefreshLayout.setRefreshing(false);
 
-	}
+        });
 
-	private void loadInitial(String token, String repoOwner, String repoName, String branchName, int resultLimit) {
+        recyclerView.addOnScrollListener(endlessRecyclerOnScrollListener);
 
-		Call<List<Commits>> call = api.getRepositoryCommits(token, repoOwner, repoName, 1, branchName, resultLimit);
+        loadInitial(instanceUrl, instanceToken, repoOwner, repoName, branchName);
 
-		call.enqueue(new Callback<List<Commits>>() {
+        assert savedInstanceState != null;
+        fastItemAdapter.withSavedInstanceState(savedInstanceState);
 
-			@Override
+    }
-			public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {
 
-				if(response.isSuccessful()) {
+    private void loadInitial(String instanceUrl, String token, String repoOwner, String repoName, String branchName) {
 
-					assert response.body() != null;
+        Call<List<Commits>> call = RetrofitClient
-					if(response.body().size() > 0) {
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .getRepositoryCommits(token, repoOwner, repoName,  1, branchName);
 
-						commitsList.clear();
+        call.enqueue(new Callback<List<Commits>>() {
-						commitsList.addAll(response.body());
-						adapter.notifyDataChanged();
-						noData.setVisibility(View.GONE);
 
-					}
+            @Override
-					else {
+            public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {
-						commitsList.clear();
-						adapter.notifyDataChanged();
-						noData.setVisibility(View.VISIBLE);
-					}
 
-					progressBar.setVisibility(View.GONE);
+                if (response.isSuccessful()) {
 
-				}
+                    assert response.body() != null;
-				else {
 
-					Log.e(TAG, String.valueOf(response.code()));
+                    if(response.body().size() > 0) {
 
-				}
+                        if(response.body().size() == resultLimit) {
+                            loadNextFlag = true;
+                        }
 
-			}
+                        for (int i = 0; i < response.body().size(); i++) {
 
-			@Override
+                            items.add(new CommitsAdapter(getApplicationContext()).withNewItems(response.body().get(i).getCommit().getMessage(), response.body().get(i).getHtml_url(),
-			public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
+                                    response.body().get(i).getCommit().getCommitter().getName(), response.body().get(i).getCommit().getCommitter().getDate()));
 
-				Log.e(TAG, t.toString());
+                        }
-			}
 
-		});
+                        fastItemAdapter.add(items);
 
-	}
+                    }
+                    else {
 
-	private void loadMore(String token, String repoOwner, String repoName, final int page, String branchName, int resultLimit) {
+                        noData.setVisibility(View.VISIBLE);
 
-		//add loading progress view
+                    }
-		commitsList.add(new Commits("load"));
-		adapter.notifyItemInserted((commitsList.size() - 1));
 
-		Call<List<Commits>> call = api.getRepositoryCommits(token, repoOwner, repoName, page, branchName, resultLimit);
+                    progressBar.setVisibility(View.GONE);
 
-		call.enqueue(new Callback<List<Commits>>() {
+                }
+                else {
 
-			@Override
+                    Log.e(TAG, String.valueOf(response.code()));
-			public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {
 
-				if(response.isSuccessful()) {
+                }
 
-					//remove loading view
+            }
-					commitsList.remove(commitsList.size() - 1);
 
-					List<Commits> result = response.body();
+            @Override
+            public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
 
-					assert result != null;
+                Log.e(TAG, t.toString());
-					if(result.size() > 0) {
 
-						pageSize = result.size();
+            }
-						commitsList.addAll(result);
 
-					}
+        });
-					else {
 
-						adapter.setMoreDataAvailable(false);
+    }
 
-					}
+    private void loadNext(String instanceUrl, String token, String repoOwner, String repoName, final int currentPage, String branchName) {
 
-					adapter.notifyDataChanged();
+        footerAdapter.clear();
+        //noinspection unchecked
+        footerAdapter.add(new ProgressItem().withEnabled(false));
+        Handler handler = new Handler();
 
-				}
+        handler.postDelayed(() -> {
-				else {
 
-					Log.e(TAG, String.valueOf(response.code()));
+            Call<List<Commits>> call = RetrofitClient
+                    .getInstance(instanceUrl, getApplicationContext())
+                    .getApiInterface()
+                    .getRepositoryCommits(token, repoOwner, repoName, currentPage + 1, branchName);
 
-				}
+            call.enqueue(new Callback<List<Commits>>() {
 
-			}
+                @Override
+                public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {
 
-			@Override
+                    if (response.isSuccessful()) {
-			public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
 
-				Log.e(TAG, t.toString());
+                        assert response.body() != null;
 
-			}
+                        if (response.body().size() > 0) {
 
-		});
+                            loadNextFlag = response.body().size() == resultLimit;
 
-	}
+                            for (int i = 0; i < response.body().size(); i++) {
 
-	@Override
+                                fastItemAdapter.add(fastItemAdapter.getAdapterItemCount(), new CommitsAdapter(getApplicationContext()).withNewItems(response.body().get(i).getCommit().getMessage(),
-	public boolean onCreateOptionsMenu(Menu menu) {
+                                        response.body().get(i).getHtml_url(), response.body().get(i).getCommit().getCommitter().getName(),
+                                        response.body().get(i).getCommit().getCommitter().getDate()));
 
-		MenuInflater inflater = getMenuInflater();
+                            }
-		inflater.inflate(R.menu.search_menu, menu);
 
-		MenuItem searchItem = menu.findItem(R.id.action_search);
+                            footerAdapter.clear();
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
-		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+                        }
+                        else {
 
-			@Override
+                            footerAdapter.clear();
-			public boolean onQueryTextSubmit(String query) {
+                        }
 
-				return false;
+                        progressBar.setVisibility(View.GONE);
-			}
 
-			@Override
+                    }
-			public boolean onQueryTextChange(String newText) {
+                    else {
 
-				filter(newText);
+                        Log.e(TAG, String.valueOf(response.code()));
-				return true;
-			}
 
-		});
+                    }
 
-		return super.onCreateOptionsMenu(menu);
+                }
 
-	}
+                @Override
+                public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
 
-	private void filter(String text) {
+                    Log.e(TAG, t.toString());
 
-		List<Commits> arr = new ArrayList<>();
+                }
 
-		for(Commits d : commitsList) {
+            });
-			if(d.getCommit().getMessage().toLowerCase().contains(text) || d.getSha().toLowerCase().contains(text)) {
-				arr.add(d);
-			}
-		}
 
-		adapter.updateList(arr);
+        }, 1000);
-	}
 
-	private void initCloseListener() {
+        if(!loadNextFlag) {
 
-		onClickListener = view -> {
+            footerAdapter.clear();
-			getIntent().removeExtra("branchName");
+
-			finish();
+        }
-		};
+
-	}
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.search_menu, menu);
+
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+        androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+        searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+
+        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                fastItemAdapter.filter(newText);
+                return true;
+            }
+
+        });
+
+        endlessRecyclerOnScrollListener.enable();
+        return super.onCreateOptionsMenu(menu);
+
+    }
+
+    @Override
+    public void itemsFiltered(@Nullable CharSequence constraint, @Nullable List<CommitsAdapter> results) {
+        endlessRecyclerOnScrollListener.disable();
+    }
+
+    @Override
+    public void onReset() {
+        endlessRecyclerOnScrollListener.enable();
+    }
+
+    private void initCloseListener() {
+        onClickListener = view -> {
+            getIntent().removeExtra("branchName");
+            finish();
+        };
+    }
 
 }
 

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

@@ -13,7 +13,6 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Spinner;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
@@ -46,7 +45,6 @@ public class CreateFileActivity extends BaseActivity {
     private EditText newFileCommitMessage;
     private Spinner newFileBranchesSpinner;
     final Context ctx = this;
-    private Context appCtx;
 
     List<Branches> branchesList = new ArrayList<>();
 
@@ -59,13 +57,12 @@ public class CreateFileActivity extends BaseActivity {
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         String repoFullName = tinyDb.getString("repoFullName");
@@ -79,8 +76,6 @@ public class CreateFileActivity extends BaseActivity {
         newFileContent = findViewById(R.id.newFileContent);
         newFileBranchName = findViewById(R.id.newFileBranchName);
         newFileCommitMessage = findViewById(R.id.newFileCommitMessage);
-        TextView branchNameId = findViewById(R.id.branchNameId);
-        TextView branchNameHintText = findViewById(R.id.branchNameHintText);
 
         newFileName.requestFocus();
         assert imm != null;
@@ -104,18 +99,13 @@ public class CreateFileActivity extends BaseActivity {
                                        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);
-                    newFileBranchName.setVisibility(View.VISIBLE);
-                    branchNameId.setVisibility(View.VISIBLE);
-                    branchNameHintText.setVisibility(View.VISIBLE);
                 }
                 else {
                     newFileBranchName.setEnabled(false);
-                    newFileBranchName.setVisibility(View.GONE);
-                    branchNameId.setVisibility(View.GONE);
-                    branchNameHintText.setVisibility(View.GONE);
                     newFileBranchName.setText("");
                 }
 
@@ -142,13 +132,17 @@ public class CreateFileActivity extends BaseActivity {
 
     }
 
-    private View.OnClickListener createFileListener = v -> processNewFile();
+    private View.OnClickListener createFileListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processNewFile();
+        }
+    };
 
     private void processNewFile() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
         AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
+        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");
@@ -166,14 +160,14 @@ public class CreateFileActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if(newFileName_.equals("") || newFileContent_.equals("") || newFileCommitMessage_.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.newFileRequiredFields));
+            Toasty.info(getApplicationContext(), getString(R.string.newFileRequiredFields));
             return;
 
         }
@@ -181,13 +175,13 @@ public class CreateFileActivity extends BaseActivity {
         if(currentBranch.toString().equals("No branch")) {
 
             if(newFileBranchName_.equals("")) {
-                Toasty.info(ctx, getString(R.string.newFileRequiredFieldNewBranchName));
+                Toasty.info(getApplicationContext(), getString(R.string.newFileRequiredFieldNewBranchName));
                 return;
             }
             else {
                 if(!appUtil.checkStringsWithDash(newFileBranchName_)) {
 
-                    Toasty.info(ctx, getString(R.string.newFileInvalidBranchName));
+                    Toasty.info(getApplicationContext(), getString(R.string.newFileInvalidBranchName));
                     return;
 
                 }
@@ -197,13 +191,13 @@ public class CreateFileActivity extends BaseActivity {
 
         if(appUtil.charactersLength(newFileCommitMessage_) > 255) {
 
-            Toasty.info(ctx, getString(R.string.newFileCommitMessageError));
+            Toasty.info(getApplicationContext(), getString(R.string.newFileCommitMessageError));
 
         }
         else {
 
             disableProcessButton();
-            createNewFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newFileName_, appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString());
+            createNewFile(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newFileName_, appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString());
 
         }
 
@@ -220,7 +214,7 @@ public class CreateFileActivity extends BaseActivity {
         }
 
         Call<JsonElement> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .createNewFile(token, repoOwner, repoName, fileName, createNewFileJsonStr);
 
@@ -232,7 +226,7 @@ public class CreateFileActivity extends BaseActivity {
                 if(response.code() == 201) {
 
                     enableProcessButton();
-                    Toasty.info(ctx, getString(R.string.newFileSuccessMessage));
+                    Toasty.info(getApplicationContext(), getString(R.string.newFileSuccessMessage));
                     finish();
 
                 }
@@ -249,11 +243,11 @@ public class CreateFileActivity extends BaseActivity {
 
                     if(response.code() == 404) {
                         enableProcessButton();
-                        Toasty.info(ctx, getString(R.string.apiNotFound));
+                        Toasty.info(getApplicationContext(), getString(R.string.apiNotFound));
                     }
                     else {
                         enableProcessButton();
-                        Toasty.info(ctx, getString(R.string.orgCreatedError));
+                        Toasty.info(getApplicationContext(), getString(R.string.orgCreatedError));
                     }
 
                 }
@@ -272,9 +266,9 @@ public class CreateFileActivity extends BaseActivity {
     private void getBranches(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
 
         Call<List<Branches>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .getBranches(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+                .getBranches(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<List<Branches>>() {
 
@@ -320,7 +314,12 @@ public class CreateFileActivity extends BaseActivity {
     }
 
     private void initCloseListener() {
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
     }
 
     private void disableProcessButton() {

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

@@ -28,8 +28,6 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.MultiSelectDialog;
-import org.mian.gitnex.helpers.StaticGlobalVariables;
-import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.CreateIssue;
 import org.mian.gitnex.models.Labels;
@@ -63,8 +61,6 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
     private boolean assigneesFlag;
     private boolean labelsFlag;
     final Context ctx = this;
-    private Context appCtx;
-    private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 
     List<Milestones> milestonesList = new ArrayList<>();
     ArrayList<MultiSelectModel> listOfAssignees = new ArrayList<>();
@@ -78,15 +74,13 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         final String loginFullName = tinyDb.getString("userFullname");
@@ -96,11 +90,6 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         final String repoName = parts[1];
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        // if gitea is 1.12 or higher use the new limit
-        if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
-            resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
-        }
-
         ImageView closeActivity = findViewById(R.id.close);
         assigneesList = findViewById(R.id.newIssueAssigneesList);
         newIssueLabels = findViewById(R.id.newIssueLabels);
@@ -128,7 +117,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
         newIssueMilestoneSpinner = findViewById(R.id.newIssueMilestoneSpinner);
         newIssueMilestoneSpinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
-        getMilestones(instanceUrl, instanceToken, repoOwner, repoName, loginUid, resultLimit);
+        getMilestones(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
 
         getLabels(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
         getCollaborators(instanceUrl, instanceToken, repoOwner, repoName, loginUid, loginFullName);
@@ -153,8 +142,8 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
     private void processNewIssue() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         String repoFullName = tinyDb.getString("repoFullName");
@@ -175,21 +164,21 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
         if(!connToInternet) {
 
-            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if (newIssueTitleForm.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.issueTitleEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.issueTitleEmpty));
             return;
 
         }
 
         /*if (newIssueDescriptionForm.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.issueDescriptionEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.issueDescriptionEmpty));
             return;
 
         }*/
@@ -228,7 +217,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
     public void loadCollaboratorsList() {
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
@@ -239,9 +228,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         final String repoName = parts[1];
 
         Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<List<Collaborators>>() {
 
@@ -283,9 +272,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         Call<JsonElement> call3;
 
         call3 = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .createNewIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, createNewIssueJson);
+                .createNewIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, createNewIssueJson);
 
         call3.enqueue(new Callback<JsonElement>() {
 
@@ -296,10 +285,10 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                     if(response2.code() == 201) {
 
                         //Log.i("isSuccessful1", String.valueOf(response2.body()));
-                        TinyDB tinyDb = new TinyDB(appCtx);
+                        TinyDB tinyDb = new TinyDB(getApplicationContext());
                         tinyDb.putBoolean("resumeIssues", true);
 
-                        Toasty.info(ctx, getString(R.string.issueCreated));
+                        Toasty.info(getApplicationContext(), getString(R.string.issueCreated));
                         enableProcessButton();
                         finish();
 
@@ -317,7 +306,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                 }
                 else {
 
-                    Toasty.info(ctx, getString(R.string.issueCreatedError));
+                    Toasty.info(getApplicationContext(), getString(R.string.issueCreatedError));
                     enableProcessButton();
                     //Log.i("isSuccessful2", String.valueOf(response2.body()));
 
@@ -343,13 +332,13 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         };
     }
 
-    private void getMilestones(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid, int resultLimit) {
+    private void getMilestones(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
 
         String msState = "open";
         Call<List<Milestones>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .getMilestones(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, 1, resultLimit, msState);
+                .getMilestones(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, msState);
 
         call.enqueue(new Callback<List<Milestones>>() {
 
@@ -401,9 +390,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
     private void getCollaborators(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid, String loginFullName) {
 
         Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
         listOfAssignees.add(new MultiSelectModel(-1, loginFullName));
 
@@ -473,9 +462,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
     private void getLabels(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
 
         Call<List<Labels>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .getlabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+                .getlabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<List<Labels>>() {
 
@@ -541,7 +530,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                 multiSelectDialog.show(getSupportFragmentManager(), "multiSelectDialog");
             }
             else {
-                Toasty.info(ctx, getResources().getString(R.string.noAssigneesFound));
+                Toasty.info(getApplicationContext(), getResources().getString(R.string.noAssigneesFound));
             }
         }
         else if (v == newIssueLabels) {
@@ -549,7 +538,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                 multiSelectDialogLabels.show(getSupportFragmentManager(), "multiSelectDialogLabels");
             }
             else {
-                Toasty.info(ctx, getResources().getString(R.string.noLabelsFound));
+                Toasty.info(getApplicationContext(), getResources().getString(R.string.noLabelsFound));
             }
         }
         else if (v == newIssueDueDate) {

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

@@ -41,7 +41,6 @@ public class CreateLabelActivity extends BaseActivity {
     private EditText labelName;
     private Button createLabelButton;
     final Context ctx = this;
-    private Context appCtx;
 
     @Override
     protected int getLayoutResourceId(){
@@ -50,13 +49,11 @@ public class CreateLabelActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
@@ -73,7 +70,7 @@ public class CreateLabelActivity extends BaseActivity {
 
         }
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
         ImageView closeActivity = findViewById(R.id.close);
         colorPicker = findViewById(R.id.colorPicker);
@@ -153,8 +150,8 @@ public class CreateLabelActivity extends BaseActivity {
 
     private void processUpdateLabel() {
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
         AppUtil appUtil = new AppUtil();
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
@@ -176,21 +173,21 @@ public class CreateLabelActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if(updateLabelName.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.labelEmptyError));
+            Toasty.info(getApplicationContext(), getString(R.string.labelEmptyError));
             return;
 
         }
 
         if(!appUtil.checkStrings(updateLabelName)) {
 
-            Toasty.info(ctx, getString(R.string.labelNameError));
+            Toasty.info(getApplicationContext(), getString(R.string.labelNameError));
             return;
 
         }
@@ -202,9 +199,9 @@ public class CreateLabelActivity extends BaseActivity {
 
     private void processCreateLabel() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
         AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
@@ -216,7 +213,7 @@ public class CreateLabelActivity extends BaseActivity {
         String newLabelName = labelName.getText().toString();
         String newLabelColor;
         if(tinyDb.getString("labelColor").isEmpty()) {
-            newLabelColor = String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(ctx, R.color.releasePre)));
+            newLabelColor = String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(getApplicationContext(), R.color.releasePre)));
         }
         else {
             newLabelColor = tinyDb.getString("labelColor");
@@ -224,21 +221,21 @@ public class CreateLabelActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if(newLabelName.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.labelEmptyError));
+            Toasty.info(getApplicationContext(), getString(R.string.labelEmptyError));
             return;
 
         }
 
         if(!appUtil.checkStrings(newLabelName)) {
 
-            Toasty.info(ctx, getString(R.string.labelNameError));
+            Toasty.info(getApplicationContext(), getString(R.string.labelNameError));
             return;
 
         }
@@ -251,14 +248,14 @@ public class CreateLabelActivity extends BaseActivity {
     private void createNewLabel(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String newLabelName, String newLabelColor, String loginUid) {
 
         CreateLabel createLabelFunc = new CreateLabel(newLabelName, newLabelColor);
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         Call<CreateLabel> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .createLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, createLabelFunc);
+                .createLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, createLabelFunc);
 
         call.enqueue(new Callback<CreateLabel>() {
 
@@ -267,7 +264,7 @@ public class CreateLabelActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    Toasty.info(ctx, getString(R.string.labelCreated));
+                    Toasty.info(getApplicationContext(), getString(R.string.labelCreated));
                     tinyDb.putString("labelColor", "");
                     tinyDb.putBoolean("labelsRefresh", true);
                     finish();
@@ -286,7 +283,7 @@ public class CreateLabelActivity extends BaseActivity {
 
                     enableProcessButton();
                     tinyDb.putString("labelColor", "");
-                    Toasty.info(ctx, getString(R.string.labelGeneralError));
+                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
 
                 }
 
@@ -305,14 +302,14 @@ public class CreateLabelActivity extends BaseActivity {
     private void patchLabel(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String updateLabelName, String updateLabelColor, int labelId, String loginUid) {
 
         CreateLabel createLabelFunc = new CreateLabel(updateLabelName, updateLabelColor);
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         Call<CreateLabel> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .patchLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, labelId, createLabelFunc);
+                .patchLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, labelId, createLabelFunc);
 
         call.enqueue(new Callback<CreateLabel>() {
 
@@ -322,7 +319,7 @@ public class CreateLabelActivity extends BaseActivity {
                 if(response.isSuccessful()) {
                     if(response.code() == 200) {
 
-                        Toasty.info(ctx, getString(R.string.labelUpdated));
+                        Toasty.info(getApplicationContext(), getString(R.string.labelUpdated));
                         tinyDb.putString("labelColor", "");
                         tinyDb.putBoolean("labelsRefresh", true);
                         tinyDb.putString("labelColorDefault", "");
@@ -348,7 +345,7 @@ public class CreateLabelActivity extends BaseActivity {
                     enableProcessButton();
                     tinyDb.putString("labelColor", "");
                     tinyDb.putString("labelColorDefault", "");
-                    Toasty.info(ctx, getString(R.string.labelGeneralError));
+                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
 
                 }
 
@@ -383,9 +380,9 @@ public class CreateLabelActivity extends BaseActivity {
         Call<Labels> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .deleteLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, labelId);
+                .deleteLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, labelId);
 
         call.enqueue(new Callback<Labels>() {
 
@@ -395,8 +392,8 @@ public class CreateLabelActivity extends BaseActivity {
                 if(response.isSuccessful()) {
                     if(response.code() == 204) {
 
-                        Toasty.info(ctx, getString(R.string.labelDeleteText));
+                        Toasty.info(getApplicationContext(), getString(R.string.labelDeleteText));
-                        LabelsViewModel.loadLabelsList(instanceUrl, instanceToken, repoOwner, repoName, ctx);
+                        LabelsViewModel.loadLabelsList(instanceUrl, instanceToken, repoOwner, repoName, getApplicationContext());
                         getIntent().removeExtra("labelAction");
                         getIntent().removeExtra("labelId");
 
@@ -412,7 +409,7 @@ public class CreateLabelActivity extends BaseActivity {
                 }
                 else {
 
-                    Toasty.info(ctx, getString(R.string.labelDeleteErrorText));
+                    Toasty.info(getApplicationContext(), getString(R.string.labelDeleteErrorText));
 
                 }
 

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

@@ -18,7 +18,7 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.helpers.VersionCheck;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Milestones;
 import org.mian.gitnex.util.AppUtil;
@@ -37,7 +37,6 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
     private EditText milestoneDescription;
     private Button createNewMilestoneButton;
     final Context ctx = this;
-    private Context appCtx;
 
     @Override
     protected int getLayoutResourceId(){
@@ -46,11 +45,9 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -92,9 +89,9 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
     private void processNewMilestone() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
         AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
@@ -110,14 +107,14 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
         if(!connToInternet) {
 
-            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if(newMilestoneTitle.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.milestoneNameErrorEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.milestoneNameErrorEmpty));
             return;
 
         }
@@ -125,7 +122,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
         if(!newMilestoneDescription.equals("")) {
             if (appUtil.charactersLength(newMilestoneDescription) > 255) {
 
-                Toasty.info(ctx, getString(R.string.milestoneDescError));
+                Toasty.info(getApplicationContext(), getString(R.string.milestoneDescError));
                 return;
 
             }
@@ -134,14 +131,14 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
         String finalMilestoneDueDate = null;
         if(!newMilestoneDueDate.isEmpty()) {
             finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate)));
-        } else if (new Version(tinyDb.getString("giteaVersion")).less("1.10.0")) {
+        } else if (VersionCheck.compareVersion("1.10.0", tinyDb.getString("giteaVersion")) > 1) {
             // if Gitea version is less than 1.10.0 DueDate is required
-            Toasty.info(ctx, getString(R.string.milestoneDateEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.milestoneDateEmpty));
             return;
         }
 
         disableProcessButton();
-        createNewMilestone(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate);
+        createNewMilestone(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate);
 
     }
 
@@ -152,7 +149,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
         Call<Milestones> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .createMilestone(token, repoOwner, repoName, createMilestone);
 
@@ -164,9 +161,9 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
                 if(response.isSuccessful()) {
                     if(response.code() == 201) {
 
-                        TinyDB tinyDb = new TinyDB(appCtx);
+                        TinyDB tinyDb = new TinyDB(getApplicationContext());
                         tinyDb.putBoolean("milestoneCreated", true);
-                        Toasty.info(ctx, getString(R.string.milestoneCreated));
+                        Toasty.info(getApplicationContext(), getString(R.string.milestoneCreated));
                         enableProcessButton();
                         finish();
 
@@ -184,7 +181,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
                 else {
 
                     enableProcessButton();
-                    Toasty.info(ctx, getString(R.string.milestoneCreatedError));
+                    Toasty.info(getApplicationContext(), getString(R.string.milestoneCreatedError));
 
                 }
 

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

@@ -35,7 +35,6 @@ public class CreateNewUserActivity extends BaseActivity {
     private EditText userPassword;
     private Button createUserButton;
     final Context ctx = this;
-    private Context appCtx;
 
     @Override
     protected int getLayoutResourceId(){
@@ -46,9 +45,8 @@ public class CreateNewUserActivity extends BaseActivity {
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -80,9 +78,9 @@ public class CreateNewUserActivity extends BaseActivity {
 
     private void processCreateNewUser() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
         AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
+        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");
@@ -94,41 +92,41 @@ public class CreateNewUserActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if(newFullName.equals("") || newUserName.equals("") | newUserEmail.equals("") || newUserPassword.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.emptyFields));
+            Toasty.info(getApplicationContext(), getString(R.string.emptyFields));
             return;
 
         }
 
         if(!appUtil.checkStrings(newFullName)) {
 
-            Toasty.info(ctx, getString(R.string.userInvalidFullName));
+            Toasty.info(getApplicationContext(), getString(R.string.userInvalidFullName));
             return;
 
         }
 
         if(!appUtil.checkStringsWithAlphaNumeric(newUserName)) {
 
-            Toasty.info(ctx, getString(R.string.userInvalidUserName));
+            Toasty.info(getApplicationContext(), getString(R.string.userInvalidUserName));
             return;
 
         }
 
         if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {
 
-            Toasty.info(ctx, getString(R.string.userInvalidEmail));
+            Toasty.info(getApplicationContext(), getString(R.string.userInvalidEmail));
             return;
 
         }
 
         disableProcessButton();
-        createNewUser(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newFullName, newUserName, newUserEmail, newUserPassword);
+        createNewUser(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), newFullName, newUserName, newUserEmail, newUserPassword);
 
     }
 
@@ -139,7 +137,7 @@ public class CreateNewUserActivity extends BaseActivity {
         Call<UserInfo> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .createNewUser(instanceToken, createUser);
 
@@ -150,7 +148,7 @@ public class CreateNewUserActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    Toasty.info(ctx, getString(R.string.userCreatedText));
+                    Toasty.info(getApplicationContext(), getString(R.string.userCreatedText));
                     enableProcessButton();
                     finish();
 
@@ -185,7 +183,7 @@ public class CreateNewUserActivity extends BaseActivity {
                 else {
 
                     enableProcessButton();
-                    Toasty.info(ctx, getString(R.string.genericError));
+                    Toasty.info(getApplicationContext(), getString(R.string.genericError));
 
                 }
 

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

@@ -34,7 +34,6 @@ public class CreateOrganizationActivity extends BaseActivity {
     private EditText orgName;
     private EditText orgDesc;
     final Context ctx = this;
-    private Context appCtx;
 
     @Override
     protected int getLayoutResourceId(){
@@ -43,11 +42,9 @@ public class CreateOrganizationActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -97,9 +94,9 @@ public class CreateOrganizationActivity extends BaseActivity {
 
     private void processNewOrganization() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
         AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
+        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");
@@ -109,7 +106,7 @@ public class CreateOrganizationActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
             return;
 
         }
@@ -117,7 +114,7 @@ public class CreateOrganizationActivity extends BaseActivity {
         if(!newOrgDesc.equals("")) {
             if (appUtil.charactersLength(newOrgDesc) > 255) {
 
-                Toasty.info(ctx, getString(R.string.orgDescError));
+                Toasty.info(getApplicationContext(), getString(R.string.orgDescError));
                 return;
 
             }
@@ -125,18 +122,18 @@ public class CreateOrganizationActivity extends BaseActivity {
 
         if(newOrgName.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.orgNameErrorEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.orgNameErrorEmpty));
 
         }
         else if(!appUtil.checkStrings(newOrgName)) {
 
-            Toasty.info(ctx, getString(R.string.orgNameErrorInvalid));
+            Toasty.info(getApplicationContext(), getString(R.string.orgNameErrorInvalid));
 
         }
         else {
 
             disableProcessButton();
-            createNewOrganization(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newOrgName, newOrgDesc);
+            createNewOrganization(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), newOrgName, newOrgDesc);
 
         }
 
@@ -147,7 +144,7 @@ public class CreateOrganizationActivity extends BaseActivity {
         UserOrganizations createOrganization = new UserOrganizations(orgName, null, orgDesc, null, null);
 
         Call<UserOrganizations> call = RetrofitClient
-            .getInstance(instanceUrl, ctx)
+            .getInstance(instanceUrl, getApplicationContext())
             .getApiInterface()
             .createNewOrganization(token, createOrganization);
 
@@ -158,10 +155,10 @@ public class CreateOrganizationActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    TinyDB tinyDb = new TinyDB(appCtx);
+                    TinyDB tinyDb = new TinyDB(getApplicationContext());
                     tinyDb.putBoolean("orgCreated", true);
                     enableProcessButton();
-                    Toasty.info(ctx, getString(R.string.orgCreated));
+                    Toasty.info(getApplicationContext(), getString(R.string.orgCreated));
                     finish();
 
                 }
@@ -177,24 +174,24 @@ public class CreateOrganizationActivity extends BaseActivity {
                 else if(response.code() == 409) {
 
                     enableProcessButton();
-                    Toasty.info(ctx, getString(R.string.orgExistsError));
+                    Toasty.info(getApplicationContext(), getString(R.string.orgExistsError));
 
                 }
                 else if(response.code() == 422) {
 
                     enableProcessButton();
-                    Toasty.info(ctx, getString(R.string.orgExistsError));
+                    Toasty.info(getApplicationContext(), getString(R.string.orgExistsError));
 
                 }
                 else {
 
                     if(response.code() == 404) {
                         enableProcessButton();
-                        Toasty.info(ctx, getString(R.string.apiNotFound));
+                        Toasty.info(getApplicationContext(), getString(R.string.apiNotFound));
                     }
                     else {
                         enableProcessButton();
-                        Toasty.info(ctx, getString(R.string.orgCreatedError));
+                        Toasty.info(getApplicationContext(), getString(R.string.orgCreatedError));
                     }
 
                 }

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

@@ -45,7 +45,6 @@ public class CreateReleaseActivity extends BaseActivity {
     private CheckBox releaseDraft;
     private Button createNewRelease;
     final Context ctx = this;
-    private Context appCtx;
 
     List<Branches> branchesList = new ArrayList<>();
 
@@ -58,13 +57,12 @@ public class CreateReleaseActivity extends BaseActivity {
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        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");
@@ -89,7 +87,7 @@ public class CreateReleaseActivity extends BaseActivity {
 
         releaseBranch = findViewById(R.id.releaseBranch);
         releaseBranch.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
-        getBranches(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+        getBranches(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
         releaseBranch.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@@ -125,9 +123,9 @@ public class CreateReleaseActivity extends BaseActivity {
 
     private void processNewRelease() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        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");
@@ -145,27 +143,27 @@ public class CreateReleaseActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if(newReleaseTagName.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.tagNameErrorEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.tagNameErrorEmpty));
             return;
 
         }
 
         if(newReleaseTitle.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.titleErrorEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.titleErrorEmpty));
             return;
 
         }
 
         disableProcessButton();
-        createNewReleaseFunc(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, newReleaseBranch, newReleaseType, newReleaseDraft);
+        createNewReleaseFunc(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, newReleaseBranch, newReleaseType, newReleaseDraft);
 
     }
 
@@ -176,7 +174,7 @@ public class CreateReleaseActivity extends BaseActivity {
         Call<Releases> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .createNewRelease(token, repoOwner, repoName, createReleaseJson);
 
@@ -187,9 +185,9 @@ public class CreateReleaseActivity extends BaseActivity {
 
                 if (response.code() == 201) {
 
-                    TinyDB tinyDb = new TinyDB(appCtx);
+                    TinyDB tinyDb = new TinyDB(getApplicationContext());
                     tinyDb.putBoolean("updateReleases", true);
-                    Toasty.info(ctx, getString(R.string.releaseCreatedText));
+                    Toasty.info(getApplicationContext(), getString(R.string.releaseCreatedText));
                     enableProcessButton();
                     finish();
 
@@ -236,7 +234,7 @@ public class CreateReleaseActivity extends BaseActivity {
     private void getBranches(String instanceUrl, String instanceToken, final String repoOwner, final String repoName) {
 
         Call<List<Branches>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getBranches(instanceToken, repoOwner, repoName);
 

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

@@ -45,7 +45,6 @@ public class CreateRepoActivity extends BaseActivity {
     private EditText repoDesc;
     private CheckBox repoAccess;
     final Context ctx = this;
-    private Context appCtx;
 
     List<OrgOwner> organizationsList = new ArrayList<>();
 
@@ -60,13 +59,11 @@ public class CreateRepoActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         final String userLogin = tinyDb.getString("userLogin");
@@ -88,7 +85,7 @@ public class CreateRepoActivity extends BaseActivity {
 
         spinner = findViewById(R.id.ownerSpinner);
         spinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
-        getOrganizations(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), userLogin);
+        getOrganizations(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), userLogin);
         spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@@ -124,9 +121,9 @@ public class CreateRepoActivity extends BaseActivity {
 
     private void processNewRepo() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
         AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
+        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");
@@ -138,7 +135,7 @@ public class CreateRepoActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
             return;
 
         }
@@ -146,7 +143,7 @@ public class CreateRepoActivity extends BaseActivity {
         if(!newRepoDesc.equals("")) {
             if (appUtil.charactersLength(newRepoDesc) > 255) {
 
-                Toasty.info(ctx, getString(R.string.repoDescError));
+                Toasty.info(getApplicationContext(), getString(R.string.repoDescError));
                 return;
 
             }
@@ -154,28 +151,28 @@ public class CreateRepoActivity extends BaseActivity {
 
         if(newRepoName.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.repoNameErrorEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorEmpty));
 
         }
         else if(!appUtil.checkStrings(newRepoName)) {
 
-            Toasty.info(ctx, getString(R.string.repoNameErrorInvalid));
+            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorInvalid));
 
         }
         else if (reservedRepoNames.contains(newRepoName)) {
 
-            Toasty.info(ctx, getString(R.string.repoNameErrorReservedName));
+            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorReservedName));
 
         }
         else if (reservedRepoPatterns.matcher(newRepoName).find()) {
 
-            Toasty.info(ctx, getString(R.string.repoNameErrorReservedPatterns));
+            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorReservedPatterns));
 
         }
         else {
 
             disableProcessButton();
-            createNewRepository(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, repoOwner, newRepoAccess);
+            createNewRepository(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, repoOwner, newRepoAccess);
 
         }
     }
@@ -188,7 +185,7 @@ public class CreateRepoActivity extends BaseActivity {
         if(repoOwner.equals(loginUid)) {
 
             call = RetrofitClient
-                    .getInstance(instanceUrl, ctx)
+                    .getInstance(instanceUrl, getApplicationContext())
                     .getApiInterface()
                     .createNewUserRepository(token, createRepository);
 
@@ -196,7 +193,7 @@ public class CreateRepoActivity extends BaseActivity {
         else {
 
             call = RetrofitClient
-                    .getInstance(instanceUrl, ctx)
+                    .getInstance(instanceUrl, getApplicationContext())
                     .getApiInterface()
                     .createNewUserOrgRepository(token, repoOwner, createRepository);
 
@@ -209,9 +206,9 @@ public class CreateRepoActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    TinyDB tinyDb = new TinyDB(appCtx);
+                    TinyDB tinyDb = new TinyDB(getApplicationContext());
                     tinyDb.putBoolean("repoCreated", true);
-                    Toasty.info(ctx, getString(R.string.repoCreated));
+                    Toasty.info(getApplicationContext(), getString(R.string.repoCreated));
                     enableProcessButton();
                     finish();
                 }
@@ -227,13 +224,13 @@ public class CreateRepoActivity extends BaseActivity {
                 else if(response.code() == 409) {
 
                     enableProcessButton();
-                    Toasty.info(ctx, getString(R.string.repoExistsError));
+                    Toasty.info(getApplicationContext(), getString(R.string.repoExistsError));
 
                 }
                 else {
 
                     enableProcessButton();
-                    Toasty.info(ctx, getString(R.string.repoCreatedError));
+                    Toasty.info(getApplicationContext(), getString(R.string.repoCreatedError));
 
                 }
 
@@ -249,10 +246,10 @@ public class CreateRepoActivity extends BaseActivity {
 
     private void getOrganizations(String instanceUrl, String instanceToken, final String userLogin) {
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         Call<List<OrgOwner>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getOrgOwners(instanceToken);
 

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

@@ -33,7 +33,6 @@ import android.util.Log;
 public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClickListener {
 
     final Context ctx = CreateTeamByOrgActivity.this;
-    private Context appCtx;
     private View.OnClickListener onClickListener;
     private TextView teamName;
     private TextView teamDesc;
@@ -74,11 +73,9 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -250,13 +247,13 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
     private void processCreateTeam() {
 
         AppUtil appUtil = new AppUtil();
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        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");
         final String orgName = tinyDb.getString("orgName");;
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
         String newTeamName = teamName.getText().toString();
         String newTeamDesc = teamDesc.getText().toString();
         String newTeamPermission = teamPermission.getText().toString().toLowerCase();
@@ -264,21 +261,21 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
         if(!connToInternet) {
 
-            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if (newTeamName.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.teamNameEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.teamNameEmpty));
             return;
 
         }
 
         if(!appUtil.checkStringsWithAlphaNumericDashDotUnderscore(newTeamName)) {
 
-            Toasty.info(ctx, getString(R.string.teamNameError));
+            Toasty.info(getApplicationContext(), getString(R.string.teamNameError));
             return;
 
         }
@@ -286,12 +283,12 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
         if(!newTeamDesc.equals("")) {
 
             if(!appUtil.checkStrings(newTeamDesc)) {
-                Toasty.info(ctx, getString(R.string.teamDescError));
+                Toasty.info(getApplicationContext(), getString(R.string.teamDescError));
                 return;
             }
 
             if(newTeamDesc.length() > 100) {
-                Toasty.info(ctx, getString(R.string.teamDescLimit));
+                Toasty.info(getApplicationContext(), getString(R.string.teamDescLimit));
                 return;
             }
 
@@ -299,7 +296,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
         if (newTeamPermission.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.teamPermissionEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.teamPermissionEmpty));
             return;
 
         }
@@ -321,9 +318,9 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
         Call<Teams> call3;
 
         call3 = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .createTeamsByOrg(Authorization.returnAuthentication(ctx, loginUid, instanceToken), orgName, createNewTeamJson);
+                .createTeamsByOrg(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), orgName, createNewTeamJson);
 
         call3.enqueue(new Callback<Teams>() {
 
@@ -333,10 +330,10 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
                 if(response2.isSuccessful()) {
                     if(response2.code() == 201) {
 
-                        TinyDB tinyDb = new TinyDB(appCtx);
+                        TinyDB tinyDb = new TinyDB(getApplicationContext());
                         tinyDb.putBoolean("resumeTeams", true);
 
-                        Toasty.info(ctx, getString(R.string.teamCreated));
+                        Toasty.info(getApplicationContext(), getString(R.string.teamCreated));
                         finish();
 
                     }
@@ -344,7 +341,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
                 }
                 else if(response2.code() == 404) {
 
-                    Toasty.info(ctx, getString(R.string.apiNotFound));
+                    Toasty.info(getApplicationContext(), getString(R.string.apiNotFound));
 
                 }
                 else if(response2.code() == 401) {
@@ -357,7 +354,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
                 }
                 else {
 
-                    Toasty.info(ctx, getString(R.string.teamCreatedError));
+                    Toasty.info(getApplicationContext(), getString(R.string.teamCreatedError));
 
                 }
 

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

@@ -3,7 +3,6 @@ package org.mian.gitnex.activities;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.view.View;
@@ -21,7 +20,6 @@ import java.util.List;
 public class CreditsActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
-    final Context ctx = this;
 
     @Override
     protected int getLayoutResourceId(){
@@ -46,7 +44,7 @@ public class CreditsActivity extends BaseActivity {
         RecyclerView mRecyclerView = findViewById(R.id.recyclerView);
 
         mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
 
         DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
                 DividerItemDecoration.VERTICAL);

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

@@ -28,9 +28,7 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.CreateIssue;
 import org.mian.gitnex.models.Issues;
@@ -50,9 +48,7 @@ import java.util.List;
 public class EditIssueActivity extends BaseActivity implements View.OnClickListener {
 
     final Context ctx = this;
-    private Context appCtx;
     private View.OnClickListener onClickListener;
-    private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 
     private EditText editIssueTitle;
     private SocialAutoCompleteTextView editIssueDescription;
@@ -74,11 +70,10 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
@@ -96,11 +91,6 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
         editIssueDescription = findViewById(R.id.editIssueDescription);
         editIssueDueDate = findViewById(R.id.editIssueDueDate);
 
-        // if gitea is 1.12 or higher use the new limit
-        if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
-            resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
-        }
-
         editIssueTitle.requestFocus();
         assert imm != null;
         imm.showSoftInput(editIssueTitle, InputMethodManager.SHOW_IMPLICIT);
@@ -130,14 +120,14 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
         }
 
         disableProcessButton();
-        getIssue(instanceUrl, instanceToken, loginUid, repoOwner, repoName, issueIndex, resultLimit);
+        getIssue(instanceUrl, instanceToken, loginUid, repoOwner, repoName, issueIndex);
 
 
     }
 
     public void loadCollaboratorsList() {
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
@@ -148,9 +138,9 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
         final String repoName = parts[1];
 
         Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<List<Collaborators>>() {
 
@@ -196,8 +186,8 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
     private void processEditIssue() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         String repoFullName = tinyDb.getString("repoFullName");
@@ -217,21 +207,21 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
         if(!connToInternet) {
 
-            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if (editIssueTitleForm.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.issueTitleEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.issueTitleEmpty));
             return;
 
         }
 
         /*if (editIssueDescriptionForm.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.issueDescriptionEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.issueDescriptionEmpty));
             return;
 
         }*/
@@ -250,14 +240,14 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
     private void editIssue(String instanceUrl, String instanceToken, String repoOwner, String repoName, int issueIndex, String loginUid, String title, String description, String dueDate, int editIssueMilestoneId) {
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         CreateIssue issueData = new CreateIssue(title, description, dueDate, editIssueMilestoneId);
 
         Call<JsonElement> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .patchIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueData);
+                .patchIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, issueData);
 
         call.enqueue(new Callback<JsonElement>() {
 
@@ -267,10 +257,10 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                 if(response.code() == 201) {
 
                     if(tinyDb.getString("issueType").equals("pr")) {
-                        Toasty.info(ctx, getString(R.string.editPrSuccessMessage));
+                        Toasty.info(getApplicationContext(), getString(R.string.editPrSuccessMessage));
                     }
                     else {
-                        Toasty.info(ctx, getString(R.string.editIssueSuccessMessage));
+                        Toasty.info(getApplicationContext(), getString(R.string.editIssueSuccessMessage));
                     }
 
                     tinyDb.putBoolean("issueEdited", true);
@@ -290,7 +280,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                 else {
 
                     enableProcessButton();
-                    Toasty.info(ctx, getString(R.string.genericError));
+                    Toasty.info(getApplicationContext(), getString(R.string.genericError));
 
                 }
 
@@ -336,12 +326,12 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
     }
 
-    private void getIssue(final String instanceUrl, final String instanceToken, final String loginUid, final String repoOwner, final String repoName, int issueIndex, int resultLimit) {
+    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, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .getIssueByIndex(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
+                .getIssueByIndex(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);
 
         call.enqueue(new Callback<Issues>() {
 
@@ -363,9 +353,9 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                     if(response.body().getId() > 0) {
 
                         Call<List<Milestones>> call_ = RetrofitClient
-                                .getInstance(instanceUrl, ctx)
+                                .getInstance(instanceUrl, getApplicationContext())
                                 .getApiInterface()
-                                .getMilestones(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, 1, resultLimit, msState);
+                                .getMilestones(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, msState);
 
                         final int finalMsId = msId;
 
@@ -442,7 +432,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                 }
                 else {
 
-                    Toasty.info(ctx, getString(R.string.genericError));
+                    Toasty.info(getApplicationContext(), getString(R.string.genericError));
 
                 }
 

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

@@ -1,26 +1,26 @@
 package org.mian.gitnex.activities;
 
-import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import org.apache.commons.io.FileUtils;
 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.ParseDiff;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.Version;
 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;
@@ -32,150 +32,188 @@ import retrofit2.Callback;
 
 public class FileDiffActivity extends BaseActivity {
 
-	private View.OnClickListener onClickListener;
+    private View.OnClickListener onClickListener;
-	private TextView toolbarTitle;
+    private TextView toolbar_title;
-	private ListView mListView;
+    private RecyclerView mRecyclerView;
-	private ProgressBar mProgressBar;
+    private ProgressBar mProgressBar;
-	final Context ctx = this;
-	private Context appCtx;
 
-	@Override
+    @Override
-	protected int getLayoutResourceId() {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_file_diff;
+    }
 
-		return R.layout.activity_file_diff;
+    @Override
-	}
+    public void onCreate(Bundle savedInstanceState) {
 
-	@Override
+        super.onCreate(savedInstanceState);
-	public void onCreate(Bundle savedInstanceState) {
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
 
-		super.onCreate(savedInstanceState);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
-		appCtx = 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");
 
-		Toolbar toolbar = findViewById(R.id.toolbar);
+        ImageView closeActivity = findViewById(R.id.close);
-		setSupportActionBar(toolbar);
+        toolbar_title = findViewById(R.id.toolbar_title);
+        mRecyclerView = findViewById(R.id.recyclerView);
+        mProgressBar = findViewById(R.id.progress_bar);
 
-		final TinyDB tinyDb = new TinyDB(appCtx);
+        mRecyclerView.setHasFixedSize(true);
-		String repoFullName = tinyDb.getString("repoFullName");
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
-		String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-		ImageView closeActivity = findViewById(R.id.close);
+        toolbar_title.setText(R.string.processingText);
-		toolbarTitle = findViewById(R.id.toolbar_title);
+        initCloseListener();
-		mListView = findViewById(R.id.listView);
+        closeActivity.setOnClickListener(onClickListener);
-		mProgressBar = findViewById(R.id.progress_bar);
 
-		mListView.setDivider(null);
+        mProgressBar.setVisibility(View.VISIBLE);
 
-		toolbarTitle.setText(R.string.processingText);
+        String pullIndex = tinyDb.getString("issueNumber");
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
 
-		mProgressBar.setVisibility(View.VISIBLE);
+        getPullDiffContent(tinyDb.getString("instanceUrlWithProtocol"), repoOwner, repoName, pullIndex);
 
-		String pullIndex = tinyDb.getString("issueNumber");
+    }
 
-		boolean apiCall = true;
+    private void getPullDiffContent(String instanceUrl, String owner, String repo, String filename) {
-		String instanceUrl = tinyDb.getString("instanceUrl");
 
-		// fallback for old gitea instances
+        Call<ResponseBody> call = RetrofitClient
-		if(new Version(tinyDb.getString("giteaVersion")).less("1.13.0")) {
+                .getInstance(instanceUrl, getApplicationContext())
-			apiCall = false;
+                .getWebInterface()
-			instanceUrl = tinyDb.getString("instanceUrlWithProtocol");
+                .getPullDiffContent(owner, repo, filename);
-		}
 
-		getPullDiffContent(instanceUrl, repoOwner, repoName, pullIndex, instanceToken, apiCall);
+        call.enqueue(new Callback<ResponseBody>() {
 
-	}
+            @Override
+            public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
 
-	private void getPullDiffContent(String instanceUrl, String owner, String repo, String pullIndex, String token, boolean apiCall) {
+                if (response.code() == 200) {
 
-		Call<ResponseBody> call;
+                    try {
-		if(apiCall) {
+                        assert response.body() != null;
-			call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getPullDiffContent(token, owner, repo, pullIndex);
-		}
-		else {
-			call = RetrofitClient.getInstance(instanceUrl, ctx).getWebInterface().getPullDiffContent(owner, repo, pullIndex);
-		}
 
-		call.enqueue(new Callback<ResponseBody>() {
+                        AppUtil appUtil = new AppUtil();
+                        List<FileDiffView> fileContentsArray = new ArrayList<>();
 
-			@Override
+                        String[] lines = response.body().string().split("diff");
-			public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
 
-				if(response.code() == 200) {
+                        if(lines.length > 0) {
 
-					try {
+                            for (int i = 1; i < lines.length; i++) {
-						assert response.body() != null;
 
-						AppUtil appUtil = new AppUtil();
+                                if(lines[i].contains("@@ -")) {
-						List<FileDiffView> fileContentsArray = ParseDiff.getFileDiffViewArray(response.body().string());
 
-						int filesCount = fileContentsArray.size();
+                                    String[] level2nd = lines[i].split("@@ -"); // main content part of single diff view
-						if(filesCount > 1) {
-							toolbarTitle.setText(getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)));
-						}
-						else {
-							toolbarTitle.setText(getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount)));
-						}
 
-						FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, fileContentsArray);
+                                    String[] fileName_ = level2nd[0].split("\\+\\+\\+ b/"); // filename part
-						mListView.setAdapter(adapter);
+                                    String fileNameFinal = fileName_[1];
 
-						mProgressBar.setVisibility(View.GONE);
+                                    String[] fileContents_ = level2nd[1].split("@@"); // file info / content part
+                                    String fileInfoFinal = fileContents_[0];
+                                    String fileContentsFinal = (fileContents_[1]);
 
-					}
+                                    if(level2nd.length > 2) {
-					catch(IOException e) {
+                                        for (int j = 2; j < level2nd.length; j++) {
-						e.printStackTrace();
+                                            fileContentsFinal += (level2nd[j]);
-					}
+                                        }
+                                    }
 
-				}
+                                    String fileExtension = FileUtils.getExtension(fileNameFinal);
-				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));
+                                    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 if(response.code() == 403) {
+                                }
+                                else {
 
-					Toasty.info(ctx, ctx.getString(R.string.authorizeError));
+                                    String[] getFileName = lines[i].split("--git a/");
 
-				}
+                                    String[] getFileName_ = getFileName[1].split("b/");
-				else if(response.code() == 404) {
+                                    String getFileNameFinal = getFileName_[0].trim();
 
-					Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+                                    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 = FileUtils.getExtension(getFileNameFinal);
-				else {
 
-					Toasty.info(ctx, getString(R.string.labelGeneralError));
+                                    if(appUtil.imageExtension(FileUtils.getExtension(getFileNameFinal))) {
 
-				}
+                                        fileContentsArray.add(new FileDiffView(getFileNameFinal, appUtil.imageExtension(fileExtension), "", binaryFileFinal));
+                                    }
 
-			}
+                                }
 
-			@Override
+                            }
-			public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
 
-				Log.e("onFailure", t.toString());
+                        }
-			}
-		});
 
-	}
+                        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)));
+                        }
 
-	private void initCloseListener() {
+                        FilesDiffAdapter adapter = new FilesDiffAdapter(fileContentsArray, getApplicationContext());
+                        mRecyclerView.setAdapter(adapter);
 
-		onClickListener = new View.OnClickListener() {
+                        mProgressBar.setVisibility(View.GONE);
 
-			@Override
+                    } catch (IOException e) {
-			public void onClick(View view) {
+                        e.printStackTrace();
+                    }
 
-				getIntent().removeExtra("singleFileName");
+                }
-				finish();
+                else if(response.code() == 401) {
-			}
+
-		};
+                    AlertDialogs.authorizationTokenRevokedDialog(getApplicationContext(), getResources().getString(R.string.alertDialogTokenRevokedTitle),
-	}
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else if(response.code() == 403) {
+
+                    Toasty.info(getApplicationContext(), getApplicationContext().getString(R.string.authorizeError));
+
+                }
+                else if(response.code() == 404) {
+
+                    Toasty.info(getApplicationContext(), getApplicationContext().getString(R.string.apiNotFound));
+
+                }
+                else {
+
+                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                getIntent().removeExtra("singleFileName");
+                finish();
+            }
+        };
+    }
 
 
 }

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

@@ -1,17 +1,20 @@
 package org.mian.gitnex.activities;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.BitmapFactory;
 import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.Environment;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Base64;
 import android.util.Log;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -21,25 +24,26 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import com.github.barteksc.pdfviewer.PDFView;
 import com.github.barteksc.pdfviewer.util.FitPolicy;
 import com.github.chrisbanes.photoview.PhotoView;
+import com.pddstudio.highlightjs.HighlightJsView;
+import com.pddstudio.highlightjs.models.Theme;
 import org.apache.commons.io.FileUtils;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.fragments.BottomSheetFileViewerFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.highlightjs.HighlightJsView;
-import org.mian.gitnex.helpers.highlightjs.models.Theme;
 import org.mian.gitnex.models.Files;
 import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.Objects;
@@ -55,16 +59,17 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 	private View.OnClickListener onClickListener;
 	private TextView singleFileContents;
 	private LinearLayout singleFileContentsFrame;
-	private HighlightJsView singleCodeContents;
+	private LinearLayout highlightJs;
+	//private HighlightJsView singleCodeContents;
 	private PhotoView imageView;
 	final Context ctx = this;
-	private Context appCtx;
 	private ProgressBar mProgressBar;
 	private byte[] imageData;
 	private PDFView pdfView;
 	private LinearLayout pdfViewFrame;
 	private byte[] decodedPdf;
 	private Boolean pdfNightMode;
+	private static final int PERMISSION_REQUEST_CODE = 1;
 
 	@Override
 	protected int getLayoutResourceId() {
@@ -76,12 +81,10 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
-		appCtx = getApplicationContext();
-
 		Toolbar toolbar = findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);
 
-		final TinyDB tinyDb = new TinyDB(appCtx);
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());
 		String repoFullName = tinyDb.getString("repoFullName");
 		String[] parts = repoFullName.split("/");
 		final String repoOwner = parts[0];
@@ -92,7 +95,8 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 		ImageView closeActivity = findViewById(R.id.close);
 		singleFileContents = findViewById(R.id.singleFileContents);
-		singleCodeContents = findViewById(R.id.singleCodeContents);
+		highlightJs = findViewById(R.id.highlightJs);
+		//singleCodeContents = findViewById(R.id.singleCodeContents);
 		imageView = findViewById(R.id.imageView);
 		mProgressBar = findViewById(R.id.progress_bar);
 		pdfView = findViewById(R.id.pdfView);
@@ -131,9 +135,9 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 	private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename) {
 
-		final TinyDB tinyDb = new TinyDB(appCtx);
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
-		Call<Files> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getSingleFileContents(token, owner, repo, filename);
+		Call<Files> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getSingleFileContents(token, owner, repo, filename);
 
 		call.enqueue(new Callback<Files>() {
 
@@ -157,7 +161,8 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 						if(appUtil.imageExtension(fileExtension)) { // file is image
 
 							singleFileContentsFrame.setVisibility(View.GONE);
-							singleCodeContents.setVisibility(View.GONE);
+							highlightJs.setVisibility(View.GONE);
+							//singleCodeContents.setVisibility(View.GONE);
 							pdfViewFrame.setVisibility(View.GONE);
 							imageView.setVisibility(View.VISIBLE);
 
@@ -168,39 +173,59 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 						}
 						else if(appUtil.sourceCodeExtension(fileExtension)) { // file is sourcecode
 
-							imageView.setVisibility(View.GONE);
-							singleFileContentsFrame.setVisibility(View.GONE);
 							pdfViewFrame.setVisibility(View.GONE);
-							singleCodeContents.setVisibility(View.VISIBLE);
+							imageView.setVisibility(View.GONE);
+
+							if(Build.VERSION.SDK_INT > 23) {
+
+								highlightJs.setVisibility(View.VISIBLE);
+								LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+								assert inflater != null;
+								@SuppressLint("InflateParams") View mView = inflater.inflate(R.layout.custom_highlightjs, null);
+								HighlightJsView singleCodeContents = mView.findViewById(R.id.singleCodeContents);
+								highlightJs.addView(mView);
+
+								singleFileContentsFrame.setVisibility(View.GONE);
+								singleCodeContents.setVisibility(View.VISIBLE);
+
+								switch(tinyDb.getInt("fileviewerSourceCodeThemeId")) {
+									case 1:
+										singleCodeContents.setTheme(Theme.ARDUINO_LIGHT);
+										break;
+									case 2:
+										singleCodeContents.setTheme(Theme.GITHUB);
+										break;
+									case 3:
+										singleCodeContents.setTheme(Theme.FAR);
+										break;
+									case 4:
+										singleCodeContents.setTheme(Theme.IR_BLACK);
+										break;
+									case 5:
+										singleCodeContents.setTheme(Theme.ANDROID_STUDIO);
+										break;
+									default:
+										singleCodeContents.setTheme(Theme.MONOKAI_SUBLIME);
+								}
+
+								singleCodeContents.setShowLineNumbers(true);
+								singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));
 
-							switch(tinyDb.getInt("fileviewerSourceCodeThemeId")) {
-								case 1:
-									singleCodeContents.setTheme(Theme.ARDUINO_LIGHT);
-									break;
-								case 2:
-									singleCodeContents.setTheme(Theme.GITHUB);
-									break;
-								case 3:
-									singleCodeContents.setTheme(Theme.FAR);
-									break;
-								case 4:
-									singleCodeContents.setTheme(Theme.IR_BLACK);
-									break;
-								case 5:
-									singleCodeContents.setTheme(Theme.ANDROID_STUDIO);
-									break;
-								default:
-									singleCodeContents.setTheme(Theme.MONOKAI_SUBLIME);
 							}
+							else {
 
-							singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));
+								singleFileContents.setVisibility(View.VISIBLE);
+								singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));
+
+							}
 
 						}
 						else if(appUtil.pdfExtension(fileExtension)) { // file is pdf
 
 							imageView.setVisibility(View.GONE);
 							singleFileContentsFrame.setVisibility(View.GONE);
-							singleCodeContents.setVisibility(View.GONE);
+							highlightJs.setVisibility(View.GONE);
+							//singleCodeContents.setVisibility(View.GONE);
 							pdfViewFrame.setVisibility(View.VISIBLE);
 
 							pdfNightMode = tinyDb.getBoolean("enablePdfMode");
@@ -212,7 +237,8 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 						else if(appUtil.excludeFilesInFileViewerExtension(fileExtension)) { // files need to be excluded
 
 							imageView.setVisibility(View.GONE);
-							singleCodeContents.setVisibility(View.GONE);
+							highlightJs.setVisibility(View.GONE);
+							//singleCodeContents.setVisibility(View.GONE);
 							pdfViewFrame.setVisibility(View.GONE);
 							singleFileContentsFrame.setVisibility(View.VISIBLE);
 
@@ -224,7 +250,8 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 						else { // file type not known - plain text view
 
 							imageView.setVisibility(View.GONE);
-							singleCodeContents.setVisibility(View.GONE);
+							highlightJs.setVisibility(View.GONE);
+							//singleCodeContents.setVisibility(View.GONE);
 							pdfViewFrame.setVisibility(View.GONE);
 							singleFileContentsFrame.setVisibility(View.VISIBLE);
 
@@ -256,7 +283,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 				}
 				else {
 
-					Toasty.info(ctx, getString(R.string.labelGeneralError));
+					Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
 
 				}
 
@@ -301,9 +328,21 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 	@Override
 	public void onButtonClicked(String text) {
 
-		if("downloadFile".equals(text)) {
+		switch(text) {
+			case "downloadFile":
 
-			requestFileDownload();
+				if(Build.VERSION.SDK_INT >= 23) {
+					if(checkPermission()) {
+						requestFileDownload();
+					}
+					else {
+						requestPermission();
+					}
+				}
+				else {
+					requestFileDownload();
+				}
+				break;
 
 		}
 
@@ -311,70 +350,72 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 	private void requestFileDownload() {
 
-		final TinyDB tinyDb = new TinyDB(appCtx);
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
 		if(!tinyDb.getString("downloadFileContents").isEmpty()) {
 
-			int CREATE_REQUEST_CODE = 40;
-
 			File outputFileName = new File(tinyDb.getString("downloadFileName"));
+			final File downloadFilePath = new File(Environment.getExternalStorageDirectory().getPath() + "/Download/" + outputFileName.getName());
 
-			Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+			byte[] pdfAsBytes = Base64.decode(tinyDb.getString("downloadFileContents"), 0);
-
+			FileOutputStream fileOutputStream = null;
-			intent.addCategory(Intent.CATEGORY_OPENABLE);
-			intent.setType("*/*");
-			intent.putExtra(Intent.EXTRA_TITLE, outputFileName.getName());
-
-			startActivityForResult(intent, CREATE_REQUEST_CODE);
-
-		}
-		else {
-			Toasty.error(ctx, getString(R.string.waitLoadingDownloadFile));
-		}
-
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-
-		super.onActivityResult(requestCode, resultCode, data);
-
-		final TinyDB tinyDb = new TinyDB(appCtx);
-
-		if (requestCode == 40 && resultCode == RESULT_OK) {
 
 			try {
 
-				assert data != null;
+				fileOutputStream = new FileOutputStream(downloadFilePath, false);
-				Uri uri = data.getData();
+				Objects.requireNonNull(fileOutputStream).write(pdfAsBytes);
-
+				fileOutputStream.flush();
-				assert uri != null;
+				fileOutputStream.close();
-				OutputStream outputStream = getContentResolver().openOutputStream(uri);
+				Toasty.info(getApplicationContext(), getString(R.string.downloadFileSaved));
-
-				byte[] dataAsBytes = Base64.decode(tinyDb.getString("downloadFileContents"), 0);
-
-				assert outputStream != null;
-				outputStream.write(dataAsBytes);
-				outputStream.close();
-
-				Toasty.info(ctx, getString(R.string.downloadFileSaved));
 
 			}
-			catch (IOException e) {
+			catch(IOException e) {
 				Log.e("errorFileDownloading", Objects.requireNonNull(e.getMessage()));
 			}
 
 		}
+		else {
+			Toasty.error(getApplicationContext(), getString(R.string.waitLoadingDownloadFile));
+		}
 
 	}
 
+	private boolean checkPermission() {
+
+		int result = ContextCompat.checkSelfPermission(this, android.Manifest.permission.WRITE_EXTERNAL_STORAGE);
+		return result == PackageManager.PERMISSION_GRANTED;
+	}
+
+	private void requestPermission() {
+
+		ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.WRITE_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
+	}
+
+	@Override
+	public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+
+		switch(requestCode) {
+			case PERMISSION_REQUEST_CODE:
+				if(grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+					Log.i("PermissionsCheck", "Permission Granted");
+				}
+				else {
+					Log.e("PermissionsCheck", "Permission Denied");
+				}
+				break;
+		}
+	}
+
 	private void initCloseListener() {
 
-		onClickListener = view -> {
+		onClickListener = new View.OnClickListener() {
 
-			getIntent().removeExtra("singleFileName");
+			@Override
-			finish();
+			public void onClick(View view) {
 
+				getIntent().removeExtra("singleFileName");
+				finish();
+			}
 		};
 	}
 

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

@@ -2,23 +2,28 @@ package org.mian.gitnex.activities;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.Spinner;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
-import com.google.gson.JsonElement;
 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.databinding.ActivityMergePullRequestBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.helpers.VersionCheck;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.MergePullRequest;
 import org.mian.gitnex.models.MergePullRequestSpinner;
@@ -37,12 +42,16 @@ import retrofit2.Response;
 
 public class MergePullRequestActivity extends BaseActivity {
 
+	public ImageView closeActivity;
 	private View.OnClickListener onClickListener;
-	final Context ctx = this;
-	private Context appCtx;
-	private ActivityMergePullRequestBinding viewBinding;
 
+	final Context ctx = this;
+
+	private SocialAutoCompleteTextView mergeDescription;
+	private EditText mergeTitle;
+	private Spinner mergeModeSpinner;
 	private ArrayAdapter<Mention> defaultMentionAdapter;
+	private Button mergeButton;
 	private String Do;
 
 	@Override
@@ -56,24 +65,23 @@ public class MergePullRequestActivity extends BaseActivity {
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
-		appCtx = getApplicationContext();
 
-		viewBinding = ActivityMergePullRequestBinding.inflate(getLayoutInflater());
+		boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
-		View view = viewBinding.getRoot();
+		TinyDB tinyDb = new TinyDB(getApplicationContext());
-		setContentView(view);
-
-		boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
-		TinyDB tinyDb = new TinyDB(appCtx);
 
 		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-		viewBinding.mergeTitle.requestFocus();
+		mergeModeSpinner = findViewById(R.id.mergeSpinner);
+		mergeDescription = findViewById(R.id.mergeDescription);
+		mergeTitle = findViewById(R.id.mergeTitle);
+
+		mergeTitle.requestFocus();
 		assert imm != null;
-		imm.showSoftInput(viewBinding.mergeTitle, InputMethodManager.SHOW_IMPLICIT);
+		imm.showSoftInput(mergeTitle, InputMethodManager.SHOW_IMPLICIT);
 
 		setMergeAdapter();
 
-		viewBinding.mergeSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+		mergeModeSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
 
 			@Override
 			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@@ -93,35 +101,20 @@ public class MergePullRequestActivity extends BaseActivity {
 		defaultMentionAdapter = new MentionArrayAdapter<>(this);
 		loadCollaboratorsList();
 
-		viewBinding.mergeDescription.setMentionAdapter(defaultMentionAdapter);
+		mergeDescription.setMentionAdapter(defaultMentionAdapter);
+
+		closeActivity = findViewById(R.id.close);
+		TextView toolbar_title = findViewById(R.id.toolbar_title);
 
 		if(!tinyDb.getString("issueTitle").isEmpty()) {
-			viewBinding.toolbarTitle.setText(tinyDb.getString("issueTitle"));
+			toolbar_title.setText(tinyDb.getString("issueTitle"));
-			viewBinding.mergeTitle.setText(tinyDb.getString("issueTitle") + " (#" + tinyDb.getString("issueNumber") + ")");
+			mergeTitle.setText(tinyDb.getString("issueTitle") + " (#" + tinyDb.getString("issueNumber")+ ")");
 		}
 
 		initCloseListener();
-		viewBinding.close.setOnClickListener(onClickListener);
+		closeActivity.setOnClickListener(onClickListener);
 
-		// if gitea version is greater/equal(1.12.0) than user installed version (installed.higherOrEqual(compareVer))
+		mergeButton = findViewById(R.id.mergeButton);
-		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
-			viewBinding.deleteBranch.setVisibility(View.VISIBLE);
-		}
-
-		if(tinyDb.getString("prMergeable").equals("false")) {
-			disableProcessButton();
-			viewBinding.mergeInfoDisabledMessage.setVisibility(View.VISIBLE);
-		}
-		else {
-			viewBinding.mergeInfoDisabledMessage.setVisibility(View.GONE);
-		}
-
-		if(tinyDb.getString("prIsFork").equals("true")) {
-			viewBinding.deleteBranchForkInfo.setVisibility(View.VISIBLE);
-		}
-		else {
-			viewBinding.deleteBranchForkInfo.setVisibility(View.GONE);
-		}
 
 		if(!connToInternet) {
 
@@ -130,7 +123,7 @@ public class MergePullRequestActivity extends BaseActivity {
 		}
 		else {
 
-			viewBinding.mergeButton.setOnClickListener(mergePullRequest);
+			mergeButton.setOnClickListener(mergePullRequest);
 
 		}
 
@@ -138,27 +131,27 @@ public class MergePullRequestActivity extends BaseActivity {
 
 	private void setMergeAdapter() {
 
-		TinyDB tinyDb = new TinyDB(appCtx);
+		TinyDB tinyDb = new TinyDB(getApplicationContext());
 
 		ArrayList<MergePullRequestSpinner> mergeList = new ArrayList<>();
 
 		mergeList.add(new MergePullRequestSpinner("merge", getResources().getString(R.string.mergeOptionMerge)));
 		mergeList.add(new MergePullRequestSpinner("rebase", getResources().getString(R.string.mergeOptionRebase)));
 		mergeList.add(new MergePullRequestSpinner("rebase-merge", getResources().getString(R.string.mergeOptionRebaseCommit)));
-		// squash merge works only on gitea > v1.11.4 due to a bug
+		//squash merge works only on gitea v1.11.5 and higher due to a bug
-		if(new Version(tinyDb.getString("giteaVersion")).higher("1.11.4")) {
+		if(VersionCheck.compareVersion("1.11.5", tinyDb.getString("giteaVersion")) < 1) {
 			mergeList.add(new MergePullRequestSpinner("squash", getResources().getString(R.string.mergeOptionSquash)));
 		}
 
 		ArrayAdapter<MergePullRequestSpinner> adapter = new ArrayAdapter<>(MergePullRequestActivity.this, R.layout.spinner_item, mergeList);
 		adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
-		viewBinding.mergeSpinner.setAdapter(adapter);
+		mergeModeSpinner.setAdapter(adapter);
 
 	}
 
 	public void loadCollaboratorsList() {
 
-		final TinyDB tinyDb = new TinyDB(appCtx);
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
 		final String instanceUrl = tinyDb.getString("instanceUrl");
 		final String loginUid = tinyDb.getString("loginUid");
@@ -168,7 +161,7 @@ public class MergePullRequestActivity extends BaseActivity {
 		final String repoOwner = parts[0];
 		final String repoName = parts[1];
 
-		Call<List<Collaborators>> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+		Call<List<Collaborators>> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
 		call.enqueue(new Callback<List<Collaborators>>() {
 
@@ -213,27 +206,26 @@ public class MergePullRequestActivity extends BaseActivity {
 
 	private void processMergePullRequest() {
 
-		String mergePRDesc = viewBinding.mergeDescription.getText().toString();
+		String mergePRDesc = mergeDescription.getText().toString();
-		String mergePRTitle = viewBinding.mergeTitle.getText().toString();
+		String mergePRTitle = mergeTitle.getText().toString();
-		boolean deleteBranch = viewBinding.deleteBranch.isChecked();
 
-		boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+		boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
 		if(!connToInternet) {
 
-			Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+			Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
 			return;
 
 		}
 
 		disableProcessButton();
-		mergeFunction(Do, mergePRDesc, mergePRTitle, deleteBranch);
+		mergeFunction(Do, mergePRDesc, mergePRTitle);
 
 	}
 
-	private void mergeFunction(String Do, String mergePRDT, String mergeTitle, boolean deleteBranch) {
+	private void mergeFunction(String Do, String mergePRDT, String mergeTitle) {
 
-		final TinyDB tinyDb = new TinyDB(appCtx);
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
 		final String instanceUrl = tinyDb.getString("instanceUrl");
 		final String loginUid = tinyDb.getString("loginUid");
@@ -246,7 +238,7 @@ public class MergePullRequestActivity extends BaseActivity {
 
 		MergePullRequest mergePR = new MergePullRequest(Do, mergePRDT, mergeTitle);
 
-		Call<ResponseBody> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().mergePullRequest(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, prIndex, mergePR);
+		Call<ResponseBody> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().mergePullRequest(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, prIndex, mergePR);
 
 		call.enqueue(new Callback<ResponseBody>() {
 
@@ -255,48 +247,10 @@ public class MergePullRequestActivity extends BaseActivity {
 
 				if(response.code() == 200) {
 
-					if(deleteBranch) {
+					Toasty.info(getApplicationContext(), getString(R.string.mergePRSuccessMsg));
-
+					tinyDb.putBoolean("prMerged", true);
-						if(tinyDb.getString("prIsFork").equals("true")) {
+					tinyDb.putBoolean("resumePullRequests", true);
-
+					finish();
-							String repoFullName = tinyDb.getString("prForkFullName");
-							String[] parts = repoFullName.split("/");
-							final String repoOwner = parts[0];
-							final String repoName = parts[1];
-
-							deleteBranchFunction(repoOwner, repoName);
-
-							Toasty.info(ctx, getString(R.string.mergePRSuccessMsg));
-							tinyDb.putBoolean("prMerged", true);
-							tinyDb.putBoolean("resumePullRequests", true);
-							finish();
-
-						}
-						else {
-
-							String repoFullName = tinyDb.getString("repoFullName");
-							String[] parts = repoFullName.split("/");
-							final String repoOwner = parts[0];
-							final String repoName = parts[1];
-
-							deleteBranchFunction(repoOwner, repoName);
-
-							Toasty.info(ctx, getString(R.string.mergePRSuccessMsg));
-							tinyDb.putBoolean("prMerged", true);
-							tinyDb.putBoolean("resumePullRequests", true);
-							finish();
-
-						}
-
-					}
-					else {
-
-						Toasty.info(ctx, getString(R.string.mergePRSuccessMsg));
-						tinyDb.putBoolean("prMerged", true);
-						tinyDb.putBoolean("resumePullRequests", true);
-						finish();
-
-					}
 
 				}
 				else if(response.code() == 401) {
@@ -308,13 +262,13 @@ public class MergePullRequestActivity extends BaseActivity {
 				else if(response.code() == 404) {
 
 					enableProcessButton();
-					Toasty.info(ctx, getString(R.string.mergePR404ErrorMsg));
+					Toasty.info(getApplicationContext(), getString(R.string.mergePR404ErrorMsg));
 
 				}
 				else {
 
 					enableProcessButton();
-					Toasty.info(ctx, getString(R.string.genericError));
+					Toasty.info(getApplicationContext(), getString(R.string.genericError));
 
 				}
 
@@ -331,56 +285,23 @@ public class MergePullRequestActivity extends BaseActivity {
 
 	}
 
-	private void deleteBranchFunction(String repoOwner, String repoName) {
-
-		TinyDB tinyDb = new TinyDB(appCtx);
-
-		String instanceUrl = tinyDb.getString("instanceUrl");
-		String loginUid = tinyDb.getString("loginUid");
-		String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-		String branchName = tinyDb.getString("prHeadBranch");
-
-		Call<JsonElement> call = RetrofitClient
-				.getInstance(instanceUrl, ctx)
-				.getApiInterface()
-				.deleteBranch(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				if(response.code() == 204) {
-
-					Log.i("deleteBranch", "Branch deleted successfully");
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-
-			}
-
-		});
-
-	}
-
 	private void disableProcessButton() {
 
-		viewBinding.mergeButton.setEnabled(false);
+		mergeButton.setEnabled(false);
-		viewBinding.mergeButton.setBackground(getResources().getDrawable(R.drawable.shape_buttons_disabled));
+		GradientDrawable shape = new GradientDrawable();
+		shape.setCornerRadius(8);
+		shape.setColor(getResources().getColor(R.color.hintColor));
+		mergeButton.setBackground(shape);
 
 	}
 
 	private void enableProcessButton() {
 
-		viewBinding.mergeButton.setEnabled(true);
+		mergeButton.setEnabled(true);
-		viewBinding.mergeButton.setBackground(getResources().getDrawable(R.drawable.shape_buttons));
+		GradientDrawable shape = new GradientDrawable();
+		shape.setCornerRadius(8);
+		shape.setColor(getResources().getColor(R.color.btnBackground));
+		mergeButton.setBackground(shape);
 
 	}
 

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

@@ -1,6 +1,5 @@
 package org.mian.gitnex.activities;
 
-import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -13,15 +12,13 @@ import org.mian.gitnex.util.TinyDB;
 
 public class OpenRepoInBrowserActivity extends AppCompatActivity {
 
-    private Context appCtx;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
         String instanceUrlWithProtocol = "https://" + tinyDb.getString("instanceUrlRaw");
         if (!tinyDb.getString("instanceUrlWithProtocol").isEmpty()) {
             instanceUrlWithProtocol = tinyDb.getString("instanceUrlWithProtocol");

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

@@ -7,7 +7,6 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.Bundle;
@@ -32,9 +31,6 @@ import java.util.Objects;
 
 public class OrganizationDetailActivity extends BaseActivity implements BottomSheetOrganizationFragment.BottomSheetListener {
 
-    final Context ctx = this;
-    private Context appCtx;
-
     @Override
     protected int getLayoutResourceId(){
         return R.layout.activity_org_detail;
@@ -42,11 +38,9 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
         String orgName = tinyDb.getString("orgName");
 
         Toolbar toolbar = findViewById(R.id.toolbar);
@@ -68,15 +62,15 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
         switch(tinyDb.getInt("customFontId", -1)) {
 
             case 0:
-                myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf");
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/roboto.ttf");
                 break;
 
             case 2:
-                myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf");
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/sourcecodeproregular.ttf");
                 break;
 
             default:
-                myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/manroperegular.ttf");
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/manroperegular.ttf");
                 break;
 
         }
@@ -132,7 +126,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
     @Override
     public void onButtonClicked(String text) {
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         switch (text) {
             case "repository":
@@ -157,7 +151,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
         @Override
         public Fragment getItem(int position) {
 
-            TinyDB tinyDb = new TinyDB(appCtx);
+            TinyDB tinyDb = new TinyDB(getApplicationContext());
             String orgName;
             if(getIntent().getStringExtra("orgName") != null || !Objects.equals(getIntent().getStringExtra("orgName"), "")) {
                 orgName = getIntent().getStringExtra("orgName");

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

@@ -1,41 +1,33 @@
 package org.mian.gitnex.activities;
 
-import android.content.Context;
+import androidx.annotation.Nullable;
-import android.content.Intent;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
 import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.TextView;
-import androidx.appcompat.widget.Toolbar;
-import androidx.lifecycle.ViewModelProvider;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.TeamMembersByOrgAdapter;
-import org.mian.gitnex.fragments.BottomSheetOrganizationTeamsFragment;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.viewmodels.TeamMembersByOrgViewModel;
+import java.util.List;
 import java.util.Objects;
 
 /**
  * Author M M Arif
  */
 
-public class OrganizationTeamMembersActivity extends BaseActivity implements BottomSheetOrganizationTeamsFragment.BottomSheetListener {
+public class OrganizationTeamMembersActivity extends BaseActivity {
 
     private TextView noDataMembers;
     private View.OnClickListener onClickListener;
     private TeamMembersByOrgAdapter adapter;
     private GridView mGridView;
 
-    final Context ctx = this;
-    private Context appCtx;
-
-    private String teamId;
-
     @Override
     protected int getLayoutResourceId(){
         return R.layout.activity_org_team_members;
@@ -43,13 +35,9 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        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");
@@ -69,6 +57,7 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
             toolbarTitle.setText(R.string.orgTeamMembers);
         }
 
+        String teamId;
         if(getIntent().getStringExtra("teamId") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamId")).equals("")){
             teamId = getIntent().getStringExtra("teamId");
         }
@@ -76,24 +65,11 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
             teamId = "0";
         }
 
+        getIntent().getStringExtra("teamId");
+        //Log.i("teamId", getIntent().getStringExtra("teamId"));
+
         assert teamId != null;
-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), Integer.parseInt(teamId));
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), Integer.valueOf(teamId));
-
-    }
-
-    @Override
-    public void onResume() {
-
-        super.onResume();
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-
-        if(tinyDb.getBoolean("teamActionFlag")) {
-            fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), Integer.parseInt(teamId));
-            tinyDb.putBoolean("teamActionFlag", false);
-        }
 
     }
 
@@ -101,65 +77,30 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
 
         TeamMembersByOrgViewModel teamMembersModel = new ViewModelProvider(this).get(TeamMembersByOrgViewModel.class);
 
-        teamMembersModel.getMembersByOrgList(instanceUrl, instanceToken, teamId, ctx).observe(this, teamMembersListMain -> {
+        teamMembersModel.getMembersByOrgList(instanceUrl, instanceToken, teamId, getApplicationContext()).observe(this, new Observer<List<UserInfo>>() {
-
+            @Override
-            adapter = new TeamMembersByOrgAdapter(ctx, teamMembersListMain);
+            public void onChanged(@Nullable List<UserInfo> teamMembersListMain) {
-            if(adapter.getCount() > 0) {
+                adapter = new TeamMembersByOrgAdapter(getApplicationContext(), teamMembersListMain);
-                mGridView.setAdapter(adapter);
+                if(adapter.getCount() > 0) {
-                noDataMembers.setVisibility(View.GONE);
+                    mGridView.setAdapter(adapter);
+                    noDataMembers.setVisibility(View.GONE);
+                }
+                else {
+                    adapter.notifyDataSetChanged();
+                    mGridView.setAdapter(adapter);
+                    noDataMembers.setVisibility(View.VISIBLE);
+                }
             }
-            else {
-                adapter.notifyDataSetChanged();
-                mGridView.setAdapter(adapter);
-                noDataMembers.setVisibility(View.VISIBLE);
-            }
-
         });
 
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
-        return true;
-
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-
-        int id = item.getItemId();
-
-        switch(id) {
-            case android.R.id.home:
-                finish();
-                return true;
-            case R.id.genericMenu:
-                BottomSheetOrganizationTeamsFragment bottomSheet = new BottomSheetOrganizationTeamsFragment();
-                bottomSheet.show(getSupportFragmentManager(), "orgTeamsBottomSheet");
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-
-    }
-
-    @Override
-    public void onButtonClicked(String text) {
-
-        TinyDB tinyDb = new TinyDB(appCtx);
-
-        if("newMember".equals(text)) {
-            Intent intent = new Intent(OrganizationTeamMembersActivity.this, AddNewTeamMemberActivity.class);
-            intent.putExtra("teamId", teamId);
-            startActivity(intent);
-        }
-
-    }
-
     private void initCloseListener() {
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
     }
 }

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

@@ -35,7 +35,6 @@ public class ProfileEmailActivity extends BaseActivity {
     private View.OnClickListener onClickListener;
     private EditText userEmail;
     final Context ctx = this;
-    private Context appCtx;
     private Button addEmailButton;
 
     @Override
@@ -45,11 +44,9 @@ public class ProfileEmailActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -84,8 +81,8 @@ public class ProfileEmailActivity extends BaseActivity {
 
     private void processAddNewEmail() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
-        TinyDB tinyDb = new TinyDB(appCtx);
+        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");
@@ -94,20 +91,20 @@ public class ProfileEmailActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if(newUserEmail.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.emailErrorEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.emailErrorEmpty));
             return;
 
         }
         else if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {
 
-            Toasty.info(ctx, getString(R.string.emailErrorInvalid));
+            Toasty.info(getApplicationContext(), getString(R.string.emailErrorInvalid));
             return;
 
         }
@@ -115,19 +112,19 @@ public class ProfileEmailActivity extends BaseActivity {
         List<String> newEmailList = new ArrayList<>(Arrays.asList(newUserEmail.split(",")));
 
         disableProcessButton();
-        addNewEmail(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newEmailList);
+        addNewEmail(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), newEmailList);
 
     }
 
     private void addNewEmail(final String instanceUrl, final String token, List<String> newUserEmail) {
 
         AddEmail addEmailFunc = new AddEmail(newUserEmail);
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         Call<JsonElement> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .addNewEmail(token, addEmailFunc);
 
@@ -138,7 +135,7 @@ public class ProfileEmailActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    Toasty.info(ctx, getString(R.string.emailAddedText));
+                    Toasty.info(getApplicationContext(), getString(R.string.emailAddedText));
                     tinyDb.putBoolean("emailsRefresh", true);
                     enableProcessButton();
                     finish();
@@ -174,7 +171,7 @@ public class ProfileEmailActivity extends BaseActivity {
                 else {
 
                     enableProcessButton();
-                    Toasty.info(ctx, getString(R.string.labelGeneralError));
+                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
 
                 }
 

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

@@ -39,7 +39,6 @@ public class ReplyToIssueActivity extends BaseActivity {
     private View.OnClickListener onClickListener;
 
     final Context ctx = this;
-    private Context appCtx;
 
     private SocialAutoCompleteTextView addComment;
     private ArrayAdapter<Mention> defaultMentionAdapter;
@@ -54,12 +53,11 @@ public class ReplyToIssueActivity extends BaseActivity {
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         addComment = findViewById(R.id.addComment);
         addComment.setShowSoftInputOnFocus(true);
@@ -85,26 +83,20 @@ public class ReplyToIssueActivity extends BaseActivity {
 
         replyButton = findViewById(R.id.replyButton);
 
-        if(getIntent().getStringExtra("commentBody") != null) {
-
-            addComment.setText(getIntent().getStringExtra("commentBody"));
-
-            if(getIntent().getBooleanExtra("cursorToEnd", false)) {
-                addComment.setSelection(addComment.length());
-            }
-
-        }
-
         if(getIntent().getStringExtra("commentAction") != null && getIntent().getStringExtra("commentAction").equals("edit")) {
 
+            addComment.setText(getIntent().getStringExtra("commentBody"));
             final String commentId = getIntent().getStringExtra("commentId");
 
             toolbar_title.setText(getResources().getString(R.string.editCommentTitle));
             replyButton.setText(getResources().getString(R.string.editCommentButtonText));
 
-            replyButton.setOnClickListener(v -> {
+            replyButton.setOnClickListener(new View.OnClickListener() {
-                disableProcessButton();
+                public void onClick(View v) {
-                IssueActions.editIssueComment(ctx, Integer.parseInt(commentId), addComment.getText().toString());
+                    disableProcessButton();
+                    IssueActions.editIssueComment(ctx, Integer.valueOf(commentId), addComment.getText().toString());
+                }
+
             });
 
             return;
@@ -125,7 +117,7 @@ public class ReplyToIssueActivity extends BaseActivity {
 
     public void loadCollaboratorsList() {
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
@@ -136,9 +128,9 @@ public class ReplyToIssueActivity extends BaseActivity {
         final String repoName = parts[1];
 
         Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<List<Collaborators>>() {
 
@@ -191,18 +183,18 @@ public class ReplyToIssueActivity extends BaseActivity {
     private void processNewCommentReply() {
 
         String newReplyDT = addComment.getText().toString();
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
         if(!connToInternet) {
 
-            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if(newReplyDT.equals("")) {
 
-            Toasty.info(ctx, getString(R.string.commentEmptyError));
+            Toasty.info(getApplicationContext(), getString(R.string.commentEmptyError));
 
         }
         else {
@@ -216,7 +208,7 @@ public class ReplyToIssueActivity extends BaseActivity {
 
     private void replyComment(String newReplyDT) {
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
@@ -230,9 +222,9 @@ public class ReplyToIssueActivity extends BaseActivity {
         Issues issueComment = new Issues(newReplyDT);
 
         Call<Issues> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .replyCommentToIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueComment);
+                .replyCommentToIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, issueComment);
 
         call.enqueue(new Callback<Issues>() {
 
@@ -241,7 +233,7 @@ public class ReplyToIssueActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    Toasty.info(ctx, getString(R.string.commentSuccess));
+                    Toasty.info(getApplicationContext(), getString(R.string.commentSuccess));
                     tinyDb.putBoolean("commentPosted", true);
                     tinyDb.putBoolean("resumeIssues", true);
                     tinyDb.putBoolean("resumePullRequests", true);
@@ -260,7 +252,7 @@ public class ReplyToIssueActivity extends BaseActivity {
                 else {
 
                     enableProcessButton();
-                    Toasty.info(ctx, getString(R.string.commentError));
+                    Toasty.info(getApplicationContext(), getString(R.string.commentError));
 
                 }
 

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

@@ -1,11 +1,19 @@
 package org.mian.gitnex.activities;
 
+import com.google.android.material.tabs.TabLayout;
+import com.google.gson.JsonElement;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import retrofit2.Call;
+import retrofit2.Callback;
 import android.annotation.SuppressLint;
-import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.graphics.Typeface;
-import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -15,543 +23,426 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentStatePagerAdapter;
-import androidx.viewpager.widget.ViewPager;
-import com.google.android.material.tabs.TabLayout;
-import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.fragments.BottomSheetIssuesFilterFragment;
-import org.mian.gitnex.fragments.BottomSheetMilestonesFilterFragment;
-import org.mian.gitnex.fragments.BottomSheetPullRequestFilterFragment;
 import org.mian.gitnex.fragments.BottomSheetRepoFragment;
 import org.mian.gitnex.fragments.BranchesFragment;
 import org.mian.gitnex.fragments.CollaboratorsFragment;
 import org.mian.gitnex.fragments.FilesFragment;
-import org.mian.gitnex.fragments.IssuesFragment;
+import org.mian.gitnex.fragments.IssuesMainFragment;
 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.RepoInfoFragment;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.helpers.VersionCheck;
 import org.mian.gitnex.models.UserRepositories;
-import org.mian.gitnex.models.WatchInfo;
+import org.mian.gitnex.models.WatchRepository;
 import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
 import java.util.Objects;
-import retrofit2.Call;
+import android.net.Uri;
-import retrofit2.Callback;
 
 /**
  * Author M M Arif
  */
 
-public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoFragment.BottomSheetListener, BottomSheetIssuesFilterFragment.BottomSheetListener,
+public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoFragment.BottomSheetListener {
-		BottomSheetPullRequestFilterFragment.BottomSheetListener, BottomSheetMilestonesFilterFragment.BottomSheetListener {
 
-	private TextView textViewBadgeIssue;
+    private TextView textViewBadgeIssue;
-	private TextView textViewBadgePull;
+    private TextView textViewBadgePull;
-	private TextView textViewBadgeRelease;
+    private TextView textViewBadgeRelease;
 
-	private FragmentRefreshListener fragmentRefreshListener;
+    @Override
-	private FragmentRefreshListenerPr fragmentRefreshListenerPr;
+    protected int getLayoutResourceId(){
-	private FragmentRefreshListenerMilestone fragmentRefreshListenerMilestone;
+        return R.layout.activity_repo_detail;
+    }
 
-	final Context ctx = this;
+    @Override
-	private Context appCtx;
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
-	// issues interface
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
-	public FragmentRefreshListener getFragmentRefreshListener() {
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        String repoName1 = parts[1];
+
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String repoOwner = parts[0];
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+        String appLocale = tinyDb.getString("locale");
+        AppUtil.setAppLocale(getResources(), appLocale);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
+
+        setSupportActionBar(toolbar);
+        Objects.requireNonNull(getSupportActionBar()).setTitle(repoName1);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
+
+        ViewPager mViewPager = findViewById(R.id.container);
+        mViewPager.setAdapter(mSectionsPagerAdapter);
+
+        TabLayout tabLayout = findViewById(R.id.tabs);
+
+        Typeface myTypeface;
+
+        switch(tinyDb.getInt("customFontId", -1)) {
+
+            case 0:
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/roboto.ttf");
+                break;
+
+            case 2:
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/sourcecodeproregular.ttf");
+                break;
+
+            default:
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/manroperegular.ttf");
+                break;
+
+        }
+
+        toolbarTitle.setTypeface(myTypeface);
+        toolbarTitle.setText(repoName1);
+
+        ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
+        int tabsCount = vg.getChildCount();
+        for (int j = 0; j < tabsCount; j++) {
+            ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
+            int tabChildCount = vgTab.getChildCount();
+            for (int i = 0; i < tabChildCount; i++) {
+                View tabViewChild = vgTab.getChildAt(i);
+                if (tabViewChild instanceof TextView) {
+                    ((TextView) tabViewChild).setTypeface(myTypeface);
+                }
+            }
+        }
+
+        // only show Collaborators if you have permission to
+        final View collaboratorTab = vg.getChildAt(8);
+        if (tinyDb.getBoolean("isRepoAdmin")) {
+            collaboratorTab.setVisibility(View.VISIBLE);
+        }
+        else {
+            collaboratorTab.setVisibility(View.GONE);
+        }
+
+        mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
+        tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
+
+        if(tinyDb.getBoolean("enableCounterBadges")) {
+
+            @SuppressLint("InflateParams") View tabHeader2 = LayoutInflater.from(this).inflate(R.layout.badge_issue, null);
+            textViewBadgeIssue = tabHeader2.findViewById(R.id.counterBadgeIssue);
+
+            @SuppressLint("InflateParams") View tabHeader4 = LayoutInflater.from(this).inflate(R.layout.badge_pull, null);
+            textViewBadgePull = tabHeader4.findViewById(R.id.counterBadgePull);
+
+            @SuppressLint("InflateParams") View tabHeader6 = LayoutInflater.from(this).inflate(R.layout.badge_release, null);
+            textViewBadgeRelease = tabHeader6.findViewById(R.id.counterBadgeRelease);
+
+            textViewBadgeIssue.setVisibility(View.GONE);
+            textViewBadgePull.setVisibility(View.GONE);
+            textViewBadgeRelease.setVisibility(View.GONE);
+
+            getRepoInfo(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1);
+            ColorStateList textColor = tabLayout.getTabTextColors();
+
+            // issue count
+            if (textViewBadgeIssue.getText() != "") {
+                TabLayout.Tab tabOpenIssues = tabLayout.getTabAt(2);
+                Objects.requireNonNull(tabLayout.getTabAt(2)).setCustomView(tabHeader2);
+                assert tabOpenIssues != null;
+                TextView openIssueTabView = Objects.requireNonNull(tabOpenIssues.getCustomView()).findViewById(R.id.counterBadgeIssueText);
+                openIssueTabView.setTextColor(textColor);
+            }
+
+            // pull count
+            if (textViewBadgePull.getText() != "") { // only show if API returned a number
+                Objects.requireNonNull(tabLayout.getTabAt(4)).setCustomView(tabHeader4);
+                TabLayout.Tab tabOpenPulls = tabLayout.getTabAt(4);
+                assert tabOpenPulls != null;
+                TextView openPullTabView = Objects.requireNonNull(tabOpenPulls.getCustomView()).findViewById(R.id.counterBadgePullText);
+                openPullTabView.setTextColor(textColor);
+            }
+
+            // release count
+            if (VersionCheck.compareVersion("1.11.5", tinyDb.getString("giteaVersion")) < 1) {
+                if(textViewBadgeRelease.getText() != "") { // only show if API returned a number
+                    Objects.requireNonNull(tabLayout.getTabAt(5)).setCustomView(tabHeader6);
+                    TabLayout.Tab tabOpenRelease = tabLayout.getTabAt(5);
+                    assert tabOpenRelease != null;
+                    TextView openReleaseTabView = Objects.requireNonNull(tabOpenRelease.getCustomView()).findViewById(R.id.counterBadgeReleaseText);
+                    openReleaseTabView.setTextColor(textColor);
+                }
+            }
+        }
+
+        checkRepositoryStarStatus(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1);
+        checkRepositoryWatchStatus(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1);
+
+    }
+
+    @Override
+    public void onResume() {
+
+        super.onResume();
+        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");
+
+        if(tinyDb.getBoolean("enableCounterIssueBadge")) {
+            getRepoInfo(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+        }
+
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.repo_dotted_menu, menu);
+        return true;
+
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        int id = item.getItemId();
+
+        switch (id) {
+            case android.R.id.home:
+                finish();
+                return true;
+            case R.id.repoMenu:
+                BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
+                bottomSheet.show(getSupportFragmentManager(), "repoBottomSheet");
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+
+    }
+
+    @Override
+    public void onButtonClicked(String text) {
+
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        switch (text) {
+            case "label":
+                startActivity(new Intent(RepoDetailActivity.this, CreateLabelActivity.class));
+                break;
+            case "newIssue":
+                startActivity(new Intent(RepoDetailActivity.this, CreateIssueActivity.class));
+                break;
+            case "newMilestone":
+                startActivity(new Intent(RepoDetailActivity.this, CreateMilestoneActivity.class));
+                break;
+            case "addCollaborator":
+                startActivity(new Intent(RepoDetailActivity.this, AddCollaboratorToRepositoryActivity.class));
+                break;
+            case "createRelease":
+                startActivity(new Intent(RepoDetailActivity.this, CreateReleaseActivity.class));
+                break;
+            case "openWebRepo":
+                Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(tinyDb.getString("repoHtmlUrl")));
+                startActivity(i);
+                break;
+            case "shareRepo":
+	            Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
+	            sharingIntent.setType("text/plain");
+	            sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, tinyDb.getString("repoHtmlUrl"));
+	            sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, tinyDb.getString("repoHtmlUrl"));
+	            startActivity(Intent.createChooser(sharingIntent, tinyDb.getString("repoHtmlUrl")));
+                break;
+            case "newFile":
+                startActivity(new Intent(RepoDetailActivity.this, CreateFileActivity.class));
+                break;
+        }
+
+    }
+
+    public class SectionsPagerAdapter extends FragmentStatePagerAdapter {
+
+        SectionsPagerAdapter(FragmentManager fm) {
+            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+        }
+
+        @NonNull
+        @Override
+        public Fragment getItem(int position) {
+
+            TinyDB tinyDb = new TinyDB(getApplicationContext());
+            String repoFullName = tinyDb.getString("repoFullName");
+            String[] parts = repoFullName.split("/");
+            String repoOwner = parts[0];
+            String repoName = parts[1];
+
+            Fragment fragment = null;
+            switch (position) {
+                case 0: // files
+                    return FilesFragment.newInstance(repoOwner, repoName);
+                case 1: // information
+                    return RepoInfoFragment.newInstance(repoOwner, repoName);
+                case 2: // issues
+                    fragment = new IssuesMainFragment();
+                    break;
+                case 3: // branches
+                    return BranchesFragment.newInstance(repoOwner, repoName);
+                case 4: // pull requests
+                    fragment = new PullRequestsFragment();
+                    break;
+                case 5: // releases
+                    return ReleasesFragment.newInstance(repoOwner, repoName);
+                case 6: // milestones
+                    return MilestonesFragment.newInstance(repoOwner, repoName);
+                case 7: // labels
+                    return LabelsFragment.newInstance(repoOwner, repoName);
+                case 8: // collaborators
+                    return CollaboratorsFragment.newInstance(repoOwner, repoName);
+            }
+            assert fragment != null;
+            return fragment;
+        }
+
+        @Override
+        public int getCount() {
+            return 9;
+        }
+
+    }
+
+    private void getRepoInfo(String instanceUrl, String token, final String owner, String repo) {
+
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        Call<UserRepositories> call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .getUserRepository(token, owner, repo);
+
+        call.enqueue(new Callback<UserRepositories>() {
+
+            @Override
+            public void onResponse(@NonNull Call<UserRepositories> call, @NonNull retrofit2.Response<UserRepositories> response) {
+
+                UserRepositories repoInfo = response.body();
+
+                if (response.isSuccessful()) {
+
+                    if (response.code() == 200) {
+
+                        if(tinyDb.getBoolean("enableCounterBadges")) {
+                            assert repoInfo != null;
+
+                            if(repoInfo.getOpen_issues_count() != null) {
+                                textViewBadgeIssue.setVisibility(View.VISIBLE);
+                                textViewBadgeIssue.setText(repoInfo.getOpen_issues_count());
+                            }
+
+                            if(repoInfo.getOpen_pull_count() != null) {
+                                textViewBadgePull.setVisibility(View.VISIBLE);
+                                textViewBadgePull.setText(repoInfo.getOpen_pull_count());
+                            }
+
+                            if(repoInfo.getRelease_count() != null) {
+                                textViewBadgeRelease.setVisibility(View.VISIBLE);
+                                textViewBadgeRelease.setText(repoInfo.getRelease_count());
+                            }
+                        }
 
-		return fragmentRefreshListener;
+                    }
-	}
 
-	public void setFragmentRefreshListener(FragmentRefreshListener fragmentRefreshListener) {
+                }
+                else {
+                    Log.e("onFailure", String.valueOf(response.code()));
+                }
 
-		this.fragmentRefreshListener = fragmentRefreshListener;
+            }
-	}
 
-	public interface FragmentRefreshListener {
+            @Override
+            public void onFailure(@NonNull Call<UserRepositories> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
 
-		void onRefresh(String text);
+        });
 
-	}
+    }
 
-	// pr interface
+    private void checkRepositoryStarStatus(String instanceUrl, String instanceToken, final String owner, String repo) {
-	public FragmentRefreshListenerPr getFragmentRefreshListenerPr() {
 
-		return fragmentRefreshListenerPr;
+        Call<JsonElement> call;
-	}
 
-	public void setFragmentRefreshListenerPr(FragmentRefreshListenerPr fragmentRefreshListenerPr) {
+        call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .checkRepoStarStatus(instanceToken, owner, repo);
 
-		this.fragmentRefreshListenerPr = fragmentRefreshListenerPr;
+        call.enqueue(new Callback<JsonElement>() {
-	}
 
-	public interface FragmentRefreshListenerPr {
+            @Override
+            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
 
-		void onRefresh(String text);
+                TinyDB tinyDb = new TinyDB(getApplicationContext());
+                tinyDb.putInt("repositoryStarStatus", response.code());
 
-	}
+            }
 
-	// milestones interface
+            @Override
-	public FragmentRefreshListenerMilestone getFragmentRefreshListenerMilestone() {
+            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
 
-		return fragmentRefreshListenerMilestone;
+    }
-	}
 
-	public void setFragmentRefreshListenerMilestone(FragmentRefreshListenerMilestone fragmentRefreshListenerMilestone) {
+    private void checkRepositoryWatchStatus(String instanceUrl, String instanceToken, final String owner, String repo) {
 
-		this.fragmentRefreshListenerMilestone = fragmentRefreshListenerMilestone;
+        Call<WatchRepository> call;
-	}
 
-	public interface FragmentRefreshListenerMilestone {
+        call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .checkRepoWatchStatus(instanceToken, owner, repo);
 
-		void onRefresh(String text);
+        call.enqueue(new Callback<WatchRepository>() {
 
-	}
+            @Override
+            public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
 
-	@Override
+                TinyDB tinyDb = new TinyDB(getApplicationContext());
-	protected int getLayoutResourceId() {
 
-		return R.layout.activity_repo_detail;
+                if(response.code() == 200) {
-	}
+                    assert response.body() != null;
+                    if(response.body().getSubscribed()) {
+                        tinyDb.putBoolean("repositoryWatchStatus", true);
+                    }
+                }
+                else {
+                    tinyDb.putBoolean("repositoryWatchStatus", false);
+                }
 
-	@Override
+            }
-	public void onCreate(Bundle savedInstanceState) {
 
-		super.onCreate(savedInstanceState);
+            @Override
-		appCtx = getApplicationContext();
+            public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
 
-		TinyDB tinyDb = new TinyDB(appCtx);
+    }
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		String repoName1 = parts[1];
-
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String repoOwner = parts[0];
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-
-		tinyDb.putString("repoIssuesState", "open");
-		tinyDb.putString("repoPrState", "open");
-		tinyDb.putString("milestoneState", "open");
-
-		String appLocale = tinyDb.getString("locale");
-		AppUtil.setAppLocale(getResources(), appLocale);
-
-		Toolbar toolbar = findViewById(R.id.toolbar);
-		TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
-
-		setSupportActionBar(toolbar);
-		Objects.requireNonNull(getSupportActionBar()).setTitle(repoName1);
-		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-		SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
-
-		ViewPager mViewPager = findViewById(R.id.container);
-		mViewPager.setAdapter(mSectionsPagerAdapter);
-
-		TabLayout tabLayout = findViewById(R.id.tabs);
-
-		Typeface myTypeface;
-
-		switch(tinyDb.getInt("customFontId", -1)) {
-
-			case 0:
-				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf");
-				break;
-
-			case 2:
-				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf");
-				break;
-
-			default:
-				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/manroperegular.ttf");
-				break;
-
-		}
-
-		toolbarTitle.setTypeface(myTypeface);
-		toolbarTitle.setText(repoName1);
-
-		ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
-		int tabsCount = vg.getChildCount();
-		for(int j = 0; j < tabsCount; j++) {
-			ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
-			int tabChildCount = vgTab.getChildCount();
-			for(int i = 0; i < tabChildCount; i++) {
-				View tabViewChild = vgTab.getChildAt(i);
-				if(tabViewChild instanceof TextView) {
-					((TextView) tabViewChild).setTypeface(myTypeface);
-				}
-			}
-		}
-
-		// only show Collaborators if you have permission to
-		final View collaboratorTab = vg.getChildAt(8);
-		if(tinyDb.getBoolean("isRepoAdmin")) {
-			collaboratorTab.setVisibility(View.VISIBLE);
-		}
-		else {
-			collaboratorTab.setVisibility(View.GONE);
-		}
-
-		mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
-		tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
-
-		if(tinyDb.getBoolean("enableCounterBadges")) {
-
-			@SuppressLint("InflateParams") View tabHeader2 = LayoutInflater.from(this).inflate(R.layout.badge_issue, null);
-			textViewBadgeIssue = tabHeader2.findViewById(R.id.counterBadgeIssue);
-
-			@SuppressLint("InflateParams") View tabHeader4 = LayoutInflater.from(this).inflate(R.layout.badge_pull, null);
-			textViewBadgePull = tabHeader4.findViewById(R.id.counterBadgePull);
-
-			@SuppressLint("InflateParams") View tabHeader6 = LayoutInflater.from(this).inflate(R.layout.badge_release, null);
-			textViewBadgeRelease = tabHeader6.findViewById(R.id.counterBadgeRelease);
-
-			textViewBadgeIssue.setVisibility(View.GONE);
-			textViewBadgePull.setVisibility(View.GONE);
-			textViewBadgeRelease.setVisibility(View.GONE);
-
-			getRepoInfo(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName1);
-			ColorStateList textColor = tabLayout.getTabTextColors();
-
-			// issue count
-			if(textViewBadgeIssue.getText() != "") {
-				TabLayout.Tab tabOpenIssues = tabLayout.getTabAt(2);
-				Objects.requireNonNull(tabLayout.getTabAt(2)).setCustomView(tabHeader2);
-				assert tabOpenIssues != null;
-				TextView openIssueTabView = Objects.requireNonNull(tabOpenIssues.getCustomView()).findViewById(R.id.counterBadgeIssueText);
-				openIssueTabView.setTextColor(textColor);
-			}
-
-			// pull count
-			if(textViewBadgePull.getText() != "") { // only show if API returned a number
-				Objects.requireNonNull(tabLayout.getTabAt(3)).setCustomView(tabHeader4);
-				TabLayout.Tab tabOpenPulls = tabLayout.getTabAt(3);
-				assert tabOpenPulls != null;
-				TextView openPullTabView = Objects.requireNonNull(tabOpenPulls.getCustomView()).findViewById(R.id.counterBadgePullText);
-				openPullTabView.setTextColor(textColor);
-			}
-
-			// release count
-			if(new Version("1.11.4").less(tinyDb.getString("giteaVersion"))) {
-				if(textViewBadgeRelease.getText() != "") { // only show if API returned a number
-					Objects.requireNonNull(tabLayout.getTabAt(5)).setCustomView(tabHeader6);
-					TabLayout.Tab tabOpenRelease = tabLayout.getTabAt(5);
-					assert tabOpenRelease != null;
-					TextView openReleaseTabView = Objects.requireNonNull(tabOpenRelease.getCustomView()).findViewById(R.id.counterBadgeReleaseText);
-					openReleaseTabView.setTextColor(textColor);
-				}
-			}
-		}
-
-		checkRepositoryStarStatus(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName1);
-		checkRepositoryWatchStatus(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName1);
-
-	}
-
-	@Override
-	public void onResume() {
-
-		super.onResume();
-		TinyDB tinyDb = new TinyDB(appCtx);
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-
-		if(tinyDb.getBoolean("enableCounterIssueBadge")) {
-			getRepoInfo(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-		}
-
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-
-		MenuInflater inflater = getMenuInflater();
-		inflater.inflate(R.menu.repo_dotted_menu, menu);
-		return true;
-
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-
-		int id = item.getItemId();
-
-		switch(id) {
-			case android.R.id.home:
-				finish();
-				return true;
-			case R.id.repoMenu:
-				BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
-				bottomSheet.show(getSupportFragmentManager(), "repoBottomSheet");
-				return true;
-			case R.id.filter:
-				BottomSheetIssuesFilterFragment filterBottomSheet = new BottomSheetIssuesFilterFragment();
-				filterBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuBottomSheet");
-				return true;
-			case R.id.filterPr:
-				BottomSheetPullRequestFilterFragment filterPrBottomSheet = new BottomSheetPullRequestFilterFragment();
-				filterPrBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuPrBottomSheet");
-				return true;
-			case R.id.filterMilestone:
-				BottomSheetMilestonesFilterFragment filterMilestoneBottomSheet = new BottomSheetMilestonesFilterFragment();
-				filterMilestoneBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuMilestoneBottomSheet");
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
-		}
-
-	}
-
-	@Override
-	public void onButtonClicked(String text) {
-
-		TinyDB tinyDb = new TinyDB(appCtx);
-
-		switch(text) {
-			case "label":
-				startActivity(new Intent(RepoDetailActivity.this, CreateLabelActivity.class));
-				break;
-			case "newIssue":
-				startActivity(new Intent(RepoDetailActivity.this, CreateIssueActivity.class));
-				break;
-			case "newMilestone":
-				startActivity(new Intent(RepoDetailActivity.this, CreateMilestoneActivity.class));
-				break;
-			case "addCollaborator":
-				startActivity(new Intent(RepoDetailActivity.this, AddCollaboratorToRepositoryActivity.class));
-				break;
-			case "createRelease":
-				startActivity(new Intent(RepoDetailActivity.this, CreateReleaseActivity.class));
-				break;
-			case "openWebRepo":
-				Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(tinyDb.getString("repoHtmlUrl")));
-				startActivity(i);
-				break;
-			case "shareRepo":
-				Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
-				sharingIntent.setType("text/plain");
-				sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, tinyDb.getString("repoHtmlUrl"));
-				sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, tinyDb.getString("repoHtmlUrl"));
-				startActivity(Intent.createChooser(sharingIntent, tinyDb.getString("repoHtmlUrl")));
-				break;
-			case "newFile":
-				startActivity(new Intent(RepoDetailActivity.this, CreateFileActivity.class));
-				break;
-			case "openIssues":
-				if(getFragmentRefreshListener() != null) {
-					getFragmentRefreshListener().onRefresh("open");
-				}
-				break;
-			case "closedIssues":
-				if(getFragmentRefreshListener() != null) {
-					getFragmentRefreshListener().onRefresh("closed");
-				}
-				break;
-			case "openPr":
-				if(getFragmentRefreshListenerPr() != null) {
-					getFragmentRefreshListenerPr().onRefresh("open");
-				}
-				break;
-			case "closedPr":
-				if(getFragmentRefreshListenerPr() != null) {
-					getFragmentRefreshListenerPr().onRefresh("closed");
-				}
-				break;
-			case "openMilestone":
-				if(getFragmentRefreshListenerMilestone() != null) {
-					getFragmentRefreshListenerMilestone().onRefresh("open");
-				}
-				break;
-			case "closedMilestone":
-				if(getFragmentRefreshListenerMilestone() != null) {
-					getFragmentRefreshListenerMilestone().onRefresh("closed");
-				}
-				break;
-		}
-
-	}
-
-	public class SectionsPagerAdapter extends FragmentStatePagerAdapter {
-
-		SectionsPagerAdapter(FragmentManager fm) {
-
-			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
-		}
-
-		@NonNull
-		@Override
-		public Fragment getItem(int position) {
-
-			TinyDB tinyDb = new TinyDB(appCtx);
-			String repoFullName = tinyDb.getString("repoFullName");
-			String[] parts = repoFullName.split("/");
-			String repoOwner = parts[0];
-			String repoName = parts[1];
-
-			Fragment fragment = null;
-			switch(position) {
-				case 0: // information
-					return RepoInfoFragment.newInstance(repoOwner, repoName);
-				case 1: // files
-					return FilesFragment.newInstance(repoOwner, repoName);
-				case 2: // issues
-					fragment = new IssuesFragment();
-					break;
-				case 3: // pull requests
-					fragment = new PullRequestsFragment();
-					break;
-				case 4: // branches
-					return BranchesFragment.newInstance(repoOwner, repoName);
-				case 5: // releases
-					return ReleasesFragment.newInstance(repoOwner, repoName);
-				case 6: // milestones
-					fragment = new MilestonesFragment();
-					break;
-				case 7: // labels
-					return LabelsFragment.newInstance(repoOwner, repoName);
-				case 8: // collaborators
-					return CollaboratorsFragment.newInstance(repoOwner, repoName);
-			}
-			assert fragment != null;
-			return fragment;
-		}
-
-		@Override
-		public int getCount() {
-
-			return 9;
-		}
-
-	}
-
-	private void getRepoInfo(String instanceUrl, String token, final String owner, String repo) {
-
-		TinyDB tinyDb = new TinyDB(appCtx);
-
-		Call<UserRepositories> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserRepository(token, owner, repo);
-
-		call.enqueue(new Callback<UserRepositories>() {
-
-			@Override
-			public void onResponse(@NonNull Call<UserRepositories> call, @NonNull retrofit2.Response<UserRepositories> response) {
-
-				UserRepositories repoInfo = response.body();
-
-				if(response.isSuccessful()) {
-
-					if(response.code() == 200) {
-
-						if(tinyDb.getBoolean("enableCounterBadges")) {
-							assert repoInfo != null;
-
-							if(repoInfo.getOpen_issues_count() != null) {
-								textViewBadgeIssue.setVisibility(View.VISIBLE);
-								textViewBadgeIssue.setText(repoInfo.getOpen_issues_count());
-							}
-
-							if(repoInfo.getOpen_pull_count() != null) {
-								textViewBadgePull.setVisibility(View.VISIBLE);
-								textViewBadgePull.setText(repoInfo.getOpen_pull_count());
-							}
-
-							if(repoInfo.getRelease_count() != null) {
-								textViewBadgeRelease.setVisibility(View.VISIBLE);
-								textViewBadgeRelease.setText(repoInfo.getRelease_count());
-							}
-						}
-
-					}
-
-				}
-				else {
-					Log.e("onFailure", String.valueOf(response.code()));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<UserRepositories> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-			}
-
-		});
-
-	}
-
-	private void checkRepositoryStarStatus(String instanceUrl, String instanceToken, final String owner, String repo) {
-
-		Call<JsonElement> call;
-
-		call = RetrofitClient.getInstance(instanceUrl, ctx).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(appCtx);
-				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<WatchInfo> call;
-
-		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().checkRepoWatchStatus(instanceToken, owner, repo);
-
-		call.enqueue(new Callback<WatchInfo>() {
-
-			@Override
-			public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
-
-				TinyDB tinyDb = new TinyDB(appCtx);
-
-				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<WatchInfo> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-			}
-		});
-
-	}
 
 }

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

@@ -1,6 +1,5 @@
 package org.mian.gitnex.activities;
 
-import android.content.Context;
 import android.os.Bundle;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.Observer;
@@ -30,9 +29,6 @@ public class RepoStargazersActivity extends BaseActivity {
     private GridView mGridView;
     private ProgressBar mProgressBar;
 
-    final Context ctx = this;
-    private Context appCtx;
-
     @Override
     protected int getLayoutResourceId(){
         return R.layout.activity_repo_stargazers;
@@ -40,11 +36,9 @@ public class RepoStargazersActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        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");
@@ -65,7 +59,7 @@ public class RepoStargazersActivity extends BaseActivity {
 
         toolbarTitle.setText(R.string.repoStargazersInMenu);
 
-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
     }
 
@@ -73,10 +67,10 @@ public class RepoStargazersActivity extends BaseActivity {
 
         RepoStargazersViewModel repoStargazersModel = new ViewModelProvider(this).get(RepoStargazersViewModel.class);
 
-        repoStargazersModel.getRepoStargazers(instanceUrl, instanceToken, repoOwner, repoName, ctx).observe(this, new Observer<List<UserInfo>>() {
+        repoStargazersModel.getRepoStargazers(instanceUrl, instanceToken, repoOwner, repoName, getApplicationContext()).observe(this, new Observer<List<UserInfo>>() {
             @Override
             public void onChanged(@Nullable List<UserInfo> stargazersListMain) {
-                adapter = new RepoStargazersAdapter(ctx, stargazersListMain);
+                adapter = new RepoStargazersAdapter(getApplicationContext(), stargazersListMain);
                 if(adapter.getCount() > 0) {
                     mGridView.setAdapter(adapter);
                     noDataStargazers.setVisibility(View.GONE);

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

@@ -1,6 +1,5 @@
 package org.mian.gitnex.activities;
 
-import android.content.Context;
 import android.os.Bundle;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.Observer;
@@ -30,9 +29,6 @@ public class RepoWatchersActivity extends BaseActivity {
     private GridView mGridView;
     private ProgressBar mProgressBar;
 
-    final Context ctx = this;
-    private Context appCtx;
-
     @Override
     protected int getLayoutResourceId(){
         return R.layout.activity_repo_watchers;
@@ -40,11 +36,9 @@ public class RepoWatchersActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+        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");
@@ -65,7 +59,7 @@ public class RepoWatchersActivity extends BaseActivity {
 
         toolbarTitle.setText(R.string.repoWatchersInMenu);
 
-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
     }
 
@@ -73,10 +67,10 @@ public class RepoWatchersActivity extends BaseActivity {
 
         RepoWatchersViewModel repoWatchersModel = new ViewModelProvider(this).get(RepoWatchersViewModel.class);
 
-        repoWatchersModel.getRepoWatchers(instanceUrl, instanceToken, repoOwner, repoName, ctx).observe(this, new Observer<List<UserInfo>>() {
+        repoWatchersModel.getRepoWatchers(instanceUrl, instanceToken, repoOwner, repoName, getApplicationContext()).observe(this, new Observer<List<UserInfo>>() {
             @Override
             public void onChanged(@Nullable List<UserInfo> watchersListMain) {
-                adapter = new RepoWatchersAdapter(ctx, watchersListMain);
+                adapter = new RepoWatchersAdapter(getApplicationContext(), watchersListMain);
                 if(adapter.getCount() > 0) {
                     mGridView.setAdapter(adapter);
                     noDataWatchers.setVisibility(View.GONE);

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

@@ -1,328 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Switch;
-import android.widget.TextView;
-import androidx.appcompat.app.AlertDialog;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.util.TinyDB;
-
-/**
- * Author M M Arif
- */
-
-public class SettingsAppearanceActivity extends BaseActivity {
-
-	private Context appCtx;
-	private View.OnClickListener onClickListener;
-
-	private static String[] timeList = {"Pretty", "Normal"};
-	private static int timeSelectedChoice = 0;
-
-	private static String[] codeBlockList = {"Green - Black", "White - Black", "Grey - Black", "White - Grey", "Dark - White"};
-	private static int codeBlockSelectedChoice = 0;
-
-	private static String[] homeScreenList = {"My Repositories", "Starred Repositories", "Organizations", "Repositories", "Profile"};
-	private static int homeScreenSelectedChoice = 0;
-
-	private static String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
-	private static int customFontSelectedChoice = 0;
-
-	private static String[] themeList = {"Dark", "Light", "Auto (Day/Night)"};
-	private static int themeSelectedChoice = 0;
-
-	@Override
-	protected int getLayoutResourceId() {
-
-		return R.layout.activity_settings_appearance;
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-		appCtx = getApplicationContext();
-
-		final TinyDB tinyDb = new TinyDB(appCtx);
-
-		ImageView closeActivity = findViewById(R.id.close);
-
-		final TextView tvDateTimeSelected = findViewById(R.id.tvDateTimeSelected); // setter for time
-		final TextView codeBlockSelected = findViewById(R.id.codeBlockSelected); // setter for code block
-		final TextView homeScreenSelected = findViewById(R.id.homeScreenSelected); // setter for home screen
-		final TextView customFontSelected = findViewById(R.id.customFontSelected); // setter for custom font
-		final TextView themeSelected = findViewById(R.id.themeSelected); // setter for theme
-
-		LinearLayout timeFrame = findViewById(R.id.timeFrame);
-		LinearLayout codeBlockFrame = findViewById(R.id.codeBlockFrame);
-		LinearLayout homeScreenFrame = findViewById(R.id.homeScreenFrame);
-		LinearLayout customFontFrame = findViewById(R.id.customFontFrame);
-		LinearLayout themeFrame = findViewById(R.id.themeSelectionFrame);
-
-		Switch counterBadgesSwitch = findViewById(R.id.switchCounterBadge);
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		if(!tinyDb.getString("timeStr").isEmpty()) {
-			tvDateTimeSelected.setText(tinyDb.getString("timeStr"));
-		}
-
-		if(!tinyDb.getString("codeBlockStr").isEmpty()) {
-			codeBlockSelected.setText(tinyDb.getString("codeBlockStr"));
-		}
-
-		if(!tinyDb.getString("homeScreenStr").isEmpty()) {
-			homeScreenSelected.setText(tinyDb.getString("homeScreenStr"));
-		}
-
-		if(!tinyDb.getString("customFontStr").isEmpty()) {
-			customFontSelected.setText(tinyDb.getString("customFontStr"));
-		}
-
-		if(!tinyDb.getString("themeStr").isEmpty()) {
-			themeSelected.setText(tinyDb.getString("themeStr"));
-		}
-
-		if(timeSelectedChoice == 0) {
-			timeSelectedChoice = tinyDb.getInt("timeId");
-		}
-
-		if(codeBlockSelectedChoice == 0) {
-			codeBlockSelectedChoice = tinyDb.getInt("codeBlockId");
-		}
-
-		if(homeScreenSelectedChoice == 0) {
-			homeScreenSelectedChoice = tinyDb.getInt("homeScreenId");
-		}
-
-		if(customFontSelectedChoice == 0) {
-			customFontSelectedChoice = tinyDb.getInt("customFontId", 1);
-		}
-
-		if(themeSelectedChoice == 0) {
-			themeSelectedChoice = tinyDb.getInt("themeId");
-		}
-
-		if(tinyDb.getBoolean("enableCounterBadges")) {
-			counterBadgesSwitch.setChecked(true);
-		}
-		else {
-			counterBadgesSwitch.setChecked(false);
-		}
-
-		// counter badge switcher
-		counterBadgesSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			if (isChecked) {
-				tinyDb.putBoolean("enableCounterBadges", true);
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-			}
-			else {
-				tinyDb.putBoolean("enableCounterBadges", false);
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-			}
-
-		});
-
-		// theme selection dialog
-		themeFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
-
-			tsBuilder.setTitle(getResources().getString(R.string.themeSelectorDialogTitle));
-			if(themeSelectedChoice != -1) {
-				tsBuilder.setCancelable(true);
-			}
-			else {
-				tsBuilder.setCancelable(false);
-			}
-
-			tsBuilder.setSingleChoiceItems(themeList, themeSelectedChoice, (dialogInterfaceTheme, i) -> {
-
-				themeSelectedChoice = i;
-				themeSelected.setText(themeList[i]);
-				tinyDb.putString("themeStr", themeList[i]);
-				tinyDb.putInt("themeId", i);
-
-				tinyDb.putBoolean("refreshParent", true);
-				this.recreate();
-				this.overridePendingTransition(0, 0);
-				dialogInterfaceTheme.dismiss();
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-
-			});
-
-			AlertDialog cfDialog = tsBuilder.create();
-			cfDialog.show();
-
-		});
-
-		// custom font dialog
-		customFontFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder cfBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
-
-			cfBuilder.setTitle(R.string.settingsCustomFontSelectorDialogTitle);
-			if(customFontSelectedChoice != -1) {
-				cfBuilder.setCancelable(true);
-			}
-			else {
-				cfBuilder.setCancelable(false);
-			}
-
-			cfBuilder.setSingleChoiceItems(customFontList, customFontSelectedChoice, (dialogInterfaceCustomFont, i) -> {
-
-				customFontSelectedChoice = i;
-				customFontSelected.setText(customFontList[i]);
-				tinyDb.putString("customFontStr", customFontList[i]);
-				tinyDb.putInt("customFontId", i);
-
-				tinyDb.putBoolean("refreshParent", true);
-				this.recreate();
-				this.overridePendingTransition(0, 0);
-				dialogInterfaceCustomFont.dismiss();
-				Toasty.info(appCtx, appCtx.getResources().getString(R.string.settingsSave));
-
-			});
-
-			AlertDialog cfDialog = cfBuilder.create();
-			cfDialog.show();
-
-		});
-
-		// home screen dialog
-		homeScreenFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder hsBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
-
-			hsBuilder.setTitle(R.string.settingsHomeScreenSelectorDialogTitle);
-			if(homeScreenSelectedChoice != -1) {
-				hsBuilder.setCancelable(true);
-			}
-			else {
-				hsBuilder.setCancelable(false);
-			}
-
-			hsBuilder.setSingleChoiceItems(homeScreenList, homeScreenSelectedChoice, (dialogInterfaceHomeScreen, i) -> {
-
-				homeScreenSelectedChoice = i;
-				homeScreenSelected.setText(homeScreenList[i]);
-				tinyDb.putString("homeScreenStr", homeScreenList[i]);
-				tinyDb.putInt("homeScreenId", i);
-
-				dialogInterfaceHomeScreen.dismiss();
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-
-			});
-
-			AlertDialog hsDialog = hsBuilder.create();
-			hsDialog.show();
-
-		});
-
-		// code block dialog
-		codeBlockFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder cBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
-
-			cBuilder.setTitle(R.string.settingsCodeBlockSelectorDialogTitle);
-			if(codeBlockSelectedChoice != -1) {
-				cBuilder.setCancelable(true);
-			}
-			else {
-				cBuilder.setCancelable(false);
-			}
-
-			cBuilder.setSingleChoiceItems(codeBlockList, codeBlockSelectedChoice, (dialogInterfaceCodeBlock, i) -> {
-
-				codeBlockSelectedChoice = i;
-				codeBlockSelected.setText(codeBlockList[i]);
-				tinyDb.putString("codeBlockStr", codeBlockList[i]);
-				tinyDb.putInt("codeBlockId", i);
-
-				switch(codeBlockList[i]) {
-					case "White - Black":
-						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.white));
-						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
-						break;
-					case "Grey - Black":
-						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorAccent));
-						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
-						break;
-					case "White - Grey":
-						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.white));
-						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.colorAccent));
-						break;
-					case "Dark - White":
-						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorPrimary));
-						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.white));
-						break;
-					default:
-						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorLightGreen));
-						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
-						break;
-				}
-
-				dialogInterfaceCodeBlock.dismiss();
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-
-			});
-
-			AlertDialog cDialog = cBuilder.create();
-			cDialog.show();
-
-		});
-
-		// time and date dialog
-		timeFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder tBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
-
-			tBuilder.setTitle(R.string.settingsTimeSelectorDialogTitle);
-			if(timeSelectedChoice != -1) {
-				tBuilder.setCancelable(true);
-			}
-			else {
-				tBuilder.setCancelable(false);
-			}
-
-			tBuilder.setSingleChoiceItems(timeList, timeSelectedChoice, (dialogInterfaceTime, i) -> {
-
-				timeSelectedChoice = i;
-				tvDateTimeSelected.setText(timeList[i]);
-				tinyDb.putString("timeStr", timeList[i]);
-				tinyDb.putInt("timeId", i);
-
-				if("Normal".equals(timeList[i])) {
-					tinyDb.putString("dateFormat", "normal");
-				}
-				else {
-					tinyDb.putString("dateFormat", "pretty");
-				}
-
-				dialogInterfaceTime.dismiss();
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-
-			});
-
-			AlertDialog tDialog = tBuilder.create();
-			tDialog.show();
-
-
-		});
-
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> {
-			finish();
-		};
-	}
-
-}

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

@@ -1,119 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Switch;
-import android.widget.TextView;
-import androidx.appcompat.app.AlertDialog;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.util.TinyDB;
-
-/**
- * Author M M Arif
- */
-
-public class SettingsFileViewerActivity extends BaseActivity {
-
-	private Context appCtx;
-	private View.OnClickListener onClickListener;
-
-	private static String[] fileViewerSourceCodeThemesList = {"Sublime", "Arduino Light", "Github", "Far ", "Ir Black", "Android Studio"};
-	private static int fileViewerSourceCodeThemesSelectedChoice = 0;
-
-	@Override
-	protected int getLayoutResourceId() {
-
-		return R.layout.activity_settings_fileview;
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-		appCtx = getApplicationContext();
-
-		final TinyDB tinyDb = new TinyDB(appCtx);
-
-		ImageView closeActivity = findViewById(R.id.close);
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		final TextView fileViewerSourceCodeThemesSelected = findViewById(R.id.sourceCodeThemeSelected); // setter for fileviewer theme
-
-		LinearLayout sourceCodeThemeFrame = findViewById(R.id.sourceCodeThemeFrame);
-
-		Switch pdfModeSwitch = findViewById(R.id.switchPdfMode);
-
-		if(!tinyDb.getString("fileviewerSourceCodeThemeStr").isEmpty()) {
-			fileViewerSourceCodeThemesSelected.setText(tinyDb.getString("fileviewerSourceCodeThemeStr"));
-		}
-
-		if(fileViewerSourceCodeThemesSelectedChoice == 0) {
-			fileViewerSourceCodeThemesSelectedChoice = tinyDb.getInt("fileviewerThemeId");
-		}
-
-		if(tinyDb.getBoolean("enablePdfMode")) {
-			pdfModeSwitch.setChecked(true);
-		}
-		else {
-			pdfModeSwitch.setChecked(false);
-		}
-
-		// fileviewer srouce code theme selection dialog
-		sourceCodeThemeFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder fvtsBuilder = new AlertDialog.Builder(SettingsFileViewerActivity.this);
-
-			fvtsBuilder.setTitle(R.string.fileviewerSourceCodeThemeSelectorDialogTitle);
-			if(fileViewerSourceCodeThemesSelectedChoice != -1) {
-				fvtsBuilder.setCancelable(true);
-			}
-			else {
-				fvtsBuilder.setCancelable(false);
-			}
-
-			fvtsBuilder.setSingleChoiceItems(fileViewerSourceCodeThemesList, fileViewerSourceCodeThemesSelectedChoice, (dialogInterfaceTheme, i) -> {
-
-				fileViewerSourceCodeThemesSelectedChoice = i;
-				fileViewerSourceCodeThemesSelected.setText(fileViewerSourceCodeThemesList[i]);
-				tinyDb.putString("fileviewerSourceCodeThemeStr", fileViewerSourceCodeThemesList[i]);
-				tinyDb.putInt("fileviewerSourceCodeThemeId", i);
-
-				dialogInterfaceTheme.dismiss();
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-
-			});
-
-			AlertDialog cfDialog = fvtsBuilder.create();
-			cfDialog.show();
-
-		});
-
-		// pdf night mode switcher
-		pdfModeSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			if(isChecked) {
-				tinyDb.putBoolean("enablePdfMode", true);
-				tinyDb.putString("enablePdfModeInit", "yes");
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-			}
-			else {
-				tinyDb.putBoolean("enablePdfMode", false);
-				tinyDb.putString("enablePdfModeInit", "yes");
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-			}
-
-		});
-
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> finish();
-	}
-
-}

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

@@ -1,71 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.Switch;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.util.TinyDB;
-
-/**
- * Author M M Arif
- */
-
-public class SettingsReportsActivity extends BaseActivity {
-
-	private Context appCtx;
-	private View.OnClickListener onClickListener;
-
-	@Override
-	protected int getLayoutResourceId() {
-
-		return R.layout.activity_settings_reporting;
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-		appCtx = getApplicationContext();
-
-		TinyDB tinyDb = new TinyDB(appCtx);
-
-		ImageView closeActivity = findViewById(R.id.close);
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		Switch crashReportsSwitch = findViewById(R.id.crashReportsSwitch);
-
-		if(tinyDb.getBoolean("crashReportingEnabled")) {
-			crashReportsSwitch.setChecked(true);
-		}
-		else {
-			crashReportsSwitch.setChecked(false);
-		}
-
-		// crash reports switcher
-		crashReportsSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			if(isChecked) {
-				tinyDb.putBoolean("crashReportingEnabled", true);
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-			}
-			else {
-				tinyDb.putBoolean("crashReportingEnabled", false);
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-			}
-
-		});
-
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> {
-			finish();
-		};
-	}
-
-}

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

@@ -1,214 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.appcompat.app.AlertDialog;
-import org.apache.commons.io.FileUtils;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.FilesData;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-
-/**
- * Author M M Arif
- */
-
-public class SettingsSecurityActivity extends BaseActivity {
-
-	private Context appCtx;
-	private View.OnClickListener onClickListener;
-
-	private static String[] cacheSizeDataList = {"50 MB", "100 MB", "250 MB", "500 MB", "1 GB"};
-	private static int cacheSizeDataSelectedChoice = 0;
-
-	private static String[] cacheSizeImagesList = {"50 MB", "100 MB", "250 MB", "500 MB", "1 GB"};
-	private static int cacheSizeImagesSelectedChoice = 0;
-
-	@Override
-	protected int getLayoutResourceId() {
-
-		return R.layout.activity_settings_security;
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-		appCtx = getApplicationContext();
-
-		TinyDB tinyDb = new TinyDB(appCtx);
-
-		ImageView closeActivity = findViewById(R.id.close);
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		TextView cacheSizeDataSelected = findViewById(R.id.cacheSizeDataSelected); // setter for data cache size
-		TextView cacheSizeImagesSelected = findViewById(R.id.cacheSizeImagesSelected); // setter for images cache size
-		TextView clearCacheSelected = findViewById(R.id.clearCacheSelected); // setter for clear cache
-
-		LinearLayout certsFrame = findViewById(R.id.certsFrame);
-		LinearLayout cacheSizeDataFrame = findViewById(R.id.cacheSizeDataSelectionFrame);
-		LinearLayout cacheSizeImagesFrame = findViewById(R.id.cacheSizeImagesSelectionFrame);
-		LinearLayout clearCacheFrame = findViewById(R.id.clearCacheSelectionFrame);
-
-		if(!tinyDb.getString("cacheSizeStr").isEmpty()) {
-			cacheSizeDataSelected.setText(tinyDb.getString("cacheSizeStr"));
-		}
-
-		if(!tinyDb.getString("cacheSizeImagesStr").isEmpty()) {
-			cacheSizeImagesSelected.setText(tinyDb.getString("cacheSizeImagesStr"));
-		}
-
-		if(cacheSizeDataSelectedChoice == 0) {
-			cacheSizeDataSelectedChoice = tinyDb.getInt("cacheSizeId");
-		}
-
-		if(cacheSizeImagesSelectedChoice == 0) {
-			cacheSizeImagesSelectedChoice = tinyDb.getInt("cacheSizeImagesId");
-		}
-
-		// clear cache setter
-		File cacheDir = appCtx.getCacheDir();
-		long size__ = FilesData.getFileSizeRecursively(new HashSet<>(), cacheDir);
-		if(size__ > 0) {
-			clearCacheSelected.setText(String.valueOf(AppUtil.formatFileSizeInDetail(size__)));
-		}
-
-		// clear cache
-		clearCacheFrame.setOnClickListener(v1 -> {
-
-			AlertDialog.Builder builder = new AlertDialog.Builder(SettingsSecurityActivity.this);
-
-			builder.setTitle(getResources().getString(R.string.clearCacheDialogHeader));
-			builder.setMessage(getResources().getString(R.string.clearCacheDialogMessage));
-			builder.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
-
-				try {
-
-					FileUtils.deleteDirectory(cacheDir);
-					FileUtils.mkdir(cacheDir.getAbsolutePath());
-					this.recreate();
-					this.overridePendingTransition(0, 0);
-
-				}
-				catch (IOException e) {
-
-					Log.e("SettingsSecurity", e.toString());
-
-				}
-
-			});
-
-			builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
-			builder.create().show();
-
-		});
-
-		// cache size images selection dialog
-		cacheSizeImagesFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsSecurityActivity.this);
-
-			tsBuilder.setTitle(getResources().getString(R.string.cacheSizeImagesDialogHeader));
-			if(cacheSizeImagesSelectedChoice != -1) {
-				tsBuilder.setCancelable(true);
-			}
-			else {
-				tsBuilder.setCancelable(false);
-			}
-
-			tsBuilder.setSingleChoiceItems(cacheSizeImagesList, cacheSizeImagesSelectedChoice, (dialogInterfaceTheme, i) -> {
-
-				cacheSizeImagesSelectedChoice = i;
-				cacheSizeImagesSelected.setText(cacheSizeImagesList[i]);
-				tinyDb.putString("cacheSizeImagesStr", cacheSizeImagesList[i]);
-				tinyDb.putInt("cacheSizeImagesId", i);
-
-				dialogInterfaceTheme.dismiss();
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-
-			});
-
-			AlertDialog cfDialog = tsBuilder.create();
-			cfDialog.show();
-
-		});
-
-		// cache size data selection dialog
-		cacheSizeDataFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsSecurityActivity.this);
-
-			tsBuilder.setTitle(getResources().getString(R.string.cacheSizeDataDialogHeader));
-			if(cacheSizeDataSelectedChoice != -1) {
-				tsBuilder.setCancelable(true);
-			}
-			else {
-				tsBuilder.setCancelable(false);
-			}
-
-			tsBuilder.setSingleChoiceItems(cacheSizeDataList, cacheSizeDataSelectedChoice, (dialogInterfaceTheme, i) -> {
-
-				cacheSizeDataSelectedChoice = i;
-				cacheSizeDataSelected.setText(cacheSizeDataList[i]);
-				tinyDb.putString("cacheSizeStr", cacheSizeDataList[i]);
-				tinyDb.putInt("cacheSizeId", i);
-
-				dialogInterfaceTheme.dismiss();
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-
-			});
-
-			AlertDialog cfDialog = tsBuilder.create();
-			cfDialog.show();
-
-		});
-
-		// certs deletion
-		certsFrame.setOnClickListener(v1 -> {
-
-			AlertDialog.Builder builder = new AlertDialog.Builder(SettingsSecurityActivity.this);
-
-			builder.setTitle(getResources().getString(R.string.settingsCertsPopupTitle));
-			builder.setMessage(getResources().getString(R.string.settingsCertsPopupMessage));
-			builder.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
-
-				appCtx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE).edit().remove(MemorizingTrustManager.KEYSTORE_KEY).apply();
-
-				tinyDb.putBoolean("loggedInMode", false);
-				tinyDb.remove("basicAuthPassword");
-				tinyDb.putBoolean("basicAuthFlag", false);
-				//tinyDb.clear();
-
-				Intent loginActivityIntent = new Intent().setClass(appCtx, LoginActivity.class);
-				loginActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-				appCtx.startActivity(loginActivityIntent);
-
-			});
-
-			builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
-			builder.create().show();
-
-		});
-
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> {
-			finish();
-		};
-	}
-
-}

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

@@ -1,165 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.appcompat.app.AlertDialog;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.util.TinyDB;
-
-/**
- * Author M M Arif
- */
-
-public class SettingsTranslationActivity extends BaseActivity {
-
-	private Context appCtx;
-	private View.OnClickListener onClickListener;
-
-	private static String[] langList = {"English", "Arabic", "Chinese", "Finnish", "French", "German", "Italian", "Latvian", "Persian", "Polish", "Portuguese/Brazilian", "Russian", "Serbian", "Spanish", "Turkish",
-			"Ukrainian"};
-	private static int langSelectedChoice = 0;
-
-	@Override
-	protected int getLayoutResourceId() {
-
-		return R.layout.activity_settings_translation;
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-		appCtx = getApplicationContext();
-
-		TinyDB tinyDb = new TinyDB(appCtx);
-
-		ImageView closeActivity = findViewById(R.id.close);
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		final TextView tvLanguageSelected = findViewById(R.id.tvLanguageSelected); // setter for en, fr
-		TextView helpTranslate = findViewById(R.id.helpTranslate);
-
-		LinearLayout langFrame = findViewById(R.id.langFrame);
-
-		helpTranslate.setOnClickListener(v12 -> {
-
-			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);
-
-		});
-
-		if(!tinyDb.getString("localeStr").isEmpty()) {
-			tvLanguageSelected.setText(tinyDb.getString("localeStr"));
-		}
-
-		if(langSelectedChoice == 0) {
-			langSelectedChoice = tinyDb.getInt("langId");
-		}
-
-		// language dialog
-		langFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder lBuilder = new AlertDialog.Builder(SettingsTranslationActivity.this);
-
-			lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
-			if(langSelectedChoice != -1) {
-				lBuilder.setCancelable(true);
-			}
-			else {
-				lBuilder.setCancelable(false);
-			}
-
-			lBuilder.setSingleChoiceItems(langList, langSelectedChoice, (dialogInterface, i) -> {
-
-				langSelectedChoice = i;
-				tvLanguageSelected.setText(langList[i]);
-				tinyDb.putString("localeStr", langList[i]);
-				tinyDb.putInt("langId", i);
-
-				switch(langList[i]) {
-					case "Arabic":
-						tinyDb.putString("locale", "ar");
-						break;
-					case "Chinese":
-						tinyDb.putString("locale", "zh");
-						break;
-					case "Finnish":
-						tinyDb.putString("locale", "fi");
-						break;
-					case "French":
-						tinyDb.putString("locale", "fr");
-						break;
-					case "German":
-						tinyDb.putString("locale", "de");
-						break;
-					case "Italian":
-						tinyDb.putString("locale", "it");
-						break;
-					case "Latvian":
-						tinyDb.putString("locale", "lv");
-						break;
-					case "Persian":
-						tinyDb.putString("locale", "fa");
-						break;
-					case "Polish":
-						tinyDb.putString("locale", "pl");
-						break;
-					case "Portuguese/Brazilian":
-						tinyDb.putString("locale", "pt");
-						break;
-					case "Russian":
-						tinyDb.putString("locale", "ru");
-						break;
-					case "Serbian":
-						tinyDb.putString("locale", "sr");
-						break;
-					case "Spanish":
-						tinyDb.putString("locale", "es");
-						break;
-					case "Turkish":
-						tinyDb.putString("locale", "tr");
-						break;
-					case "Ukrainian":
-						tinyDb.putString("locale", "uk");
-						break;
-					default:
-						tinyDb.putString("locale", "en");
-						break;
-				}
-
-				tinyDb.putBoolean("refreshParent", true);
-				this.recreate();
-				this.overridePendingTransition(0, 0);
-				dialogInterface.dismiss();
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-
-			});
-
-			lBuilder.setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> dialog.dismiss());
-
-			AlertDialog lDialog = lBuilder.create();
-			lDialog.show();
-
-		});
-
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> {
-			finish();
-		};
-	}
-
-}

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

@@ -3,7 +3,6 @@ package org.mian.gitnex.activities;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.view.View;
@@ -21,7 +20,6 @@ import java.util.List;
 public class SponsorsActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
-    private Context appCtx;
 
     @Override
     protected int getLayoutResourceId(){
@@ -30,9 +28,7 @@ public class SponsorsActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
 
         ImageView closeActivity = findViewById(R.id.close);
 
@@ -47,7 +43,7 @@ public class SponsorsActivity extends BaseActivity {
         RecyclerView mRecyclerView = findViewById(R.id.recyclerView);
 
         mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(appCtx));
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
 
         DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
                 DividerItemDecoration.VERTICAL);

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

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.TextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CommitsActivity;
@@ -35,7 +34,7 @@ public class BranchesAdapter extends RecyclerView.Adapter<BranchesAdapter.Branch
 
             branchNameTv = itemView.findViewById(R.id.branchName);
             branchCommitAuthor = itemView.findViewById(R.id.branchCommitAuthor);
-            Button branchCommitHash = itemView.findViewById(R.id.branchCommitHash);
+            TextView branchCommitHash = itemView.findViewById(R.id.branchCommitHash);
 
             branchCommitHash.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View v) {

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

@@ -1,21 +1,18 @@
 package org.mian.gitnex.adapters;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
+import android.text.Html;
-import android.net.Uri;
+import android.text.method.LinkMovementMethod;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
+import com.mikepenz.fastadapter.FastAdapter;
+import com.mikepenz.fastadapter.items.AbstractItem;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.models.Commits;
 import org.mian.gitnex.util.TinyDB;
+import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
@@ -23,152 +20,142 @@ import java.util.Locale;
  * Author M M Arif
  */
 
-public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class CommitsAdapter extends AbstractItem<CommitsAdapter, CommitsAdapter.ViewHolder> {
 
-    private Context ctx;
+    final private Context ctx;
-    private final int TYPE_LOAD = 0;
+    private String commitTitle;
-    private List<Commits> commitsList;
+    private String commitHtmlUrl;
-    private CommitsAdapter.OnLoadMoreListener loadMoreListener;
+    private String commitCommitter;
-    private boolean isLoading = false;
+    private Date commitDate;
-    private boolean isMoreDataAvailable = true;
 
-    public CommitsAdapter(Context ctx, List<Commits> commitsListMain) {
+    private boolean isSelectable = true;
 
+    public CommitsAdapter(Context ctx) {
         this.ctx = ctx;
-        this.commitsList = commitsListMain;
+    }
 
+    public CommitsAdapter withNewItems(String commitTitle, String commitHtmlUrl, String commitCommitter, Date commitDate) {
+
+        this.setNewItems(commitTitle, commitHtmlUrl, commitCommitter, commitDate);
+        return this;
+
+    }
+
+    private void setNewItems(String commitTitle, String commitHtmlUrl, String commitCommitter, Date commitDate) {
+
+        this.commitTitle = commitTitle;
+        this.commitHtmlUrl = commitHtmlUrl;
+        this.commitCommitter = commitCommitter;
+        this.commitDate = commitDate;
+
+    }
+
+    public String getCommitTitle() {
+        return commitTitle;
+    }
+
+    private String getCommitHtmlUrl() {
+        return commitHtmlUrl;
+    }
+
+    private String getcommitCommitter() {
+        return commitCommitter;
+    }
+
+    private Date getcommitDate() {
+        return commitDate;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public CommitsAdapter withEnabled(boolean enabled) {
+        return null;
+    }
+
+    @Override
+    public boolean isSelectable() {
+        return isSelectable;
+    }
+
+    @Override
+    public CommitsAdapter withSelectable(boolean selectable) {
+
+        this.isSelectable = selectable;
+        return this;
+
+    }
+
+    @Override
+    public int getType() {
+        return R.id.commitList;
+    }
+
+    @Override
+    public int getLayoutRes() {
+        return R.layout.list_commits;
     }
 
     @NonNull
     @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    public CommitsAdapter.ViewHolder getViewHolder(@NonNull View v) {
 
-        LayoutInflater inflater = LayoutInflater.from(ctx);
+        return new CommitsAdapter.ViewHolder(v);
-
-        if(viewType == TYPE_LOAD) {
-            return new CommitsHolder(inflater.inflate(R.layout.list_commits, parent, false));
-        }
-        else {
-            return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
-        }
 
     }
 
-    @Override
+    public class ViewHolder extends FastAdapter.ViewHolder<CommitsAdapter> {
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
-        if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+        final TinyDB tinyDb = new TinyDB(ctx);
+        final String locale = tinyDb.getString("locale");
+        final String timeFormat = tinyDb.getString("dateFormat");
 
-            isLoading = true;
+        TextView commitTitleVw;
-            loadMoreListener.onLoadMore();
+        TextView commitCommitterVw;
+        TextView commitDateVw;
+        TextView commitHtmlUrlVw;
 
-        }
+        public ViewHolder(View itemView) {
-
-        if(getItemViewType(position) == TYPE_LOAD) {
-
-            ((CommitsHolder) holder).bindData(commitsList.get(position));
-
-        }
-
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-
-        if(commitsList.get(position).getSha() != null) {
-            return TYPE_LOAD;
-        }
-        else {
-            return 1;
-        }
-
-    }
-
-    @Override
-    public int getItemCount() {
-
-        return commitsList.size();
-
-    }
-
-    class CommitsHolder extends RecyclerView.ViewHolder {
-
-        TextView commitTitle;
-        TextView commitCommitter;
-        TextView commitDate;
-        Button commitHtmlUrl;
-
-        CommitsHolder(View itemView) {
 
             super(itemView);
 
-            commitTitle = itemView.findViewById(R.id.commitTitleVw);
+            commitTitleVw = itemView.findViewById(R.id.commitTitleVw);
-            commitCommitter = itemView.findViewById(R.id.commitCommitterVw);
+            commitCommitterVw = itemView.findViewById(R.id.commitCommitterVw);
-            commitDate = itemView.findViewById(R.id.commitDateVw);
+            commitDateVw = itemView.findViewById(R.id.commitDateVw);
-            commitHtmlUrl = itemView.findViewById(R.id.commitHtmlUrlVw);
+            commitHtmlUrlVw = itemView.findViewById(R.id.commitHtmlUrlVw);
 
         }
 
-        @SuppressLint("SetTextI18n")
+        @Override
-        void bindData(Commits commitsModel) {
+        public void bindView(CommitsAdapter item, @NonNull List<Object> payloads) {
 
-            final TinyDB tinyDb = new TinyDB(ctx);
+            commitTitleVw.setText(item.getCommitTitle());
-            final String locale = tinyDb.getString("locale");
+            commitCommitterVw.setText(ctx.getString(R.string.commitCommittedBy, item.getcommitCommitter()));
-            final String timeFormat = tinyDb.getString("dateFormat");
 
-            commitTitle.setText(commitsModel.getCommit().getMessage());
+            commitDateVw.setText(TimeHelper.formatTime(item.getcommitDate(), new Locale(locale), timeFormat, ctx));
-            commitCommitter.setText(ctx.getString(R.string.commitCommittedBy, commitsModel.getCommit().getCommitter().getName()));
-
-            commitDate.setText(TimeHelper.formatTime(commitsModel.getCommit().getCommitter().getDate(), new Locale(locale), timeFormat, ctx));
 
             if(timeFormat.equals("pretty")) {
-                commitDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(commitsModel.getCommit().getCommitter().getDate()), ctx));
+                commitDateVw.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(item.getcommitDate()), ctx));
             }
 
-            commitHtmlUrl.setOnClickListener(v -> ctx.startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(commitsModel.getHtml_url()))));
+            commitHtmlUrlVw.setText(Html.fromHtml("<a href='" + item.getCommitHtmlUrl() + "'>" + ctx.getResources().getString(R.string.viewInBrowser) + "</a> "));
+            commitHtmlUrlVw.setMovementMethod(LinkMovementMethod.getInstance());
 
         }
 
-    }
+        @Override
+        public void unbindView(@NonNull CommitsAdapter item) {
 
-    static class LoadHolder extends RecyclerView.ViewHolder {
+            commitTitleVw.setText(null);
+            commitCommitterVw.setText(null);
+            commitDateVw.setText(null);
+            commitHtmlUrlVw.setText(null);
 
-        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(CommitsAdapter.OnLoadMoreListener loadMoreListener) {
-
-        this.loadMoreListener = loadMoreListener;
-
-    }
-
-    public void updateList(List<Commits> list) {
-
-        commitsList = list;
-        notifyDataSetChanged();
-    }
-
 }

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

@@ -9,7 +9,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
@@ -26,7 +25,7 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
-import org.mian.gitnex.models.WatchInfo;
+import org.mian.gitnex.models.WatchRepository;
 import org.mian.gitnex.util.TinyDB;
 import java.util.List;
 import retrofit2.Call;
@@ -59,7 +58,6 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 		private TextView repoStars;
 		private TextView repoForks;
 		private TextView repoOpenIssuesCount;
-		private LinearLayout archiveRepo;
 
 		private ReposSearchViewHolder(View itemView) {
 
@@ -75,7 +73,6 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 			repoForks = itemView.findViewById(R.id.repoForks);
 			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
 			ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
-			archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
 
 			itemView.setOnClickListener(v -> {
 
@@ -98,16 +95,16 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 					final String repoName = parts[1];
 					final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-					WatchInfo watch = new WatchInfo();
+					WatchRepository watch = new WatchRepository();
 
-					Call<WatchInfo> call;
+					Call<WatchRepository> call;
 
 					call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-					call.enqueue(new Callback<WatchInfo>() {
+					call.enqueue(new Callback<WatchRepository>() {
 
 						@Override
-						public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
+						public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
 
 							if(response.isSuccessful()) {
 
@@ -129,7 +126,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 						}
 
 						@Override
-						public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
+						public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
 
 							tinyDb.putBoolean("repoWatch", false);
 							Toasty.info(context, context.getString(R.string.genericApiStatusError));
@@ -195,7 +192,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 	@Override
 	public ExploreRepositoriesAdapter.ReposSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repos, parent, false);
 		return new ExploreRepositoriesAdapter.ReposSearchViewHolder(v);
 	}
 
@@ -245,13 +242,6 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 		}
 		holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
 
-		if(currentItem.isArchived()) {
-			holder.archiveRepo.setVisibility(View.VISIBLE);
-		}
-		else {
-			holder.archiveRepo.setVisibility(View.GONE);
-		}
-
 	}
 
 	@Override

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

@@ -165,7 +165,6 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
             holder.fileInfo.setText(AppUtil.formatFileSizeInDetail(currentItem.getSize()));
         }
         else if(currentItem.getType().equals("dir")) {
-	        holder.fileInfo.setVisibility(View.GONE);
             holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_folder_24));
         }
         else {

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

@@ -1,267 +1,139 @@
 package org.mian.gitnex.adapters;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
-import android.graphics.Typeface;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.BaseAdapter;
+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.activities.ReplyToIssueActivity;
-import org.mian.gitnex.helpers.DiffTextView;
 import org.mian.gitnex.models.FileDiffView;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentSkipListMap;
 
 /**
- * Author opyale
+ * Author M M Arif
  */
 
-public class FilesDiffAdapter extends BaseAdapter {
+public class FilesDiffAdapter extends RecyclerView.Adapter<FilesDiffAdapter.FilesDiffViewHolder> {
 
-	private static Map<Long, View> selectedViews;
+    private List<FileDiffView> dataList;
-	private static final int MAXIMUM_LINES = 5000;
+    private Context ctx;
 
-	private static int COLOR_ADDED;
+    static class FilesDiffViewHolder extends RecyclerView.ViewHolder {
-	private static int COLOR_REMOVED;
-	private static int COLOR_NORMAL;
-	private static int COLOR_SELECTED;
-	private static int COLOR_FONT;
 
-	private Context context;
+        private TextView fileContents;
-	private List<FileDiffView> fileDiffViews;
+        private TextView fileName;
+        private TextView fileInfo;
+        private ImageView fileImage;
+        private HorizontalScrollView fileContentsView;
+        private LinearLayout allLines;
 
-	public FilesDiffAdapter(Context context, List<FileDiffView> fileDiffViews) {
+        private FilesDiffViewHolder(View itemView) {
+            super(itemView);
 
-		this.context = context;
+            fileContents = itemView.findViewById(R.id.fileContents);
-		this.fileDiffViews = fileDiffViews;
+            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);
 
-		selectedViews = new ConcurrentSkipListMap<>();
+        }
+    }
 
-		COLOR_ADDED = getColorFromAttribute(R.attr.diffAddedColor);
+    public FilesDiffAdapter(List<FileDiffView> dataListMain, Context ctx) {
-		COLOR_REMOVED = getColorFromAttribute(R.attr.diffRemovedColor);
+        this.dataList = dataListMain;
-		COLOR_NORMAL = getColorFromAttribute(R.attr.primaryBackgroundColor);
+        this.ctx = ctx;
-		COLOR_SELECTED = getColorFromAttribute(R.attr.diffSelectedColor);
+    }
-		COLOR_FONT = getColorFromAttribute(R.attr.inputTextColor);
 
-	}
+    @NonNull
+    @Override
+    public FilesDiffAdapter.FilesDiffViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_files_diffs, parent, false);
+        return new FilesDiffAdapter.FilesDiffViewHolder(v);
+    }
 
-	@Override
+    @Override
-	public int getCount() {
+    public void onBindViewHolder(@NonNull FilesDiffViewHolder holder, int position) {
 
-		return fileDiffViews.size();
+        holder.setIsRecyclable(false);
-	}
+        FileDiffView data = dataList.get(position);
 
-	@Override
+        if(data.isFileType()) {
-	public Object getItem(int position) {
 
-		return fileDiffViews.get(position);
+            holder.fileName.setText(data.getFileName());
-	}
 
-	@Override
+            holder.fileInfo.setVisibility(View.GONE);
-	public long getItemId(int position) {
 
-		return position;
+            //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);
 
-	@SuppressLint({"ViewHolder", "InflateParams"})
+        }
-	@Override
+        else {
-	public View getView(int position, View convertView, ViewGroup parent) {
 
-		convertView = LayoutInflater.from(context).inflate(R.layout.list_files_diffs, null, false);
+            String[] splitData = data.getFileContents().split("\\R");
 
-		TextView headerFileName = convertView.findViewById(R.id.headerFileName);
+            for (String eachSplit : splitData) {
-		TextView headerFileInfo = convertView.findViewById(R.id.headerFileInfo);
-		ImageView footerImage = convertView.findViewById(R.id.footerImage);
-		LinearLayout diffStats = convertView.findViewById(R.id.diff_stats);
-		LinearLayout diffLines = convertView.findViewById(R.id.diffLines);
 
-		FileDiffView data = (FileDiffView) getItem(position);
+                TextView textLine = new TextView(ctx);
-		headerFileName.setText(data.getFileName());
+                textLine.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 
-		if(data.isFileBinary()) {
+                if (eachSplit.startsWith("+")) {
 
-			diffStats.setVisibility(View.GONE);
+                    textLine.setText(eachSplit);
-			diffLines.addView(getMessageView(context.getResources().getString(R.string.binaryFileError)));
+                    holder.allLines.addView(textLine);
 
-		}
+                    textLine.setTextColor(ctx.getResources().getColor(R.color.colorPrimary));
-		else {
+                    textLine.setPadding(5, 5, 5, 5);
+                    textLine.setBackgroundColor(ctx.getResources().getColor(R.color.diffAddedColor));
 
-			diffStats.setVisibility(View.VISIBLE);
+                }
-			headerFileInfo.setText(data.getFileInfo());
+                else if (eachSplit.startsWith("-")) {
 
-			String[] codeLines = getLines(data.toString());
+                    textLine.setText(eachSplit);
+                    holder.allLines.addView(textLine);
 
-			if(MAXIMUM_LINES > codeLines.length) {
+                    textLine.setTextColor(ctx.getResources().getColor(R.color.colorPrimary));
+                    textLine.setPadding(5, 5, 5, 5);
+                    textLine.setBackgroundColor(ctx.getResources().getColor(R.color.diffRemovedColor));
 
-				for(int l=0; l<codeLines.length; l++) {
+                }
+                else {
 
-					if(codeLines[l].length() > 0) {
+                    if(eachSplit.length() > 0) {
+                        textLine.setText(eachSplit);
+                        holder.allLines.addView(textLine);
 
-						int uniquePosition = l + (position * MAXIMUM_LINES);
+                        textLine.setTextColor(ctx.getResources().getColor(R.color.colorPrimary));
+                        textLine.setPadding(5, 5, 5, 5);
+                        textLine.setBackgroundColor(ctx.getResources().getColor(R.color.white));
+                    }
 
-						DiffTextView diffTextView = new DiffTextView(context);
+                }
 
-						diffTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);
+            }
-						diffTextView.setPadding(15, 2, 15, 2);
-						diffTextView.setTypeface(Typeface.createFromAsset(context.getAssets(), "fonts/sourcecodeproregular.ttf"));
-						diffTextView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-						diffTextView.setPosition(uniquePosition);
 
-						boolean isSelected = false;
+            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);
+            }
 
-						for(View view : selectedViews.values()) {
+        }
 
-							if(((DiffTextView) view).getPosition() == uniquePosition) {
+    }
 
-								diffTextView.setBackgroundColor(COLOR_SELECTED);
+    @Override
-								isSelected = true;
+    public int getItemCount() {
-								break;
+        return dataList.size();
+    }
 
-							}
+}
-
-						}
-
-
-						if(codeLines[l].startsWith("+")) {
-
-							diffTextView.setText(codeLines[l]);
-							diffTextView.setTextColor(COLOR_FONT);
-
-							if(!isSelected) {
-
-								diffTextView.setInitialBackgroundColor(COLOR_ADDED);
-							}
-
-						}
-						else if(codeLines[l].startsWith("-")) {
-
-							diffTextView.setText(codeLines[l]);
-							diffTextView.setTextColor(COLOR_FONT);
-
-							if(!isSelected) {
-
-								diffTextView.setInitialBackgroundColor(COLOR_REMOVED);
-							}
-
-						}
-						else {
-
-							diffTextView.setText(codeLines[l]);
-							diffTextView.setTextColor(COLOR_FONT);
-
-							if(!isSelected) {
-
-								diffTextView.setInitialBackgroundColor(COLOR_NORMAL);
-							}
-
-						}
-
-
-						diffTextView.setOnClickListener(v -> {
-
-							if(((DiffTextView) v).getCurrentBackgroundColor() != COLOR_SELECTED) {
-
-								selectedViews.put(((DiffTextView) v).getPosition(), v);
-								v.setBackgroundColor(COLOR_SELECTED);
-
-							}
-							else {
-
-								selectedViews.remove(((DiffTextView) v).getPosition());
-								v.setBackgroundColor(((DiffTextView) v).getInitialBackgroundColor());
-
-							}
-
-						});
-
-
-						diffTextView.setOnLongClickListener(v -> {
-
-							if(((DiffTextView) v).getCurrentBackgroundColor() == COLOR_SELECTED) {
-
-								StringBuilder stringBuilder = new StringBuilder();
-								stringBuilder.append("```\n");
-
-								for(View view : selectedViews.values()) {
-
-									stringBuilder.append(((DiffTextView) view).getText());
-									stringBuilder.append("\n");
-
-								}
-
-								stringBuilder.append("```\n\n");
-
-								selectedViews.clear();
-
-								Intent intent = new Intent(context, ReplyToIssueActivity.class);
-								intent.putExtra("commentBody", stringBuilder.toString());
-								intent.putExtra("cursorToEnd", true);
-								intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-								context.startActivity(intent);
-
-							}
-
-							return true;
-
-						});
-
-						diffLines.addView(diffTextView);
-
-					}
-
-				}
-
-			}
-			else {
-
-				diffLines.addView(getMessageView(context.getResources().getString(R.string.fileTooLarge)));
-
-			}
-
-		}
-
-		return convertView;
-
-	}
-
-	private TextView getMessageView(String message) {
-
-		TextView textView = new TextView(context);
-
-		textView.setTextColor(COLOR_FONT);
-		textView.setBackgroundColor(COLOR_NORMAL);
-		textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
-		textView.setPadding(15, 15, 15, 15);
-		textView.setTypeface(Typeface.DEFAULT);
-		textView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-		textView.setText(message);
-
-		return textView;
-
-	}
-
-	private String[] getLines(String content) {
-
-		return content.split("\\R");
-
-	}
-
-	private int getColorFromAttribute(int resid) {
-
-		TypedValue typedValue = new TypedValue();
-		context.getTheme().resolveAttribute(resid, typedValue, true);
-
-		return typedValue.data;
-
-	}
-
-}

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

@@ -11,28 +11,29 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import com.google.gson.JsonElement;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.ReplyToIssueActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.ClickListener;
-import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.UserMentions;
 import org.mian.gitnex.models.IssueComments;
+import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.helpers.ClickListener;
+import org.ocpsoft.prettytime.PrettyTime;
+import java.sql.Time;
+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.recyclerview.widget.RecyclerView;
 import io.noties.markwon.AbstractMarkwonPlugin;
 import io.noties.markwon.Markwon;
 import io.noties.markwon.core.CorePlugin;
@@ -41,6 +42,7 @@ 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;
@@ -48,8 +50,6 @@ 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;
 
 /**
  * Author M M Arif
@@ -60,20 +60,14 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 	private List<IssueComments> issuesComments;
 	private Context mCtx;
 
-	public IssueCommentsAdapter(Context mCtx, List<IssueComments> issuesCommentsMain) {
+	static class IssueCommentViewHolder extends RecyclerView.ViewHolder {
-
-		this.mCtx = mCtx;
-		this.issuesComments = issuesCommentsMain;
-
-	}
-
-	class IssueCommentViewHolder extends RecyclerView.ViewHolder {
 
 		private TextView issueNumber;
 		private TextView commendId;
 		private ImageView issueCommenterAvatar;
 		private TextView issueComment;
 		private TextView issueCommentDate;
+		private ImageView commentsOptionsMenu;
 		private TextView commendBodyRaw;
 		private TextView commentModified;
 		private TextView commenterUsername;
@@ -88,7 +82,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 			issueCommenterAvatar = itemView.findViewById(R.id.issueCommenterAvatar);
 			issueComment = itemView.findViewById(R.id.issueComment);
 			issueCommentDate = itemView.findViewById(R.id.issueCommentDate);
-			ImageView commentsOptionsMenu = itemView.findViewById(R.id.commentsOptionsMenu);
+			commentsOptionsMenu = itemView.findViewById(R.id.commentsOptionsMenu);
 			commendBodyRaw = itemView.findViewById(R.id.commendBodyRaw);
 			commentModified = itemView.findViewById(R.id.commentModified);
 			commenterUsername = itemView.findViewById(R.id.commenterUsername);
@@ -96,32 +90,32 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 			commentsOptionsMenu.setOnClickListener(v -> {
 
-				final Context ctx = v.getContext();
+				final Context context = v.getContext();
-				final TinyDB tinyDb = new TinyDB(ctx);
+				final TinyDB tinyDb = new TinyDB(context);
 				final String loginUid = tinyDb.getString("loginUid");
 
-				@SuppressLint("InflateParams") View view = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_issue_comments, null);
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_issue_comments, null);
 
 				TextView commentMenuEdit = view.findViewById(R.id.commentMenuEdit);
 				TextView commentShare = view.findViewById(R.id.issueCommentShare);
-				TextView commentMenuDelete = view.findViewById(R.id.commentMenuDelete);
+				//TextView commentMenuDelete = view.findViewById(R.id.commentMenuDelete);
 
 				if(!loginUid.contentEquals(commenterUsername.getText())) {
 					commentMenuEdit.setVisibility(View.GONE);
-					commentMenuDelete.setVisibility(View.GONE);
+					//commentMenuDelete.setVisibility(View.GONE);
 				}
 
-				BottomSheetDialog dialog = new BottomSheetDialog(ctx);
+				BottomSheetDialog dialog = new BottomSheetDialog(context);
 				dialog.setContentView(view);
 				dialog.show();
 
 				commentMenuEdit.setOnClickListener(ediComment -> {
 
-					Intent intent = new Intent(ctx, ReplyToIssueActivity.class);
+					Intent intent = new Intent(context, ReplyToIssueActivity.class);
 					intent.putExtra("commentId", commendId.getText());
 					intent.putExtra("commentAction", "edit");
 					intent.putExtra("commentBody", commendBodyRaw.getText());
-					ctx.startActivity(intent);
+					context.startActivity(intent);
 					dialog.dismiss();
 
 				});
@@ -134,21 +128,20 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 					// share issue comment
 					Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
 					sharingIntent.setType("text/plain");
-					String intentHeader = tinyDb.getString("issueNumber") + ctx.getResources().getString(R.string.hash) + "issuecomment-" + commendId.getText() + " " + tinyDb.getString("issueTitle");
+					String intentHeader = tinyDb.getString("issueNumber") + context.getResources().getString(R.string.hash) + "issuecomment-" + commendId.getText() + " " + tinyDb.getString("issueTitle");
 					sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, intentHeader);
 					sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, commentUrl);
-					ctx.startActivity(Intent.createChooser(sharingIntent, intentHeader));
+					context.startActivity(Intent.createChooser(sharingIntent, intentHeader));
 
 					dialog.dismiss();
 
 				});
 
-				commentMenuDelete.setOnClickListener(deleteComment -> {
+                /*commentMenuDelete.setOnClickListener(deleteComment -> {
 
-					deleteIssueComment(ctx, Integer.parseInt(commendId.getText().toString()), getAdapterPosition());
+                    dialog.dismiss();
-					dialog.dismiss();
 
-				});
+                });*/
 
 			});
 
@@ -156,79 +149,10 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 	}
 
-	private void updateAdapter(int position) {
+	public IssueCommentsAdapter(Context mCtx, List<IssueComments> issuesCommentsMain) {
 
-		issuesComments.remove(position);
+		this.mCtx = mCtx;
-		notifyItemRemoved(position);
+		this.issuesComments = issuesCommentsMain;
-		notifyItemRangeChanged(position, issuesComments.size());
-
-	}
-
-	private void deleteIssueComment(final Context ctx, final int commentId, int position) {
-
-		final TinyDB tinyDb = new TinyDB(ctx);
-		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").split("/");
-		if (repoFullName.length != 2) {
-			return;
-		}
-		final String repoOwner = repoFullName[0];
-		final String repoName = repoFullName[1];
-
-		Call<JsonElement> call;
-
-		call = RetrofitClient
-				.getInstance(instanceUrl, ctx)
-				.getApiInterface()
-				.deleteComment(instanceToken, repoOwner, repoName, commentId);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				if(response.code() == 204) {
-
-					updateAdapter(position);
-					Toasty.info(ctx, ctx.getResources().getString(R.string.deleteCommentSuccess));
-
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
-							ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
-							ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-							ctx.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(ctx, ctx.getString(R.string.genericError));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
-
-			}
-
-		});
 
 	}
 
@@ -294,13 +218,20 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 						return Collections.singleton("drawable");
 					}
 				});
-				plugin.placeholderProvider(drawable -> null);
+				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() {
 

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

@@ -1,28 +1,29 @@
 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.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
+import com.mikepenz.fastadapter.FastAdapter;
+import com.mikepenz.fastadapter.items.AbstractItem;
+import com.mikepenz.fastadapter.listeners.ClickEventHook;
+import com.mikepenz.fastadapter.utils.EventHookUtil;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.models.Issues;
 import org.mian.gitnex.util.TinyDB;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
@@ -30,74 +31,112 @@ import java.util.Locale;
  * Author M M Arif
  */
 
-public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class IssuesAdapter extends AbstractItem<IssuesAdapter, IssuesAdapter.ViewHolder> {
 
-	private Context context;
+	final private Context ctx;
-	private final int TYPE_LOAD = 0;
+	private String issueTitle;
-	private List<Issues> issuesList;
+	private int issueNumber;
-	private OnLoadMoreListener loadMoreListener;
+	private String issueAssigneeAvatar;
-	private boolean isLoading = false, isMoreDataAvailable = true;
+	private Date issueCreatedTime;
+	private int issueCommentsCount;
+	private String userFullname;
+	private String userLogin;
 
-	public IssuesAdapter(Context context, List<Issues> issuesListMain) {
+	private boolean isSelectable = true;
 
-		this.context = context;
+	public IssuesAdapter(Context ctx) {
-		this.issuesList = issuesListMain;
+		this.ctx = ctx;
+	}
 
+	public IssuesAdapter withNewItems(String issueTitle, int issueNumber, String issueAssigneeAvatar, Date issueCreatedTime, int issueCommentsCount, String userFullname, String userLogin) {
+
+		this.setNewItems(issueTitle, issueNumber, issueAssigneeAvatar, issueCreatedTime, issueCommentsCount, userFullname, userLogin);
+		return this;
+
+	}
+
+	private void setNewItems(String issueTitle, int issueNumber, String issueAssigneeAvatar, Date issueCreatedTime, int issueCommentsCount, String userFullname, String userLogin) {
+
+		this.issueTitle = issueTitle;
+		this.issueNumber = issueNumber;
+		this.issueAssigneeAvatar = issueAssigneeAvatar;
+		this.issueCreatedTime = issueCreatedTime;
+		this.issueCommentsCount = issueCommentsCount;
+		this.userFullname = userFullname;
+		this.userLogin = userLogin;
+
+	}
+
+	private int getIssueNumber() {
+		return issueNumber;
+	}
+
+	public String getIssueTitle() {
+		return issueTitle;
+	}
+
+	private String getIssueAssigneeAvatar() {
+		return issueAssigneeAvatar;
+	}
+
+	private Date getIssueCreatedTime() {
+		return issueCreatedTime;
+	}
+
+	private int getIssueCommentsCount() {
+		return issueCommentsCount;
+	}
+
+	private String getUserFullname() {
+		return userFullname;
+	}
+
+	private String getUserLogin() {
+		return userLogin;
+	}
+
+	@Override
+	public boolean isEnabled() {
+		return true;
+	}
+
+	@Override
+	public IssuesAdapter withEnabled(boolean enabled) {
+		return null;
+	}
+
+	@Override
+	public boolean isSelectable() {
+		return isSelectable;
+	}
+
+	@Override
+	public IssuesAdapter withSelectable(boolean selectable) {
+		this.isSelectable = selectable;
+		return this;
+	}
+
+	@Override
+	public int getType() {
+		return R.id.relativeLayoutFrameIssuesList;
+	}
+
+	@Override
+	public int getLayoutRes() {
+		return R.layout.list_issues;
 	}
 
 	@NonNull
 	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+	public IssuesAdapter.ViewHolder getViewHolder(@NonNull View v) {
-
+		return new IssuesAdapter.ViewHolder(v);
-		LayoutInflater inflater = LayoutInflater.from(context);
-
-		if(viewType == TYPE_LOAD) {
-			return new IssuesHolder(inflater.inflate(R.layout.list_issues, parent, false));
-		}
-		else {
-			return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
-		}
-
 	}
 
-	@Override
+	public class ViewHolder extends FastAdapter.ViewHolder<IssuesAdapter> {
-	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		final TinyDB tinyDb = new TinyDB(ctx);
-
+		final String locale = tinyDb.getString("locale");
-			isLoading = true;
+		final String timeFormat = tinyDb.getString("dateFormat");
-			loadMoreListener.onLoadMore();
-
-		}
-
-		if(getItemViewType(position) == TYPE_LOAD) {
-
-			((IssuesHolder) holder).bindData(issuesList.get(position));
-
-		}
-
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-
-		if(issuesList.get(position).getTitle() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-
-	}
-
-	@Override
-	public int getItemCount() {
-
-		return issuesList.size();
-
-	}
-
-	class IssuesHolder extends RecyclerView.ViewHolder {
 
 		private TextView issueNumber;
 		private ImageView issueAssigneeAvatar;
@@ -105,7 +144,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		private TextView issueCreatedTime;
 		private TextView issueCommentsCount;
 
-		IssuesHolder(View itemView) {
+		public ViewHolder(View itemView) {
 
 			super(itemView);
 
@@ -113,124 +152,94 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 			issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
 			issueTitle = itemView.findViewById(R.id.issueTitle);
 			issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
-			LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
 			issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
 
-			issueTitle.setOnClickListener(v -> {
-
-				Context context = v.getContext();
-
-				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", issueNumber.getText());
-
-				TinyDB tinyDb = new TinyDB(context);
-				tinyDb.putString("issueNumber", issueNumber.getText().toString());
-				tinyDb.putString("issueType", "issue");
-				context.startActivity(intent);
-
-			});
-			frameCommentsCount.setOnClickListener(v -> {
-
-				Context context = v.getContext();
-
-				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", issueNumber.getText());
-
-				TinyDB tinyDb = new TinyDB(context);
-				tinyDb.putString("issueNumber", issueNumber.getText().toString());
-				tinyDb.putString("issueType", "issue");
-				context.startActivity(intent);
-
-			});
-
 		}
 
-		@SuppressLint("SetTextI18n")
+		@Override
-		void bindData(Issues issuesModel) {
+		public void bindView(@NonNull IssuesAdapter item, @NonNull List<Object> payloads) {
 
-			final TinyDB tinyDb = new TinyDB(context);
+			if (!item.getUserFullname().equals("")) {
-			final String locale = tinyDb.getString("locale");
+				issueAssigneeAvatar.setOnClickListener(new ClickListener(ctx.getResources().getString(R.string.issueCreator) + item.getUserFullname(), ctx));
-			final String timeFormat = tinyDb.getString("dateFormat");
-
-			if(!issuesModel.getUser().getFull_name().equals("")) {
-				issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));
 			}
 			else {
-				issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getLogin(), context));
+				issueAssigneeAvatar.setOnClickListener(new ClickListener(ctx.getResources().getString(R.string.issueCreator) + item.getUserLogin(), ctx));
 			}
 
-			PicassoService.getInstance(context).get().load(issuesModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
+			PicassoService.getInstance(ctx).get().load(item.getIssueAssigneeAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
 
-			String issueNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + issuesModel.getNumber() + "</font>";
+			String issueNumber_ = "<font color='" + ctx.getResources().getColor(R.color.lightGray) + "'>" + ctx.getResources().getString(R.string.hash) + item.getIssueNumber() + "</font>";
-			issueTitle.setText(Html.fromHtml(issueNumber_ + " " + issuesModel.getTitle()));
+			issueTitle.setText(Html.fromHtml(issueNumber_ + " " + item.getIssueTitle()));
 
-			issueNumber.setText(String.valueOf(issuesModel.getNumber()));
+			issueNumber.setText(String.valueOf(item.getIssueNumber()));
-			issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));
+			issueCommentsCount.setText(String.valueOf(item.getIssueCommentsCount()));
+
+			switch (timeFormat) {
 
-			switch(timeFormat) {
 				case "pretty": {
 					PrettyTime prettyTime = new PrettyTime(new Locale(locale));
-					String createdTime = prettyTime.format(issuesModel.getCreated_at());
+					String createdTime = prettyTime.format(item.getIssueCreatedTime());
 					issueCreatedTime.setText(createdTime);
-					issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issuesModel.getCreated_at()), context));
+					issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(item.getIssueCreatedTime()), ctx));
 					break;
 				}
 				case "normal": {
-					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + ctx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-					String createdTime = formatter.format(issuesModel.getCreated_at());
+					String createdTime = formatter.format(item.getIssueCreatedTime());
 					issueCreatedTime.setText(createdTime);
 					break;
 				}
 				case "normal1": {
-					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + ctx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-					String createdTime = formatter.format(issuesModel.getCreated_at());
+					String createdTime = formatter.format(item.getIssueCreatedTime());
 					issueCreatedTime.setText(createdTime);
 					break;
 				}
+
 			}
 
 		}
 
-	}
+		@Override
+		public void unbindView(@NonNull IssuesAdapter item) {
 
-	static class LoadHolder extends RecyclerView.ViewHolder {
+			issueTitle.setText(null);
+			issueCommentsCount.setText(null);
+			issueCreatedTime.setText(null);
 
-		LoadHolder(View itemView) {
-
-			super(itemView);
 		}
 
 	}
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
+	public static class IssueTitleClickEvent extends ClickEventHook<IssuesAdapter> {
 
-		isMoreDataAvailable = moreDataAvailable;
+		@Nullable
+		@Override
+		public List<View> onBindMany(@NonNull RecyclerView.ViewHolder viewHolder) {
 
-	}
+			if (viewHolder instanceof IssuesAdapter.ViewHolder) {
+				return EventHookUtil.toList(((ViewHolder) viewHolder).issueTitle);
+			}
 
-	public void notifyDataChanged() {
+			return super.onBindMany(viewHolder);
 
-		notifyDataSetChanged();
+		}
-		isLoading = false;
 
-	}
+		@Override
+		public void onClick(View v, int position, @NonNull FastAdapter<IssuesAdapter> fastAdapter, IssuesAdapter item) {
 
-	public interface OnLoadMoreListener {
+			Context context = v.getContext();
 
-		void onLoadMore();
+			Intent intent = new Intent(context, IssueDetailActivity.class);
+			intent.putExtra("issueNumber", item.getIssueNumber());
 
-	}
+			TinyDB tinyDb = new TinyDB(context);
+			tinyDb.putString("issueNumber", String.valueOf(item.getIssueNumber()));
+			tinyDb.putString("issueType", "issue");
+			context.startActivity(intent);
 
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
+		}
 
-		this.loadMoreListener = loadMoreListener;
-
-	}
-
-	public void updateList(List<Issues> list) {
-
-		issuesList = list;
-		notifyDataSetChanged();
 	}
 
 }

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

@@ -2,36 +2,39 @@ 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.util.Log;
 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 androidx.annotation.NonNull;
+import com.amulyakhare.textdrawable.TextDrawable;
-import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.MilestoneActions;
 import org.mian.gitnex.helpers.ClickListener;
-import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.models.Milestones;
 import org.mian.gitnex.util.TinyDB;
 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.recyclerview.widget.RecyclerView;
 import io.noties.markwon.AbstractMarkwonPlugin;
 import io.noties.markwon.Markwon;
 import io.noties.markwon.core.CorePlugin;
@@ -52,348 +55,308 @@ import io.noties.markwon.linkify.LinkifyPlugin;
  * Author M M Arif
  */
 
-public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.MilestonesViewHolder> implements Filterable {
 
-	private Context context;
+    private List<Milestones> milestonesList;
-	private final int TYPE_LOAD = 0;
+    private Context mCtx;
-	private List<Milestones> dataList;
+    private List<Milestones> milestonesListFull;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false;
-	private boolean isMoreDataAvailable = true;
-	private String TAG = StaticGlobalVariables.tagMilestonesAdapter;
 
-	public MilestonesAdapter(Context context, List<Milestones> dataListMain) {
+    static class MilestonesViewHolder extends RecyclerView.ViewHolder {
 
-		this.context = context;
+        private TextView milestoneId;
-		this.dataList = dataListMain;
+        private TextView msTitle;
+        private TextView msDescription;
+        private TextView msOpenIssues;
+        private TextView msClosedIssues;
+        private TextView msDueDate;
+        private ImageView msStatus;
+        private ProgressBar msProgress;
+	    private TextView milestoneStatus;
 
-	}
+        private MilestonesViewHolder(View itemView) {
+            super(itemView);
 
-	@NonNull
+            milestoneId = itemView.findViewById(R.id.milestoneId);
-	@Override
+            msTitle = itemView.findViewById(R.id.milestoneTitle);
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            msStatus = itemView.findViewById(R.id.milestoneState);
+            msDescription = itemView.findViewById(R.id.milestoneDescription);
+            msOpenIssues = itemView.findViewById(R.id.milestoneIssuesOpen);
+            msClosedIssues = itemView.findViewById(R.id.milestoneIssuesClosed);
+            msDueDate = itemView.findViewById(R.id.milestoneDueDate);
+            msProgress = itemView.findViewById(R.id.milestoneProgress);
+	        ImageView milestonesMenu = itemView.findViewById(R.id.milestonesMenu);
+	        milestoneStatus = itemView.findViewById(R.id.milestoneStatus);
 
-		LayoutInflater inflater = LayoutInflater.from(context);
+            milestonesMenu.setOnClickListener(v -> {
 
-		if(viewType == TYPE_LOAD) {
+                Context ctx = v.getContext();
-			return new MilestonesAdapter.DataHolder(inflater.inflate(R.layout.list_milestones, parent, false));
+                int milestoneId_ = Integer.parseInt(milestoneId.getText().toString());
-		}
-		else {
-			return new MilestonesAdapter.LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
-		}
 
-	}
+                @SuppressLint("InflateParams") View view = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_milestones_in_list, null);
 
-	@Override
+	            TextView closeMilestone = view.findViewById(R.id.closeMilestone);
-	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+	            TextView openMilestone = view.findViewById(R.id.openMilestone);
-
+
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+	            BottomSheetDialog dialog = new BottomSheetDialog(ctx);
-
+	            dialog.setContentView(view);
-			isLoading = true;
+	            dialog.show();
-			loadMoreListener.onLoadMore();
+
-
+	            if(milestoneStatus.getText().toString().equals("open")) {
-		}
+
-
+	            	closeMilestone.setVisibility(View.VISIBLE);
-		if(getItemViewType(position) == TYPE_LOAD) {
+		            openMilestone.setVisibility(View.GONE);
-
+
-			((MilestonesAdapter.DataHolder) holder).bindData(dataList.get(position));
+	            }
-
+	            else {
-		}
+
-
+		            closeMilestone.setVisibility(View.GONE);
-	}
+		            openMilestone.setVisibility(View.VISIBLE);
-
+
-	class DataHolder extends RecyclerView.ViewHolder {
+	            }
-
+
-		private TextView milestoneId;
+	            closeMilestone.setOnClickListener(v12 -> {
-		private TextView msTitle;
+
-		private TextView msDescription;
+		            MilestoneActions.closeMilestone(ctx, milestoneId_);
-		private TextView msOpenIssues;
+		            dialog.dismiss();
-		private TextView msClosedIssues;
+
-		private TextView msDueDate;
+	            });
-		private ProgressBar msProgress;
+
-		private TextView milestoneStatus;
+	            openMilestone.setOnClickListener(v12 -> {
-
+
-		DataHolder(View itemView) {
+		            MilestoneActions.openMilestone(ctx, milestoneId_);
-
+		            dialog.dismiss();
-			super(itemView);
+
-
+	            });
-			milestoneId = itemView.findViewById(R.id.milestoneId);
+
-			msTitle = itemView.findViewById(R.id.milestoneTitle);
+            });
-			msDescription = itemView.findViewById(R.id.milestoneDescription);
+
-			msOpenIssues = itemView.findViewById(R.id.milestoneIssuesOpen);
+        }
-			msClosedIssues = itemView.findViewById(R.id.milestoneIssuesClosed);
+    }
-			msDueDate = itemView.findViewById(R.id.milestoneDueDate);
+
-			msProgress = itemView.findViewById(R.id.milestoneProgress);
+    public MilestonesAdapter(Context mCtx, List<Milestones> milestonesMain) {
-			ImageView milestonesMenu = itemView.findViewById(R.id.milestonesMenu);
+        this.mCtx = mCtx;
-			milestoneStatus = itemView.findViewById(R.id.milestoneStatus);
+        this.milestonesList = milestonesMain;
-
+        milestonesListFull = new ArrayList<>(milestonesList);
-			milestonesMenu.setOnClickListener(v -> {
+    }
-
+
-				Context ctx = v.getContext();
+    @NonNull
-				int milestoneId_ = Integer.parseInt(milestoneId.getText().toString());
+    @Override
-
+    public MilestonesAdapter.MilestonesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-				@SuppressLint("InflateParams") View view = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_milestones_in_list, null);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_milestones, parent, false);
-
+        return new MilestonesAdapter.MilestonesViewHolder(v);
-				TextView closeMilestone = view.findViewById(R.id.closeMilestone);
+    }
-				TextView openMilestone = view.findViewById(R.id.openMilestone);
+
-
+    @Override
-				BottomSheetDialog dialog = new BottomSheetDialog(ctx);
+    public void onBindViewHolder(@NonNull MilestonesAdapter.MilestonesViewHolder holder, int position) {
-				dialog.setContentView(view);
+
-				dialog.show();
+        final TinyDB tinyDb = new TinyDB(mCtx);
-
+        final String locale = tinyDb.getString("locale");
-				if(milestoneStatus.getText().toString().equals("open")) {
+        final String timeFormat = tinyDb.getString("dateFormat");
-
+
-					closeMilestone.setVisibility(View.VISIBLE);
+        Milestones currentItem = milestonesList.get(position);
-					openMilestone.setVisibility(View.GONE);
+
-
+        holder.milestoneId.setText(String.valueOf(currentItem.getId()));
-				}
+        holder.milestoneStatus.setText(currentItem.getState());
-				else {
+
-
+        final Markwon markwon = Markwon.builder(Objects.requireNonNull(mCtx))
-					closeMilestone.setVisibility(View.GONE);
+                .usePlugin(CorePlugin.create())
-					openMilestone.setVisibility(View.VISIBLE);
+                .usePlugin(ImagesPlugin.create(plugin -> {
-
+                    plugin.addSchemeHandler(new SchemeHandler() {
-				}
+                        @NonNull
-
+                        @Override
-				closeMilestone.setOnClickListener(v12 -> {
+                        public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
-
+
-					MilestoneActions.closeMilestone(ctx, milestoneId_);
+                            final int resourceId = mCtx.getResources().getIdentifier(
-					dialog.dismiss();
+                                    raw.substring("drawable://".length()),
-					updateAdapter(getAdapterPosition());
+                                    "drawable",
-
+                                    mCtx.getPackageName());
-				});
+
-
+                            final Drawable drawable = mCtx.getDrawable(resourceId);
-				openMilestone.setOnClickListener(v12 -> {
+
-
+                            assert drawable != null;
-					MilestoneActions.openMilestone(ctx, milestoneId_);
+                            return ImageItem.withResult(drawable);
-					dialog.dismiss();
+                        }
-					updateAdapter(getAdapterPosition());
+
-
+                        @NonNull
-				});
+                        @Override
-
+                        public Collection<String> supportedSchemes() {
-			});
+                            return Collections.singleton("drawable");
-
+                        }
-		}
+                    });
-
+                    plugin.placeholderProvider(drawable -> null);
-		@SuppressLint("SetTextI18n")
+                    plugin.addMediaDecoder(GifMediaDecoder.create(false));
-		void bindData(Milestones dataModel) {
+                    plugin.addMediaDecoder(SvgMediaDecoder.create(mCtx.getResources()));
-
+                    plugin.addMediaDecoder(SvgMediaDecoder.create());
-			final TinyDB tinyDb = new TinyDB(context);
+                    plugin.defaultMediaDecoder(DefaultMediaDecoder.create(mCtx.getResources()));
-			final String locale = tinyDb.getString("locale");
+                    plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
-			final String timeFormat = tinyDb.getString("dateFormat");
+                }))
-
+                .usePlugin(new AbstractMarkwonPlugin() {
-			milestoneId.setText(String.valueOf(dataModel.getId()));
+                    @Override
-			milestoneStatus.setText(dataModel.getState());
+                    public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
-
+                        builder
-			Markwon markwon = Markwon.builder(Objects.requireNonNull(context)).usePlugin(CorePlugin.create()).usePlugin(ImagesPlugin.create(plugin -> {
+                                .codeTextColor(tinyDb.getInt("codeBlockColor"))
-				plugin.addSchemeHandler(new SchemeHandler() {
+                                .codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
-
+                                .linkColor(mCtx.getResources().getColor(R.color.lightBlue));
-					@NonNull
+                    }
-					@Override
+                })
-					public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+                .usePlugin(TablePlugin.create(mCtx))
-
+                .usePlugin(TaskListPlugin.create(mCtx))
-							final int resourceId = context.getResources().getIdentifier(
+                .usePlugin(HtmlPlugin.create())
-									raw.substring("drawable://".length()),
+                .usePlugin(StrikethroughPlugin.create())
-									"drawable",
+                .usePlugin(LinkifyPlugin.create())
-									context.getPackageName());
+                .build();
-
+
-							final Drawable drawable = context.getDrawable(resourceId);
+        Spanned msTitle = markwon.toMarkdown(currentItem.getTitle());
-
+        markwon.setParsedMarkdown(holder.msTitle, msTitle);
-							assert drawable != null;
+
-							return ImageItem.withResult(drawable);
+        if(currentItem.getState().equals("open")) {
-						}
+
-
+            @SuppressLint("ResourceType") int color = Color.parseColor(mCtx.getResources().getString(R.color.releaseStable));
-						@NonNull
+            TextDrawable drawable = TextDrawable.builder()
-						@Override
+                    .beginConfig()
-						public Collection<String> supportedSchemes() {
+                    //.useFont(Typeface.DEFAULT)
-							return Collections.singleton("drawable");
+                    .textColor(mCtx.getResources().getColor(R.color.white))
-						}
+                    .fontSize(30)
-					});
+                    .toUpperCase()
-
+                    .width(120)
-					plugin.placeholderProvider(drawable -> null);
+                    .height(60)
-					plugin.addMediaDecoder(GifMediaDecoder.create(false));
+                    .endConfig()
-					plugin.addMediaDecoder(SvgMediaDecoder.create(context.getResources()));
+                    .buildRoundRect("open", color, 8);
-					plugin.addMediaDecoder(SvgMediaDecoder.create());
+
-					plugin.defaultMediaDecoder(DefaultMediaDecoder.create(context.getResources()));
+            holder.msStatus.setImageDrawable(drawable);
-					plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
+
-
+        }
-				}))
+        else if(currentItem.getState().equals("closed")) {
-
+
-			.usePlugin(new AbstractMarkwonPlugin() {
+            @SuppressLint("ResourceType") int color = Color.parseColor(mCtx.getResources().getString(R.color.colorRed));
-				@Override
+            TextDrawable drawable = TextDrawable.builder()
-				public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
+                    .beginConfig()
-					builder
+                    //.useFont(Typeface.DEFAULT)
-							.codeTextColor(tinyDb.getInt("codeBlockColor"))
+                    .textColor(mCtx.getResources().getColor(R.color.white))
-							.codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
+                    .fontSize(30)
-							.linkColor(context.getResources().getColor(R.color.lightBlue));
+                    .toUpperCase()
-				}
+                    .width(140)
-			})
+                    .height(60)
-			.usePlugin(TablePlugin.create(context))
+                    .endConfig()
-			.usePlugin(TaskListPlugin.create(context))
+                    .buildRoundRect("closed", color, 8);
-			.usePlugin(HtmlPlugin.create())
+
-			.usePlugin(StrikethroughPlugin.create())
+            holder.msStatus.setImageDrawable(drawable);
-			.usePlugin(LinkifyPlugin.create())
+
-			.build();
+        }
-
+
-			Spanned msTitle_ = markwon.toMarkdown(dataModel.getTitle());
+        if (!currentItem.getDescription().equals("")) {
-			markwon.setParsedMarkdown(msTitle, msTitle_);
+            final CharSequence bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(currentItem.getDescription()));
-
+            holder.msDescription.setText(bodyWithMD);
-			if(!dataModel.getDescription().equals("")) {
+        }
-
+        else {
-				CharSequence bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(dataModel.getDescription()));
+            holder.msDescription.setText("");
-				msDescription.setText(bodyWithMD);
+        }
-
+
-			}
+        holder.msOpenIssues.setText(String.valueOf(currentItem.getOpen_issues()));
-			else {
+        holder.msOpenIssues.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.milestoneOpenIssues, currentItem.getOpen_issues()), mCtx));
-
+
-				msDescription.setText(context.getString(R.string.milestoneNoDescription));
+        holder.msClosedIssues.setText(String.valueOf(currentItem.getClosed_issues()));
-			}
+        holder.msClosedIssues.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.milestoneClosedIssues, currentItem.getClosed_issues()), mCtx));
-
+
-			msOpenIssues.setText(context.getString(R.string.milestoneIssueStatusOpen, dataModel.getOpen_issues()));
+        if ((currentItem.getOpen_issues() + currentItem.getClosed_issues()) > 0) {
-			msClosedIssues.setText(context.getString(R.string.milestoneIssueStatusClosed, dataModel.getClosed_issues()));
+
-
+            if (currentItem.getOpen_issues() == 0) {
-			if((dataModel.getOpen_issues() + dataModel.getClosed_issues()) > 0) {
+                holder.msProgress.setProgress(100);
-
+                holder.msProgress.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.milestoneCompletion, 100), mCtx));
-				if(dataModel.getOpen_issues() == 0) {
+            }
-
+            else {
-					msProgress.setProgress(100);
+                int msCompletion = 100 * currentItem.getClosed_issues() / (currentItem.getOpen_issues() + currentItem.getClosed_issues());
-					msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, 100), context));
+                holder.msProgress.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.milestoneCompletion, msCompletion), mCtx));
-
+                holder.msProgress.setProgress(msCompletion);
-				}
+            }
-				else {
+
-
+        }
-					int msCompletion = 100 * dataModel.getClosed_issues() / (dataModel.getOpen_issues() + dataModel.getClosed_issues());
+        else {
-					msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, msCompletion), context));
+            holder.msProgress.setProgress(0);
-					msProgress.setProgress(msCompletion);
+            holder.msProgress.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.milestoneCompletion, 0), mCtx));
-
+        }
-				}
+
-
+        if(currentItem.getDue_on() != null) {
-			}
+
-			else {
+            if (timeFormat.equals("normal") || timeFormat.equals("pretty")) {
-
+                DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", new Locale(locale));
-				msProgress.setProgress(0);
+                Date date = null;
-				msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, 0), context));
+                try {
-
+                    date = formatter.parse(currentItem.getDue_on());
-			}
+                } catch (ParseException e) {
-
+                    e.printStackTrace();
-			if(dataModel.getDue_on() != null) {
+                }
-
+                assert date != null;
-				if(timeFormat.equals("normal") || timeFormat.equals("pretty")) {
+                String dueDate = formatter.format(date);
-
+
-					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", new Locale(locale));
+                if(date.before(new Date())) {
-					Date date = null;
+                    holder.msDueDate.setTextColor(mCtx.getResources().getColor(R.color.darkRed));
-
+                }
-					try {
+
-						date = formatter.parse(dataModel.getDue_on());
+                holder.msDueDate.setText(mCtx.getResources().getString(R.string.dueDate, dueDate));
-					}
+                holder.msDueDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToast(currentItem.getDue_on()), mCtx));
-					catch(ParseException e) {
+
-						Log.e(TAG, e.toString());
+            } else if (timeFormat.equals("normal1")) {
-					}
+                SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", new Locale(locale));
-
+                Date date1 = null;
-					assert date != null;
+                try {
-					String dueDate = formatter.format(date);
+                    date1 = formatter.parse(currentItem.getDue_on());
-
+                } catch (ParseException e) {
-					if(date.before(new Date())) {
+                    e.printStackTrace();
-						msDueDate.setTextColor(context.getResources().getColor(R.color.darkRed));
+                }
-					}
+                assert date1 != null;
-
+                String dueDate = formatter.format(date1);
-					msDueDate.setText(dueDate);
+                holder.msDueDate.setText(mCtx.getResources().getString(R.string.dueDate, dueDate));
-					msDueDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToast(dataModel.getDue_on()), context));
+            }
-
+
-				}
+        }
-				else if(timeFormat.equals("normal1")) {
+        else {
-
+            holder.msDueDate.setText("");
-					SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", new Locale(locale));
+        }
-
+
-					Date date1 = null;
+    }
-
+
-					try {
+    @Override
-						date1 = formatter.parse(dataModel.getDue_on());
+    public int getItemCount() {
-					}
+        return milestonesList.size();
-					catch(ParseException e) {
+    }
-						Log.e(TAG, e.toString());
+
-					}
+    @Override
-
+    public Filter getFilter() {
-					assert date1 != null;
+        return milestoneFilter;
-					String dueDate = formatter.format(date1);
+    }
-					msDueDate.setText(dueDate);
+
-
+    private Filter milestoneFilter = new Filter() {
-				}
+
-
+        @Override
-			}
+        protected FilterResults performFiltering(CharSequence constraint) {
-			else {
+            List<Milestones> filteredList = new ArrayList<>();
-
+
-				msDueDate.setText(context.getString(R.string.milestoneNoDueDate));
+            if (constraint == null || constraint.length() == 0) {
-			}
+                filteredList.addAll(milestonesListFull);
-
+            } else {
-		}
+                String filterPattern = constraint.toString().toLowerCase().trim();
-
+
-	}
+                for (Milestones item : milestonesListFull) {
-
+                    if (item.getTitle().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
-	private void updateAdapter(int position) {
+                        filteredList.add(item);
-
+                    }
-		dataList.remove(position);
+                }
-		notifyItemRemoved(position);
+            }
-		notifyItemRangeChanged(position, dataList.size());
+
-
+            FilterResults results = new FilterResults();
-	}
+            results.values = filteredList;
-
+
-	@Override
+            return results;
-	public int getItemViewType(int position) {
+        }
-
+
-		if(dataList.get(position).getTitle() != null) {
+        @Override
-			return TYPE_LOAD;
+        protected void publishResults(CharSequence constraint, FilterResults results) {
-		}
+            milestonesList.clear();
-		else {
+            milestonesList.addAll((List) results.values);
-			return 1;
+            notifyDataSetChanged();
-		}
+        }
-
+
-	}
+    };
-
-	@Override
-	public int getItemCount() {
-
-		return dataList.size();
-
-	}
-
-	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(OnLoadMoreListener loadMoreListener) {
-
-		this.loadMoreListener = loadMoreListener;
-
-	}
-
-	public void updateList(List<Milestones> list) {
-
-		dataList = list;
-		notifyDataSetChanged();
-	}
 
 }

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

@@ -7,11 +7,9 @@ import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CheckBox;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
@@ -26,7 +24,7 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
-import org.mian.gitnex.models.WatchInfo;
+import org.mian.gitnex.models.WatchRepository;
 import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
@@ -47,64 +45,59 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 
     static class MyReposViewHolder extends RecyclerView.ViewHolder {
 
-        private ImageView imageAvatar;
+        private ImageView imageMy;
-        private TextView repoName;
+        private TextView mTextView1My;
-        private TextView repoDescription;
+        private TextView mTextView2My;
-        private TextView repoFullName;
+        private TextView fullNameMy;
-        private ImageView repoPrivatePublic;
+        private ImageView repoPrivatePublicMy;
-        private TextView repoStars;
+        private TextView repoStarsMy;
-        private TextView repoForks;
+        private TextView repoForksMy;
-        private TextView repoOpenIssuesCount;
+        private TextView repoOpenIssuesCountMy;
         private TextView repoType;
-	    private CheckBox isRepoAdmin;
-	    private LinearLayout archiveRepo;
 
         private MyReposViewHolder(View itemView) {
             super(itemView);
-	        repoName = itemView.findViewById(R.id.repoName);
+            mTextView1My = itemView.findViewById(R.id.repoNameMy);
-	        repoDescription = itemView.findViewById(R.id.repoDescription);
+            mTextView2My = itemView.findViewById(R.id.repoDescriptionMy);
-	        imageAvatar = itemView.findViewById(R.id.imageAvatar);
+            imageMy = itemView.findViewById(R.id.imageAvatarMy);
-	        repoFullName = itemView.findViewById(R.id.repoFullName);
+            fullNameMy = itemView.findViewById(R.id.repoFullNameMy);
-            repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
+            repoPrivatePublicMy = itemView.findViewById(R.id.imageRepoTypeMy);
-            repoStars = itemView.findViewById(R.id.repoStars);
+            repoStarsMy = itemView.findViewById(R.id.repoStarsMy);
-            repoForks = itemView.findViewById(R.id.repoForks);
+            repoForksMy = itemView.findViewById(R.id.repoForksMy);
-            repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+            repoOpenIssuesCountMy = itemView.findViewById(R.id.repoOpenIssuesCountMy);
             ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
             repoType = itemView.findViewById(R.id.repoType);
-	        isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
-	        archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
 
             itemView.setOnClickListener(v -> {
 
                 Context context = v.getContext();
 
                 Intent intent = new Intent(context, RepoDetailActivity.class);
-                intent.putExtra("repoFullName", repoFullName.getText().toString());
+                intent.putExtra("repoFullName", fullNameMy.getText().toString());
 
                 TinyDB tinyDb = new TinyDB(context);
-                tinyDb.putString("repoFullName", repoFullName.getText().toString());
+                tinyDb.putString("repoFullName", fullNameMy.getText().toString());
                 tinyDb.putString("repoType", repoType.getText().toString());
                 //tinyDb.putBoolean("resumeIssues", true);
-	            tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
 
                 //store if user is watching this repo
                 {
                     final String instanceUrl = tinyDb.getString("instanceUrl");
-                    String[] parts = repoFullName.getText().toString().split("/");
+                    String[] parts = fullNameMy.getText().toString().split("/");
                     final String repoOwner = parts[0];
                     final String repoName = parts[1];
                     final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-                    WatchInfo watch = new WatchInfo();
+                    WatchRepository watch = new WatchRepository();
 
-                    Call<WatchInfo> call;
+                    Call<WatchRepository> call;
 
                     call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-                    call.enqueue(new Callback<WatchInfo>() {
+                    call.enqueue(new Callback<WatchRepository>() {
 
                         @Override
-                        public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
+                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
 
                             if(response.isSuccessful()) {
 
@@ -126,7 +119,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
                         }
 
                         @Override
-                        public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
+                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
 
                             tinyDb.putBoolean("repoWatch", false);
                             Toasty.info(context, context.getString(R.string.genericApiStatusError));
@@ -151,7 +144,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
                 TextView repoWatchers = view.findViewById(R.id.repoWatchers);
                 TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-                bottomSheetHeader.setText(repoFullName.getText());
+                bottomSheetHeader.setText(fullNameMy.getText());
                 BottomSheetDialog dialog = new BottomSheetDialog(context);
                 dialog.setContentView(view);
                 dialog.show();
@@ -159,7 +152,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
                 repoOpenInBrowser.setOnClickListener(openInBrowser -> {
 
                     Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
-                    intentOpenInBrowser.putExtra("repoFullNameBrowser", repoFullName.getText());
+                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullNameMy.getText());
                     context.startActivity(intentOpenInBrowser);
                     dialog.dismiss();
 
@@ -168,7 +161,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
                 repoStargazers.setOnClickListener(stargazers -> {
 
                     Intent intent = new Intent(context, RepoStargazersActivity.class);
-                    intent.putExtra("repoFullNameForStars", repoFullName.getText());
+                    intent.putExtra("repoFullNameForStars", fullNameMy.getText());
                     context.startActivity(intent);
                     dialog.dismiss();
 
@@ -177,7 +170,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
                 repoWatchers.setOnClickListener(watchers -> {
 
                     Intent intentW = new Intent(context, RepoWatchersActivity.class);
-                    intentW.putExtra("repoFullNameForWatchers", repoFullName.getText());
+                    intentW.putExtra("repoFullNameForWatchers", fullNameMy.getText());
                     context.startActivity(intentW);
                     dialog.dismiss();
 
@@ -197,7 +190,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
     @NonNull
     @Override
     public MyReposListAdapter.MyReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_my_repos, parent, false);
         return new MyReposListAdapter.MyReposViewHolder(v);
     }
 
@@ -205,7 +198,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
     public void onBindViewHolder(@NonNull MyReposListAdapter.MyReposViewHolder holder, int position) {
 
         UserRepositories currentItem = reposList.get(position);
-        holder.repoDescription.setVisibility(View.GONE);
+        holder.mTextView2My.setVisibility(View.GONE);
 
         ColorGenerator generator = ColorGenerator.MATERIAL;
         int color = generator.getColor(currentItem.getName());
@@ -223,44 +216,32 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 
         if (currentItem.getAvatar_url() != null) {
             if (!currentItem.getAvatar_url().equals("")) {
-                PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.imageAvatar);
+                PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.imageMy);
             } else {
-                holder.imageAvatar.setImageDrawable(drawable);
+                holder.imageMy.setImageDrawable(drawable);
             }
         }
         else {
-            holder.imageAvatar.setImageDrawable(drawable);
+            holder.imageMy.setImageDrawable(drawable);
         }
 
-        holder.repoName.setText(currentItem.getName());
+        holder.mTextView1My.setText(currentItem.getName());
         if (!currentItem.getDescription().equals("")) {
-            holder.repoDescription.setVisibility(View.VISIBLE);
+            holder.mTextView2My.setVisibility(View.VISIBLE);
-            holder.repoDescription.setText(currentItem.getDescription());
+            holder.mTextView2My.setText(currentItem.getDescription());
         }
-        holder.repoFullName.setText(currentItem.getFullname());
+        holder.fullNameMy.setText(currentItem.getFullname());
         if(currentItem.getPrivateFlag()) {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+            holder.repoPrivatePublicMy.setImageResource(R.drawable.ic_lock_bold);
             holder.repoType.setText(R.string.strPrivate);
         }
         else {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+            holder.repoPrivatePublicMy.setImageResource(R.drawable.ic_public);
             holder.repoType.setText(R.string.strPublic);
         }
-        holder.repoStars.setText(currentItem.getStars_count());
+        holder.repoStarsMy.setText(currentItem.getStars_count());
-        holder.repoForks.setText(currentItem.getForks_count());
+        holder.repoForksMy.setText(currentItem.getForks_count());
-        holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
+        holder.repoOpenIssuesCountMy.setText(currentItem.getOpen_issues_count());
-
-	    if(holder.isRepoAdmin == null) {
-		    holder.isRepoAdmin = new CheckBox(mCtx);
-	    }
-	    holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
-
-	    if(currentItem.isArchived()) {
-		    holder.archiveRepo.setVisibility(View.VISIBLE);
-	    }
-	    else {
-		    holder.archiveRepo.setVisibility(View.GONE);
-	    }
 
     }
 

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

@@ -7,6 +7,8 @@ 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;
@@ -20,6 +22,10 @@ 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;
 
@@ -27,222 +33,231 @@ import java.util.Locale;
  * Author M M Arif
  */
 
-public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable {
 
-	private Context context;
+    private Context context;
-	private final int TYPE_LOAD = 0;
+    private final int TYPE_LOAD = 0;
-	private List<PullRequests> prList;
+    private List<PullRequests> prList;
-	private PullRequestsAdapter.OnLoadMoreListener loadMoreListener;
+    private List<PullRequests> prListFull;
-	private boolean isLoading = false, isMoreDataAvailable = true;
+    private PullRequestsAdapter.OnLoadMoreListener loadMoreListener;
+    private boolean isLoading = false, isMoreDataAvailable = true;
 
-	public PullRequestsAdapter(Context context, List<PullRequests> prListMain) {
+    public PullRequestsAdapter(Context context, List<PullRequests> prListMain) {
 
-		this.context = context;
+        this.context = context;
-		this.prList = prListMain;
+        this.prList = prListMain;
+        prListFull = new ArrayList<>(prList);
 
-	}
+    }
 
-	@NonNull
+    @NonNull
-	@Override
+    @Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
-		LayoutInflater inflater = LayoutInflater.from(context);
+        LayoutInflater inflater = LayoutInflater.from(context);
 
-		if(viewType == TYPE_LOAD) {
+        if(viewType == TYPE_LOAD){
-			return new PullRequestsAdapter.PullRequestsHolder(inflater.inflate(R.layout.list_pr, parent, false));
+            return new PullRequestsAdapter.PullRequestsHolder(inflater.inflate(R.layout.list_pr, parent,false));
-		}
+        }
-		else {
+        else {
-			return new PullRequestsAdapter.LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
+            return new PullRequestsAdapter.LoadHolder(inflater.inflate(R.layout.row_load,parent,false));
-		}
+        }
 
-	}
+    }
 
-	@Override
+    @Override
-	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+        if(position >= getItemCount()-1 && isMoreDataAvailable && !isLoading && loadMoreListener!=null) {
 
-			isLoading = true;
+            isLoading = true;
-			loadMoreListener.onLoadMore();
+            loadMoreListener.onLoadMore();
 
-		}
+        }
 
-		if(getItemViewType(position) == TYPE_LOAD) {
+        if(getItemViewType(position) == TYPE_LOAD) {
 
-			((PullRequestsAdapter.PullRequestsHolder) holder).bindData(prList.get(position));
+            ((PullRequestsAdapter.PullRequestsHolder)holder).bindData(prList.get(position));
 
-		}
+        }
 
-	}
+    }
 
-	@Override
+    @Override
-	public int getItemViewType(int position) {
+    public int getItemViewType(int position) {
 
-		if(prList.get(position).getTitle() != null) {
+        if(prList.get(position).getTitle() != null) {
-			return TYPE_LOAD;
+            return TYPE_LOAD;
-		}
+        }
-		else {
+        else {
-			return 1;
+            return 1;
-		}
+        }
 
-	}
+    }
 
-	@Override
+    @Override
-	public int getItemCount() {
+    public int getItemCount() {
 
-		return prList.size();
+        return prList.size();
 
-	}
+    }
 
-	class PullRequestsHolder extends RecyclerView.ViewHolder {
+    class PullRequestsHolder extends RecyclerView.ViewHolder {
 
-		private TextView prNumber;
+        private TextView prNumber;
-		private TextView prMergeable;
+        private ImageView assigneeAvatar;
-		private TextView prHeadBranch;
+        private TextView prTitle;
-		private TextView prIsFork;
+        private TextView prCreatedTime;
-		private TextView prForkFullName;
+        private TextView prCommentsCount;
-		private ImageView assigneeAvatar;
-		private TextView prTitle;
-		private TextView prCreatedTime;
-		private TextView prCommentsCount;
 
-		PullRequestsHolder(View itemView) {
+        PullRequestsHolder(View itemView) {
 
-			super(itemView);
+            super(itemView);
 
-			prNumber = itemView.findViewById(R.id.prNumber);
+            prNumber = itemView.findViewById(R.id.prNumber);
-			prMergeable = itemView.findViewById(R.id.prMergeable);
+            assigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
-			prHeadBranch = itemView.findViewById(R.id.prHeadBranch);
+            prTitle = itemView.findViewById(R.id.prTitle);
-			prIsFork = itemView.findViewById(R.id.prIsFork);
+            prCommentsCount = itemView.findViewById(R.id.prCommentsCount);
-			prForkFullName = itemView.findViewById(R.id.prForkFullName);
+            LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
-			assigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
+            prCreatedTime = itemView.findViewById(R.id.prCreatedTime);
-			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(v -> {
+            prTitle.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
 
-				Context context = v.getContext();
+                    Context context = v.getContext();
 
-				Intent intent = new Intent(context, IssueDetailActivity.class);
+                    Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", prNumber.getText());
+                    intent.putExtra("issueNumber", prNumber.getText());
-				intent.putExtra("prMergeable", prMergeable.getText());
-				intent.putExtra("prHeadBranch", prHeadBranch.getText());
 
-				TinyDB tinyDb = new TinyDB(context);
+                    TinyDB tinyDb = new TinyDB(context);
-				tinyDb.putString("issueNumber", prNumber.getText().toString());
+                    tinyDb.putString("issueNumber", prNumber.getText().toString());
-				tinyDb.putString("prMergeable", prMergeable.getText().toString());
+                    tinyDb.putString("issueType", "pr");
-				tinyDb.putString("prHeadBranch", prHeadBranch.getText().toString());
+                    context.startActivity(intent);
-				tinyDb.putString("prIsFork", prIsFork.getText().toString());
-				tinyDb.putString("prForkFullName", prForkFullName.getText().toString());
-				tinyDb.putString("issueType", "pr");
-				context.startActivity(intent);
 
-			});
+                }
-			frameCommentsCount.setOnClickListener(v -> {
+            });
+            frameCommentsCount.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
 
-				Context context = v.getContext();
+                    Context context = v.getContext();
 
-				Intent intent = new Intent(context, IssueDetailActivity.class);
+                    Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", prNumber.getText());
+                    intent.putExtra("issueNumber", prNumber.getText());
-				intent.putExtra("prMergeable", prMergeable.getText());
-				intent.putExtra("prHeadBranch", prHeadBranch.getText());
 
-				TinyDB tinyDb = new TinyDB(context);
+                    TinyDB tinyDb = new TinyDB(context);
-				tinyDb.putString("issueNumber", prNumber.getText().toString());
+                    tinyDb.putString("issueNumber", prNumber.getText().toString());
-				tinyDb.putString("prMergeable", prMergeable.getText().toString());
+                    tinyDb.putString("issueType", "pr");
-				tinyDb.putString("prHeadBranch", prHeadBranch.getText().toString());
+                    context.startActivity(intent);
-				tinyDb.putString("prIsFork", prIsFork.getText().toString());
-				tinyDb.putString("prForkFullName", prForkFullName.getText().toString());
-				tinyDb.putString("issueType", "pr");
-				context.startActivity(intent);
 
-			});
+                }
+            });
 
-		}
+        }
 
-		@SuppressLint("SetTextI18n")
+        @SuppressLint("SetTextI18n")
-		void bindData(PullRequests prModel) {
+        void bindData(PullRequests prModel){
 
-			final TinyDB tinyDb = new TinyDB(context);
+            final TinyDB tinyDb = new TinyDB(context);
-			final String locale = tinyDb.getString("locale");
+            final String locale = tinyDb.getString("locale");
-			final String timeFormat = tinyDb.getString("dateFormat");
+            final String timeFormat = tinyDb.getString("dateFormat");
 
-			if(!prModel.getUser().getFull_name().equals("")) {
+            if (!prModel.getUser().getFull_name().equals("")) {
-				assigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.prCreator) + prModel.getUser().getFull_name(), context));
+                assigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.prCreator) + prModel.getUser().getFull_name(), context));
-			}
+            } else {
-			else {
+                assigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.prCreator) + prModel.getUser().getLogin(), context));
-				assigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.prCreator) + prModel.getUser().getLogin(), context));
+            }
-			}
 
-			if(prModel.getUser().getAvatar_url() != null) {
+            if (prModel.getUser().getAvatar_url() != null) {
-				PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
+                PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
-			}
+            } else {
-			else {
+                PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
-				PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).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>";
+            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()));
+            prTitle.setText(Html.fromHtml(prNumber_ + " " + prModel.getTitle()));
 
-			prNumber.setText(String.valueOf(prModel.getNumber()));
+            prNumber.setText(String.valueOf(prModel.getNumber()));
-			prMergeable.setText(String.valueOf(prModel.isMergeable()));
+            prCommentsCount.setText(String.valueOf(prModel.getComments()));
-			if(prModel.getHead() != null) {
-				prHeadBranch.setText(prModel.getHead().getRef());
-				prIsFork.setText(String.valueOf(prModel.getHead().getRepo().isFork()));
-				prForkFullName.setText(prModel.getHead().getRepo().getFull_name());
-			}
-			prCommentsCount.setText(String.valueOf(prModel.getComments()));
 
-			prCreatedTime.setText(TimeHelper.formatTime(prModel.getCreated_at(), new Locale(locale), timeFormat, context));
+            prCreatedTime.setText(TimeHelper.formatTime(prModel.getCreated_at(), new Locale(locale), timeFormat, context));
 
-			if(timeFormat.equals("pretty")) {
+            if(timeFormat.equals("pretty")) {
-				prCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(prModel.getCreated_at()), context));
+                prCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(prModel.getCreated_at()), context));
-			}
+            }
 
-		}
+        }
 
-	}
+    }
 
-	static class LoadHolder extends RecyclerView.ViewHolder {
+    static class LoadHolder extends RecyclerView.ViewHolder {
 
-		LoadHolder(View itemView) {
+        LoadHolder(View itemView) {
+            super(itemView);
+        }
 
-			super(itemView);
+    }
-		}
 
-	}
+    public void setMoreDataAvailable(boolean moreDataAvailable) {
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
+        isMoreDataAvailable = moreDataAvailable;
 
-		isMoreDataAvailable = moreDataAvailable;
+    }
 
-	}
+    public void notifyDataChanged() {
 
-	public void notifyDataChanged() {
+        notifyDataSetChanged();
+        isLoading = false;
 
-		notifyDataSetChanged();
+    }
-		isLoading = false;
 
-	}
+    public interface OnLoadMoreListener {
 
-	public interface OnLoadMoreListener {
+        void onLoadMore();
 
-		void onLoadMore();
+    }
 
-	}
+    public void setLoadMoreListener(PullRequestsAdapter.OnLoadMoreListener loadMoreListener) {
 
-	public void setLoadMoreListener(PullRequestsAdapter.OnLoadMoreListener loadMoreListener) {
+        this.loadMoreListener = loadMoreListener;
 
-		this.loadMoreListener = loadMoreListener;
+    }
 
-	}
+    @Override
+    public Filter getFilter() {
+        return prFilter;
+    }
 
-	public void updateList(List<PullRequests> list) {
+    private Filter prFilter = new Filter() {
+        @Override
+        protected FilterResults performFiltering(CharSequence constraint) {
+            List<PullRequests> filteredList = new ArrayList<>();
 
-		prList = list;
+            if (constraint == null || constraint.length() == 0) {
-		notifyDataSetChanged();
+                filteredList.addAll(prList);
-	}
+            } else {
+                String filterPattern = constraint.toString().toLowerCase().trim();
+
+                for (PullRequests item : prList) {
+                    if (item.getTitle().toLowerCase().contains(filterPattern) || item.getBody().toLowerCase().contains(filterPattern)) {
+                        filteredList.add(item);
+                    }
+                }
+            }
+
+            FilterResults results = new FilterResults();
+            results.values = filteredList;
+
+            return results;
+        }
+
+        @Override
+        protected void publishResults(CharSequence constraint, FilterResults results) {
+            prList.clear();
+            prList.addAll((List) results.values);
+            notifyDataSetChanged();
+        }
+    };
 
 }

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

@@ -10,25 +10,19 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
+import com.amulyakhare.textdrawable.TextDrawable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.ClickListener;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TimeHelper;
 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.Locale;
 import java.util.Objects;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import io.noties.markwon.AbstractMarkwonPlugin;
 import io.noties.markwon.Markwon;
 import io.noties.markwon.core.CorePlugin;
@@ -37,6 +31,7 @@ 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;
@@ -54,44 +49,25 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
     private List<Releases> releasesList;
     private Context mCtx;
 
-	static class ReleasesViewHolder extends RecyclerView.ViewHolder {
+    static class ReleasesViewHolder extends RecyclerView.ViewHolder {
 
-        private TextView releaseType;
+        private ImageView releaseType;
-        private TextView releaseName;
+        private TextView releaseTitle;
-        private ImageView authorAvatar;
+        private TextView releaseDescription;
-        private TextView authorName;
+        private TextView releaseDownload;
-        private TextView releaseTag;
-        private TextView releaseCommitSha;
-        private TextView releaseDate;
-        private TextView releaseBodyContent;
-        private LinearLayout downloadFrame;
-        private RelativeLayout downloads;
         private TextView releaseZipDownload;
-	    private TextView releaseTarDownload;
+        private TextView releaseTarDownload;
-	    private ImageView downloadDropdownIcon;
+        private TextView releaseTag;
-	    private RecyclerView downloadList;
 
         private ReleasesViewHolder(View itemView) {
-
             super(itemView);
 
-	        releaseType = itemView.findViewById(R.id.releaseType);
+            releaseType = itemView.findViewById(R.id.releaseType);
-	        releaseName = itemView.findViewById(R.id.releaseName);
+            releaseTitle = itemView.findViewById(R.id.releaseTitle);
-	        authorAvatar = itemView.findViewById(R.id.authorAvatar);
+            releaseDescription = itemView.findViewById(R.id.releaseDescription);
-	        authorName = itemView.findViewById(R.id.authorName);
+            releaseZipDownload = itemView.findViewById(R.id.releaseZipDownload);
-	        releaseTag = itemView.findViewById(R.id.releaseTag);
+            releaseTarDownload = itemView.findViewById(R.id.releaseTarDownload);
-	        releaseCommitSha = itemView.findViewById(R.id.releaseCommitSha);
+            releaseTag = itemView.findViewById(R.id.releaseTag);
-	        releaseDate = itemView.findViewById(R.id.releaseDate);
-	        releaseBodyContent = itemView.findViewById(R.id.releaseBodyContent);
-	        downloadFrame = itemView.findViewById(R.id.downloadFrame);
-	        downloads = itemView.findViewById(R.id.downloads);
-	        releaseZipDownload = itemView.findViewById(R.id.releaseZipDownload);
-	        releaseTarDownload = itemView.findViewById(R.id.releaseTarDownload);
-	        downloadDropdownIcon = itemView.findViewById(R.id.downloadDropdownIcon);
-	        downloadList = itemView.findViewById(R.id.downloadList);
-
-	        downloadList.setHasFixedSize(true);
-	        downloadList.setLayoutManager(new LinearLayoutManager(itemView.getContext()));
 
         }
     }
@@ -112,74 +88,83 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
     public void onBindViewHolder(@NonNull ReleasesAdapter.ReleasesViewHolder holder, int position) {
 
         final TinyDB tinyDb = new TinyDB(mCtx);
-	    final String locale = tinyDb.getString("locale");
-	    final String timeFormat = tinyDb.getString("dateFormat");
 
         Releases currentItem = releasesList.get(position);
 
-	    holder.releaseName.setText(currentItem.getName());
+        holder.releaseTitle.setText(currentItem.getName());
 
-	    if(currentItem.isPrerelease()) {
+        if(!currentItem.getTag_name().equals("")) {
-		    holder.releaseType.setBackgroundResource(R.drawable.shape_pre_release);
+            holder.releaseTag.setText(mCtx.getResources().getString(R.string.releaseTag, currentItem.getTag_name()));
-		    holder.releaseType.setText(R.string.releaseTypePre);
+        }
-	    }
+        else {
-	    else if(currentItem.isDraft()) {
+            holder.releaseTag.setVisibility(View.GONE);
-		    holder.releaseType.setVisibility(View.GONE);
+        }
-	    }
-	    else {
-		    holder.releaseType.setBackgroundResource(R.drawable.shape_stable_release);
-		    holder.releaseType.setText(R.string.releaseTypeStable);
-	    }
 
-	    if(currentItem.getAuthor().getAvatar_url() != null) {
+        if(currentItem.isPrerelease()) {
-		    PicassoService.getInstance(mCtx).get().load(currentItem.getAuthor().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.authorAvatar);
+            TextDrawable drawable = TextDrawable.builder()
-	    }
+                    .beginConfig()
-
+                    //.useFont(Typeface.DEFAULT)
-	    holder.authorName.setText(mCtx.getResources().getString(R.string.releasePublishedBy, currentItem.getAuthor().getUsername()));
+                    .textColor(mCtx.getResources().getColor(R.color.white))
-
+                    .fontSize(34)
-	    if(currentItem.getTag_name() != null) {
+                    .width(260)
-	    	holder.releaseTag.setText(currentItem.getTag_name());
+                    .height(60)
-	    }
+                    .endConfig()
-
+                    .buildRoundRect(mCtx.getResources().getString(R.string.releaseTypePre), mCtx.getResources().getColor(R.color.releasePre), 8);
-	    if(currentItem.getPublished_at() != null) {
+            holder.releaseType.setImageDrawable(drawable);
-		    holder.releaseDate.setText(TimeHelper.formatTime(currentItem.getPublished_at(), new Locale(locale), timeFormat, mCtx));
+        }
-	    }
+        else {
-
+            TextDrawable drawable = TextDrawable.builder()
-	    if(timeFormat.equals("pretty")) {
+                    .beginConfig()
-		    holder.releaseDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getPublished_at()), mCtx));
+                    //.useFont(Typeface.DEFAULT)
-	    }
+                    .textColor(mCtx.getResources().getColor(R.color.white))
+                    .fontSize(34)
+                    .width(260)
+                    .height(60)
+                    .endConfig()
+                    .buildRoundRect(mCtx.getResources().getString(R.string.releaseTypeStable), mCtx.getResources().getColor(R.color.releaseStable), 8);
+            holder.releaseType.setImageDrawable(drawable);
+        }
 
         final Markwon markwon = Markwon.builder(Objects.requireNonNull(mCtx))
                 .usePlugin(CorePlugin.create())
-                .usePlugin(ImagesPlugin.create(plugin -> {
+                .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
-                    plugin.addSchemeHandler(new SchemeHandler() {
+                    @Override
-                        @NonNull
+                    public void configureImages(@NonNull ImagesPlugin plugin) {
-                        @Override
+                        plugin.addSchemeHandler(new SchemeHandler() {
-                        public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+                            @NonNull
+                            @Override
+                            public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
 
-                            final int resourceId = mCtx.getResources().getIdentifier(
+                                final int resourceId = mCtx.getResources().getIdentifier(
-                                    raw.substring("drawable://".length()),
+                                        raw.substring("drawable://".length()),
-                                    "drawable",
+                                        "drawable",
-                                    mCtx.getPackageName());
+                                        mCtx.getPackageName());
 
-                            final Drawable drawable = mCtx.getDrawable(resourceId);
+                                final Drawable drawable = mCtx.getDrawable(resourceId);
 
-                            assert drawable != null;
+                                assert drawable != null;
-                            return ImageItem.withResult(drawable);
+                                return ImageItem.withResult(drawable);
-                        }
+                            }
 
-                        @NonNull
+                            @NonNull
-                        @Override
+                            @Override
-                        public Collection<String> supportedSchemes() {
+                            public Collection<String> supportedSchemes() {
-                            return Collections.singleton("drawable");
+                                return Collections.singleton("drawable");
-                        }
+                            }
-                    });
+                        });
-                    plugin.placeholderProvider(drawable -> null);
+                        plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
-                    plugin.addMediaDecoder(GifMediaDecoder.create(false));
+                            @Nullable
-                    plugin.addMediaDecoder(SvgMediaDecoder.create(mCtx.getResources()));
+                            @Override
-                    plugin.addMediaDecoder(SvgMediaDecoder.create());
+                            public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
-                    plugin.defaultMediaDecoder(DefaultMediaDecoder.create(mCtx.getResources()));
+                                return null;
-                    plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
+                            }
+                        });
+                        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
@@ -200,29 +185,12 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
         Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(currentItem.getBody()));
 
         if(!currentItem.getBody().equals("")) {
-            markwon.setParsedMarkdown(holder.releaseBodyContent, bodyWithMD);
+            markwon.setParsedMarkdown(holder.releaseDescription, bodyWithMD);
         }
         else {
-            holder.releaseBodyContent.setVisibility(View.GONE);
+            holder.releaseDescription.setVisibility(View.GONE);
         }
 
-	    holder.downloadFrame.setOnClickListener(v -> {
-
-		    if(holder.downloads.getVisibility() == View.GONE) {
-
-			    holder.downloadDropdownIcon.setImageResource(R.drawable.ic_arrow_down);
-			    holder.downloads.setVisibility(View.VISIBLE);
-
-		    }
-		    else {
-
-			    holder.downloadDropdownIcon.setImageResource(R.drawable.ic_arrow_right);
-			    holder.downloads.setVisibility(View.GONE);
-
-		    }
-
-	    });
-
         holder.releaseZipDownload.setText(
                 Html.fromHtml("<a href='" + currentItem.getZipball_url() + "'>" + mCtx.getResources().getString(R.string.zipArchiveDownloadReleasesTab) + "</a> "));
         holder.releaseZipDownload.setMovementMethod(LinkMovementMethod.getInstance());
@@ -231,9 +199,6 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
                 Html.fromHtml("<a href='" + currentItem.getTarball_url() + "'>" + mCtx.getResources().getString(R.string.tarArchiveDownloadReleasesTab) + "</a> "));
         holder.releaseTarDownload.setMovementMethod(LinkMovementMethod.getInstance());
 
-	    ReleasesDownloadsAdapter adapter = new ReleasesDownloadsAdapter(currentItem.getAssets());
-	    holder.downloadList.setAdapter(adapter);
-
     }
 
     @Override

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

@@ -1,68 +0,0 @@
-package org.mian.gitnex.adapters;
-
-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 androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.models.Releases;
-import java.util.List;
-
-/**
- * Author M M Arif
- **/
-
-public class ReleasesDownloadsAdapter extends RecyclerView.Adapter<ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder> {
-
-	private List<Releases.assetsObject> releasesDownloadsList;
-
-	static class ReleasesDownloadsViewHolder extends RecyclerView.ViewHolder {
-
-		private TextView downloadName;
-
-		private ReleasesDownloadsViewHolder(View itemView) {
-
-			super(itemView);
-
-			downloadName = itemView.findViewById(R.id.downloadName);
-
-		}
-	}
-
-	ReleasesDownloadsAdapter(List<Releases.assetsObject> releasesDownloadsMain) {
-
-		this.releasesDownloadsList = releasesDownloadsMain;
-	}
-
-	@NonNull
-	@Override
-	public ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_releases_downloads, parent, false);
-		return new ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder(v);
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder holder, int position) {
-
-		Releases.assetsObject currentItem = releasesDownloadsList.get(position);
-
-		if(currentItem.getName() != null) {
-
-			holder.downloadName.setText(
-				Html.fromHtml("<a href='" + currentItem.getBrowser_download_url() + "'>" + currentItem.getName() + "</a> "));
-			holder.downloadName.setMovementMethod(LinkMovementMethod.getInstance());
-
-		}
-
-	}
-
-	@Override
-	public int getItemCount() {
-		return releasesDownloadsList.size();
-	}
-
-}

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

@@ -109,6 +109,13 @@ public class RepoStargazersAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
+        if(tinyDb.getInt("themeId") == 1) { //light
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
+        }
+        else { // dark
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
+        }
+
     }
 
 }

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

@@ -109,6 +109,13 @@ public class RepoWatchersAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
+        if(tinyDb.getInt("themeId") == 1) { //light
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
+        }
+        else { // dark
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
+        }
+
     }
 
 }

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

@@ -11,7 +11,6 @@ import android.widget.CheckBox;
 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;
@@ -28,7 +27,7 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
-import org.mian.gitnex.models.WatchInfo;
+import org.mian.gitnex.models.WatchRepository;
 import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
@@ -57,7 +56,6 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 		private TextView repoForks;
 		private TextView repoOpenIssuesCount;
 		private TextView repoType;
-		private LinearLayout archiveRepo;
 
 		private ReposViewHolder(View itemView) {
 
@@ -73,7 +71,6 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
 			ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
 			repoType = itemView.findViewById(R.id.repoType);
-			archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
 
 			itemView.setOnClickListener(v -> {
 
@@ -98,16 +95,16 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 					final String repoName = parts[1];
 					final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-					WatchInfo watch = new WatchInfo();
+					WatchRepository watch = new WatchRepository();
 
-					Call<WatchInfo> call;
+					Call<WatchRepository> call;
 
 					call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-					call.enqueue(new Callback<WatchInfo>() {
+					call.enqueue(new Callback<WatchRepository>() {
 
 						@Override
-						public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
+						public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
 
 							if(response.isSuccessful()) {
 
@@ -129,7 +126,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 						}
 
 						@Override
-						public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
+						public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
 
 							tinyDb.putBoolean("repoWatch", false);
 							Toasty.info(context, context.getString(R.string.genericApiStatusError));
@@ -202,7 +199,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 	@Override
 	public ReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repos, parent, false);
 		return new ReposViewHolder(v);
 	}
 
@@ -252,13 +249,6 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 		}
 		holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
 
-		if(currentItem.isArchived()) {
-			holder.archiveRepo.setVisibility(View.VISIBLE);
-		}
-		else {
-			holder.archiveRepo.setVisibility(View.GONE);
-		}
-
 	}
 
 	@Override

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

@@ -11,7 +11,6 @@ import android.widget.CheckBox;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
@@ -26,7 +25,7 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
-import org.mian.gitnex.models.WatchInfo;
+import org.mian.gitnex.models.WatchRepository;
 import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
@@ -57,7 +56,6 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
         private TextView repoForks;
         private TextView repoOpenIssuesCount;
         private TextView repoType;
-	    private LinearLayout archiveRepo;
 
         private OrgReposViewHolder(View itemView) {
             super(itemView);
@@ -72,7 +70,6 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
             repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
             ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
             repoType = itemView.findViewById(R.id.repoType);
-	        archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
 
             itemView.setOnClickListener(v -> {
 
@@ -95,16 +92,16 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                     final String repoName = parts[1];
                     final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-                    WatchInfo watch = new WatchInfo();
+                    WatchRepository watch = new WatchRepository();
 
-                    Call<WatchInfo> call;
+                    Call<WatchRepository> call;
 
                     call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-                    call.enqueue(new Callback<WatchInfo>() {
+                    call.enqueue(new Callback<WatchRepository>() {
 
                         @Override
-                        public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
+                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
 
                             if(response.isSuccessful()) {
 
@@ -126,7 +123,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                         }
 
                         @Override
-                        public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
+                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
 
                             tinyDb.putBoolean("repoWatch", false);
                             Toasty.info(context, context.getString(R.string.genericApiStatusError));
@@ -197,7 +194,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
     @NonNull
     @Override
     public RepositoriesByOrgAdapter.OrgReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories_by_org, parent, false);
         return new RepositoriesByOrgAdapter.OrgReposViewHolder(v);
     }
 
@@ -255,13 +252,6 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
         }
         holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
 
-	    if(currentItem.isArchived()) {
-		    holder.archiveRepo.setVisibility(View.VISIBLE);
-	    }
-	    else {
-		    holder.archiveRepo.setVisibility(View.GONE);
-	    }
-
     }
 
     @Override

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

@@ -11,7 +11,6 @@ import android.widget.CheckBox;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
@@ -26,7 +25,7 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
-import org.mian.gitnex.models.WatchInfo;
+import org.mian.gitnex.models.WatchRepository;
 import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
@@ -57,7 +56,6 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
         private TextView repoForks;
         private TextView repoOpenIssuesCount;
         private TextView repoType;
-	    private LinearLayout archiveRepo;
 
         private StarredReposViewHolder(View itemView) {
             super(itemView);
@@ -72,7 +70,6 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
             repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
             ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
             repoType = itemView.findViewById(R.id.repoType);
-	        archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
 
             itemView.setOnClickListener(v -> {
 
@@ -95,16 +92,16 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                     final String repoName = parts[1];
                     final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-                    WatchInfo watch = new WatchInfo();
+                    WatchRepository watch = new WatchRepository();
 
-                    Call<WatchInfo> call;
+                    Call<WatchRepository> call;
 
                     call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-                    call.enqueue(new Callback<WatchInfo>() {
+                    call.enqueue(new Callback<WatchRepository>() {
 
                         @Override
-                        public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
+                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
 
                             if(response.isSuccessful()) {
 
@@ -126,7 +123,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                         }
 
                         @Override
-                        public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
+                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
 
                             tinyDb.putBoolean("repoWatch", false);
                             Toasty.info(context, context.getString(R.string.genericApiStatusError));
@@ -198,7 +195,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
     @NonNull
     @Override
     public StarredReposListAdapter.StarredReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_starred_repos, parent, false);
         return new StarredReposListAdapter.StarredReposViewHolder(v);
     }
 
@@ -255,13 +252,6 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
         }
         holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
 
-	    if(currentItem.isArchived()) {
-		    holder.archiveRepo.setVisibility(View.VISIBLE);
-	    }
-	    else {
-		    holder.archiveRepo.setVisibility(View.GONE);
-	    }
-
     }
 
     @Override

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

@@ -111,5 +111,12 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
+        if(tinyDb.getInt("themeId") == 1) { //light
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
+        }
+        else { // dark
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
+        }
+
     }
 }

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

@@ -1,184 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.models.UserInfo;
-import org.mian.gitnex.util.TinyDB;
-import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-/**
- * Author M M Arif
- */
-
-public class UserSearchForTeamMemberAdapter extends RecyclerView.Adapter<UserSearchForTeamMemberAdapter.UserSearchViewHolder> {
-
-	private List<UserInfo> usersSearchList;
-	private Context mCtx;
-	private int teamId;
-
-	public UserSearchForTeamMemberAdapter(List<UserInfo> dataList, Context mCtx, int teamId) {
-		this.mCtx = mCtx;
-		this.usersSearchList = dataList;
-		this.teamId = teamId;
-	}
-
-	static class UserSearchViewHolder extends RecyclerView.ViewHolder {
-
-		private ImageView userAvatar;
-		private TextView userFullName;
-		private TextView userName;
-		private TextView userNameMain;
-		private ImageView addMemberButtonAdd;
-		private ImageView addMemberButtonRemove;
-		private TextView teamId_;
-
-		private UserSearchViewHolder(View itemView) {
-
-			super(itemView);
-			userAvatar = itemView.findViewById(R.id.userAvatar);
-			userFullName = itemView.findViewById(R.id.userFullName);
-			userName = itemView.findViewById(R.id.userName);
-			userNameMain = itemView.findViewById(R.id.userNameMain);
-			addMemberButtonAdd = itemView.findViewById(R.id.addCollaboratorButtonAdd);
-			addMemberButtonRemove = itemView.findViewById(R.id.addCollaboratorButtonRemove);
-			teamId_ = itemView.findViewById(R.id.teamId);
-
-			addMemberButtonAdd.setOnClickListener(v -> {
-
-				Context context = v.getContext();
-
-				AlertDialogs.addMemberDialog(context, userNameMain.getText().toString(),
-						context.getResources().getString(R.string.addTeamMemberTitle),
-						context.getResources().getString(R.string.addTeamMemberMessage),
-						context.getResources().getString(R.string.addButton),
-						context.getResources().getString(R.string.cancelButton), Integer.parseInt(teamId_.getText().toString()));
-
-			});
-
-			addMemberButtonRemove.setOnClickListener(v -> {
-
-				Context context = v.getContext();
-
-				AlertDialogs.removeMemberDialog(context, userNameMain.getText().toString(),
-						context.getResources().getString(R.string.removeTeamMemberTitle),
-						context.getResources().getString(R.string.removeTeamMemberMessage),
-						context.getResources().getString(R.string.removeButton),
-						context.getResources().getString(R.string.cancelButton), Integer.parseInt(teamId_.getText().toString()));
-
-			});
-
-		}
-
-	}
-
-	@NonNull
-	@Override
-	public UserSearchForTeamMemberAdapter.UserSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_collaborators_search, parent, false);
-		return new UserSearchForTeamMemberAdapter.UserSearchViewHolder(v);
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull final UserSearchForTeamMemberAdapter.UserSearchViewHolder holder, int position) {
-
-		final UserInfo currentItem = usersSearchList.get(position);
-
-		holder.userNameMain.setText(currentItem.getLogin());
-		holder.teamId_.setText(String.valueOf(teamId));
-
-		if (!currentItem.getFullname().equals("")) {
-			holder.userFullName.setText(currentItem.getFullname());
-			holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
-		}
-		else {
-			holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
-			holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
-		}
-
-		if (!currentItem.getAvatar().equals("")) {
-			PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
-		}
-
-		if(getItemCount() > 0) {
-
-			TinyDB tinyDb = new TinyDB(mCtx);
-			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");
-
-			Call<UserInfo> call = RetrofitClient
-					.getInstance(instanceUrl, mCtx)
-					.getApiInterface()
-					.checkTeamMember(Authorization.returnAuthentication(mCtx, loginUid, instanceToken), teamId, currentItem.getLogin());
-
-			call.enqueue(new Callback<UserInfo>() {
-
-				@Override
-				public void onResponse(@NonNull Call<UserInfo> call, @NonNull Response<UserInfo> response) {
-
-					if(response.code() == 200) {
-
-						if(!currentItem.getLogin().equals(loginUid) && !currentItem.getLogin().equals(repoOwner)) {
-							holder.addMemberButtonRemove.setVisibility(View.VISIBLE);
-						}
-						else {
-							holder.addMemberButtonRemove.setVisibility(View.GONE);
-						}
-
-					}
-					else if(response.code() == 404) {
-
-						if(!currentItem.getLogin().equals(loginUid) && !currentItem.getLogin().equals(repoOwner)) {
-							holder.addMemberButtonAdd.setVisibility(View.VISIBLE);
-						}
-						else {
-							holder.addMemberButtonAdd.setVisibility(View.GONE);
-						}
-
-					}
-					else {
-						holder.addMemberButtonRemove.setVisibility(View.GONE);
-						holder.addMemberButtonAdd.setVisibility(View.GONE);
-					}
-
-				}
-
-				@Override
-				public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
-
-					Toasty.error(mCtx, mCtx.getResources().getString(R.string.genericServerResponseError));
-
-				}
-
-			});
-
-		}
-
-	}
-
-	@Override
-	public int getItemCount() {
-		return usersSearchList.size();
-	}
-
-}

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

@@ -2,18 +2,20 @@ package org.mian.gitnex.clients;
 
 import android.content.Context;
 import android.util.Log;
-import org.mian.gitnex.helpers.FilesData;
+import androidx.annotation.NonNull;
 import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
 import java.io.File;
+import java.io.IOException;
 import java.security.SecureRandom;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.X509TrustManager;
 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;
@@ -22,14 +24,13 @@ import retrofit2.converter.gson.GsonConverterFactory;
  * Author M M Arif
  */
 
-public class AppApiService {
+public class IssuesService {
 
 	public static <S> S createService(Class<S> serviceClass, String instanceURL, Context ctx) {
 
-		TinyDB tinyDb = new TinyDB(ctx);
 		final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
 		File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
-		int cacheSize = FilesData.returnOnlyNumber(tinyDb.getString("cacheSizeStr")) * 1024 * 1024;
+		int cacheSize = 50 * 1024 * 1024; // 50MB
 		Cache cache = new Cache(httpCacheDirectory, cacheSize);
 
 		HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
@@ -47,18 +48,22 @@ public class AppApiService {
 					//.addInterceptor(logging)
 					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
 					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()))
-					.addInterceptor(chain -> {
+					.addInterceptor(new Interceptor() {
 
-						Request request = chain.request();
+				@NonNull
-						if(connToInternet) {
+				@Override
-							request = request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build();
+				public Response intercept(@NonNull Chain chain) throws IOException {
-						}
-						else {
-							request = request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build();
-						}
-						return chain.proceed(request);
 
-					}).build();
+					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)

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

@@ -14,18 +14,16 @@ import javax.net.ssl.X509TrustManager;
 import okhttp3.OkHttpClient;
 
 /**
- * Author opyale
+ * Author anonTree1417
  */
 
 public class PicassoService {
 
 	private static PicassoService picassoService;
-	private static File cachePath;
 	private Picasso picasso;
 
 	private PicassoService(Context context) {
 
-		cachePath = new File(context.getCacheDir() + "/picasso_cache/");
 		Picasso.Builder builder = new Picasso.Builder(context);
 
 		try {
@@ -47,7 +45,11 @@ public class PicassoService {
 
 			});
 
-			picasso = builder.memoryCache(new PicassoCache(cachePath, context)).build();
+			File cachePath = new File(context.getCacheDir() + "/picasso_cache/");
+			//noinspection ResultOfMethodCallIgnored
+			cachePath.mkdirs();
+
+			picasso = builder.memoryCache(new PicassoCache(cachePath)).build();
 
 		}
 		catch(Exception e) {
@@ -59,9 +61,7 @@ public class PicassoService {
 
 	public Picasso get() {
 
-		cachePath.mkdirs();
 		return picasso;
-
 	}
 
 	public static synchronized PicassoService getInstance(Context context) {

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

@@ -0,0 +1,83 @@
+package org.mian.gitnex.clients;
+
+import android.content.Context;
+import android.util.Log;
+import androidx.annotation.NonNull;
+import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
+import org.mian.gitnex.util.AppUtil;
+import java.io.File;
+import java.io.IOException;
+import java.security.SecureRandom;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.X509TrustManager;
+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);
+
+		try {
+
+			SSLContext sslContext = SSLContext.getInstance("TLS");
+
+			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(ctx);
+			sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom());
+
+			OkHttpClient okHttpClient = new OkHttpClient.Builder()
+					.cache(cache)
+					//.addInterceptor(logging)
+					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
+					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()))
+					.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);
+		}
+		catch(Exception e) {
+			Log.e("onFailure", e.toString());
+		}
+
+		return null;
+	}
+
+}

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

@@ -2,12 +2,10 @@ package org.mian.gitnex.clients;
 
 import android.content.Context;
 import android.util.Log;
-import org.mian.gitnex.helpers.FilesData;
-import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 import org.mian.gitnex.interfaces.ApiInterface;
 import org.mian.gitnex.interfaces.WebInterface;
+import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
 import java.io.File;
 import java.security.SecureRandom;
 import javax.net.ssl.HttpsURLConnection;
@@ -31,9 +29,8 @@ public class RetrofitClient {
 
 	private RetrofitClient(String instanceUrl, Context ctx) {
 
-		TinyDB tinyDb = new TinyDB(ctx);
 		final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
-		int cacheSize = FilesData.returnOnlyNumber(tinyDb.getString("cacheSizeStr")) * 1024 * 1024;
+		int cacheSize = 50 * 1024 * 1024; // 50MB
 		File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
 		Cache cache = new Cache(httpCacheDirectory, cacheSize);
 
@@ -47,9 +44,12 @@ public class RetrofitClient {
 			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(ctx);
 			sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom());
 
-			OkHttpClient.Builder okHttpClient = new OkHttpClient.Builder().cache(cache)
+			OkHttpClient.Builder okHttpClient = new OkHttpClient.Builder()
+					.cache(cache)
 					//.addInterceptor(logging)
-					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager).hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier())).addInterceptor(chain -> {
+					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
+					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()))
+					.addInterceptor(chain -> {
 
 						Request request = chain.request();
 						if(connToInternet) {
@@ -61,7 +61,11 @@ public class RetrofitClient {
 						return chain.proceed(request);
 					});
 
-			Retrofit.Builder builder = new Retrofit.Builder().baseUrl(instanceUrl).client(okHttpClient.build()).addConverterFactory(ScalarsConverterFactory.create()).addConverterFactory(GsonConverterFactory.create());
+			Retrofit.Builder builder = new Retrofit.Builder()
+					.baseUrl(instanceUrl)
+					.client(okHttpClient.build())
+					.addConverterFactory(ScalarsConverterFactory.create())
+					.addConverterFactory(GsonConverterFactory.create());
 
 			retrofit = builder.build();
 
@@ -73,18 +77,15 @@ public class RetrofitClient {
 	}
 
 	public static synchronized RetrofitClient getInstance(String instanceUrl, Context ctx) {
-
 		return new RetrofitClient(instanceUrl, ctx);
 	}
 
 	public ApiInterface getApiInterface() {
-
 		return retrofit.create(ApiInterface.class);
 	}
 
-	public WebInterface getWebInterface() {
+    public WebInterface getWebInterface() {
-
+        return retrofit.create(WebInterface.class);
-		return retrofit.create(WebInterface.class);
+    }
-	}
 
 }

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

@@ -1,35 +0,0 @@
-package org.mian.gitnex.fragments;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.AdminGetUsersActivity;
-import org.mian.gitnex.util.TinyDB;
-
-/**
- * Author M M Arif
- */
-
-public class AdministrationFragment extends Fragment {
-
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
-		View v = inflater.inflate(R.layout.fragment_administration, container, false);
-
-		TinyDB tinyDb = new TinyDB(getContext());
-
-		TextView adminUsers = v.findViewById(R.id.adminUsers);
-
-		adminUsers.setOnClickListener(v1 -> startActivity(new Intent(getContext(), AdminGetUsersActivity.class)));
-
-		return v;
-	}
-
-}

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

@@ -22,7 +22,7 @@ public class BottomSheetAdminUsersFragment extends BottomSheetDialogFragment {
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.bottom_sheet_admin_users, container, false);
+        View v = inflater.inflate(R.layout.bottom_sheet_admin_users_layout, container, false);
 
         TextView createNewUser = v.findViewById(R.id.createNewUser);
 

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

@@ -1,63 +0,0 @@
-package org.mian.gitnex.fragments;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import org.mian.gitnex.R;
-
-/**
- * Author M M Arif
- */
-
-public class BottomSheetIssuesFilterFragment extends BottomSheetDialogFragment {
-
-	private BottomSheetIssuesFilterFragment.BottomSheetListener bmListener;
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
-		View v = inflater.inflate(R.layout.bottom_sheet_issues_filter, container, false);
-
-		TextView openIssues = v.findViewById(R.id.openIssues);
-		TextView closedIssues = v.findViewById(R.id.closedIssues);
-
-		openIssues.setOnClickListener(v1 -> {
-			bmListener.onButtonClicked("openIssues");
-			dismiss();
-		});
-
-		closedIssues.setOnClickListener(v12 -> {
-			bmListener.onButtonClicked("closedIssues");
-			dismiss();
-		});
-
-		return v;
-	}
-
-	public interface BottomSheetListener {
-
-		void onButtonClicked(String text);
-
-	}
-
-	@Override
-	public void onAttach(@NonNull Context context) {
-
-		super.onAttach(context);
-
-		try {
-			bmListener = (BottomSheetIssuesFilterFragment.BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
-			throw new ClassCastException(context.toString() + " must implement BottomSheetListener");
-		}
-	}
-
-}

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

@@ -1,64 +0,0 @@
-package org.mian.gitnex.fragments;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import org.mian.gitnex.R;
-
-/**
- * Author M M Arif
- */
-
-public class BottomSheetMilestonesFilterFragment extends BottomSheetDialogFragment {
-
-	private BottomSheetMilestonesFilterFragment.BottomSheetListener bmListener;
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
-		View v = inflater.inflate(R.layout.bottom_sheet_milestones_filter, container, false);
-
-		TextView openMilestone = v.findViewById(R.id.openMilestone);
-		TextView closedMilestone = v.findViewById(R.id.closedMilestone);
-
-		openMilestone.setOnClickListener(v1 -> {
-			bmListener.onButtonClicked("openMilestone");
-			dismiss();
-		});
-
-		closedMilestone.setOnClickListener(v12 -> {
-			bmListener.onButtonClicked("closedMilestone");
-			dismiss();
-		});
-
-		return v;
-	}
-
-	public interface BottomSheetListener {
-
-		void onButtonClicked(String text);
-
-	}
-
-	@Override
-	public void onAttach(@NonNull Context context) {
-
-		super.onAttach(context);
-
-		try {
-			bmListener = (BottomSheetMilestonesFilterFragment.BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
-			Log.e("MilestonesFilterBs", e.toString());
-		}
-	}
-
-}

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

@@ -0,0 +1,39 @@
+package org.mian.gitnex.fragments;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.AdminGetUsersActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * Author M M Arif
+ */
+
+public class BottomSheetNavSubMenuFragment extends BottomSheetDialogFragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.bottom_sheet_nav_sub_menu_layout, container, false);
+
+        TextView adminUsers = v.findViewById(R.id.adminUsers);
+
+        adminUsers.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(getContext(), AdminGetUsersActivity.class));
+                dismiss();
+            }
+        });
+
+        return v;
+    }
+
+}

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

@@ -22,7 +22,7 @@ public class BottomSheetOrganizationFragment extends BottomSheetDialogFragment {
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.bottom_sheet_organization, container, false);
+        View v = inflater.inflate(R.layout.bottom_sheet_organization_layout, container, false);
 
         TextView createTeam = v.findViewById(R.id.createTeam);
         TextView createRepository = v.findViewById(R.id.createRepository);

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

@@ -1,58 +0,0 @@
-package org.mian.gitnex.fragments;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import org.mian.gitnex.R;
-
-/**
- * Author M M Arif
- */
-
-public class BottomSheetOrganizationTeamsFragment extends BottomSheetDialogFragment {
-
-	private BottomSheetOrganizationTeamsFragment.BottomSheetListener bmListener;
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
-		View v = inflater.inflate(R.layout.bottom_sheet_organization_teams, container, false);
-
-		TextView addNewMember = v.findViewById(R.id.addNewMember);
-
-		addNewMember.setOnClickListener(v1 -> {
-
-			bmListener.onButtonClicked("newMember");
-			dismiss();
-
-		});
-
-		return v;
-
-	}
-
-	public interface BottomSheetListener {
-		void onButtonClicked(String text);
-	}
-
-	@Override
-	public void onAttach(@NonNull Context context) {
-		super.onAttach(context);
-
-		try {
-			bmListener = (BottomSheetOrganizationTeamsFragment.BottomSheetListener) context;
-		}
-		catch (ClassCastException e) {
-			Log.e("BsOrganizationTeams", e.toString());
-		}
-	}
-
-}

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

@@ -21,7 +21,7 @@ public class BottomSheetProfileFragment extends BottomSheetDialogFragment {
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.bottom_sheet_profile, container, false);
+        View v = inflater.inflate(R.layout.bottom_sheet_profile_layout, container, false);
 
         TextView addNewEmailAddress = v.findViewById(R.id.addNewEmailAddress);
 

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

@@ -1,63 +0,0 @@
-package org.mian.gitnex.fragments;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import org.mian.gitnex.R;
-
-/**
- * Author M M Arif
- */
-
-public class BottomSheetPullRequestFilterFragment extends BottomSheetDialogFragment {
-
-	private BottomSheetPullRequestFilterFragment.BottomSheetListener bmListener;
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
-		View v = inflater.inflate(R.layout.bottom_sheet_pull_request_filter, container, false);
-
-		TextView openPr = v.findViewById(R.id.openPr);
-		TextView closedPr = v.findViewById(R.id.closedPr);
-
-		openPr.setOnClickListener(v1 -> {
-			bmListener.onButtonClicked("openPr");
-			dismiss();
-		});
-
-		closedPr.setOnClickListener(v12 -> {
-			bmListener.onButtonClicked("closedPr");
-			dismiss();
-		});
-
-		return v;
-	}
-
-	public interface BottomSheetListener {
-
-		void onButtonClicked(String text);
-
-	}
-
-	@Override
-	public void onAttach(@NonNull Context context) {
-
-		super.onAttach(context);
-
-		try {
-			bmListener = (BottomSheetPullRequestFilterFragment.BottomSheetListener) context;
-		}
-		catch(ClassCastException e) {
-			throw new ClassCastException(context.toString() + " must implement BottomSheetListener");
-		}
-	}
-
-}

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

@@ -24,7 +24,7 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.bottom_sheet_repo, container, false);
+        View v = inflater.inflate(R.layout.bottom_sheet_repo_layout, container, false);
 
         final TinyDB tinyDb = new TinyDB(getContext());
 

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

@@ -1,7 +1,5 @@
 package org.mian.gitnex.fragments;
 
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -9,8 +7,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.IssueActions;
@@ -20,8 +16,11 @@ import org.mian.gitnex.activities.EditIssueActivity;
 import org.mian.gitnex.activities.FileDiffActivity;
 import org.mian.gitnex.activities.MergePullRequestActivity;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.Version;
 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;
 
 /**
@@ -30,228 +29,213 @@ import java.util.Objects;
 
 public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
-	@Nullable
+    @Nullable
-	@Override
+    @Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-		View v = inflater.inflate(R.layout.bottom_sheet_single_issue, container, false);
+        View v = inflater.inflate(R.layout.bottom_sheet_single_issue_layout, container, false);
 
-		final Context ctx = getContext();
+        final Context ctx = getContext();
-		final TinyDB tinyDB = new TinyDB(ctx);
+        final TinyDB tinyDB = new TinyDB(ctx);
 
-		TextView editIssue = v.findViewById(R.id.editIssue);
+        TextView editIssue = v.findViewById(R.id.editIssue);
-		TextView editLabels = v.findViewById(R.id.editLabels);
+        TextView editLabels = v.findViewById(R.id.editLabels);
-		TextView closeIssue = v.findViewById(R.id.closeIssue);
+        TextView closeIssue = v.findViewById(R.id.closeIssue);
-		TextView reOpenIssue = v.findViewById(R.id.reOpenIssue);
+        TextView reOpenIssue = v.findViewById(R.id.reOpenIssue);
-		TextView addRemoveAssignees = v.findViewById(R.id.addRemoveAssignees);
+        TextView addRemoveAssignees = v.findViewById(R.id.addRemoveAssignees);
-		TextView copyIssueUrl = v.findViewById(R.id.copyIssueUrl);
+        TextView copyIssueUrl = v.findViewById(R.id.copyIssueUrl);
-		TextView openFilesDiff = v.findViewById(R.id.openFilesDiff);
+        TextView openFilesDiff = v.findViewById(R.id.openFilesDiff);
-		TextView mergePullRequest = v.findViewById(R.id.mergePullRequest);
+        TextView mergePullRequest = v.findViewById(R.id.mergePullRequest);
-		TextView shareIssue = v.findViewById(R.id.shareIssue);
+        TextView shareIssue = v.findViewById(R.id.shareIssue);
-		TextView subscribeIssue = v.findViewById(R.id.subscribeIssue);
+        TextView subscribeIssue = v.findViewById(R.id.subscribeIssue);
-		TextView unsubscribeIssue = v.findViewById(R.id.unsubscribeIssue);
+        TextView unsubscribeIssue = v.findViewById(R.id.unsubscribeIssue);
 
-		if(tinyDB.getString("issueType").equals("pr")) {
+        if(tinyDB.getString("issueType").equals("pr")) {
 
-			editIssue.setText(R.string.editPrText);
+            editIssue.setText(R.string.editPrText);
-			copyIssueUrl.setText(R.string.copyPrUrlText);
+            copyIssueUrl.setText(R.string.copyPrUrlText);
-			shareIssue.setText(R.string.sharePr);
+            shareIssue.setText(R.string.sharePr);
 
-			if(tinyDB.getBoolean("prMerged") || tinyDB.getString("repoPrState").equals("closed")) {
+            if(tinyDB.getBoolean("prMerged")) {
-				mergePullRequest.setVisibility(View.GONE);
+                mergePullRequest.setVisibility(View.GONE);
-			}
+            }
-			else {
+            else {
-				mergePullRequest.setVisibility(View.VISIBLE);
+                mergePullRequest.setVisibility(View.VISIBLE);
-			}
+            }
 
-			if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.13.0")) {
+            if(tinyDB.getString("repoType").equals("public")) {
-				openFilesDiff.setVisibility(View.VISIBLE);
+                openFilesDiff.setVisibility(View.VISIBLE);
-			}
+            }
-			else if(tinyDB.getString("repoType").equals("public")) {
+            else {
-				openFilesDiff.setVisibility(View.VISIBLE);
+                openFilesDiff.setVisibility(View.GONE);
-			}
+            }
-			else {
-				openFilesDiff.setVisibility(View.GONE);
-			}
 
-		}
+        }
-		else {
+        else {
 
-			mergePullRequest.setVisibility(View.GONE);
+            mergePullRequest.setVisibility(View.GONE);
 
-		}
+        }
 
-		mergePullRequest.setOnClickListener(new View.OnClickListener() {
+        mergePullRequest.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
 
-			@Override
+                startActivity(new Intent(ctx, MergePullRequestActivity.class));
-			public void onClick(View v) {
+                dismiss();
 
-				startActivity(new Intent(ctx, MergePullRequestActivity.class));
+            }
-				dismiss();
+        });
 
-			}
+        openFilesDiff.setOnClickListener(new View.OnClickListener() {
-		});
+            @Override
+            public void onClick(View v) {
 
-		openFilesDiff.setOnClickListener(new View.OnClickListener() {
+                startActivity(new Intent(ctx, FileDiffActivity.class));
+                dismiss();
 
-			@Override
+            }
-			public void onClick(View v) {
+        });
 
-				startActivity(new Intent(ctx, FileDiffActivity.class));
+        editIssue.setOnClickListener(new View.OnClickListener() {
-				dismiss();
+            @Override
+            public void onClick(View v) {
 
-			}
+                startActivity(new Intent(ctx, EditIssueActivity.class));
-		});
+                dismiss();
 
-		editIssue.setOnClickListener(new View.OnClickListener() {
+            }
+        });
 
-			@Override
+        editLabels.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
+            @Override
+            public void onClick(View v) {
 
-				startActivity(new Intent(ctx, EditIssueActivity.class));
+                startActivity(new Intent(ctx, AddRemoveLabelsActivity.class));
-				dismiss();
+                dismiss();
 
-			}
+            }
-		});
+        });
 
-		editLabels.setOnClickListener(new View.OnClickListener() {
+        addRemoveAssignees.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
 
-			@Override
+                startActivity(new Intent(ctx, AddRemoveAssigneesActivity.class));
-			public void onClick(View v) {
+                dismiss();
 
-				startActivity(new Intent(ctx, AddRemoveLabelsActivity.class));
+            }
-				dismiss();
+        });
 
-			}
+        shareIssue.setOnClickListener(v1 -> {
-		});
 
-		addRemoveAssignees.setOnClickListener(new View.OnClickListener() {
+            // get url of repo
+            String repoFullName = tinyDB.getString("repoFullName");
+            String instanceUrlWithProtocol = "https://" + tinyDB.getString("instanceUrlRaw");
+            if (!tinyDB.getString("instanceUrlWithProtocol").isEmpty()) {
+                instanceUrlWithProtocol = tinyDB.getString("instanceUrlWithProtocol");
+            }
 
-			@Override
+            // get issue Url
-			public void onClick(View v) {
+            String issueUrl = instanceUrlWithProtocol + "/" + repoFullName + "/issues/" + tinyDB.getString("issueNumber");
 
-				startActivity(new Intent(ctx, AddRemoveAssigneesActivity.class));
+            // share issue
-				dismiss();
+            Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
+            sharingIntent.setType("text/plain");
+            sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle"));
+            sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, issueUrl);
+            startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle")));
 
-			}
+            dismiss();
-		});
 
-		shareIssue.setOnClickListener(v1 -> {
+        });
 
-			// get url of repo
+        copyIssueUrl.setOnClickListener(new View.OnClickListener() {
-			String repoFullName = tinyDB.getString("repoFullName");
+            @Override
-			String instanceUrlWithProtocol = "https://" + tinyDB.getString("instanceUrlRaw");
+            public void onClick(View v) {
-			if(!tinyDB.getString("instanceUrlWithProtocol").isEmpty()) {
-				instanceUrlWithProtocol = tinyDB.getString("instanceUrlWithProtocol");
-			}
 
-			// get issue Url
+                // get url of repo
-			String issueUrl = instanceUrlWithProtocol + "/" + repoFullName + "/issues/" + tinyDB.getString("issueNumber");
+                String repoFullName = tinyDB.getString("repoFullName");
+                String instanceUrlWithProtocol = "https://" + tinyDB.getString("instanceUrlRaw");
+                if (!tinyDB.getString("instanceUrlWithProtocol").isEmpty()) {
+                    instanceUrlWithProtocol = tinyDB.getString("instanceUrlWithProtocol");
+                }
 
-			// share issue
+                // get issue Url
-			Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
+                String issueUrl = instanceUrlWithProtocol + "/" + repoFullName + "/issues/" + tinyDB.getString("issueNumber");
-			sharingIntent.setType("text/plain");
-			sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle"));
-			sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, issueUrl);
-			startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle")));
 
-			dismiss();
+                // copy to clipboard
+                ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(android.content.Context.CLIPBOARD_SERVICE);
+                ClipData clip = ClipData.newPlainText("issueUrl", issueUrl);
+                assert clipboard != null;
+                clipboard.setPrimaryClip(clip);
 
-		});
+                dismiss();
 
-		copyIssueUrl.setOnClickListener(new View.OnClickListener() {
+                Toasty.info(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
 
-			@Override
+            }
-			public void onClick(View v) {
+        });
 
-				// get url of repo
+        if(tinyDB.getString("issueType").equals("issue")) {
-				String repoFullName = tinyDB.getString("repoFullName");
-				String instanceUrlWithProtocol = "https://" + tinyDB.getString("instanceUrlRaw");
-				if(!tinyDB.getString("instanceUrlWithProtocol").isEmpty()) {
-					instanceUrlWithProtocol = tinyDB.getString("instanceUrlWithProtocol");
-				}
 
-				// get issue Url
+            if (tinyDB.getString("issueState").equals("open")) { // close issue
-				String issueUrl = instanceUrlWithProtocol + "/" + repoFullName + "/issues/" + tinyDB.getString("issueNumber");
 
-				// copy to clipboard
+                reOpenIssue.setVisibility(View.GONE);
-				ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(android.content.Context.CLIPBOARD_SERVICE);
+                closeIssue.setVisibility(View.VISIBLE);
-				ClipData clip = ClipData.newPlainText("issueUrl", issueUrl);
-				assert clipboard != null;
-				clipboard.setPrimaryClip(clip);
 
-				dismiss();
+                closeIssue.setOnClickListener(closeSingleIssue -> {
 
-				Toasty.info(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
+                    IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "closed");
+                    dismiss();
 
-			}
+                });
-		});
 
-		if(tinyDB.getString("issueType").equals("issue")) {
+            }
+            else if (tinyDB.getString("issueState").equals("closed")) {
 
-			if(tinyDB.getString("issueState").equals("open")) { // close issue
+                closeIssue.setVisibility(View.GONE);
+                reOpenIssue.setVisibility(View.VISIBLE);
 
-				reOpenIssue.setVisibility(View.GONE);
+                reOpenIssue.setOnClickListener(reOpenSingleIssue -> {
-				closeIssue.setVisibility(View.VISIBLE);
 
-				closeIssue.setOnClickListener(closeSingleIssue -> {
+                    IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "open");
+                    dismiss();
 
-					IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "closed");
+                });
-					dismiss();
 
-				});
+            }
 
-			}
+        }
-			else if(tinyDB.getString("issueState").equals("closed")) {
+        else {
 
-				closeIssue.setVisibility(View.GONE);
+            reOpenIssue.setVisibility(View.GONE);
-				reOpenIssue.setVisibility(View.VISIBLE);
+            closeIssue.setVisibility(View.GONE);
 
-				reOpenIssue.setOnClickListener(reOpenSingleIssue -> {
+        }
 
-					IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "open");
+        subscribeIssue.setOnClickListener(subscribeToIssue -> {
-					dismiss();
 
-				});
+            IssueActions.subscribe(ctx, subscribeIssue, unsubscribeIssue);
+            //dismiss();
 
-			}
+        });
 
-		}
+        unsubscribeIssue.setOnClickListener(unsubscribeToIssue -> {
-		else {
 
-			reOpenIssue.setVisibility(View.GONE);
+            IssueActions.unsubscribe(ctx, subscribeIssue, unsubscribeIssue);
-			closeIssue.setVisibility(View.GONE);
+            //dismiss();
 
-		}
+        });
 
-		subscribeIssue.setOnClickListener(subscribeToIssue -> {
+        //if RepoWatch True Provide Unsubscribe first
+        // ToDo: API to check if user is subscribed to an issue (do not exist can be guessed by many api endpoints :/)
+        if (tinyDB.getBoolean("repoWatch")) {
+            subscribeIssue.setVisibility(View.GONE);
+            unsubscribeIssue.setVisibility(View.VISIBLE);
+        }
 
-			IssueActions.subscribe(ctx);
+        return v;
-			dismiss();
+    }
-
-		});
-
-		unsubscribeIssue.setOnClickListener(unsubscribeToIssue -> {
-
-			IssueActions.unsubscribe(ctx);
-			dismiss();
-
-		});
-
-		if(new Version(tinyDB.getString("giteaVersion")).less("1.12.0")) {
-			subscribeIssue.setVisibility(View.GONE);
-			unsubscribeIssue.setVisibility(View.GONE);
-		}
-		else if(tinyDB.getBoolean("issueSubscribed")) {
-			subscribeIssue.setVisibility(View.GONE);
-			unsubscribeIssue.setVisibility(View.VISIBLE);
-		}
-		else {
-			subscribeIssue.setVisibility(View.VISIBLE);
-			unsubscribeIssue.setVisibility(View.GONE);
-		}
-
-		return v;
-	}
 
 }

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

@@ -4,6 +4,14 @@ import android.annotation.SuppressLint;
 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;
@@ -14,19 +22,12 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import 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;
@@ -43,275 +44,268 @@ import moe.feng.common.view.breadcrumbs.model.BreadcrumbItem;
 
 public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapterListener {
 
-	private ProgressBar mProgressBar;
+    private ProgressBar mProgressBar;
-	private FilesAdapter adapter;
+    private FilesAdapter adapter;
-	private RecyclerView mRecyclerView;
+    private RecyclerView mRecyclerView;
-	private TextView noDataFiles;
+    private TextView noDataFiles;
-	private LinearLayout filesFrame;
+    private LinearLayout filesFrame;
-	private TextView fileStructure;
+    private TextView fileStructure;
-	private static String repoNameF = "param2";
+    private static String repoNameF = "param2";
-	private static String repoOwnerF = "param1";
+    private static String repoOwnerF = "param1";
-	private BreadcrumbsView mBreadcrumbsView;
+    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;
+    }
 
-	private String repoName;
+    @Override
-	private String repoOwner;
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            repoName = getArguments().getString(repoNameF);
+            repoOwner = getArguments().getString(repoOwnerF);
+        }
+    }
 
-	private OnFragmentInteractionListener mListener;
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
 
-	public FilesFragment() {
+        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");
 
-	public static FilesFragment newInstance(String param1, String param2) {
+        noDataFiles = v.findViewById(R.id.noDataFiles);
+        filesFrame = v.findViewById(R.id.filesFrame);
 
-		FilesFragment fragment = new FilesFragment();
+        fileStructure = v.findViewById(R.id.fileStructure);
-		Bundle args = new Bundle();
+        mRecyclerView = v.findViewById(R.id.recyclerView);
-		args.putString(repoOwnerF, param1);
+        mRecyclerView.setHasFixedSize(true);
-		args.putString(repoNameF, param2);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-		fragment.setArguments(args);
-		return fragment;
-	}
 
-	@Override
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
-	public void onCreate(Bundle savedInstanceState) {
+                DividerItemDecoration.VERTICAL);
+        mRecyclerView.addItemDecoration(dividerItemDecoration);
 
-		super.onCreate(savedInstanceState);
+        mProgressBar = v.findViewById(R.id.progress_bar);
-		if(getArguments() != null) {
-			repoName = getArguments().getString(repoNameF);
-			repoOwner = getArguments().getString(repoOwnerF);
-		}
-	}
 
-	@Override
+        mBreadcrumbsView = v.findViewById(R.id.breadcrumbs_view);
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        mBreadcrumbsView.setItems(new ArrayList<>(Arrays.asList(
+                BreadcrumbItem.createSimpleItem(getResources().getString(R.string.filesBreadcrumbRoot))
+        )));
 
-		View v = inflater.inflate(R.layout.fragment_files, container, false);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
-		setHasOptionsMenu(true);
 
-		TinyDB tinyDb = new TinyDB(getContext());
+        return  v;
-		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);
+    @Override
-		filesFrame = v.findViewById(R.id.filesFrame);
+    public void onResume() {
+        super.onResume();
+    }
 
-		fileStructure = v.findViewById(R.id.fileStructure);
+    private static BreadcrumbItem createItem(String title) {
-		mRecyclerView = v.findViewById(R.id.recyclerView);
+        List<String> list = new ArrayList<>();
-		mRecyclerView.setHasFixedSize(true);
+        list.add(title);
-		mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        return new BreadcrumbItem(list);
+    }
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
+    @Override
-		mRecyclerView.addItemDecoration(dividerItemDecoration);
+    public void onClickDir(String dirName) {
 
-		mProgressBar = v.findViewById(R.id.progress_bar);
+        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");
 
-		mBreadcrumbsView = v.findViewById(R.id.breadcrumbs_view);
+        StringBuilder breadcrumbBuilder = new StringBuilder();
-		mBreadcrumbsView.setItems(new ArrayList<>(Arrays.asList(BreadcrumbItem.createSimpleItem(getResources().getString(R.string.filesBreadcrumbRoot)))));
 
-		fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
+        breadcrumbBuilder.append(fileStructure.getText().toString()).append("/").append(dirName);
 
-		return v;
+        fileStructure.setText(breadcrumbBuilder);
-	}
 
-	@Override
+        String dirName_ = fileStructure.getText().toString();
-	public void onResume() {
+        dirName_ = dirName_.startsWith("/") ? dirName_.substring(1) : dirName_;
+        final String finalDirName_ = dirName_;
+
+        mBreadcrumbsView.addItem(createItem(dirName));
+        //noinspection unchecked
+        mBreadcrumbsView.setCallback(new DefaultBreadcrumbsCallback<BreadcrumbItem>() {
+            @SuppressLint("SetTextI18n")
+            @Override
+            public void onNavigateBack(BreadcrumbItem item, int position) {
+
+                if(position == 0) {
+                    fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
+                    fileStructure.setText("");
+                    return;
+                }
+
+                String filterDir = fileStructure.getText().toString();
+                String result = filterDir.substring(0, filterDir.indexOf(item.getSelectedItem()));
+                fileStructure.setText(result + item.getSelectedItem());
+
+                String currentIndex = (result + item.getSelectedItem()).substring(1);
+
+                fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, currentIndex);
+
+            }
 
-		super.onResume();
+            @Override
-	}
+            public void onNavigateNewLocation(BreadcrumbItem newItem, int changedPosition) {
 
-	private static BreadcrumbItem createItem(String title) {
+            }
+        });
 
-		List<String> list = new ArrayList<>();
+        fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, finalDirName_);
-		list.add(title);
-		return new BreadcrumbItem(list);
-	}
 
-	@Override
+    }
-	public void onClickDir(String dirName) {
 
-		TinyDB tinyDb = new TinyDB(getContext());
+    @Override
-		final String instanceUrl = tinyDb.getString("instanceUrl");
+    public void onClickFile(String fileName) {
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-		StringBuilder breadcrumbBuilder = new StringBuilder();
+        Intent intent = new Intent(getContext(), FileViewActivity.class);
 
-		breadcrumbBuilder.append(fileStructure.getText().toString()).append("/").append(dirName);
+        if(!fileStructure.getText().toString().equals("Root")) {
 
-		fileStructure.setText(breadcrumbBuilder);
+            intent.putExtra("singleFileName", fileStructure.getText().toString()+"/"+fileName);
+        }
+        else {
+
+            intent.putExtra("singleFileName", fileName);
+        }
 
-		String dirName_ = fileStructure.getText().toString();
+        Objects.requireNonNull(getContext()).startActivity(intent);
-		dirName_ = dirName_.startsWith("/") ? dirName_.substring(1) : dirName_;
+    }
-		final String finalDirName_ = dirName_;
 
-		mBreadcrumbsView.addItem(createItem(dirName));
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo) {
-		//noinspection unchecked
+
-		mBreadcrumbsView.setCallback(new DefaultBreadcrumbsCallback<BreadcrumbItem>() {
+        mRecyclerView.setVisibility(View.GONE);
-
+        mProgressBar.setVisibility(View.VISIBLE);
-			@SuppressLint("SetTextI18n")
-			@Override
-			public void onNavigateBack(BreadcrumbItem item, int position) {
-
-				if(position == 0) {
-					fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
-					fileStructure.setText("");
-					return;
-				}
-
-				String filterDir = fileStructure.getText().toString();
-				String result = filterDir.substring(0, filterDir.indexOf(item.getSelectedItem()));
-				fileStructure.setText(result + item.getSelectedItem());
-
-				String currentIndex = (result + item.getSelectedItem()).substring(1);
-
-				fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, currentIndex);
-
-			}
-
-			@Override
-			public void onNavigateNewLocation(BreadcrumbItem newItem, int changedPosition) {
-
-			}
-		});
-
-		fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, finalDirName_);
-
-	}
-
-	@Override
-	public void onClickFile(String fileName) {
-
-		Intent intent = new Intent(getContext(), FileViewActivity.class);
-
-		if(!fileStructure.getText().toString().equals("Root")) {
-
-			intent.putExtra("singleFileName", fileStructure.getText().toString() + "/" + fileName);
-		}
-		else {
-
-			intent.putExtra("singleFileName", fileName);
-		}
-
-		Objects.requireNonNull(getContext()).startActivity(intent);
-	}
-
-	private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo) {
-
-		mRecyclerView.setVisibility(View.GONE);
-		mProgressBar.setVisibility(View.VISIBLE);
-
-		FilesViewModel filesModel = new ViewModelProvider(this).get(FilesViewModel.class);
-
-		filesModel.getFilesList(instanceUrl, instanceToken, owner, repo, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Files>>() {
-
-			@Override
-			public void onChanged(@Nullable List<Files> filesListMain) {
-
-				adapter = new FilesAdapter(getContext(), filesListMain, FilesFragment.this);
-
-				mBreadcrumbsView.removeItemAfter(1);
-				if(adapter.getItemCount() > 0) {
-					mRecyclerView.setVisibility(View.VISIBLE);
-					mRecyclerView.setAdapter(adapter);
-					filesFrame.setVisibility(View.VISIBLE);
-					noDataFiles.setVisibility(View.GONE);
-				}
-				else {
-					mRecyclerView.setVisibility(View.VISIBLE);
-					adapter.notifyDataSetChanged();
-					mRecyclerView.setAdapter(adapter);
-					filesFrame.setVisibility(View.VISIBLE);
-					noDataFiles.setVisibility(View.VISIBLE);
-				}
-				filesFrame.setVisibility(View.VISIBLE);
-				mProgressBar.setVisibility(View.GONE);
-			}
-		});
-
-	}
-
-	private void fetchDataAsyncSub(String instanceUrl, String instanceToken, String owner, String repo, String filesDir) {
-
-		mRecyclerView.setVisibility(View.GONE);
-		mProgressBar.setVisibility(View.VISIBLE);
-
-		FilesViewModel filesModel2 = new ViewModelProvider(this).get(FilesViewModel.class);
-
-		filesModel2.getFilesList2(instanceUrl, instanceToken, owner, repo, filesDir, getContext()).observe(this, new Observer<List<Files>>() {
-
-			@Override
-			public void onChanged(@Nullable List<Files> filesListMain2) {
-
-				adapter = new FilesAdapter(getContext(), filesListMain2, FilesFragment.this);
-				if(adapter.getItemCount() > 0) {
-					mRecyclerView.setVisibility(View.VISIBLE);
-					mRecyclerView.setAdapter(adapter);
-					filesFrame.setVisibility(View.VISIBLE);
-					noDataFiles.setVisibility(View.GONE);
-				}
-				else {
-					mRecyclerView.setVisibility(View.VISIBLE);
-					adapter.notifyDataSetChanged();
-					mRecyclerView.setAdapter(adapter);
-					filesFrame.setVisibility(View.VISIBLE);
-					noDataFiles.setVisibility(View.VISIBLE);
-				}
-				filesFrame.setVisibility(View.VISIBLE);
-				mProgressBar.setVisibility(View.GONE);
-			}
-		});
-
-	}
-
-	@Override
-	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-
-		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.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);
-
-	}
 
+        FilesViewModel filesModel = new ViewModelProvider(this).get(FilesViewModel.class);
+
+        filesModel.getFilesList(instanceUrl, instanceToken, owner, repo, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Files>>() {
+            @Override
+            public void onChanged(@Nullable List<Files> filesListMain) {
+                adapter = new FilesAdapter(getContext(), filesListMain, FilesFragment.this);
+
+                mBreadcrumbsView.removeItemAfter(1);
+                if(adapter.getItemCount() > 0) {
+                    mRecyclerView.setVisibility(View.VISIBLE);
+                    mRecyclerView.setAdapter(adapter);
+                    filesFrame.setVisibility(View.VISIBLE);
+                    noDataFiles.setVisibility(View.GONE);
+                }
+                else {
+                    mRecyclerView.setVisibility(View.VISIBLE);
+                    adapter.notifyDataSetChanged();
+                    mRecyclerView.setAdapter(adapter);
+                    filesFrame.setVisibility(View.VISIBLE);
+                    noDataFiles.setVisibility(View.VISIBLE);
+                }
+                filesFrame.setVisibility(View.VISIBLE);
+                mProgressBar.setVisibility(View.GONE);
+            }
+        });
+
+    }
+
+    private void fetchDataAsyncSub(String instanceUrl, String instanceToken, String owner, String repo, String filesDir) {
+
+        mRecyclerView.setVisibility(View.GONE);
+        mProgressBar.setVisibility(View.VISIBLE);
+
+        FilesViewModel filesModel2 = new ViewModelProvider(this).get(FilesViewModel.class);
+
+        filesModel2.getFilesList2(instanceUrl, instanceToken, owner, repo, filesDir, getContext()).observe(this, new Observer<List<Files>>() {
+            @Override
+            public void onChanged(@Nullable List<Files> filesListMain2) {
+                adapter = new FilesAdapter(getContext(), filesListMain2, FilesFragment.this);
+                if(adapter.getItemCount() > 0) {
+                    mRecyclerView.setVisibility(View.VISIBLE);
+                    mRecyclerView.setAdapter(adapter);
+                    filesFrame.setVisibility(View.VISIBLE);
+                    noDataFiles.setVisibility(View.GONE);
+                }
+                else {
+                    mRecyclerView.setVisibility(View.VISIBLE);
+                    adapter.notifyDataSetChanged();
+                    mRecyclerView.setAdapter(adapter);
+                    filesFrame.setVisibility(View.VISIBLE);
+                    noDataFiles.setVisibility(View.VISIBLE);
+                }
+                filesFrame.setVisibility(View.VISIBLE);
+                mProgressBar.setVisibility(View.GONE);
+            }
+        });
+
+    }
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+
+        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+
+        inflater.inflate(R.menu.search_menu, menu);
+        super.onCreateOptionsMenu(menu, inflater);
+
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+        androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+        searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        //searchView.setQueryHint(getContext().getString(R.string.search));
+
+        /*if(!connToInternet) {
+            return;
+        }*/
+
+        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                if(mRecyclerView.getAdapter() != null) {
+                    adapter.getFilter().filter(newText);
+                }
+                return false;
+            }
+        });
+
+    }
+
+    public void onButtonPressed(Uri uri) {
+        if (mListener != null) {
+            mListener.onFragmentInteraction(uri);
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
+
+    public interface OnFragmentInteractionListener {
+        void onFragmentInteraction(Uri uri);
+    }
 }

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

@@ -0,0 +1,305 @@
+package org.mian.gitnex.fragments;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
+import org.mian.gitnex.helpers.VersionCheck;
+import org.mian.gitnex.adapters.IssuesAdapter;
+import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.util.TinyDB;
+import java.util.ArrayList;
+import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import com.mikepenz.fastadapter.IItemAdapter;
+import com.mikepenz.fastadapter.adapters.ItemAdapter;
+import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter;
+import com.mikepenz.fastadapter.listeners.ItemFilterListener;
+import com.mikepenz.fastadapter_extensions.items.ProgressItem;
+import com.mikepenz.fastadapter_extensions.scroll.EndlessRecyclerOnScrollListener;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import static com.mikepenz.fastadapter.adapters.ItemAdapter.items;
+
+/**
+ * Author M M Arif
+ */
+
+public class IssuesClosedFragment extends Fragment implements ItemFilterListener<IssuesAdapter> {
+
+    private Context ctx;
+    private ProgressBar mProgressBarClosed;
+    private boolean loadNextFlag = false;
+    private String TAG = StaticGlobalVariables.tagIssuesListClosed;
+    private TextView noDataIssuesClosed;
+    private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
+    private String requestType = StaticGlobalVariables.issuesRequestType;
+    private String issueState = StaticGlobalVariables.issueStateClosed;
+
+    private List<IssuesAdapter> items = new ArrayList<>();
+    private FastItemAdapter<IssuesAdapter> fastItemAdapter;
+    private ItemAdapter footerAdapter;
+    private EndlessRecyclerOnScrollListener endlessRecyclerOnScrollListener;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+        final View v = inflater.inflate(R.layout.fragment_issues_closed, 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");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+
+        if (VersionCheck.compareVersion("1.12.0", tinyDb.getString("giteaVersion")) < 1) {
+            resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+        }
+
+        noDataIssuesClosed = v.findViewById(R.id.noDataIssuesClosed);
+        mProgressBarClosed = v.findViewById(R.id.progress_barClosed);
+        final SwipeRefreshLayout swipeRefreshLayout = v.findViewById(R.id.pullToRefreshClosed);
+
+        RecyclerView recyclerView = v.findViewById(R.id.recyclerViewClosed);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        recyclerView.setHasFixedSize(true);
+
+        fastItemAdapter = new FastItemAdapter<>();
+        fastItemAdapter.withSelectable(true);
+
+        footerAdapter = items();
+        //noinspection unchecked
+        fastItemAdapter.addAdapter(StaticGlobalVariables.issuesPageInit, footerAdapter);
+
+        fastItemAdapter.getItemFilter().withFilterPredicate((IItemAdapter.Predicate<IssuesAdapter>) (item, constraint) -> item.getIssueTitle().toLowerCase().contains(constraint.toString().toLowerCase()));
+
+        fastItemAdapter.getItemFilter().withItemFilterListener(this);
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        recyclerView.setItemAnimator(new DefaultItemAnimator());
+        recyclerView.setAdapter(fastItemAdapter);
+
+        endlessRecyclerOnScrollListener = new EndlessRecyclerOnScrollListener(footerAdapter) {
+
+            @Override
+            public void onLoadMore(final int currentPage) {
+
+                loadNext(instanceUrl, instanceToken, repoOwner, repoName, resultLimit, issueState, requestType, currentPage);
+
+            }
+
+        };
+
+        swipeRefreshLayout.setOnRefreshListener(() -> {
+
+            mProgressBarClosed.setVisibility(View.VISIBLE);
+            fastItemAdapter.clear();
+            endlessRecyclerOnScrollListener.resetPageCount();
+            swipeRefreshLayout.setRefreshing(false);
+
+        });
+
+        recyclerView.addOnScrollListener(endlessRecyclerOnScrollListener);
+
+        loadInitial(instanceUrl, instanceToken, repoOwner, repoName, issueState, resultLimit, requestType);
+
+        fastItemAdapter.withEventHook(new IssuesAdapter.IssueTitleClickEvent());
+
+        assert savedInstanceState != null;
+        fastItemAdapter.withSavedInstanceState(savedInstanceState);
+
+        return v;
+
+    }
+
+    @Override
+    public void onResume() {
+
+        super.onResume();
+        TinyDB tinyDb = new TinyDB(getContext());
+
+        if(tinyDb.getBoolean("resumeClosedIssues")) {
+
+            mProgressBarClosed.setVisibility(View.VISIBLE);
+            fastItemAdapter.clear();
+            endlessRecyclerOnScrollListener.resetPageCount();
+            tinyDb.putBoolean("resumeClosedIssues", false);
+
+        }
+
+    }
+
+    private void loadInitial(String instanceUrl, String token, String repoOwner, String repoName, String issueState, int resultLimit, String requestType) {
+
+        Call<List<Issues>> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().getClosedIssues(token, repoOwner, repoName, 1, issueState, resultLimit, requestType);
+
+        call.enqueue(new Callback<List<Issues>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
+
+                if(response.isSuccessful()) {
+
+                    assert response.body() != null;
+                    if(response.body().size() > 0) {
+
+                        if(response.body().size() == resultLimit) {
+                            loadNextFlag = true;
+                        }
+
+                        for(int i = 0; i < response.body().size(); i++) {
+                            items.add(new IssuesAdapter(getContext()).withNewItems(response.body().get(i).getTitle(), response.body().get(i).getNumber(), response.body().get(i).getUser().getAvatar_url(), response.body().get(i).getCreated_at(), response.body().get(i).getComments(), response.body().get(i).getUser().getFull_name(), response.body().get(i).getUser().getLogin()));
+                        }
+
+                        fastItemAdapter.add(items);
+                        noDataIssuesClosed.setVisibility(View.GONE);
+
+                    }
+                    else {
+                        noDataIssuesClosed.setVisibility(View.VISIBLE);
+                    }
+
+                    mProgressBarClosed.setVisibility(View.GONE);
+
+                }
+                else {
+                    Log.i(TAG, String.valueOf(response.code()));
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
+
+                Log.e(TAG, t.toString());
+            }
+
+        });
+
+    }
+
+    private void loadNext(String instanceUrl, String token, String repoOwner, String repoName, int resultLimit, String issueState, String requestType, final int currentPage) {
+
+        footerAdapter.clear();
+        //noinspection unchecked
+        footerAdapter.add(new ProgressItem().withEnabled(false));
+
+        Call<List<Issues>> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().getClosedIssues(token, repoOwner, repoName, currentPage + 1, issueState, resultLimit, requestType);
+
+        call.enqueue(new Callback<List<Issues>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
+
+                if(response.isSuccessful()) {
+
+                    assert response.body() != null;
+
+                    if(response.body().size() > 0) {
+
+                        loadNextFlag = response.body().size() == resultLimit;
+
+                        for(int i = 0; i < response.body().size(); i++) {
+
+                            fastItemAdapter.add(fastItemAdapter.getAdapterItemCount(), new IssuesAdapter(getContext()).withNewItems(response.body().get(i).getTitle(), response.body().get(i).getNumber(), response.body().get(i).getUser().getAvatar_url(), response.body().get(i).getCreated_at(), response.body().get(i).getComments(), response.body().get(i).getUser().getFull_name(), response.body().get(i).getUser().getLogin()));
+
+                        }
+
+                        footerAdapter.clear();
+                        mProgressBarClosed.setVisibility(View.GONE);
+
+                    }
+                    else {
+                        footerAdapter.clear();
+                    }
+
+                    mProgressBarClosed.setVisibility(View.GONE);
+
+                }
+                else {
+                    Log.i(TAG, String.valueOf(response.code()));
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
+
+                Log.i(TAG, t.toString());
+            }
+
+        });
+
+        if(!loadNextFlag) {
+            footerAdapter.clear();
+        }
+
+    }
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+
+        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.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+
+                fastItemAdapter.filter(newText);
+                return true;
+            }
+
+        });
+
+        endlessRecyclerOnScrollListener.enable();
+
+    }
+
+    @Override
+    public void itemsFiltered(@Nullable CharSequence constraint, @Nullable List<IssuesAdapter> results) {
+
+        endlessRecyclerOnScrollListener.disable();
+    }
+
+    @Override
+    public void onReset() {
+
+        endlessRecyclerOnScrollListener.enable();
+    }
+
+}

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

@@ -1,336 +0,0 @@
-package org.mian.gitnex.fragments;
-
-import android.content.Context;
-import android.os.Bundle;
-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 androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.RepoDetailActivity;
-import org.mian.gitnex.adapters.IssuesAdapter;
-import org.mian.gitnex.clients.AppApiService;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.StaticGlobalVariables;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.Version;
-import org.mian.gitnex.interfaces.ApiInterface;
-import org.mian.gitnex.models.Issues;
-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 IssuesFragment extends Fragment {
-
-	private Menu menu;
-	private RecyclerView recyclerView;
-	private List<Issues> issuesList;
-	private IssuesAdapter adapter;
-	private ApiInterface api;
-	private Context context;
-	private int pageSize = StaticGlobalVariables.issuesPageInit;
-	private ProgressBar mProgressBar;
-	private String TAG = StaticGlobalVariables.tagIssuesList;
-	private TextView noDataIssues;
-	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
-	private String requestType = StaticGlobalVariables.issuesRequestType;
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
-		final View v = inflater.inflate(R.layout.fragment_issues, container, false);
-		setHasOptionsMenu(true);
-		context = getContext();
-
-		TinyDB tinyDb = new TinyDB(getContext());
-		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");
-
-		final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
-
-		// if gitea is 1.12 or higher use the new limit
-		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
-			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
-		}
-
-		recyclerView = v.findViewById(R.id.recyclerView);
-		issuesList = new ArrayList<>();
-
-		mProgressBar = v.findViewById(R.id.progress_bar);
-		noDataIssues = v.findViewById(R.id.noDataIssues);
-
-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
-
-			swipeRefresh.setRefreshing(false);
-			loadInitial(instanceToken, repoOwner, repoName, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
-			adapter.notifyDataChanged();
-
-		}, 200));
-
-		adapter = new IssuesAdapter(getContext(), issuesList);
-		adapter.setLoadMoreListener(() -> recyclerView.post(() -> {
-
-			if(issuesList.size() == resultLimit || pageSize == resultLimit) {
-
-				int page = (issuesList.size() + resultLimit) / resultLimit;
-				loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
-
-			}
-
-		}));
-
-		recyclerView.setHasFixedSize(true);
-		recyclerView.setLayoutManager(new LinearLayoutManager(context));
-		recyclerView.setAdapter(adapter);
-
-		((RepoDetailActivity) Objects.requireNonNull(getActivity())).setFragmentRefreshListener(issueState -> {
-
-			if(issueState.equals("closed")) {
-				menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
-			}
-			else {
-				menu.getItem(1).setIcon(R.drawable.ic_filter);
-			}
-
-			issuesList.clear();
-
-			adapter = new IssuesAdapter(getContext(), issuesList);
-			adapter.setLoadMoreListener(() -> recyclerView.post(() -> {
-
-				if(issuesList.size() == resultLimit || pageSize == resultLimit) {
-
-					int page = (issuesList.size() + resultLimit) / resultLimit;
-					loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
-
-				}
-
-			}));
-
-			tinyDb.putString("repoIssuesState", issueState);
-
-			mProgressBar.setVisibility(View.VISIBLE);
-			noDataIssues.setVisibility(View.GONE);
-
-			loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, requestType, issueState);
-			recyclerView.setAdapter(adapter);
-
-		});
-
-		api = AppApiService.createService(ApiInterface.class, instanceUrl, getContext());
-		loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
-
-		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("resumeIssues")) {
-
-			loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
-			tinyDb.putBoolean("resumeIssues", false);
-
-		}
-
-	}
-
-	private void loadInitial(String token, String repoOwner, String repoName, int resultLimit, String requestType, String issueState) {
-
-		Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName, 1, resultLimit, requestType, issueState);
-
-		call.enqueue(new Callback<List<Issues>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
-
-				if(response.code() == 200) {
-
-					assert response.body() != null;
-					if(response.body().size() > 0) {
-
-						issuesList.clear();
-						issuesList.addAll(response.body());
-						adapter.notifyDataChanged();
-						noDataIssues.setVisibility(View.GONE);
-
-					}
-					else {
-
-						issuesList.clear();
-						adapter.notifyDataChanged();
-						noDataIssues.setVisibility(View.VISIBLE);
-
-					}
-
-					mProgressBar.setVisibility(View.GONE);
-
-				}
-				else if(response.code() == 404) {
-
-					noDataIssues.setVisibility(View.VISIBLE);
-					mProgressBar.setVisibility(View.GONE);
-
-				}
-				else {
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
-
-				Log.e(TAG, t.toString());
-			}
-
-		});
-
-	}
-
-	private void loadMore(String token, String repoOwner, String repoName, int page, int resultLimit, String requestType, String issueState) {
-
-		//add loading progress view
-		issuesList.add(new Issues("load"));
-		adapter.notifyItemInserted((issuesList.size() - 1));
-
-		Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName, page, resultLimit, requestType, issueState);
-
-		call.enqueue(new Callback<List<Issues>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
-
-				if(response.code() == 200) {
-
-					//remove loading view
-					issuesList.remove(issuesList.size() - 1);
-
-					List<Issues> result = response.body();
-
-					assert result != null;
-					if(result.size() > 0) {
-
-						pageSize = result.size();
-						issuesList.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<Issues>> call, @NonNull Throwable t) {
-
-				Log.e(TAG, t.toString());
-
-			}
-
-		});
-	}
-
-	@Override
-	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-
-		this.menu = menu;
-		inflater.inflate(R.menu.search_menu, menu);
-		inflater.inflate(R.menu.filter_menu, menu);
-		super.onCreateOptionsMenu(menu, inflater);
-
-		TinyDB tinyDb = new TinyDB(context);
-
-		if(tinyDb.getString("repoIssuesState").equals("closed")) {
-			menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
-		}
-		else {
-			menu.getItem(1).setIcon(R.drawable.ic_filter);
-		}
-
-		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
-		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
-
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-
-				return false;
-			}
-
-			@Override
-			public boolean onQueryTextChange(String newText) {
-
-				filter(newText);
-				return false;
-
-			}
-
-		});
-
-	}
-
-	private void filter(String text) {
-
-		List<Issues> arr = new ArrayList<>();
-
-		for(Issues d : issuesList) {
-			if(d.getTitle().toLowerCase().contains(text) || d.getBody().toLowerCase().contains(text)) {
-				arr.add(d);
-			}
-		}
-
-		adapter.updateList(arr);
-	}
-
-}

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

@@ -0,0 +1,155 @@
+package org.mian.gitnex.fragments;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+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.widget.TextView;
+import com.google.android.material.tabs.TabLayout;
+import org.mian.gitnex.R;
+import org.mian.gitnex.util.TinyDB;
+import java.util.Objects;
+
+/**
+ * Author M M Arif
+ */
+
+public class IssuesMainFragment extends Fragment {
+
+	private Context ctx;
+
+	public IssuesMainFragment() {
+
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+		View v = inflater.inflate(R.layout.fragment_issues_main, container, false);
+		setHasOptionsMenu(true);
+
+		TinyDB tinyDb = new TinyDB(getContext());
+
+		SectionsPagerAdapter mSectionsPagerAdapter = new IssuesMainFragment.SectionsPagerAdapter(getChildFragmentManager());
+
+		ViewPager mViewPager = v.findViewById(R.id.issuesContainer);
+		mViewPager.setAdapter(mSectionsPagerAdapter);
+
+		Typeface myTypeface;
+		if(tinyDb.getInt("customFontId") == 0) {
+
+			myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
+
+		}
+		else if (tinyDb.getInt("customFontId") == 1) {
+
+			myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/manroperegular.ttf");
+
+		}
+		else if (tinyDb.getInt("customFontId") == 2) {
+
+			myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
+
+		}
+		else {
+
+			myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
+
+		}
+
+		TabLayout tabLayout = v.findViewById(R.id.tabs);
+
+		ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
+		int tabsCount = vg.getChildCount();
+
+		for (int j = 0; j < tabsCount; j++) {
+
+			ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
+			int tabChildCount = vgTab.getChildCount();
+
+			for (int i = 0; i < tabChildCount; i++) {
+
+				View tabViewChild = vgTab.getChildAt(i);
+				if (tabViewChild instanceof TextView) {
+					((TextView) tabViewChild).setTypeface(myTypeface);
+				}
+
+			}
+
+		}
+
+		mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
+		tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
+
+		return v;
+
+	}
+
+	public static class SectionsPagerAdapter extends FragmentStatePagerAdapter {
+
+		SectionsPagerAdapter(FragmentManager fm) {
+			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+		}
+
+		@NonNull
+		@Override
+		public Fragment getItem(int position) {
+
+			Fragment fragment = null;
+			switch (position) {
+				case 0: // open issues
+					fragment = new IssuesOpenFragment();
+					break;
+				case 1: // closed issues
+					fragment = new IssuesClosedFragment();
+					break;
+			}
+			assert fragment != null;
+			return fragment;
+		}
+
+		@Override
+		public int getCount() {
+			return 2;
+		}
+
+	}
+
+	@Override
+	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+
+		menu.clear();
+		Objects.requireNonNull(getActivity()).getMenuInflater().inflate(R.menu.repo_dotted_menu, menu);
+		super.onCreateOptionsMenu(menu, inflater);
+
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+
+		int id = item.getItemId();
+
+		switch (id) {
+			case android.R.id.home:
+				return true;
+			case R.id.repoMenu:
+				BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
+				bottomSheet.show(getChildFragmentManager(), "repoBottomSheet");
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
+		}
+
+	}
+
+}

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

@@ -0,0 +1,302 @@
+package org.mian.gitnex.fragments;
+
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+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 com.mikepenz.fastadapter.IItemAdapter;
+import com.mikepenz.fastadapter.adapters.ItemAdapter;
+import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter;
+import com.mikepenz.fastadapter.listeners.ItemFilterListener;
+import com.mikepenz.fastadapter_extensions.items.ProgressItem;
+import com.mikepenz.fastadapter_extensions.scroll.EndlessRecyclerOnScrollListener;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
+import org.mian.gitnex.helpers.VersionCheck;
+import org.mian.gitnex.adapters.IssuesAdapter;
+import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.util.TinyDB;
+import java.util.ArrayList;
+import java.util.List;
+import static com.mikepenz.fastadapter.adapters.ItemAdapter.items;
+
+/**
+ * Author M M Arif
+ */
+
+public class IssuesOpenFragment extends Fragment implements ItemFilterListener<IssuesAdapter> {
+
+	private ProgressBar mProgressBar;
+	private boolean loadNextFlag = false;
+	private String TAG = StaticGlobalVariables.tagIssuesListOpen;
+	private TextView noDataIssues;
+	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
+	private String requestType = StaticGlobalVariables.issuesRequestType;
+
+	private List<IssuesAdapter> items = new ArrayList<>();
+	private FastItemAdapter<IssuesAdapter> fastItemAdapter;
+	private ItemAdapter footerAdapter;
+	private EndlessRecyclerOnScrollListener endlessRecyclerOnScrollListener;
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+		final View v = inflater.inflate(R.layout.fragment_issues, 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");
+		String repoFullName = tinyDb.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		final String repoOwner = parts[0];
+		final String repoName = parts[1];
+
+		if (VersionCheck.compareVersion("1.12.0", tinyDb.getString("giteaVersion")) < 1) {
+			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+		}
+
+		noDataIssues = v.findViewById(R.id.noDataIssues);
+		mProgressBar = v.findViewById(R.id.progress_bar);
+		final SwipeRefreshLayout swipeRefreshLayout = v.findViewById(R.id.pullToRefresh);
+
+		RecyclerView recyclerView = v.findViewById(R.id.recyclerView);
+		recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		recyclerView.setHasFixedSize(true);
+
+		fastItemAdapter = new FastItemAdapter<>();
+		fastItemAdapter.withSelectable(true);
+
+		footerAdapter = items();
+		//noinspection unchecked
+		fastItemAdapter.addAdapter(StaticGlobalVariables.issuesPageInit, footerAdapter);
+
+		fastItemAdapter.getItemFilter().withFilterPredicate((IItemAdapter.Predicate<IssuesAdapter>) (item, constraint) -> item.getIssueTitle().toLowerCase().contains(constraint.toString().toLowerCase()));
+
+		fastItemAdapter.getItemFilter().withItemFilterListener(this);
+
+		recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		recyclerView.setItemAnimator(new DefaultItemAnimator());
+		recyclerView.setAdapter(fastItemAdapter);
+
+		endlessRecyclerOnScrollListener = new EndlessRecyclerOnScrollListener(footerAdapter) {
+
+			@Override
+			public void onLoadMore(final int currentPage) {
+
+				loadNext(instanceUrl, instanceToken, repoOwner, repoName, resultLimit, requestType, currentPage);
+
+			}
+
+		};
+
+		swipeRefreshLayout.setOnRefreshListener(() -> {
+
+			mProgressBar.setVisibility(View.VISIBLE);
+			fastItemAdapter.clear();
+			endlessRecyclerOnScrollListener.resetPageCount();
+			swipeRefreshLayout.setRefreshing(false);
+
+		});
+
+		recyclerView.addOnScrollListener(endlessRecyclerOnScrollListener);
+
+		loadInitial(instanceUrl, instanceToken, repoOwner, repoName, resultLimit, requestType);
+
+		fastItemAdapter.withEventHook(new IssuesAdapter.IssueTitleClickEvent());
+
+		assert savedInstanceState != null;
+		fastItemAdapter.withSavedInstanceState(savedInstanceState);
+
+		return v;
+
+	}
+
+	@Override
+	public void onResume() {
+
+		super.onResume();
+		TinyDB tinyDb = new TinyDB(getContext());
+
+		if(tinyDb.getBoolean("resumeIssues")) {
+
+			mProgressBar.setVisibility(View.VISIBLE);
+			fastItemAdapter.clear();
+			endlessRecyclerOnScrollListener.resetPageCount();
+			tinyDb.putBoolean("resumeIssues", false);
+
+		}
+
+	}
+
+	private void loadInitial(String instanceUrl, String token, String repoOwner, String repoName, int resultLimit, String requestType) {
+
+		Call<List<Issues>> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().getIssues(token, repoOwner, repoName, 1, resultLimit, requestType);
+
+		call.enqueue(new Callback<List<Issues>>() {
+
+			@Override
+			public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
+
+				if(response.isSuccessful()) {
+
+					assert response.body() != null;
+					if(response.body().size() > 0) {
+
+						if(response.body().size() == resultLimit) {
+							loadNextFlag = true;
+						}
+
+						for(int i = 0; i < response.body().size(); i++) {
+							items.add(new IssuesAdapter(getContext()).withNewItems(response.body().get(i).getTitle(), response.body().get(i).getNumber(), response.body().get(i).getUser().getAvatar_url(), response.body().get(i).getCreated_at(), response.body().get(i).getComments(), response.body().get(i).getUser().getFull_name(), response.body().get(i).getUser().getLogin()));
+						}
+
+						fastItemAdapter.add(items);
+						noDataIssues.setVisibility(View.GONE);
+
+					}
+					else {
+						noDataIssues.setVisibility(View.VISIBLE);
+					}
+
+					mProgressBar.setVisibility(View.GONE);
+
+				}
+				else {
+					Log.i(TAG, String.valueOf(response.code()));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
+
+				Log.e(TAG, t.toString());
+			}
+
+		});
+
+	}
+
+	private void loadNext(String instanceUrl, String token, String repoOwner, String repoName, int resultLimit, String requestType, final int currentPage) {
+
+		footerAdapter.clear();
+		//noinspection unchecked
+		footerAdapter.add(new ProgressItem().withEnabled(false));
+
+		Call<List<Issues>> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().getIssues(token, repoOwner, repoName, currentPage + 1, resultLimit, requestType);
+
+		call.enqueue(new Callback<List<Issues>>() {
+
+			@Override
+			public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
+
+				if(response.isSuccessful()) {
+
+					assert response.body() != null;
+
+					if(response.body().size() > 0) {
+
+						loadNextFlag = response.body().size() == resultLimit;
+
+						for(int i = 0; i < response.body().size(); i++) {
+
+							fastItemAdapter.add(fastItemAdapter.getAdapterItemCount(), new IssuesAdapter(getContext()).withNewItems(response.body().get(i).getTitle(), response.body().get(i).getNumber(), response.body().get(i).getUser().getAvatar_url(), response.body().get(i).getCreated_at(), response.body().get(i).getComments(), response.body().get(i).getUser().getFull_name(), response.body().get(i).getUser().getLogin()));
+
+						}
+
+						footerAdapter.clear();
+						noDataIssues.setVisibility(View.GONE);
+
+					}
+					else {
+						footerAdapter.clear();
+					}
+
+					mProgressBar.setVisibility(View.GONE);
+
+				}
+				else {
+					Log.i(TAG, String.valueOf(response.code()));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
+
+				Log.i(TAG, t.toString());
+			}
+
+		});
+
+		if(!loadNextFlag) {
+			footerAdapter.clear();
+		}
+
+	}
+
+	@Override
+	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+
+		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.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+
+			@Override
+			public boolean onQueryTextSubmit(String query) {
+
+				return false;
+			}
+
+			@Override
+			public boolean onQueryTextChange(String newText) {
+
+				fastItemAdapter.filter(newText);
+				return true;
+			}
+
+		});
+
+		endlessRecyclerOnScrollListener.enable();
+
+	}
+
+	@Override
+	public void itemsFiltered(@Nullable CharSequence constraint, @Nullable List<IssuesAdapter> results) {
+
+		endlessRecyclerOnScrollListener.disable();
+	}
+
+	@Override
+	public void onReset() {
+
+		endlessRecyclerOnScrollListener.enable();
+	}
+
+}

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

@@ -1,9 +1,17 @@
 package org.mian.gitnex.fragments;
 
-import android.content.Context;
+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 androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.os.Handler;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -11,27 +19,17 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
-import androidx.annotation.NonNull;
+import android.widget.ProgressBar;
-import androidx.fragment.app.Fragment;
+import android.widget.TextView;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.adapters.MilestonesAdapter;
-import org.mian.gitnex.clients.AppApiService;
-import org.mian.gitnex.databinding.FragmentMilestonesBinding;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.StaticGlobalVariables;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.Version;
-import org.mian.gitnex.interfaces.ApiInterface;
 import org.mian.gitnex.models.Milestones;
+import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
-import java.util.ArrayList;
+import org.mian.gitnex.viewmodels.MilestonesViewModel;
 import java.util.List;
 import java.util.Objects;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -39,122 +37,89 @@ import retrofit2.Response;
 
 public class MilestonesFragment extends Fragment {
 
-    private FragmentMilestonesBinding viewBinding;
+    private ProgressBar mProgressBar;
-
-    private Menu menu;
-    private List<Milestones> dataList;
     private MilestonesAdapter adapter;
-    private ApiInterface api;
+    private RecyclerView mRecyclerView;
-    private Context ctx;
+    private TextView noDataMilestone;
-    private int pageSize = StaticGlobalVariables.milestonesPageInit;
+    private static String repoNameF = "param2";
-    private String TAG = StaticGlobalVariables.tagMilestonesFragment;
+    private static String repoOwnerF = "param1";
-    private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
+
+    private String repoName;
+    private String repoOwner;
+    private String msState = "all";
+
+    private OnFragmentInteractionListener mListener;
+
+    public MilestonesFragment() {
+    }
+
+    public static MilestonesFragment newInstance(String param1, String param2) {
+        MilestonesFragment fragment = new MilestonesFragment();
+        Bundle args = new Bundle();
+        args.putString(repoOwnerF, param1);
+        args.putString(repoNameF, param2);
+        fragment.setArguments(args);
+        return fragment;
+    }
 
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            repoName = getArguments().getString(repoNameF);
+            repoOwner = getArguments().getString(repoOwnerF);
+        }
+    }
 
-        viewBinding = FragmentMilestonesBinding.inflate(inflater, container, false);
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        final View v = inflater.inflate(R.layout.fragment_milestones, container, false);
         setHasOptionsMenu(true);
-        ctx = getContext();
 
         TinyDB tinyDb = new TinyDB(getContext());
-        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");
+        final String locale = tinyDb.getString("locale");
+        final String timeFormat = tinyDb.getString("dateFormat");
+        noDataMilestone = v.findViewById(R.id.noDataMilestone);
 
-        viewBinding.recyclerView.setHasFixedSize(true);
+        final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
-        viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-        // if gitea is 1.12 or higher use the new limit
+        mRecyclerView = v.findViewById(R.id.recyclerView);
-        if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+        mRecyclerView.setHasFixedSize(true);
-            resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        }
 
-        dataList = new ArrayList<>();
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
-        adapter = new MilestonesAdapter(ctx, dataList);
+                DividerItemDecoration.VERTICAL);
+        mRecyclerView.addItemDecoration(dividerItemDecoration);
 
-	    if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+        mProgressBar = v.findViewById(R.id.progress_bar);
 
-		    adapter.setLoadMoreListener(() -> viewBinding.recyclerView.post(() -> {
+        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-
+            @Override
-			    if(dataList.size() == resultLimit || pageSize == resultLimit) {
+            public void onRefresh() {
-
+                new Handler().postDelayed(new Runnable() {
-				    int page = (dataList.size() + resultLimit) / resultLimit;
+                    @Override
-				    loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, tinyDb.getString("milestoneState"));
+                    public void run() {
-
+                        swipeRefresh.setRefreshing(false);
-			    }
+                        MilestonesViewModel.loadMilestonesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, msState, getContext());
-
+                    }
-		    }));
+                }, 50);
-
-	    }
-
-        viewBinding.recyclerView.setHasFixedSize(true);
-        viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
-        viewBinding.recyclerView.setAdapter(adapter);
-
-        viewBinding.pullToRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
-
-            dataList.clear();
-            viewBinding.pullToRefresh.setRefreshing(false);
-            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, tinyDb.getString("milestoneState"));
-            adapter.updateList(dataList);
-
-        }, 50));
-
-        ((RepoDetailActivity) Objects.requireNonNull(getActivity())).setFragmentRefreshListenerMilestone(milestoneState -> {
-
-            if(milestoneState.equals("closed")) {
-                menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
             }
-            else {
-                menu.getItem(1).setIcon(R.drawable.ic_filter);
-            }
-
-            dataList.clear();
-
-            adapter = new MilestonesAdapter(ctx, dataList);
-
-	        if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
-
-		        adapter.setLoadMoreListener(() -> viewBinding.recyclerView.post(() -> {
-
-			        if(dataList.size() == resultLimit || pageSize == resultLimit) {
-
-				        int page = (dataList.size() + resultLimit) / resultLimit;
-				        loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, milestoneState);
-
-			        }
-
-		        }));
-
-	        }
-
-            tinyDb.putString("milestoneState", milestoneState);
-
-            viewBinding.progressBar.setVisibility(View.VISIBLE);
-            viewBinding.noDataMilestone.setVisibility(View.GONE);
-
-            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, milestoneState);
-            viewBinding.recyclerView.setAdapter(adapter);
-
         });
 
-        api = AppApiService.createService(ApiInterface.class, instanceUrl, ctx);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
-        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, tinyDb.getString("milestoneState"));
-
-        return viewBinding.getRoot();
 
+        return v;
     }
 
     @Override
     public void onResume() {
-
         super.onResume();
-        TinyDB tinyDb = new TinyDB(getContext());
+        final TinyDB tinyDb = new TinyDB(getContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
@@ -163,167 +128,82 @@ public class MilestonesFragment extends Fragment {
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         if(tinyDb.getBoolean("milestoneCreated")) {
-
+            MilestonesViewModel.loadMilestonesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, msState, getContext());
-            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, tinyDb.getString("milestoneState"));
             tinyDb.putBoolean("milestoneCreated", false);
-
         }
-
     }
 
-    private void loadInitial(String token, String repoOwner, String repoName, int resultLimit, String milestoneState) {
+    public void onButtonPressed(Uri uri) {
-
+        if (mListener != null) {
-        Call<List<Milestones>> call = api.getMilestones(token, repoOwner, repoName, 1, resultLimit, milestoneState);
+            mListener.onFragmentInteraction(uri);
-
+        }
-        call.enqueue(new Callback<List<Milestones>>() {
-
-            @Override
-            public void onResponse(@NonNull Call<List<Milestones>> call, @NonNull Response<List<Milestones>> response) {
-
-                if(response.code() == 200) {
-
-                    assert response.body() != null;
-                    if(response.body().size() > 0) {
-
-                        dataList.clear();
-                        dataList.addAll(response.body());
-                        adapter.notifyDataChanged();
-                        viewBinding.noDataMilestone.setVisibility(View.GONE);
-
-                    }
-                    else {
-
-                        dataList.clear();
-                        adapter.notifyDataChanged();
-                        viewBinding.noDataMilestone.setVisibility(View.VISIBLE);
-
-                    }
-
-                    viewBinding.progressBar.setVisibility(View.GONE);
-
-                }
-                else {
-                    Log.e(TAG, String.valueOf(response.code()));
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<List<Milestones>> call, @NonNull Throwable t) {
-
-                Log.e(TAG, t.toString());
-            }
-
-        });
-
     }
 
-    private void loadMore(String token, String repoOwner, String repoName, int page, int resultLimit, String milestoneState) {
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
 
-        //add loading progress view
+    public interface OnFragmentInteractionListener {
-        dataList.add(new Milestones("load"));
+        void onFragmentInteraction(Uri uri);
-        adapter.notifyItemInserted((dataList.size() - 1));
+    }
 
-        Call<List<Milestones>> call = api.getMilestones(token, repoOwner, repoName, page, resultLimit, milestoneState);
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo) {
 
-        call.enqueue(new Callback<List<Milestones>>() {
+        MilestonesViewModel msModel = new ViewModelProvider(this).get(MilestonesViewModel.class);
 
+        msModel.getMilestonesList(instanceUrl, instanceToken, owner, repo, msState, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Milestones>>() {
             @Override
-            public void onResponse(@NonNull Call<List<Milestones>> call, @NonNull Response<List<Milestones>> response) {
+            public void onChanged(@Nullable List<Milestones> msListMain) {
-
+                adapter = new MilestonesAdapter(getContext(), msListMain);
-	            if(response.code() == 200) {
+                if(adapter.getItemCount() > 0) {
-
+                    mRecyclerView.setAdapter(adapter);
-                    //remove loading view
+                    noDataMilestone.setVisibility(View.GONE);
-                    dataList.remove(dataList.size() - 1);
-
-                    List<Milestones> result = response.body();
-
-                    assert result != null;
-                    if(result.size() > 0) {
-
-                        pageSize = result.size();
-                        dataList.addAll(result);
-
-                    }
-                    else {
-
-                        adapter.setMoreDataAvailable(false);
-
-                    }
-
-                    adapter.notifyDataChanged();
-
                 }
                 else {
-
+                    adapter.notifyDataSetChanged();
-                    Log.e(TAG, String.valueOf(response.code()));
+                    mRecyclerView.setAdapter(adapter);
-
+                    noDataMilestone.setVisibility(View.VISIBLE);
                 }
-
+                mProgressBar.setVisibility(View.GONE);
             }
-
-            @Override
-            public void onFailure(@NonNull Call<List<Milestones>> call, @NonNull Throwable t) {
-
-                Log.e(TAG, t.toString());
-
-            }
-
         });
+
     }
 
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
-        this.menu = menu;
+        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+
         inflater.inflate(R.menu.search_menu, menu);
-        inflater.inflate(R.menu.filter_menu_milestone, menu);
         super.onCreateOptionsMenu(menu, inflater);
 
-        TinyDB tinyDb = new TinyDB(ctx);
-
-        if(tinyDb.getString("milestoneState").equals("closed")) {
-            menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
-        }
-        else {
-            menu.getItem(1).setIcon(R.drawable.ic_filter);
-        }
-
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         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) {
-
+                if(mRecyclerView.getAdapter() != null) {
-                filter(newText);
+                    adapter.getFilter().filter(newText);
+                }
                 return false;
-
             }
-
         });
 
     }
 
-    private void filter(String text) {
-
-        List<Milestones> arr = new ArrayList<>();
-
-        for(Milestones d : dataList) {
-            if(d.getTitle().toLowerCase().contains(text) || d.getDescription().toLowerCase().contains(text)) {
-                arr.add(d);
-            }
-        }
-
-        adapter.updateList(arr);
-    }
-
 }

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

@@ -3,16 +3,17 @@ package org.mian.gitnex.fragments;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import retrofit2.Call;
+import retrofit2.Callback;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -20,8 +21,6 @@ import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.models.Organization;
 import org.mian.gitnex.util.TinyDB;
-import retrofit2.Call;
-import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -38,7 +37,6 @@ public class OrganizationInfoFragment extends Fragment {
     private TextView orgDescInfo;
     private TextView orgWebsiteInfo;
     private TextView orgLocationInfo;
-    private LinearLayout orgInfoLayout;
 
     private RepoInfoFragment.OnFragmentInteractionListener mListener;
 
@@ -78,7 +76,6 @@ public class OrganizationInfoFragment extends Fragment {
         orgDescInfo = v.findViewById(R.id.orgDescInfo);
         orgWebsiteInfo = v.findViewById(R.id.orgWebsiteInfo);
         orgLocationInfo = v.findViewById(R.id.orgLocationInfo);
-	    orgInfoLayout = v.findViewById(R.id.orgInfoLayout);
 
         orgNameInfo.setText(orgName);
 
@@ -102,46 +99,19 @@ public class OrganizationInfoFragment extends Fragment {
 
                 Organization orgInfo = response.body();
 
-                if (response.code() == 200) {
+                if (response.isSuccessful()) {
 
-                    orgInfoLayout.setVisibility(View.VISIBLE);
+                    if (response.code() == 200) {
 
-                    assert orgInfo != null;
+                        assert orgInfo != null;
+                        PicassoService.getInstance(ctx).get().load(orgInfo.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(orgAvatar);
+                        orgDescInfo.setText(orgInfo.getDescription());
+                        orgWebsiteInfo.setText(orgInfo.getWebsite());
+                        orgLocationInfo.setText(orgInfo.getLocation());
 
-                    PicassoService.getInstance(ctx).get()
+                        mProgressBar.setVisibility(View.GONE);
-	                    .load(orgInfo.getAvatar_url())
-	                    .placeholder(R.drawable.loader_animated)
-	                    .transform(new RoundedTransformation(8, 0))
-	                    .resize(230, 230)
-	                    .centerCrop().into(orgAvatar);
 
-	                if(!orgInfo.getDescription().isEmpty()) {
-		                orgDescInfo.setText(orgInfo.getDescription());
-	                }
-	                else {
-		                orgDescInfo.setText(getString(R.string.noDataDescription));
-	                }
-
-                    if(!orgInfo.getWebsite().isEmpty()) {
-	                    orgWebsiteInfo.setText(orgInfo.getWebsite());
                     }
-                    else {
-	                    orgWebsiteInfo.setText(getString(R.string.noDataWebsite));
-                    }
-
-	                if(!orgInfo.getLocation().isEmpty()) {
-		                orgLocationInfo.setText(orgInfo.getLocation());
-	                }
-	                else {
-		                orgLocationInfo.setText(getString(R.string.noDataLocation));
-	                }
-
-                    mProgressBar.setVisibility(View.GONE);
-
-                }
-                else if(response.code() == 404) {
-
-	                mProgressBar.setVisibility(View.GONE);
 
                 }
                 else {

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

@@ -3,6 +3,12 @@ package org.mian.gitnex.fragments;
 import android.content.Context;
 import android.graphics.Typeface;
 import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -11,24 +17,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentStatePagerAdapter;
-import androidx.viewpager.widget.ViewPager;
 import com.google.android.material.tabs.TabLayout;
-import com.squareup.picasso.Callback;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.ColorInverter;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.util.TinyDB;
-import java.util.Locale;
 import java.util.Objects;
-import eightbitlab.com.blurview.BlurView;
-import eightbitlab.com.blurview.RenderScriptBlur;
 
 /**
  * Author M M Arif
@@ -36,67 +31,26 @@ import eightbitlab.com.blurview.RenderScriptBlur;
 
 public class ProfileFragment extends Fragment {
 
-    private Context ctx;
+    private Context ctx = getContext();
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-    	ctx = getContext();
-
         View v = inflater.inflate(R.layout.fragment_profile, container, false);
         setHasOptionsMenu(true);
 
         TinyDB tinyDb = new TinyDB(getContext());
 
-	    BlurView blurView = v.findViewById(R.id.blurView);
         TextView userFullName = v.findViewById(R.id.userFullName);
-	    ImageView userAvatarBackground = v.findViewById(R.id.userAvatarBackground);
         ImageView userAvatar = v.findViewById(R.id.userAvatar);
         TextView userLogin = v.findViewById(R.id.userLogin);
-        TextView userLanguage = v.findViewById(R.id.userLanguage);
+        TextView userEmail = v.findViewById(R.id.userEmail);
-
-	    ViewGroup aboutFrame = v.findViewById(R.id.aboutFrame);
-
-	    String[] userLanguageCodes = tinyDb.getString("userLang").split("-");
-	    Locale locale = new Locale(userLanguageCodes[0], userLanguageCodes[1]);
-
-	    userFullName.setText(tinyDb.getString("userFullname"));
-	    userLogin.setText(getString(R.string.usernameWithAt, tinyDb.getString("userLogin")));
-	    userLanguage.setText(locale.getDisplayCountry());
-
-	    PicassoService.getInstance(ctx).get()
-		    .load(tinyDb.getString("userAvatar"))
-		    .transform(new RoundedTransformation(8, 0))
-		    .placeholder(R.drawable.loader_animated)
-		    .resize(120, 120)
-		    .centerCrop().into(userAvatar);
-
-	    PicassoService.getInstance(ctx).get()
-		    .load(tinyDb.getString("userAvatar"))
-		    .into(userAvatarBackground, new Callback() {
-
-			    @Override
-			    public void onSuccess() {
-
-				    int textColor = new ColorInverter().getImageViewContrastColor(userAvatarBackground);
-
-				    userFullName.setTextColor(textColor);
-				    userLogin.setTextColor(textColor);
-				    userLanguage.setTextColor(textColor);
-
-				    blurView.setupWith(aboutFrame)
-					    .setBlurAlgorithm(new RenderScriptBlur(ctx))
-					    .setBlurRadius(3)
-					    .setHasFixedTransformationMatrix(true);
-
-			    }
-
-			    @Override
-			    public void onError(Exception e) {}
-
-		    });
 
+        userFullName.setText(tinyDb.getString("userFullname"));
+        PicassoService.getInstance(ctx).get().load(tinyDb.getString("userAvatar")).placeholder(R.drawable.loader_animated).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"));
 
         ProfileFragment.SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getChildFragmentManager());
 
@@ -125,16 +79,11 @@ public class ProfileFragment extends Fragment {
 
         ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
         int tabsCount = vg.getChildCount();
-
         for (int j = 0; j < tabsCount; j++) {
-
             ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
             int tabChildCount = vgTab.getChildCount();
-
             for (int i = 0; i < tabChildCount; i++) {
-
                 View tabViewChild = vgTab.getChildAt(i);
-
                 if (tabViewChild instanceof TextView) {
                     ((TextView) tabViewChild).setTypeface(myTypeface);
                 }
@@ -159,22 +108,15 @@ public class ProfileFragment extends Fragment {
         public Fragment getItem(int position) {
 
             Fragment fragment = null;
-
             switch (position) {
-
                 case 0: // followers
                     return ProfileFollowersFragment.newInstance("repoOwner", "repoName");
-
                 case 1: // following
                     return ProfileFollowingFragment.newInstance("repoOwner", "repoName");
-
                 case 2: // emails
                     return ProfileEmailsFragment.newInstance("repoOwner", "repoName");
-
             }
-
             return fragment;
-
         }
 
         @Override
@@ -186,11 +128,9 @@ public class ProfileFragment extends Fragment {
 
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-
         menu.clear();
         Objects.requireNonNull(getActivity()).getMenuInflater().inflate(R.menu.profile_dotted_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);
-
     }
 
     @Override
@@ -199,20 +139,17 @@ public class ProfileFragment extends Fragment {
         int id = item.getItemId();
 
         switch (id) {
-
             case android.R.id.home:
                 ((MainActivity)ctx).finish();
                 return true;
-
             case R.id.profileMenu:
                 BottomSheetProfileFragment bottomSheet = new BottomSheetProfileFragment();
                 bottomSheet.show(getChildFragmentManager(), "profileBottomSheet");
                 return true;
-
             default:
                 return super.onOptionsItemSelected(item);
-
         }
+
     }
 
 }

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

@@ -2,6 +2,13 @@ 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;
@@ -13,23 +20,14 @@ import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.adapters.PullRequestsAdapter;
-import org.mian.gitnex.clients.AppApiService;
+import org.mian.gitnex.clients.PullRequestsService;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.Version;
 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;
@@ -44,300 +42,254 @@ import retrofit2.Response;
 
 public class PullRequestsFragment extends Fragment {
 
-	private Menu menu;
+    private ProgressBar mProgressBar;
-	private ProgressBar mProgressBar;
+    private RecyclerView recyclerView;
-	private RecyclerView recyclerView;
+    private List<PullRequests> prList;
-	private List<PullRequests> prList;
+    private PullRequestsAdapter adapter;
-	private PullRequestsAdapter adapter;
+    private ApiInterface apiPR;
-	private ApiInterface apiPR;
+    private String TAG = "PullRequestsListFragment - ";
-	private String TAG = StaticGlobalVariables.tagPullRequestsList;
+    private Context context;
-	private Context context;
+    private int pageSize = 1;
-	private int pageSize = StaticGlobalVariables.prPageInit;
+    private TextView noData;
-	private TextView noData;
+    private String prState = "open";
-	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
+    private int resultLimit = 50;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+        final View v = inflater.inflate(R.layout.fragment_pull_requests, container, false);
+        setHasOptionsMenu(true);
 
-	@Nullable
+        TinyDB tinyDb = new TinyDB(getContext());
-	@Override
+        String repoFullName = tinyDb.getString("repoFullName");
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        //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 View v = inflater.inflate(R.layout.fragment_pull_requests, container, false);
+        final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
-		setHasOptionsMenu(true);
-		context = getContext();
 
-		TinyDB tinyDb = new TinyDB(getContext());
+        context = getContext();
-		String repoFullName = tinyDb.getString("repoFullName");
+        recyclerView = v.findViewById(R.id.recyclerView);
-		String[] parts = repoFullName.split("/");
+        prList = new ArrayList<>();
-		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);
+        mProgressBar = v.findViewById(R.id.progress_bar);
+        noData = v.findViewById(R.id.noData);
 
-		// if gitea is 1.12 or higher use the new limit
+        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+            @Override
-			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+            public void onRefresh() {
-		}
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+
+                        swipeRefresh.setRefreshing(false);
+                        loadInitial(instanceToken, repoOwner, repoName, pageSize, prState, resultLimit);
+                        adapter.notifyDataChanged();
+
+                    }
+                }, 200);
+            }
+        });
+
+        adapter = new PullRequestsAdapter(getContext(), prList);
+        adapter.setLoadMoreListener(new PullRequestsAdapter.OnLoadMoreListener() {
+            @Override
+            public void onLoadMore() {
 
-		recyclerView = v.findViewById(R.id.recyclerView);
+                recyclerView.post(new Runnable() {
-		prList = new ArrayList<>();
+                    @Override
+                    public void run() {
+                        if(prList.size() == 10 || pageSize == 10) {
 
-		mProgressBar = v.findViewById(R.id.progress_bar);
+                            int page = (prList.size() + 10) / 10;
-		noData = v.findViewById(R.id.noData);
+                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, prState, resultLimit);
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+                        }
+                        /*else {
 
-			swipeRefresh.setRefreshing(false);
+                            Toasty.info(context, getString(R.string.noMoreData));
-			loadInitial(instanceToken, repoOwner, repoName, pageSize, tinyDb.getString("repoPrState"), resultLimit);
-			adapter.notifyDataChanged();
 
-		}, 200));
+                        }*/
+                    }
+                });
 
-		adapter = new PullRequestsAdapter(getContext(), prList);
+            }
-		adapter.setLoadMoreListener(() -> recyclerView.post(() -> {
+        });
 
-			if(prList.size() == 10 || pageSize == resultLimit) {
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(recyclerView.getContext(),
+                DividerItemDecoration.VERTICAL);
+        recyclerView.setHasFixedSize(true);
+        recyclerView.addItemDecoration(dividerItemDecoration);
+        recyclerView.setLayoutManager(new LinearLayoutManager(context));
+        recyclerView.setAdapter(adapter);
 
-				int page = (prList.size() + resultLimit) / resultLimit;
+        apiPR = PullRequestsService.createService(ApiInterface.class, instanceUrl, getContext());
-				loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, tinyDb.getString("repoPrState"), resultLimit);
+        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState, resultLimit);
 
-			}
+        return v;
 
-		}));
+    }
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(recyclerView.getContext(), DividerItemDecoration.VERTICAL);
+    @Override
-		recyclerView.setHasFixedSize(true);
+    public void onResume() {
-		recyclerView.addItemDecoration(dividerItemDecoration);
-		recyclerView.setLayoutManager(new LinearLayoutManager(context));
-		recyclerView.setAdapter(adapter);
 
-		((RepoDetailActivity) Objects.requireNonNull(getActivity())).setFragmentRefreshListenerPr(prState -> {
+        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(prState.equals("closed")) {
+        if(tinyDb.getBoolean("resumePullRequests")) {
-				menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
-			}
-			else {
-				menu.getItem(1).setIcon(R.drawable.ic_filter);
-			}
 
-			prList.clear();
+            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState, resultLimit);
+            tinyDb.putBoolean("resumePullRequests", false);
+            tinyDb.putBoolean("prMerged", false);
 
-			adapter = new PullRequestsAdapter(context, prList);
+        }
-			adapter.setLoadMoreListener(() -> recyclerView.post(() -> {
 
-				if(prList.size() == 10 || pageSize == resultLimit) {
+    }
 
-					int page = (prList.size() + resultLimit) / resultLimit;
+    private void loadInitial(String token, String repoOwner, String repoName, int page, String prState, int resultLimit) {
-					loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, tinyDb.getString("repoPrState"), resultLimit);
 
-				}
+        Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState, resultLimit);
 
-			}));
+        call.enqueue(new Callback<List<PullRequests>>() {
 
-			tinyDb.putString("repoPrState", prState);
+            @Override
+            public void onResponse(@NonNull Call<List<PullRequests>> call, @NonNull Response<List<PullRequests>> response) {
 
-			mProgressBar.setVisibility(View.VISIBLE);
+                if(response.isSuccessful()) {
-			noData.setVisibility(View.GONE);
 
-			loadInitial(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, pageSize, prState, resultLimit);
+                    assert response.body() != null;
-			recyclerView.setAdapter(adapter);
+                    if(response.body().size() > 0) {
 
-		});
+                        prList.clear();
+                        prList.addAll(response.body());
+                        adapter.notifyDataChanged();
+                        noData.setVisibility(View.GONE);
 
-		apiPR = AppApiService.createService(ApiInterface.class, instanceUrl, context);
+                    }
-		loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, tinyDb.getString("repoPrState"), resultLimit);
+                    else {
+                        prList.clear();
+                        adapter.notifyDataChanged();
+                        noData.setVisibility(View.VISIBLE);
+                    }
+                    mProgressBar.setVisibility(View.GONE);
+                }
+                else {
+                    Log.i(TAG, String.valueOf(response.code()));
+                }
 
-		return v;
+                Log.i("http", String.valueOf(response.code()));
 
-	}
+            }
 
-	@Override
+            @Override
-	public void onResume() {
+            public void onFailure(@NonNull Call<List<PullRequests>> call, @NonNull Throwable t) {
+                Log.e(TAG, t.toString());
+            }
 
-		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, tinyDb.getString("repoPrState"), resultLimit);
+    private void loadMore(String token, String repoOwner, String repoName, int page, String prState, int resultLimit){
-			tinyDb.putBoolean("resumePullRequests", false);
-			tinyDb.putBoolean("prMerged", false);
 
-		}
+        //add loading progress view
+        prList.add(new PullRequests("load"));
+        adapter.notifyItemInserted((prList.size() - 1));
 
-	}
+        Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState, resultLimit);
 
-	private void loadInitial(String token, String repoOwner, String repoName, int page, String prState, int resultLimit) {
+        call.enqueue(new Callback<List<PullRequests>>() {
 
-		Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState, resultLimit);
+            @Override
+            public void onResponse(@NonNull Call<List<PullRequests>> call, @NonNull Response<List<PullRequests>> response) {
 
-		call.enqueue(new Callback<List<PullRequests>>() {
+                if(response.isSuccessful()){
 
-			@Override
+                    //remove loading view
-			public void onResponse(@NonNull Call<List<PullRequests>> call, @NonNull Response<List<PullRequests>> response) {
+                    prList.remove(prList.size()-1);
 
-				if(response.code() == 200) {
+                    List<PullRequests> result = response.body();
 
-					assert response.body() != null;
+                    assert result != null;
-					if(response.body().size() > 0) {
+                    if(result.size() > 0) {
 
-						prList.clear();
+                        pageSize = result.size();
-						prList.addAll(response.body());
+                        prList.addAll(result);
-						adapter.notifyDataChanged();
-						noData.setVisibility(View.GONE);
 
-					}
+                    }
-					else {
+                    else {
 
-						prList.clear();
+                        Toasty.info(context, getString(R.string.noMoreData));
-						adapter.notifyDataChanged();
+                        adapter.setMoreDataAvailable(false);
-						noData.setVisibility(View.VISIBLE);
 
-					}
+                    }
 
-					mProgressBar.setVisibility(View.GONE);
+                    adapter.notifyDataChanged();
 
-				}
+                }
-				else if(response.code() == 404) {
+                else {
 
-					noData.setVisibility(View.VISIBLE);
+                    Log.e(TAG, String.valueOf(response.code()));
-					mProgressBar.setVisibility(View.GONE);
 
-				}
+                }
-				else {
 
-					Log.i(TAG, String.valueOf(response.code()));
+            }
 
-				}
+            @Override
+            public void onFailure(@NonNull Call<List<PullRequests>> call, @NonNull Throwable t) {
 
-				Log.i(TAG, String.valueOf(response.code()));
+                Log.e(TAG, t.toString());
 
-			}
+            }
 
-			@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);
 
-	private void loadMore(String token, String repoOwner, String repoName, int page, String prState, int resultLimit) {
+        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));
 
-		//add loading progress view
+        /*if(!connToInternet) {
-		prList.add(new PullRequests("load"));
+            return;
-		adapter.notifyItemInserted((prList.size() - 1));
+        }*/
 
-		Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState, resultLimit);
+        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
 
-		call.enqueue(new Callback<List<PullRequests>>() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                return false;
+            }
 
-			@Override
+            @Override
-			public void onResponse(@NonNull Call<List<PullRequests>> call, @NonNull Response<List<PullRequests>> response) {
+            public boolean onQueryTextChange(String newText) {
 
-				if(response.code() == 200) {
+                adapter.getFilter().filter(newText);
+                return false;
 
-					//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) {
-
-		this.menu = menu;
-		inflater.inflate(R.menu.search_menu, menu);
-		inflater.inflate(R.menu.filter_menu_pr, menu);
-		super.onCreateOptionsMenu(menu, inflater);
-
-		TinyDB tinyDb = new TinyDB(context);
-
-		if(tinyDb.getString("repoPrState").equals("closed")) {
-			menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
-		}
-		else {
-			menu.getItem(1).setIcon(R.drawable.ic_filter);
-		}
-
-		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
-		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
-
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-
-				return false;
-			}
-
-			@Override
-			public boolean onQueryTextChange(String newText) {
-
-				filter(newText);
-				return false;
-
-			}
-
-		});
-
-	}
-
-	private void filter(String text) {
-
-		List<PullRequests> arr = new ArrayList<>();
-
-		for(PullRequests d : prList) {
-			if(d.getTitle().toLowerCase().contains(text) || d.getBody().toLowerCase().contains(text)) {
-				arr.add(d);
-			}
-		}
-
-		adapter.updateList(arr);
-	}
 
 }