Prepare release (#599)

update  feature list in readme

Merge branch 'master' into 480-update-screenshots

update desc for f-droid

update screenshots, add changelogs

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

.drone.yml

@@ -1,21 +1,65 @@
 ---
 kind: pipeline
-name: gitnex-ci-test
+type: docker
+name: tests
 
 steps:
 
-  - name: test
+  - name: unit-tests
     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 ...
+  #
+  #  - name: do-or-check-formatting
+  #    image: dlsniper/docker-intellij
+  #    depends_on: [ clone ]
+  #    commands:
+  #      - /opt/intellij/bin/idea.sh format -s .idea/codeStyles/Project.xml -m *.java app/src/main/java
+
 trigger:
   event:
     - pull_request
 
 ---
 kind: pipeline
-name: gitnex-ci-build
+type: docker
+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:
 
@@ -27,7 +71,7 @@ steps:
   - name: sign
     image: nextcloudci/android:android-49
     environment:
-      TOKEN:
+      BOT_TOKEN:
         from_secret: BOT_TOKEN
       KS_PASS:
         from_secret: KS_PASS
@@ -47,8 +91,11 @@ steps:
       WEBDAV_USERNAME: GitNexBot
       WEBDAV_PASSWORD:
         from_secret: NC_TOKEN
-      PLUGIN_FILE: signed.apk
-      PLUGIN_DESTINATION: https://cloud.swatian.com/remote.php/dav/files/GitNexBot/GitNex-Builds/latest.apk
+      PLUGIN_FILE: 'signed.apk'
+      PLUGIN_TIMEOUT: 180
+      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

@@ -0,0 +1,25 @@
+[*]
+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
+line_comment = //
+block_comment_start = /*
+block_comment = *
+block_comment_end = */
+
+[*.json]
+indent_size = 2
+
+[{*.yml,*.yaml}]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+insert_final_newline = false

.gitea/issue_template.md

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

.gitlab-ci.yml

@@ -0,0 +1,63 @@
+stages:
+  - test
+  - build
+  - sign
+  - publish
+
+test:
+  image: nextcloudci/android:android-49
+  stage: test
+  script:
+    - ./gradlew test
+
+build:
+  image: nextcloudci/android:android-49
+  stage: build
+  only:
+    - master
+  script:
+    - ./gradlew build
+  artifacts:
+    paths:
+      - app/build/outputs/
+    expire_in: 15 minutes
+
+sign:
+  image: nextcloudci/android:android-49
+  stage: sign
+  only:
+    - master
+  variables:
+    OUTPUT: "signed.apk"
+    GITEA: "https://gitea.com"
+    KS_FILE: "ci_keystore.jks"
+  script:
+    - ./scripts/sign-build.sh
+  artifacts:
+    paths:
+      - signed.apk
+    expire_in: 15 minutes
+
+latest:
+  image: tutum/curl
+  stage: publish
+  only:
+    - master
+  variables:
+    WEBDAV_USERNAME: "GitNexBot"
+    PLUGIN_FILE: "signed.apk"
+    PLUGIN_DESTINATION: "https://cloud.swatian.com/remote.php/dav/files/GitNexBot/gitnex/builds/latest.apk"
+  script:
+    - curl -T "$PLUGIN_FILE" -u "$WEBDAV_USERNAME":"$WEBDAV_PASSWORD" "$PLUGIN_DESTINATION"
+
+release:
+  image: tutum/curl
+  stage: publish
+  only:
+    - tags
+  variables:
+    WEBDAV_USERNAME: "GitNexBot"
+    PLUGIN_FILE: "signed.apk"
+  script:
+    - "[[ $CI_COMMIT_REF_NAME == *'-rc'* ]] && echo 'Upload blocked. Build seems to be a release candidate.' && exit 0"
+    - curl -T "$PLUGIN_FILE" -u "$WEBDAV_USERNAME":"$WEBDAV_PASSWORD" 'https://cloud.swatian.com/remote.php/dav/files/GitNexBot/gitnex/releases/'"$CI_COMMIT_REF_NAME"'.apk'

.idea/codeStyles/Project.xml

@@ -29,6 +29,7 @@
       <option name="ELSE_ON_NEW_LINE" value="true" />
       <option name="CATCH_ON_NEW_LINE" value="true" />
       <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
       <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
       <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
       <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
@@ -36,8 +37,13 @@
       <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
       <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
       <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="1" />
+      <option name="THROWS_LIST_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="TERNARY_OPERATION_WRAP" value="1" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
       <option name="IF_BRACE_FORCE" value="3" />
-      <option name="WRAP_ON_TYPING" value="1" />
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
         <option name="SMART_TABS" value="true" />

CHANGELOG.md

@@ -1,2 +1,2 @@
 # Changelog
-[Check out the release notes](https://gitea.com/gitnex/GitNex/releases)
+[Check out the release notes](https://codeberg.org/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://gitea.com/gitnex/GitNex/wiki/Code-Standards)
+It is documented in the Wiki: [Code-Standards](https://codeberg.org/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.

CONTRIBUTORS.md

@@ -3,6 +3,7 @@ This part lists all PUBLIC individuals having contributed content to the code.
 
  * M M Arif (mmarif)
  * 6543
+ * opyale
  * Unpublished
 
 # Translators

LICENSE

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -620,55 +620,18 @@ copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
 
-            How to Apply These Terms to Your New Programs
+  GitNex is an Android client/application for Gitea.
+  Copyright (C) 2019  The GitNex Authors
 
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-    Mastalab is a Mastodon client for Android devices
-    Copyright (C) 2017  Thomas Schneider
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    Mastalab  Copyright (C) 2017 Thomas Schneider
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <https://www.gnu.org/licenses/>.

README.md

@@ -1,28 +1,22 @@
-[![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)
+[![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)
 
-[<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://gitea.com/gitnex/GitNex/releases)
+[<img alt='Download builds and releases' src='assets/apk-badge.png' height="82"/>](https://cloud.swatian.com/s/DN7E5xxtaw4fRbE)
 
 ## Note about Gitea version
 Please make sure that you are on latest stable release or later for better app experience.
 
-Check the versions [compatibility page](https://gitea.com/gitnex/GitNex/wiki/Compatibility) which lists all the supported versions with compatibility ratio.
+Check the versions [compatibility page](https://codeberg.org/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.
@@ -30,48 +24,50 @@ Option 1 - Download the source code, open it in Android Studio and build it ther
 Option 2 - Open terminal(Linux) and cd to the project dir. Run `./gradlew build`.
 
 ## Features
+- Repositories / issues/ org list
 - File and directory browser
+- File viewer
 - Create files
 - Explore repositories
-- Issues list
 - Pull requests
-- Merge pull request
-- [MANY MORE](https://gitea.com/gitnex/GitNex/wiki/Features)
+- Files diff for PRs
+- Notifications
+- Drafts
+- [MANY MORE](https://codeberg.org/gitnex/GitNex/wiki/Features)
 
 ## Contributing
-[CONTRIBUTING](https://gitea.com/gitnex/GitNex/src/branch/master/CONTRIBUTING.md)
+[CONTRIBUTING](https://codeberg.org/gitnex/GitNex/src/branch/master/CONTRIBUTING.md)
 
 ## Translation
 Help us translate GitNex to your native language.
 
-We use [Crowdin](https://crowdin.com/project/gitnex) for translation.
-If your language is not listed, please request [here](https://gitea.com/gitnex/GitNex/issues) to add it to the project.
+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.
 
 **Link: https://crowdin.com/project/GitNex**
 
 ## Screenshots:
 
-<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/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/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"/>
+<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"/>
 
 
 ## FAQ
-[Faq](https://gitea.com/gitnex/GitNex/wiki/FAQ)
+[Faq](https://codeberg.org/gitnex/GitNex/wiki/FAQ)
 
 ## Links
 [Website](https://gitnex.com)
 
-[Wiki](https://gitea.com/gitnex/GitNex/wiki/Home)
+[Wiki](https://codeberg.org/gitnex/GitNex/wiki/Home)
 
 [Website Repository](https://gitlab.com/mmarif4u/gitnex-website)
 
-[Troubleshoot Guide](https://gitea.com/gitnex/GitNex/wiki/Troubleshoot-Guide)
+[Troubleshoot Guide](https://codeberg.org/gitnex/GitNex/wiki/Troubleshoot-Guide)
 
 ## Thanks
 Thanks to all the open source libraries, contributors and donators.
 
-Open source libraries
+#### Open source libraries
 - Retrofit
 - Gson
 - Okhttp
@@ -91,7 +87,8 @@ Open source libraries
 - Caverock/androidsvg
 - Droidsonroids.gif/android-gif-drawable
 - Barteksc/AndroidPdfViewer
-- Mikepenz/fastadapter
 - Ge0rg/MemorizingTrustManager
+- Dimezis/BlurView
+- mikaelhg/urlbuilder
 
 [Follow me on Fediverse - mastodon.social/@mmarif](https://mastodon.social/@mmarif)

app/build.gradle

@@ -6,10 +6,13 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 251
-        versionName "2.5.1"
+        versionCode 300
+        versionName "3.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+    buildFeatures {
+        viewBinding = true
+    }
     buildTypes {
         release {
             minifyEnabled false
@@ -33,29 +36,30 @@ configurations {
 }
 
 dependencies {
-    def lifecycle_version = "2.2.0"
-    def markwon_version = '4.3.1'
-    def fastadapter = "3.3.1"
+    def lifecycle_version = "2.3.0-alpha05"
+    def markwon_version = "4.4.0"
+    def work_version = "2.4.0"
     def acra = "5.5.0"
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "com.google.android.material:material:1.2.0-alpha06"
+    implementation "androidx.appcompat:appcompat:1.3.0-alpha01"
+    implementation "com.google.android.material:material:1.3.0-alpha01"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
     testImplementation "junit:junit:4.13"
     androidTestImplementation "androidx.test:runner:1.2.0"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
     implementation "com.github.vihtarb:tooltip:0.2.0"
-    implementation 'com.squareup.okhttp3:okhttp:4.5.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.8.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.5.0'
-    implementation 'org.ocpsoft.prettytime:prettytime:4.0.4.Final'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-scalars:2.9.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.8.0'
+    implementation 'org.ocpsoft.prettytime:prettytime:4.0.5.Final'
     implementation "com.vdurmont:emoji-java:5.1.1"
     implementation "com.pes.materialcolorpicker:library:1.2.5"
     implementation "io.noties.markwon:core:$markwon_version"
@@ -75,19 +79,18 @@ dependencies {
     implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.19"
     implementation "com.hendraanggrian.appcompat:socialview:0.2"
     implementation "com.hendraanggrian.appcompat:socialview-commons:0.2"
-    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
     implementation "com.github.HamidrezaAmz:BreadcrumbsView:0.2.9"
     implementation "commons-io:commons-io:20030203.000550"
+    implementation "org.apache.commons:commons-lang3:3.10"
     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 "androidx.room:room-runtime:2.2.5"
+    annotationProcessor "androidx.room:room-compiler:2.2.5"
+    implementation "androidx.work:work-runtime:$work_version"
+    implementation "com.eightbitlab:blurview:1.6.3"
+    implementation "io.mikael:urlbuilder:2.0.9"
 
 }

app/src/main/AndroidManifest.xml

@@ -4,17 +4,19 @@
     package="org.mian.gitnex">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/app_logo"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/app_logo_round"
         android:supportsRtl="true"
         tools:targetApi="n">
+
         <activity android:name=".activities.MergePullRequestActivity" />
         <activity
             android:name=".activities.FileViewActivity"
@@ -59,7 +61,7 @@
             android:name=".activities.RepoDetailActivity"
             android:label="@string/title_activity_repo_detail"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".activities.MainActivity" android:theme="@android:style/Theme.NoTitleBar">
+        <activity android:name=".activities.MainActivity" android:theme="@android:style/Theme.NoTitleBar" android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -75,6 +77,19 @@
         <activity android:name=".activities.FileDiffActivity" />
         <activity android:name=".activities.CommitsActivity" />
         <activity android:name=".helpers.ssl.MemorizingActivity" android:theme="@android:style/Theme.Material.Dialog" />
+        <activity android:name=".activities.SettingsAppearanceActivity" />
+        <activity android:name=".activities.SettingsFileViewerActivity" />
+        <activity android:name=".activities.SettingsSecurityActivity" />
+        <activity android:name=".activities.SettingsTranslationActivity" />
+        <activity android:name=".activities.SettingsReportsActivity" />
+        <activity android:name=".activities.AddNewTeamMemberActivity" />
+        <activity android:name=".activities.SettingsDraftsActivity" />
+
+        <!-- Version < 3.0. DeX Mode and Screen Mirroring support -->
+        <meta-data android:name="com.samsung.android.keepalive.density" android:value="true"/>
+        <!-- Version >= 3.0. DeX Dual Mode support -->
+        <meta-data android:name="com.samsung.android.multidisplay.keep_process_alive" android:value="true"/>
+
     </application>
 
 </manifest>

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

@@ -0,0 +1 @@
+!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

@@ -0,0 +1,66 @@
+/*
+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

@@ -0,0 +1,87 @@
+/*
+
+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

@@ -0,0 +1,71 @@
+/*
+
+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

@@ -0,0 +1,99 @@
+/*
+
+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

@@ -0,0 +1,73 @@
+/*
+  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

@@ -0,0 +1,83 @@
+/*
+
+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/CollaboratorActions.java

@@ -2,16 +2,16 @@ package org.mian.gitnex.actions;
 
 import android.content.Context;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.AddCollaboratorToRepositoryActivity;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.Permission;
-import org.mian.gitnex.util.TinyDB;
-import androidx.annotation.NonNull;
 import retrofit2.Call;
 import retrofit2.Callback;
 

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

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

@@ -0,0 +1,59 @@
+package org.mian.gitnex.actions;
+
+import android.content.Context;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.NotificationThread;
+import java.io.IOException;
+import java.util.Date;
+import okhttp3.ResponseBody;
+import retrofit2.Call;
+
+/**
+ * Author opyale
+ */
+
+public class NotificationsActions {
+
+	public enum NotificationStatus {READ, UNREAD, PINNED}
+
+	private TinyDB tinyDB;
+	private Context context;
+	private String instanceUrl;
+	private String instanceToken;
+
+	public NotificationsActions(Context context) {
+
+		this.context = context;
+		this.tinyDB = new TinyDB(context);
+
+		String loginUid = tinyDB.getString("loginUid");
+
+		instanceUrl = tinyDB.getString("instanceUrl");
+		instanceToken = "token " + tinyDB.getString(loginUid + "-token");
+
+	}
+
+	public void setNotificationStatus(NotificationThread notificationThread, NotificationStatus notificationStatus) throws IOException {
+
+		Call<ResponseBody> call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface()
+			.markNotificationThreadAsRead(instanceToken, notificationThread.getId(), notificationStatus.name());
+
+		if(!call.execute().isSuccessful()) {
+
+			throw new IllegalStateException();
+		}
+	}
+
+	public boolean setAllNotificationsRead(Date date) throws IOException {
+
+		Call<ResponseBody> call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface()
+			.markNotificationThreadsAsRead(instanceToken, AppUtil.getTimestampFromDate(context, date), true,
+				new String[]{"unread", "pinned"}, "read");
+
+		return call.execute().isSuccessful();
+
+	}
+
+}

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

@@ -8,8 +8,8 @@ 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.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.util.TinyDB;
 import retrofit2.Call;
 import retrofit2.Callback;
 

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

@@ -0,0 +1,154 @@
+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.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+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

@@ -1,30 +1,29 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 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.UserSearchAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.models.UserSearch;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.models.UserInfo;
-import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.models.UserSearch;
 import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -34,6 +33,7 @@ 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;
@@ -47,11 +47,13 @@ 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(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         String repoFullName = tinyDb.getString("repoFullName");
@@ -71,26 +73,26 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
-        addCollaboratorSearch.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND) {
-                    if(!addCollaboratorSearch.getText().toString().equals("")) {
-                        loadUserSearchList(instanceUrl, instanceToken, addCollaboratorSearch.getText().toString(), getApplicationContext(), loginUid);
-                    }
+        addCollaboratorSearch.setOnEditorActionListener((v, actionId, event) -> {
+
+            if (actionId == EditorInfo.IME_ACTION_SEND) {
+                if(!addCollaboratorSearch.getText().toString().equals("")) {
+                    loadUserSearchList(instanceUrl, instanceToken, addCollaboratorSearch.getText().toString(), loginUid);
                 }
-                return false;
             }
+
+            return false;
+
         });
 
     }
 
-    public void loadUserSearchList(String instanceUrl, String token, String searchKeyword, final Context context, String loginUid) {
+    public void loadUserSearchList(String instanceUrl, String token, String searchKeyword, String loginUid) {
 
         Call<UserSearch> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .getUserBySearch(Authorization.returnAuthentication(getApplicationContext(), loginUid, token), searchKeyword, 10);
+                .getUserBySearch(Authorization.returnAuthentication(ctx, loginUid, token), searchKeyword, 10);
 
         call.enqueue(new Callback<UserSearch>() {
 
@@ -99,7 +101,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
 
                 if (response.isSuccessful()) {
                     assert response.body() != null;
-                    getUsersList(response.body().getData(), context);
+                    getUsersList(response.body().getData(), ctx);
                 } else {
                     Log.i("onResponse", String.valueOf(response.code()));
                 }
@@ -119,7 +121,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
         UserSearchAdapter adapter = new UserSearchAdapter(dataList, context);
 
         mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
         DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
                 DividerItemDecoration.VERTICAL);
         mRecyclerView.addItemDecoration(dividerItemDecoration);
@@ -139,12 +141,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
     }
 
     private void initCloseListener() {
-        onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        };
+        onClickListener = view -> finish();
     }
 
 

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

@@ -0,0 +1,164 @@
+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.helpers.TinyDB;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.models.UserSearch;
+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("") && addNewTeamMember.getText().toString().length() > 1) {
+
+					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

@@ -1,23 +1,23 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.NonNull;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.MultiSelectDialog;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.Issues;
 import org.mian.gitnex.models.MultiSelectModel;
 import org.mian.gitnex.models.UpdateIssueAssignees;
-import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;
@@ -34,6 +34,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
     private Boolean assigneesFlag = false;
     private MultiSelectDialog multiSelectDialogAssignees;
     final Context ctx = this;
+    private Context appCtx;
 
     @Override
     protected int getLayoutResourceId(){
@@ -44,11 +45,12 @@ 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(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         String repoFullName = tinyDb.getString("repoFullName");
@@ -64,12 +66,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(getApplicationContext());
+        final TinyDB tinyDb = new TinyDB(appCtx);
 
         Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<List<Collaborators>>() {
 
@@ -92,9 +94,9 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
 
                         // get current issue assignees
                         Call<Issues> callSingleIssueAssignees = RetrofitClient
-                                .getInstance(instanceUrl, getApplicationContext())
+                                .getInstance(instanceUrl, ctx)
                                 .getApiInterface()
-                                .getIssueByIndex(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);
+                                .getIssueByIndex(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
 
                         callSingleIssueAssignees.enqueue(new Callback<Issues>() {
 
@@ -137,11 +139,11 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
                                                 .multiSelectList(listOfCollaborators)
                                                 .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
                                                     @Override
-                                                    public void onSelected(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {
+                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
 
                                                         Log.i("selectedNames", String.valueOf(selectedNames));
 
-                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
+                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
                                                         tinyDb.putBoolean("singleIssueUpdate", true);
                                                         CloseActivity();
                                                     }
@@ -165,9 +167,9 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
                                                 .multiSelectList(listOfCollaborators)
                                                 .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
                                                     @Override
-                                                    public void onSelected(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {
+                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
 
-                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
+                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
                                                         tinyDb.putBoolean("singleIssueUpdate", true);
                                                         CloseActivity();
 
@@ -215,7 +217,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
                     }
                     else {
 
-                        Toasty.info(getApplicationContext(), getString(R.string.genericError));
+                        Toasty.info(ctx, getString(R.string.genericError));
 
                     }
                 }
@@ -241,9 +243,9 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
         Call<JsonElement> call3;
 
         call3 = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .patchIssueAssignees(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);
+                .patchIssueAssignees(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);
 
         call3.enqueue(new Callback<JsonElement>() {
 
@@ -275,7 +277,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
                 }
                 else {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.genericError));
+                    Toasty.info(ctx, getString(R.string.genericError));
 
                 }
 

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

@@ -1,25 +1,25 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.NonNull;
-import retrofit2.Call;
-import retrofit2.Callback;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.MultiSelectDialog;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Labels;
 import org.mian.gitnex.models.MultiSelectModel;
-import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -32,6 +32,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
     private Boolean labelsFlag = false;
     private MultiSelectDialog multiSelectDialogLabels;
     final Context ctx = this;
+    private Context appCtx;
 
     @Override
     protected int getLayoutResourceId(){
@@ -40,12 +41,14 @@ 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(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         String repoFullName = tinyDb.getString("repoFullName");
@@ -61,12 +64,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(getApplicationContext());
+        final TinyDB tinyDb = new TinyDB(appCtx);
 
         Call<List<Labels>> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .getlabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+                .getlabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<List<Labels>>() {
 
@@ -89,9 +92,9 @@ public class AddRemoveLabelsActivity extends BaseActivity {
 
                         // get current issue labels
                         Call<List<Labels>> callSingleIssueLabels = RetrofitClient
-                                .getInstance(instanceUrl, getApplicationContext())
+                                .getInstance(instanceUrl, ctx)
                                 .getApiInterface()
-                                .getIssueLabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);
+                                .getIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
 
                         callSingleIssueLabels.enqueue(new Callback<List<Labels>>() {
 
@@ -125,7 +128,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                                                 .multiSelectList(listOfLabels)
                                                 .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
                                                     @Override
-                                                    public void onSelected(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {
+                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
 
                                                         String labelIds = selectedIds.toString();
                                                         int[] integers;
@@ -142,7 +145,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                                                             integers = new int[0];
                                                         }
 
-                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
+                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
                                                         tinyDb.putBoolean("singleIssueUpdate", true);
                                                         CloseActivity();
                                                     }
@@ -166,7 +169,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                                                 .multiSelectList(listOfLabels)
                                                 .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
                                                     @Override
-                                                    public void onSelected(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {
+                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
 
                                                         String labelIds = selectedIds.toString();
                                                         int[] integers;
@@ -183,7 +186,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                                                             integers = new int[0];
                                                         }
 
-                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
+                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
                                                         tinyDb.putBoolean("singleIssueUpdate", true);
                                                         CloseActivity();
 
@@ -231,7 +234,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                     }
                     else {
 
-                        Toasty.info(getApplicationContext(), getString(R.string.genericError));
+                        Toasty.info(ctx, getString(R.string.genericError));
 
                     }
                 }
@@ -251,9 +254,9 @@ public class AddRemoveLabelsActivity extends BaseActivity {
         Labels patchIssueLabels = new Labels(issueLabels);
 
         Call<JsonElement> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .updateIssueLabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, patchIssueLabels);
+                .updateIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, patchIssueLabels);
 
         call.enqueue(new Callback<JsonElement>() {
 
@@ -285,7 +288,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                 }
                 else {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.genericError));
+                    Toasty.info(ctx, getString(R.string.genericError));
 
                 }
 

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

@@ -1,13 +1,5 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -19,16 +11,20 @@ import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.AdminGetUsersAdapter;
 import org.mian.gitnex.fragments.BottomSheetAdminUsersFragment;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.models.UserInfo;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.viewmodels.AdminGetUsersViewModel;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -38,6 +34,7 @@ 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;
@@ -52,8 +49,9 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
 
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        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");
@@ -71,50 +69,43 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
         closeActivity.setOnClickListener(onClickListener);
 
         mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
 
         DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
                 DividerItemDecoration.VERTICAL);
         mRecyclerView.addItemDecoration(dividerItemDecoration);
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        AdminGetUsersViewModel.loadUsersList(getApplicationContext(), instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken));
-                    }
-                }, 500);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
 
-        fetchDataAsync(getApplicationContext(), instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken));
+            swipeRefresh.setRefreshing(false);
+            AdminGetUsersViewModel.loadUsersList(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken));
+
+        }, 500));
+
+        fetchDataAsync(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken));
 
     }
 
     private void fetchDataAsync(Context ctx, String instanceUrl, String instanceToken) {
 
-        AdminGetUsersViewModel usersModel = ViewModelProviders.of(this).get(AdminGetUsersViewModel.class);
+        AdminGetUsersViewModel usersModel = new ViewModelProvider(this).get(AdminGetUsersViewModel.class);
 
-        usersModel.getUsersList(ctx, instanceUrl, instanceToken).observe(this, new Observer<List<UserInfo>>() {
-            @Override
-            public void onChanged(@Nullable List<UserInfo> usersListMain) {
-                adapter = new AdminGetUsersAdapter(getApplicationContext(), usersListMain);
-                if(adapter.getItemCount() > 0) {
-                    mRecyclerView.setVisibility(View.VISIBLE);
-                    mRecyclerView.setAdapter(adapter);
-                    noDataUsers.setVisibility(View.GONE);
-                    searchFilter = true;
-                }
-                else {
-                    //adapter.notifyDataSetChanged();
-                    //mRecyclerView.setAdapter(adapter);
-                    mRecyclerView.setVisibility(View.GONE);
-                    noDataUsers.setVisibility(View.VISIBLE);
-                }
+        usersModel.getUsersList(ctx, instanceUrl, instanceToken).observe(this, usersListMain -> {
+
+            adapter = new AdminGetUsersAdapter(ctx, usersListMain);
+            if(adapter.getItemCount() > 0) {
+                mRecyclerView.setVisibility(View.VISIBLE);
+                mRecyclerView.setAdapter(adapter);
+                noDataUsers.setVisibility(View.GONE);
+                searchFilter = true;
             }
+            else {
+                //adapter.notifyDataSetChanged();
+                //mRecyclerView.setAdapter(adapter);
+                mRecyclerView.setVisibility(View.GONE);
+                noDataUsers.setVisibility(View.VISIBLE);
+            }
+
         });
 
     }
@@ -125,37 +116,36 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
         final MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
 
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                if(searchFilter) {
+        new Handler().postDelayed(() -> {
 
-                    boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getApplicationContext()));
+            if(searchFilter) {
 
-                    inflater.inflate(R.menu.search_menu, menu);
+                boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-                    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);
+                inflater.inflate(R.menu.search_menu, menu);
 
-                    if(!connToInternet) {
-                        return;
+                MenuItem searchItem = menu.findItem(R.id.action_search);
+                SearchView searchView = (SearchView) searchItem.getActionView();
+                searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+
+                if(!connToInternet) {
+                    return;
+                }
+
+                searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+
+                    @Override
+                    public boolean onQueryTextSubmit(String query) { return true; }
+
+                    @Override
+                    public boolean onQueryTextChange(String newText) {
+                        adapter.getFilter().filter(newText);
+                        return false;
                     }
 
-                    searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
-                        @Override
-                        public boolean onQueryTextSubmit(String query) {
-                            return true;
-                        }
-
-                        @Override
-                        public boolean onQueryTextChange(String newText) {
-                            adapter.getFilter().filter(newText);
-                            return false;
-                        }
-                    });
-                }
+                });
             }
+
         }, 500);
 
         return true;
@@ -192,12 +182,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
     }
 
     private void initCloseListener() {
-        onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        };
+        onClickListener = view -> finish();
     }
 
 }

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

@@ -1,5 +1,6 @@
 package org.mian.gitnex.activities;
 
+import android.content.Context;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import org.acra.ACRA;
@@ -10,10 +11,11 @@ import org.acra.config.LimiterConfigurationBuilder;
 import org.acra.config.MailSenderConfigurationBuilder;
 import org.acra.data.StringFormat;
 import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.FontsOverride;
 import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.notifications.NotificationsMaster;
 
 /**
  * Author M M Arif
@@ -26,29 +28,37 @@ import org.mian.gitnex.util.TinyDB;
 
 public abstract class BaseActivity extends AppCompatActivity {
 
+	private Context appCtx;
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
-		final TinyDB tinyDb = new TinyDB(getApplicationContext());
+		appCtx = getApplicationContext();
+		final TinyDB tinyDb = new TinyDB(appCtx);
 
-		if(tinyDb.getInt("themeId") == 1) {
-			setTheme(R.style.AppThemeLight);
-		}
-		else if(tinyDb.getInt("themeId") == 2) {
+		switch(tinyDb.getInt("themeId")) {
 
-			boolean timeSetterFlag = TimeHelper.timeBetweenHours(18, 6); // 6pm to 6am
-
-			if(timeSetterFlag) {
-				setTheme(R.style.AppTheme);
-			}
-			else {
+			case 1:
 				setTheme(R.style.AppThemeLight);
-			}
+				break;
+
+			case 2:
+				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.AppTheme);
-		}
+
+		String appLocale = tinyDb.getString("locale");
+		AppUtil.setAppLocale(getResources(), appLocale);
 
 		super.onCreate(savedInstanceState);
 		setContentView(getLayoutResourceId());
@@ -78,11 +88,17 @@ public abstract class BaseActivity extends AppCompatActivity {
 
 		}
 
-		// enabling counter badges by default
-		if(tinyDb.getString("enableCounterBadgesInit").isEmpty()) {
-			tinyDb.putBoolean("enableCounterBadges", true);
-			tinyDb.putString("enableCounterBadgesInit", "yes");
-		}
+        if(tinyDb.getInt("pollingDelayMinutes") == 0) {
+            tinyDb.putInt("pollingDelayMinutes", 15);
+        }
+
+        NotificationsMaster.hireWorker(appCtx);
+
+        // enabling counter badges by default
+        if(tinyDb.getString("enableCounterBadgesInit").isEmpty()) {
+            tinyDb.putBoolean("enableCounterBadges", true);
+            tinyDb.putString("enableCounterBadgesInit", "yes");
+        }
 
 		// enable crash reports by default
 		if(tinyDb.getString("crashReportingEnabledInit").isEmpty()) {
@@ -90,6 +106,25 @@ 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));
+		}
+
+		// enable comment drafts by default
+		if(tinyDb.getString("draftsCommentsDeletionEnabledInit").isEmpty()) {
+			tinyDb.putBoolean("draftsCommentsDeletionEnabled", true);
+			tinyDb.putString("draftsCommentsDeletionEnabledInit", "yes");
+		}
+
+		if(!tinyDb.getString("instanceUrlWithProtocol").endsWith("/")) {
+
+			tinyDb.putString("instanceUrlWithProtocol", tinyDb.getString("instanceUrlWithProtocol") + "/");
+		}
+
 		if (tinyDb.getBoolean("crashReportingEnabled")) {
 
 			CoreConfigurationBuilder ACRABuilder = new CoreConfigurationBuilder(this);

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

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

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

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

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

@@ -1,9 +1,5 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.NonNull;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
 import android.app.DatePickerDialog;
 import android.content.Context;
 import android.graphics.PorterDuff;
@@ -19,6 +15,7 @@ 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;
@@ -26,20 +23,25 @@ import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.MultiSelectDialog;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.CreateIssue;
 import org.mian.gitnex.models.Labels;
 import org.mian.gitnex.models.Milestones;
 import org.mian.gitnex.models.MultiSelectModel;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
-import org.mian.gitnex.helpers.Toasty;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -61,6 +63,8 @@ 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<>();
@@ -74,13 +78,15 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
+
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         final String loginFullName = tinyDb.getString("userFullname");
@@ -90,6 +96,11 @@ 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);
@@ -117,7 +128,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);
+        getMilestones(instanceUrl, instanceToken, repoOwner, repoName, loginUid, resultLimit);
 
         getLabels(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
         getCollaborators(instanceUrl, instanceToken, repoOwner, repoName, loginUid, loginFullName);
@@ -142,8 +153,8 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
     private void processNewIssue() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         String repoFullName = tinyDb.getString("repoFullName");
@@ -164,21 +175,21 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
         if(!connToInternet) {
 
-            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if (newIssueTitleForm.equals("")) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.issueTitleEmpty));
+            Toasty.info(ctx, getString(R.string.issueTitleEmpty));
             return;
 
         }
 
         /*if (newIssueDescriptionForm.equals("")) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.issueDescriptionEmpty));
+            Toasty.info(ctx, getString(R.string.issueDescriptionEmpty));
             return;
 
         }*/
@@ -217,7 +228,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
     public void loadCollaboratorsList() {
 
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final TinyDB tinyDb = new TinyDB(appCtx);
 
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
@@ -228,9 +239,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         final String repoName = parts[1];
 
         Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<List<Collaborators>>() {
 
@@ -272,9 +283,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         Call<JsonElement> call3;
 
         call3 = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .createNewIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, createNewIssueJson);
+                .createNewIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, createNewIssueJson);
 
         call3.enqueue(new Callback<JsonElement>() {
 
@@ -285,10 +296,10 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                     if(response2.code() == 201) {
 
                         //Log.i("isSuccessful1", String.valueOf(response2.body()));
-                        TinyDB tinyDb = new TinyDB(getApplicationContext());
+                        TinyDB tinyDb = new TinyDB(appCtx);
                         tinyDb.putBoolean("resumeIssues", true);
 
-                        Toasty.info(getApplicationContext(), getString(R.string.issueCreated));
+                        Toasty.info(ctx, getString(R.string.issueCreated));
                         enableProcessButton();
                         finish();
 
@@ -306,7 +317,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                 }
                 else {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.issueCreatedError));
+                    Toasty.info(ctx, getString(R.string.issueCreatedError));
                     enableProcessButton();
                     //Log.i("isSuccessful2", String.valueOf(response2.body()));
 
@@ -332,13 +343,13 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         };
     }
 
-    private void getMilestones(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
+    private void getMilestones(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid, int resultLimit) {
 
         String msState = "open";
         Call<List<Milestones>> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .getMilestones(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, msState);
+                .getMilestones(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, 1, resultLimit, msState);
 
         call.enqueue(new Callback<List<Milestones>>() {
 
@@ -390,9 +401,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, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
 
         listOfAssignees.add(new MultiSelectModel(-1, loginFullName));
 
@@ -433,7 +444,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                                 .multiSelectList(listOfAssignees)
                                 .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
                                     @Override
-                                    public void onSelected(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {
+                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
 
                                         assigneesList.setText(dataString);
 
@@ -462,9 +473,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, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .getlabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+                .getlabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<List<Labels>>() {
 
@@ -496,7 +507,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                                 .multiSelectList(listOfLabels)
                                 .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
                                     @Override
-                                    public void onSelected(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {
+                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
 
                                         newIssueLabels.setText(dataString.trim());
                                         labelsIdHolder.setText(selectedIds.toString());
@@ -530,7 +541,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                 multiSelectDialog.show(getSupportFragmentManager(), "multiSelectDialog");
             }
             else {
-                Toasty.info(getApplicationContext(), getResources().getString(R.string.noAssigneesFound));
+                Toasty.info(ctx, getResources().getString(R.string.noAssigneesFound));
             }
         }
         else if (v == newIssueLabels) {
@@ -538,7 +549,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                 multiSelectDialogLabels.show(getSupportFragmentManager(), "multiSelectDialogLabels");
             }
             else {
-                Toasty.info(getApplicationContext(), getResources().getString(R.string.noLabelsFound));
+                Toasty.info(ctx, getResources().getString(R.string.noLabelsFound));
             }
         }
         else if (v == newIssueDueDate) {

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

@@ -1,10 +1,5 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-import retrofit2.Call;
-import retrofit2.Callback;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.GradientDrawable;
@@ -16,19 +11,24 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import com.pes.androidmaterialcolorpickerdialog.ColorPicker;
 import com.pes.androidmaterialcolorpickerdialog.ColorPickerCallback;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.CreateLabel;
 import org.mian.gitnex.models.Labels;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.viewmodels.LabelsViewModel;
 import java.util.Objects;
+import retrofit2.Call;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -41,6 +41,7 @@ public class CreateLabelActivity extends BaseActivity {
     private EditText labelName;
     private Button createLabelButton;
     final Context ctx = this;
+    private Context appCtx;
 
     @Override
     protected int getLayoutResourceId(){
@@ -49,11 +50,13 @@ 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(getApplicationContext());
+        final TinyDB tinyDb = new TinyDB(appCtx);
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
@@ -70,7 +73,7 @@ public class CreateLabelActivity extends BaseActivity {
 
         }
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         ImageView closeActivity = findViewById(R.id.close);
         colorPicker = findViewById(R.id.colorPicker);
@@ -150,8 +153,8 @@ public class CreateLabelActivity extends BaseActivity {
 
     private void processUpdateLabel() {
 
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        final TinyDB tinyDb = new TinyDB(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
@@ -173,21 +176,21 @@ public class CreateLabelActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if(updateLabelName.equals("")) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.labelEmptyError));
+            Toasty.info(ctx, getString(R.string.labelEmptyError));
             return;
 
         }
 
         if(!appUtil.checkStrings(updateLabelName)) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.labelNameError));
+            Toasty.info(ctx, getString(R.string.labelNameError));
             return;
 
         }
@@ -199,9 +202,9 @@ public class CreateLabelActivity extends BaseActivity {
 
     private void processCreateLabel() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(appCtx);
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
@@ -213,7 +216,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(getApplicationContext(), R.color.releasePre)));
+            newLabelColor = String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(ctx, R.color.releasePre)));
         }
         else {
             newLabelColor = tinyDb.getString("labelColor");
@@ -221,21 +224,21 @@ public class CreateLabelActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if(newLabelName.equals("")) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.labelEmptyError));
+            Toasty.info(ctx, getString(R.string.labelEmptyError));
             return;
 
         }
 
         if(!appUtil.checkStrings(newLabelName)) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.labelNameError));
+            Toasty.info(ctx, getString(R.string.labelNameError));
             return;
 
         }
@@ -248,14 +251,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(getApplicationContext());
+        final TinyDB tinyDb = new TinyDB(appCtx);
 
         Call<CreateLabel> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .createLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, createLabelFunc);
+                .createLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, createLabelFunc);
 
         call.enqueue(new Callback<CreateLabel>() {
 
@@ -264,7 +267,7 @@ public class CreateLabelActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.labelCreated));
+                    Toasty.info(ctx, getString(R.string.labelCreated));
                     tinyDb.putString("labelColor", "");
                     tinyDb.putBoolean("labelsRefresh", true);
                     finish();
@@ -283,7 +286,7 @@ public class CreateLabelActivity extends BaseActivity {
 
                     enableProcessButton();
                     tinyDb.putString("labelColor", "");
-                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
+                    Toasty.info(ctx, getString(R.string.labelGeneralError));
 
                 }
 
@@ -302,14 +305,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(getApplicationContext());
+        final TinyDB tinyDb = new TinyDB(appCtx);
 
         Call<CreateLabel> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .patchLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, labelId, createLabelFunc);
+                .patchLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, labelId, createLabelFunc);
 
         call.enqueue(new Callback<CreateLabel>() {
 
@@ -319,7 +322,7 @@ public class CreateLabelActivity extends BaseActivity {
                 if(response.isSuccessful()) {
                     if(response.code() == 200) {
 
-                        Toasty.info(getApplicationContext(), getString(R.string.labelUpdated));
+                        Toasty.info(ctx, getString(R.string.labelUpdated));
                         tinyDb.putString("labelColor", "");
                         tinyDb.putBoolean("labelsRefresh", true);
                         tinyDb.putString("labelColorDefault", "");
@@ -345,7 +348,7 @@ public class CreateLabelActivity extends BaseActivity {
                     enableProcessButton();
                     tinyDb.putString("labelColor", "");
                     tinyDb.putString("labelColorDefault", "");
-                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
+                    Toasty.info(ctx, getString(R.string.labelGeneralError));
 
                 }
 
@@ -380,9 +383,9 @@ public class CreateLabelActivity extends BaseActivity {
         Call<Labels> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .deleteLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, labelId);
+                .deleteLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, labelId);
 
         call.enqueue(new Callback<Labels>() {
 
@@ -392,8 +395,8 @@ public class CreateLabelActivity extends BaseActivity {
                 if(response.isSuccessful()) {
                     if(response.code() == 204) {
 
-                        Toasty.info(getApplicationContext(), getString(R.string.labelDeleteText));
-                        LabelsViewModel.loadLabelsList(instanceUrl, instanceToken, repoOwner, repoName, getApplicationContext());
+                        Toasty.info(ctx, getString(R.string.labelDeleteText));
+                        LabelsViewModel.loadLabelsList(instanceUrl, instanceToken, repoOwner, repoName, ctx);
                         getIntent().removeExtra("labelAction");
                         getIntent().removeExtra("labelId");
 
@@ -409,7 +412,7 @@ public class CreateLabelActivity extends BaseActivity {
                 }
                 else {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.labelDeleteErrorText));
+                    Toasty.info(ctx, getString(R.string.labelDeleteErrorText));
 
                 }
 

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

@@ -1,8 +1,5 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.NonNull;
-import retrofit2.Call;
-import retrofit2.Callback;
 import android.app.DatePickerDialog;
 import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
@@ -14,16 +11,19 @@ import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.ImageView;
+import androidx.annotation.NonNull;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.VersionCheck;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.models.Milestones;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
 import java.util.Calendar;
+import retrofit2.Call;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -37,6 +37,7 @@ 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(){
@@ -45,9 +46,11 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
+
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -89,9 +92,9 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
     private void processNewMilestone() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(appCtx);
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
@@ -107,14 +110,14 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
         if(!connToInternet) {
 
-            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if(newMilestoneTitle.equals("")) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.milestoneNameErrorEmpty));
+            Toasty.info(ctx, getString(R.string.milestoneNameErrorEmpty));
             return;
 
         }
@@ -122,7 +125,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
         if(!newMilestoneDescription.equals("")) {
             if (appUtil.charactersLength(newMilestoneDescription) > 255) {
 
-                Toasty.info(getApplicationContext(), getString(R.string.milestoneDescError));
+                Toasty.info(ctx, getString(R.string.milestoneDescError));
                 return;
 
             }
@@ -131,14 +134,14 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
         String finalMilestoneDueDate = null;
         if(!newMilestoneDueDate.isEmpty()) {
             finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate)));
-        } else if (VersionCheck.compareVersion("1.10.0", tinyDb.getString("giteaVersion")) > 1) {
+        } else if (new Version(tinyDb.getString("giteaVersion")).less("1.10.0")) {
             // if Gitea version is less than 1.10.0 DueDate is required
-            Toasty.info(getApplicationContext(), getString(R.string.milestoneDateEmpty));
+            Toasty.info(ctx, getString(R.string.milestoneDateEmpty));
             return;
         }
 
         disableProcessButton();
-        createNewMilestone(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate);
+        createNewMilestone(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate);
 
     }
 
@@ -149,7 +152,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
         Call<Milestones> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
                 .createMilestone(token, repoOwner, repoName, createMilestone);
 
@@ -161,9 +164,9 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
                 if(response.isSuccessful()) {
                     if(response.code() == 201) {
 
-                        TinyDB tinyDb = new TinyDB(getApplicationContext());
+                        TinyDB tinyDb = new TinyDB(appCtx);
                         tinyDb.putBoolean("milestoneCreated", true);
-                        Toasty.info(getApplicationContext(), getString(R.string.milestoneCreated));
+                        Toasty.info(ctx, getString(R.string.milestoneCreated));
                         enableProcessButton();
                         finish();
 
@@ -181,7 +184,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
                 else {
 
                     enableProcessButton();
-                    Toasty.info(getApplicationContext(), getString(R.string.milestoneCreatedError));
+                    Toasty.info(ctx, getString(R.string.milestoneCreatedError));
 
                 }
 

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

@@ -1,8 +1,5 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.NonNull;
-import retrofit2.Call;
-import retrofit2.Callback;
 import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
@@ -13,14 +10,17 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
+import androidx.annotation.NonNull;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserInfo;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
+import retrofit2.Call;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -35,6 +35,7 @@ public class CreateNewUserActivity extends BaseActivity {
     private EditText userPassword;
     private Button createUserButton;
     final Context ctx = this;
+    private Context appCtx;
 
     @Override
     protected int getLayoutResourceId(){
@@ -45,8 +46,9 @@ public class CreateNewUserActivity extends BaseActivity {
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -78,9 +80,9 @@ public class CreateNewUserActivity extends BaseActivity {
 
     private void processCreateNewUser() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        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");
@@ -92,41 +94,41 @@ public class CreateNewUserActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if(newFullName.equals("") || newUserName.equals("") | newUserEmail.equals("") || newUserPassword.equals("")) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.emptyFields));
+            Toasty.info(ctx, getString(R.string.emptyFields));
             return;
 
         }
 
         if(!appUtil.checkStrings(newFullName)) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.userInvalidFullName));
+            Toasty.info(ctx, getString(R.string.userInvalidFullName));
             return;
 
         }
 
         if(!appUtil.checkStringsWithAlphaNumeric(newUserName)) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.userInvalidUserName));
+            Toasty.info(ctx, getString(R.string.userInvalidUserName));
             return;
 
         }
 
         if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.userInvalidEmail));
+            Toasty.info(ctx, getString(R.string.userInvalidEmail));
             return;
 
         }
 
         disableProcessButton();
-        createNewUser(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), newFullName, newUserName, newUserEmail, newUserPassword);
+        createNewUser(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newFullName, newUserName, newUserEmail, newUserPassword);
 
     }
 
@@ -137,7 +139,7 @@ public class CreateNewUserActivity extends BaseActivity {
         Call<UserInfo> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
                 .createNewUser(instanceToken, createUser);
 
@@ -148,7 +150,7 @@ public class CreateNewUserActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.userCreatedText));
+                    Toasty.info(ctx, getString(R.string.userCreatedText));
                     enableProcessButton();
                     finish();
 
@@ -183,7 +185,7 @@ public class CreateNewUserActivity extends BaseActivity {
                 else {
 
                     enableProcessButton();
-                    Toasty.info(getApplicationContext(), getString(R.string.genericError));
+                    Toasty.info(ctx, getString(R.string.genericError));
 
                 }
 

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

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

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

@@ -1,8 +1,5 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.NonNull;
-import retrofit2.Call;
-import retrofit2.Callback;
 import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.GradientDrawable;
@@ -17,17 +14,20 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Spinner;
+import androidx.annotation.NonNull;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Branches;
 import org.mian.gitnex.models.Releases;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -45,6 +45,7 @@ public class CreateReleaseActivity extends BaseActivity {
     private CheckBox releaseDraft;
     private Button createNewRelease;
     final Context ctx = this;
+    private Context appCtx;
 
     List<Branches> branchesList = new ArrayList<>();
 
@@ -57,12 +58,13 @@ public class CreateReleaseActivity extends BaseActivity {
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        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");
@@ -87,7 +89,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(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+        getBranches(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
         releaseBranch.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@@ -123,9 +125,9 @@ public class CreateReleaseActivity extends BaseActivity {
 
     private void processNewRelease() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        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");
@@ -143,27 +145,27 @@ public class CreateReleaseActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if(newReleaseTagName.equals("")) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.tagNameErrorEmpty));
+            Toasty.info(ctx, getString(R.string.tagNameErrorEmpty));
             return;
 
         }
 
         if(newReleaseTitle.equals("")) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.titleErrorEmpty));
+            Toasty.info(ctx, getString(R.string.titleErrorEmpty));
             return;
 
         }
 
         disableProcessButton();
-        createNewReleaseFunc(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, newReleaseBranch, newReleaseType, newReleaseDraft);
+        createNewReleaseFunc(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, newReleaseBranch, newReleaseType, newReleaseDraft);
 
     }
 
@@ -174,7 +176,7 @@ public class CreateReleaseActivity extends BaseActivity {
         Call<Releases> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
                 .createNewRelease(token, repoOwner, repoName, createReleaseJson);
 
@@ -185,9 +187,9 @@ public class CreateReleaseActivity extends BaseActivity {
 
                 if (response.code() == 201) {
 
-                    TinyDB tinyDb = new TinyDB(getApplicationContext());
+                    TinyDB tinyDb = new TinyDB(appCtx);
                     tinyDb.putBoolean("updateReleases", true);
-                    Toasty.info(getApplicationContext(), getString(R.string.releaseCreatedText));
+                    Toasty.info(ctx, getString(R.string.releaseCreatedText));
                     enableProcessButton();
                     finish();
 
@@ -234,7 +236,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, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
                 .getBranches(instanceToken, repoOwner, repoName);
 

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

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -15,15 +14,16 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Spinner;
+import androidx.annotation.NonNull;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.OrgOwner;
 import org.mian.gitnex.models.OrganizationRepository;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -45,6 +45,7 @@ public class CreateRepoActivity extends BaseActivity {
     private EditText repoDesc;
     private CheckBox repoAccess;
     final Context ctx = this;
+    private Context appCtx;
 
     List<OrgOwner> organizationsList = new ArrayList<>();
 
@@ -59,11 +60,13 @@ public class CreateRepoActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+
         super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        boolean connToInternet = AppUtil.hasNetworkConnection(ctx);
 
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         final String userLogin = tinyDb.getString("userLogin");
@@ -85,7 +88,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(getApplicationContext(), loginUid, instanceToken), userLogin);
+        getOrganizations(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), userLogin);
         spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@@ -121,9 +124,9 @@ public class CreateRepoActivity extends BaseActivity {
 
     private void processNewRepo() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        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");
@@ -135,7 +138,7 @@ public class CreateRepoActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
 
         }
@@ -143,7 +146,7 @@ public class CreateRepoActivity extends BaseActivity {
         if(!newRepoDesc.equals("")) {
             if (appUtil.charactersLength(newRepoDesc) > 255) {
 
-                Toasty.info(getApplicationContext(), getString(R.string.repoDescError));
+                Toasty.info(ctx, getString(R.string.repoDescError));
                 return;
 
             }
@@ -151,28 +154,28 @@ public class CreateRepoActivity extends BaseActivity {
 
         if(newRepoName.equals("")) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorEmpty));
+            Toasty.info(ctx, getString(R.string.repoNameErrorEmpty));
 
         }
         else if(!appUtil.checkStrings(newRepoName)) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorInvalid));
+            Toasty.info(ctx, getString(R.string.repoNameErrorInvalid));
 
         }
         else if (reservedRepoNames.contains(newRepoName)) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorReservedName));
+            Toasty.info(ctx, getString(R.string.repoNameErrorReservedName));
 
         }
         else if (reservedRepoPatterns.matcher(newRepoName).find()) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorReservedPatterns));
+            Toasty.info(ctx, getString(R.string.repoNameErrorReservedPatterns));
 
         }
         else {
 
             disableProcessButton();
-            createNewRepository(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, repoOwner, newRepoAccess);
+            createNewRepository(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, repoOwner, newRepoAccess);
 
         }
     }
@@ -185,7 +188,7 @@ public class CreateRepoActivity extends BaseActivity {
         if(repoOwner.equals(loginUid)) {
 
             call = RetrofitClient
-                    .getInstance(instanceUrl, getApplicationContext())
+                    .getInstance(instanceUrl, ctx)
                     .getApiInterface()
                     .createNewUserRepository(token, createRepository);
 
@@ -193,7 +196,7 @@ public class CreateRepoActivity extends BaseActivity {
         else {
 
             call = RetrofitClient
-                    .getInstance(instanceUrl, getApplicationContext())
+                    .getInstance(instanceUrl, ctx)
                     .getApiInterface()
                     .createNewUserOrgRepository(token, repoOwner, createRepository);
 
@@ -206,9 +209,9 @@ public class CreateRepoActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    TinyDB tinyDb = new TinyDB(getApplicationContext());
+                    TinyDB tinyDb = new TinyDB(appCtx);
                     tinyDb.putBoolean("repoCreated", true);
-                    Toasty.info(getApplicationContext(), getString(R.string.repoCreated));
+                    Toasty.info(ctx, getString(R.string.repoCreated));
                     enableProcessButton();
                     finish();
                 }
@@ -224,13 +227,13 @@ public class CreateRepoActivity extends BaseActivity {
                 else if(response.code() == 409) {
 
                     enableProcessButton();
-                    Toasty.info(getApplicationContext(), getString(R.string.repoExistsError));
+                    Toasty.info(ctx, getString(R.string.repoExistsError));
 
                 }
                 else {
 
                     enableProcessButton();
-                    Toasty.info(getApplicationContext(), getString(R.string.repoCreatedError));
+                    Toasty.info(ctx, getString(R.string.repoCreatedError));
 
                 }
 
@@ -246,10 +249,10 @@ public class CreateRepoActivity extends BaseActivity {
 
     private void getOrganizations(String instanceUrl, String instanceToken, final String userLogin) {
 
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(appCtx);
 
         Call<List<OrgOwner>> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
                 .getOrgOwners(instanceToken);
 

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

@@ -1,30 +1,30 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import retrofit2.Call;
-import retrofit2.Callback;
 import android.content.Context;
 import android.content.DialogInterface;
 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.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Teams;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import android.util.Log;
+import retrofit2.Call;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -33,6 +33,7 @@ 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;
@@ -73,9 +74,11 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
+
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -247,13 +250,13 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
     private void processCreateTeam() {
 
         AppUtil appUtil = new AppUtil();
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         final String orgName = tinyDb.getString("orgName");;
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         String newTeamName = teamName.getText().toString();
         String newTeamDesc = teamDesc.getText().toString();
         String newTeamPermission = teamPermission.getText().toString().toLowerCase();
@@ -261,21 +264,21 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
         if(!connToInternet) {
 
-            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if (newTeamName.equals("")) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.teamNameEmpty));
+            Toasty.info(ctx, getString(R.string.teamNameEmpty));
             return;
 
         }
 
         if(!appUtil.checkStringsWithAlphaNumericDashDotUnderscore(newTeamName)) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.teamNameError));
+            Toasty.info(ctx, getString(R.string.teamNameError));
             return;
 
         }
@@ -283,12 +286,12 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
         if(!newTeamDesc.equals("")) {
 
             if(!appUtil.checkStrings(newTeamDesc)) {
-                Toasty.info(getApplicationContext(), getString(R.string.teamDescError));
+                Toasty.info(ctx, getString(R.string.teamDescError));
                 return;
             }
 
             if(newTeamDesc.length() > 100) {
-                Toasty.info(getApplicationContext(), getString(R.string.teamDescLimit));
+                Toasty.info(ctx, getString(R.string.teamDescLimit));
                 return;
             }
 
@@ -296,7 +299,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
         if (newTeamPermission.equals("")) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.teamPermissionEmpty));
+            Toasty.info(ctx, getString(R.string.teamPermissionEmpty));
             return;
 
         }
@@ -318,9 +321,9 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
         Call<Teams> call3;
 
         call3 = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .createTeamsByOrg(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), orgName, createNewTeamJson);
+                .createTeamsByOrg(Authorization.returnAuthentication(ctx, loginUid, instanceToken), orgName, createNewTeamJson);
 
         call3.enqueue(new Callback<Teams>() {
 
@@ -330,10 +333,10 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
                 if(response2.isSuccessful()) {
                     if(response2.code() == 201) {
 
-                        TinyDB tinyDb = new TinyDB(getApplicationContext());
+                        TinyDB tinyDb = new TinyDB(appCtx);
                         tinyDb.putBoolean("resumeTeams", true);
 
-                        Toasty.info(getApplicationContext(), getString(R.string.teamCreated));
+                        Toasty.info(ctx, getString(R.string.teamCreated));
                         finish();
 
                     }
@@ -341,7 +344,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
                 }
                 else if(response2.code() == 404) {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.apiNotFound));
+                    Toasty.info(ctx, getString(R.string.apiNotFound));
 
                 }
                 else if(response2.code() == 401) {
@@ -354,7 +357,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
                 }
                 else {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.teamCreatedError));
+                    Toasty.info(ctx, getString(R.string.teamCreatedError));
 
                 }
 

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

@@ -3,6 +3,7 @@ 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;
@@ -20,6 +21,7 @@ import java.util.List;
 public class CreditsActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
+    final Context ctx = this;
 
     @Override
     protected int getLayoutResourceId(){
@@ -44,7 +46,7 @@ public class CreditsActivity extends BaseActivity {
         RecyclerView mRecyclerView = findViewById(R.id.recyclerView);
 
         mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
 
         DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
                 DividerItemDecoration.VERTICAL);

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

@@ -1,9 +1,5 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.NonNull;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
 import android.annotation.SuppressLint;
 import android.app.DatePickerDialog;
 import android.content.Context;
@@ -20,6 +16,7 @@ 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;
@@ -27,19 +24,24 @@ import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.CreateIssue;
 import org.mian.gitnex.models.Issues;
 import org.mian.gitnex.models.Milestones;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -48,7 +50,9 @@ 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;
@@ -70,10 +74,11 @@ 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(getApplicationContext());
+        final TinyDB tinyDb = new TinyDB(appCtx);
 
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
@@ -91,6 +96,11 @@ 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);
@@ -111,7 +121,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
         if(!tinyDb.getString("issueNumber").isEmpty()) {
 
-            if(tinyDb.getString("issueType").equals("pr")) {
+            if(tinyDb.getString("issueType").equalsIgnoreCase("Pull")) {
                 toolbar_title.setText(getString(R.string.editPrNavHeader, String.valueOf(issueIndex)));
             }
             else {
@@ -120,14 +130,14 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
         }
 
         disableProcessButton();
-        getIssue(instanceUrl, instanceToken, loginUid, repoOwner, repoName, issueIndex);
+        getIssue(instanceUrl, instanceToken, loginUid, repoOwner, repoName, issueIndex, resultLimit);
 
 
     }
 
     public void loadCollaboratorsList() {
 
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final TinyDB tinyDb = new TinyDB(appCtx);
 
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
@@ -138,9 +148,9 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
         final String repoName = parts[1];
 
         Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<List<Collaborators>>() {
 
@@ -186,8 +196,8 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
     private void processEditIssue() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         String repoFullName = tinyDb.getString("repoFullName");
@@ -207,21 +217,21 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
         if(!connToInternet) {
 
-            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if (editIssueTitleForm.equals("")) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.issueTitleEmpty));
+            Toasty.info(ctx, getString(R.string.issueTitleEmpty));
             return;
 
         }
 
         /*if (editIssueDescriptionForm.equals("")) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.issueDescriptionEmpty));
+            Toasty.info(ctx, getString(R.string.issueDescriptionEmpty));
             return;
 
         }*/
@@ -240,14 +250,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(getApplicationContext());
+        final TinyDB tinyDb = new TinyDB(appCtx);
 
         CreateIssue issueData = new CreateIssue(title, description, dueDate, editIssueMilestoneId);
 
         Call<JsonElement> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .patchIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, issueData);
+                .patchIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueData);
 
         call.enqueue(new Callback<JsonElement>() {
 
@@ -256,11 +266,11 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
                 if(response.code() == 201) {
 
-                    if(tinyDb.getString("issueType").equals("pr")) {
-                        Toasty.info(getApplicationContext(), getString(R.string.editPrSuccessMessage));
+                    if(tinyDb.getString("issueType").equalsIgnoreCase("Pull")) {
+                        Toasty.info(ctx, getString(R.string.editPrSuccessMessage));
                     }
                     else {
-                        Toasty.info(getApplicationContext(), getString(R.string.editIssueSuccessMessage));
+                        Toasty.info(ctx, getString(R.string.editIssueSuccessMessage));
                     }
 
                     tinyDb.putBoolean("issueEdited", true);
@@ -280,7 +290,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                 else {
 
                     enableProcessButton();
-                    Toasty.info(getApplicationContext(), getString(R.string.genericError));
+                    Toasty.info(ctx, getString(R.string.genericError));
 
                 }
 
@@ -326,12 +336,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) {
+    private void getIssue(final String instanceUrl, final String instanceToken, final String loginUid, final String repoOwner, final String repoName, int issueIndex, int resultLimit) {
 
         Call<Issues> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .getIssueByIndex(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);
+                .getIssueByIndex(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
 
         call.enqueue(new Callback<Issues>() {
 
@@ -353,9 +363,9 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                     if(response.body().getId() > 0) {
 
                         Call<List<Milestones>> call_ = RetrofitClient
-                                .getInstance(instanceUrl, getApplicationContext())
+                                .getInstance(instanceUrl, ctx)
                                 .getApiInterface()
-                                .getMilestones(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, msState);
+                                .getMilestones(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, 1, resultLimit, msState);
 
                         final int finalMsId = msId;
 
@@ -432,7 +442,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                 }
                 else {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.genericError));
+                    Toasty.info(ctx, 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.AppUtil;
+import org.mian.gitnex.helpers.ParseDiff;
+import org.mian.gitnex.helpers.TinyDB;
 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,188 +32,150 @@ import retrofit2.Callback;
 
 public class FileDiffActivity extends BaseActivity {
 
-    private View.OnClickListener onClickListener;
-    private TextView toolbar_title;
-    private RecyclerView mRecyclerView;
-    private ProgressBar mProgressBar;
+	private View.OnClickListener onClickListener;
+	private TextView toolbarTitle;
+	private ListView mListView;
+	private ProgressBar mProgressBar;
+	final Context ctx = this;
+	private Context appCtx;
 
-    @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_file_diff;
-    }
+	@Override
+	protected int getLayoutResourceId() {
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+		return R.layout.activity_file_diff;
+	}
 
-        super.onCreate(savedInstanceState);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
 
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
 
-        ImageView closeActivity = findViewById(R.id.close);
-        toolbar_title = findViewById(R.id.toolbar_title);
-        mRecyclerView = findViewById(R.id.recyclerView);
-        mProgressBar = findViewById(R.id.progress_bar);
+		Toolbar toolbar = findViewById(R.id.toolbar);
+		setSupportActionBar(toolbar);
 
-        mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+		final TinyDB tinyDb = new TinyDB(appCtx);
+		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 instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        toolbar_title.setText(R.string.processingText);
-        initCloseListener();
-        closeActivity.setOnClickListener(onClickListener);
+		ImageView closeActivity = findViewById(R.id.close);
+		toolbarTitle = findViewById(R.id.toolbar_title);
+		mListView = findViewById(R.id.listView);
+		mProgressBar = findViewById(R.id.progress_bar);
 
-        mProgressBar.setVisibility(View.VISIBLE);
+		mListView.setDivider(null);
 
-        String pullIndex = tinyDb.getString("issueNumber");
+		toolbarTitle.setText(R.string.processingText);
+		initCloseListener();
+		closeActivity.setOnClickListener(onClickListener);
 
-        getPullDiffContent(tinyDb.getString("instanceUrlWithProtocol"), repoOwner, repoName, pullIndex);
+		mProgressBar.setVisibility(View.VISIBLE);
 
-    }
+		String pullIndex = tinyDb.getString("issueNumber");
 
-    private void getPullDiffContent(String instanceUrl, String owner, String repo, String filename) {
+		boolean apiCall = true;
+		String instanceUrl = tinyDb.getString("instanceUrl");
 
-        Call<ResponseBody> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
-                .getWebInterface()
-                .getPullDiffContent(owner, repo, filename);
+		// fallback for old gitea instances
+		if(new Version(tinyDb.getString("giteaVersion")).less("1.13.0")) {
+			apiCall = false;
+			instanceUrl = tinyDb.getString("instanceUrlWithProtocol");
+		}
 
-        call.enqueue(new Callback<ResponseBody>() {
+		getPullDiffContent(instanceUrl, repoOwner, repoName, pullIndex, instanceToken, apiCall);
 
-            @Override
-            public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
+	}
 
-                if (response.code() == 200) {
+	private void getPullDiffContent(String instanceUrl, String owner, String repo, String pullIndex, String token, boolean apiCall) {
 
-                    try {
-                        assert response.body() != null;
+		Call<ResponseBody> call;
+		if(apiCall) {
+			call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getPullDiffContent(token, owner, repo, pullIndex);
+		}
+		else {
+			call = RetrofitClient.getInstance(instanceUrl, ctx).getWebInterface().getPullDiffContent(owner, repo, pullIndex);
+		}
 
-                        AppUtil appUtil = new AppUtil();
-                        List<FileDiffView> fileContentsArray = new ArrayList<>();
+		call.enqueue(new Callback<ResponseBody>() {
 
-                        String[] lines = response.body().string().split("diff");
+			@Override
+			public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
 
-                        if(lines.length > 0) {
+				if(response.code() == 200) {
 
-                            for (int i = 1; i < lines.length; i++) {
+					try {
+						assert response.body() != null;
 
-                                if(lines[i].contains("@@ -")) {
+						AppUtil appUtil = new AppUtil();
+						List<FileDiffView> fileContentsArray = ParseDiff.getFileDiffViewArray(response.body().string());
 
-                                    String[] level2nd = lines[i].split("@@ -"); // main content part of single diff view
+						int filesCount = fileContentsArray.size();
+						if(filesCount > 1) {
+							toolbarTitle.setText(getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)));
+						}
+						else {
+							toolbarTitle.setText(getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount)));
+						}
 
-                                    String[] fileName_ = level2nd[0].split("\\+\\+\\+ b/"); // filename part
-                                    String fileNameFinal = fileName_[1];
+						FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, fileContentsArray);
+						mListView.setAdapter(adapter);
 
-                                    String[] fileContents_ = level2nd[1].split("@@"); // file info / content part
-                                    String fileInfoFinal = fileContents_[0];
-                                    String fileContentsFinal = (fileContents_[1]);
+						mProgressBar.setVisibility(View.GONE);
 
-                                    if(level2nd.length > 2) {
-                                        for (int j = 2; j < level2nd.length; j++) {
-                                            fileContentsFinal += (level2nd[j]);
-                                        }
-                                    }
+					}
+					catch(IOException e) {
+						e.printStackTrace();
+					}
 
-                                    String fileExtension = FileUtils.getExtension(fileNameFinal);
+				}
+				else if(response.code() == 401) {
 
-                                    String fileContentsFinalWithBlankLines = fileContentsFinal.replaceAll( ".*@@.*", "" );
-                                    String fileContentsFinalWithoutBlankLines = fileContentsFinal.replaceAll( ".*@@.*(\r?\n|\r)?", "" );
-                                    fileContentsFinalWithoutBlankLines = fileContentsFinalWithoutBlankLines.replaceAll( ".*\\ No newline at end of file.*(\r?\n|\r)?", "" );
+					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 
-                                    fileContentsArray.add(new FileDiffView(fileNameFinal, appUtil.imageExtension(fileExtension), fileInfoFinal, fileContentsFinalWithoutBlankLines));
-                                }
-                                else {
+				}
+				else if(response.code() == 403) {
 
-                                    String[] getFileName = lines[i].split("--git a/");
+					Toasty.info(ctx, ctx.getString(R.string.authorizeError));
 
-                                    String[] getFileName_ = getFileName[1].split("b/");
-                                    String getFileNameFinal = getFileName_[0].trim();
+				}
+				else if(response.code() == 404) {
 
-                                    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);
+					Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
 
-                                    String fileExtension = FileUtils.getExtension(getFileNameFinal);
+				}
+				else {
 
-                                    if(appUtil.imageExtension(FileUtils.getExtension(getFileNameFinal))) {
+					Toasty.info(ctx, getString(R.string.labelGeneralError));
 
-                                        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)));
-                        }
+	}
 
-                        FilesDiffAdapter adapter = new FilesDiffAdapter(fileContentsArray, getApplicationContext());
-                        mRecyclerView.setAdapter(adapter);
+	private void initCloseListener() {
 
-                        mProgressBar.setVisibility(View.GONE);
+		onClickListener = new View.OnClickListener() {
 
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
+			@Override
+			public void onClick(View view) {
 
-                }
-                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();
-            }
-        };
-    }
+				getIntent().removeExtra("singleFileName");
+				finish();
+			}
+		};
+	}
 
 
 }

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

@@ -1,20 +1,17 @@
 package org.mian.gitnex.activities;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.pm.PackageManager;
+import android.content.Intent;
 import android.graphics.BitmapFactory;
 import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
+import android.net.Uri;
 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;
@@ -24,26 +21,25 @@ 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.AppUtil;
+import org.mian.gitnex.helpers.TinyDB;
 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;
@@ -59,17 +55,16 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 	private View.OnClickListener onClickListener;
 	private TextView singleFileContents;
 	private LinearLayout singleFileContentsFrame;
-	private LinearLayout highlightJs;
-	//private HighlightJsView singleCodeContents;
+	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() {
@@ -81,11 +76,14 @@ 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(getApplicationContext());
+		final TinyDB tinyDb = new TinyDB(appCtx);
 		String repoFullName = tinyDb.getString("repoFullName");
+		String repoBranch = tinyDb.getString("repoBranch");
 		String[] parts = repoFullName.split("/");
 		final String repoOwner = parts[0];
 		final String repoName = parts[1];
@@ -95,8 +93,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 		ImageView closeActivity = findViewById(R.id.close);
 		singleFileContents = findViewById(R.id.singleFileContents);
-		highlightJs = findViewById(R.id.highlightJs);
-		//singleCodeContents = findViewById(R.id.singleCodeContents);
+		singleCodeContents = findViewById(R.id.singleCodeContents);
 		imageView = findViewById(R.id.imageView);
 		mProgressBar = findViewById(R.id.progress_bar);
 		pdfView = findViewById(R.id.pdfView);
@@ -129,15 +126,15 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 		toolbar_title.setText(singleFileName);
 
-		getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName);
+		getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName, repoBranch);
 
 	}
 
-	private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename) {
+	private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename, String ref) {
 
-		final TinyDB tinyDb = new TinyDB(getApplicationContext());
+		final TinyDB tinyDb = new TinyDB(appCtx);
 
-		Call<Files> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getSingleFileContents(token, owner, repo, filename);
+		Call<Files> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getSingleFileContents(token, owner, repo, filename, ref);
 
 		call.enqueue(new Callback<Files>() {
 
@@ -161,8 +158,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 						if(appUtil.imageExtension(fileExtension)) { // file is image
 
 							singleFileContentsFrame.setVisibility(View.GONE);
-							highlightJs.setVisibility(View.GONE);
-							//singleCodeContents.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
 							pdfViewFrame.setVisibility(View.GONE);
 							imageView.setVisibility(View.VISIBLE);
 
@@ -173,59 +169,39 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 						}
 						else if(appUtil.sourceCodeExtension(fileExtension)) { // file is sourcecode
 
-							pdfViewFrame.setVisibility(View.GONE);
 							imageView.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.VISIBLE);
 
-							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 {
 
-								singleFileContents.setVisibility(View.VISIBLE);
-								singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));
-
-							}
+							singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));
 
 						}
 						else if(appUtil.pdfExtension(fileExtension)) { // file is pdf
 
 							imageView.setVisibility(View.GONE);
 							singleFileContentsFrame.setVisibility(View.GONE);
-							highlightJs.setVisibility(View.GONE);
-							//singleCodeContents.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
 							pdfViewFrame.setVisibility(View.VISIBLE);
 
 							pdfNightMode = tinyDb.getBoolean("enablePdfMode");
@@ -237,8 +213,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 						else if(appUtil.excludeFilesInFileViewerExtension(fileExtension)) { // files need to be excluded
 
 							imageView.setVisibility(View.GONE);
-							highlightJs.setVisibility(View.GONE);
-							//singleCodeContents.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
 							pdfViewFrame.setVisibility(View.GONE);
 							singleFileContentsFrame.setVisibility(View.VISIBLE);
 
@@ -250,8 +225,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 						else { // file type not known - plain text view
 
 							imageView.setVisibility(View.GONE);
-							highlightJs.setVisibility(View.GONE);
-							//singleCodeContents.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
 							pdfViewFrame.setVisibility(View.GONE);
 							singleFileContentsFrame.setVisibility(View.VISIBLE);
 
@@ -283,7 +257,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 				}
 				else {
 
-					Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
+					Toasty.info(ctx, getString(R.string.labelGeneralError));
 
 				}
 
@@ -328,21 +302,9 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 	@Override
 	public void onButtonClicked(String text) {
 
-		switch(text) {
-			case "downloadFile":
+		if("downloadFile".equals(text)) {
 
-				if(Build.VERSION.SDK_INT >= 23) {
-					if(checkPermission()) {
-						requestFileDownload();
-					}
-					else {
-						requestPermission();
-					}
-				}
-				else {
-					requestFileDownload();
-				}
-				break;
+			requestFileDownload();
 
 		}
 
@@ -350,72 +312,70 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 	private void requestFileDownload() {
 
-		final TinyDB tinyDb = new TinyDB(getApplicationContext());
+		final TinyDB tinyDb = new TinyDB(appCtx);
 
 		if(!tinyDb.getString("downloadFileContents").isEmpty()) {
 
-			File outputFileName = new File(tinyDb.getString("downloadFileName"));
-			final File downloadFilePath = new File(Environment.getExternalStorageDirectory().getPath() + "/Download/" + outputFileName.getName());
+			int CREATE_REQUEST_CODE = 40;
 
-			byte[] pdfAsBytes = Base64.decode(tinyDb.getString("downloadFileContents"), 0);
-			FileOutputStream fileOutputStream = null;
+			File outputFileName = new File(tinyDb.getString("downloadFileName"));
+
+			Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+
+			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 {
 
-				fileOutputStream = new FileOutputStream(downloadFilePath, false);
-				Objects.requireNonNull(fileOutputStream).write(pdfAsBytes);
-				fileOutputStream.flush();
-				fileOutputStream.close();
-				Toasty.info(getApplicationContext(), getString(R.string.downloadFileSaved));
+				assert data != null;
+				Uri uri = data.getData();
+
+				assert uri != null;
+				OutputStream outputStream = getContentResolver().openOutputStream(uri);
+
+				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 = new View.OnClickListener() {
+		onClickListener = view -> {
 
-			@Override
-			public void onClick(View view) {
+			getIntent().removeExtra("singleFileName");
+			finish();
 
-				getIntent().removeExtra("singleFileName");
-				finish();
-			}
 		};
 	}
 

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

@@ -2,33 +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.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.VersionCheck;
+import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.MergePullRequest;
 import org.mian.gitnex.models.MergePullRequestSpinner;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
 import okhttp3.ResponseBody;
@@ -42,16 +37,12 @@ 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;
 
-	private SocialAutoCompleteTextView mergeDescription;
-	private EditText mergeTitle;
-	private Spinner mergeModeSpinner;
 	private ArrayAdapter<Mention> defaultMentionAdapter;
-	private Button mergeButton;
 	private String Do;
 
 	@Override
@@ -65,23 +56,24 @@ public class MergePullRequestActivity extends BaseActivity {
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
 
-		boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
-		TinyDB tinyDb = new TinyDB(getApplicationContext());
+		viewBinding = ActivityMergePullRequestBinding.inflate(getLayoutInflater());
+		View view = viewBinding.getRoot();
+		setContentView(view);
+
+		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+		TinyDB tinyDb = new TinyDB(appCtx);
 
 		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-		mergeModeSpinner = findViewById(R.id.mergeSpinner);
-		mergeDescription = findViewById(R.id.mergeDescription);
-		mergeTitle = findViewById(R.id.mergeTitle);
-
-		mergeTitle.requestFocus();
+		viewBinding.mergeTitle.requestFocus();
 		assert imm != null;
-		imm.showSoftInput(mergeTitle, InputMethodManager.SHOW_IMPLICIT);
+		imm.showSoftInput(viewBinding.mergeTitle, InputMethodManager.SHOW_IMPLICIT);
 
 		setMergeAdapter();
 
-		mergeModeSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+		viewBinding.mergeSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
 
 			@Override
 			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@@ -101,20 +93,35 @@ public class MergePullRequestActivity extends BaseActivity {
 		defaultMentionAdapter = new MentionArrayAdapter<>(this);
 		loadCollaboratorsList();
 
-		mergeDescription.setMentionAdapter(defaultMentionAdapter);
-
-		closeActivity = findViewById(R.id.close);
-		TextView toolbar_title = findViewById(R.id.toolbar_title);
+		viewBinding.mergeDescription.setMentionAdapter(defaultMentionAdapter);
 
 		if(!tinyDb.getString("issueTitle").isEmpty()) {
-			toolbar_title.setText(tinyDb.getString("issueTitle"));
-			mergeTitle.setText(tinyDb.getString("issueTitle") + " (#" + tinyDb.getString("issueNumber")+ ")");
+			viewBinding.toolbarTitle.setText(tinyDb.getString("issueTitle"));
+			viewBinding.mergeTitle.setText(tinyDb.getString("issueTitle") + " (#" + tinyDb.getString("issueNumber") + ")");
 		}
 
 		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
+		viewBinding.close.setOnClickListener(onClickListener);
 
-		mergeButton = findViewById(R.id.mergeButton);
+		// if gitea version is greater/equal(1.12.0) than user installed version (installed.higherOrEqual(compareVer))
+		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) {
 
@@ -123,7 +130,7 @@ public class MergePullRequestActivity extends BaseActivity {
 		}
 		else {
 
-			mergeButton.setOnClickListener(mergePullRequest);
+			viewBinding.mergeButton.setOnClickListener(mergePullRequest);
 
 		}
 
@@ -131,27 +138,27 @@ public class MergePullRequestActivity extends BaseActivity {
 
 	private void setMergeAdapter() {
 
-		TinyDB tinyDb = new TinyDB(getApplicationContext());
+		TinyDB tinyDb = new TinyDB(appCtx);
 
 		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.5 and higher due to a bug
-		if(VersionCheck.compareVersion("1.11.5", tinyDb.getString("giteaVersion")) < 1) {
+		// squash merge works only on gitea > v1.11.4 due to a bug
+		if(new Version(tinyDb.getString("giteaVersion")).higher("1.11.4")) {
 			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);
-		mergeModeSpinner.setAdapter(adapter);
+		viewBinding.mergeSpinner.setAdapter(adapter);
 
 	}
 
 	public void loadCollaboratorsList() {
 
-		final TinyDB tinyDb = new TinyDB(getApplicationContext());
+		final TinyDB tinyDb = new TinyDB(appCtx);
 
 		final String instanceUrl = tinyDb.getString("instanceUrl");
 		final String loginUid = tinyDb.getString("loginUid");
@@ -161,7 +168,7 @@ public class MergePullRequestActivity extends BaseActivity {
 		final String repoOwner = parts[0];
 		final String repoName = parts[1];
 
-		Call<List<Collaborators>> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+		Call<List<Collaborators>> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
 
 		call.enqueue(new Callback<List<Collaborators>>() {
 
@@ -206,26 +213,27 @@ public class MergePullRequestActivity extends BaseActivity {
 
 	private void processMergePullRequest() {
 
-		String mergePRDesc = mergeDescription.getText().toString();
-		String mergePRTitle = mergeTitle.getText().toString();
+		String mergePRDesc = viewBinding.mergeDescription.getText().toString();
+		String mergePRTitle = viewBinding.mergeTitle.getText().toString();
+		boolean deleteBranch = viewBinding.deleteBranch.isChecked();
 
-		boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
 		if(!connToInternet) {
 
-			Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+			Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
 
 		}
 
 		disableProcessButton();
-		mergeFunction(Do, mergePRDesc, mergePRTitle);
+		mergeFunction(Do, mergePRDesc, mergePRTitle, deleteBranch);
 
 	}
 
-	private void mergeFunction(String Do, String mergePRDT, String mergeTitle) {
+	private void mergeFunction(String Do, String mergePRDT, String mergeTitle, boolean deleteBranch) {
 
-		final TinyDB tinyDb = new TinyDB(getApplicationContext());
+		final TinyDB tinyDb = new TinyDB(appCtx);
 
 		final String instanceUrl = tinyDb.getString("instanceUrl");
 		final String loginUid = tinyDb.getString("loginUid");
@@ -238,7 +246,7 @@ public class MergePullRequestActivity extends BaseActivity {
 
 		MergePullRequest mergePR = new MergePullRequest(Do, mergePRDT, mergeTitle);
 
-		Call<ResponseBody> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().mergePullRequest(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, prIndex, mergePR);
+		Call<ResponseBody> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().mergePullRequest(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, prIndex, mergePR);
 
 		call.enqueue(new Callback<ResponseBody>() {
 
@@ -247,10 +255,48 @@ public class MergePullRequestActivity extends BaseActivity {
 
 				if(response.code() == 200) {
 
-					Toasty.info(getApplicationContext(), getString(R.string.mergePRSuccessMsg));
-					tinyDb.putBoolean("prMerged", true);
-					tinyDb.putBoolean("resumePullRequests", true);
-					finish();
+					if(deleteBranch) {
+
+						if(tinyDb.getString("prIsFork").equals("true")) {
+
+							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) {
@@ -262,13 +308,13 @@ public class MergePullRequestActivity extends BaseActivity {
 				else if(response.code() == 404) {
 
 					enableProcessButton();
-					Toasty.info(getApplicationContext(), getString(R.string.mergePR404ErrorMsg));
+					Toasty.info(ctx, getString(R.string.mergePR404ErrorMsg));
 
 				}
 				else {
 
 					enableProcessButton();
-					Toasty.info(getApplicationContext(), getString(R.string.genericError));
+					Toasty.info(ctx, getString(R.string.genericError));
 
 				}
 
@@ -285,23 +331,56 @@ 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() {
 
-		mergeButton.setEnabled(false);
-		GradientDrawable shape = new GradientDrawable();
-		shape.setCornerRadius(8);
-		shape.setColor(getResources().getColor(R.color.hintColor));
-		mergeButton.setBackground(shape);
+		viewBinding.mergeButton.setEnabled(false);
+		viewBinding.mergeButton.setBackground(getResources().getDrawable(R.drawable.shape_buttons_disabled));
 
 	}
 
 	private void enableProcessButton() {
 
-		mergeButton.setEnabled(true);
-		GradientDrawable shape = new GradientDrawable();
-		shape.setCornerRadius(8);
-		shape.setColor(getResources().getColor(R.color.btnBackground));
-		mergeButton.setBackground(shape);
+		viewBinding.mergeButton.setEnabled(true);
+		viewBinding.mergeButton.setBackground(getResources().getDrawable(R.drawable.shape_buttons));
 
 	}
 

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

@@ -1,10 +1,17 @@
 package org.mian.gitnex.activities;
 
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
-import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.PathsHelper;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import java.net.URI;
+import java.net.URISyntaxException;
+import io.mikael.urlbuilder.UrlBuilder;
 
 /**
  * Author M M Arif
@@ -12,23 +19,33 @@ import org.mian.gitnex.util.TinyDB;
 
 public class OpenRepoInBrowserActivity extends AppCompatActivity {
 
+    private Context appCtx;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
-        super.onCreate(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");
-        }
+	    try {
 
-        String repoFullNameBrowser = getIntent().getStringExtra("repoFullNameBrowser");
-        Uri url = Uri.parse(instanceUrlWithProtocol + "/" + repoFullNameBrowser);
-        Intent i = new Intent(Intent.ACTION_VIEW, url);
-        startActivity(i);
-        finish();
+		    URI instanceUrl = new URI(tinyDb.getString("instanceUrlWithProtocol"));
+
+		    String browserPath = PathsHelper.join(instanceUrl.getPath(), getIntent().getStringExtra("repoFullNameBrowser"));
+
+		    String browserUrl = UrlBuilder.fromUri(instanceUrl)
+			    .withPath(browserPath)
+			    .toString();
+
+		    Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(browserUrl));
+		    startActivity(i);
+		    finish();
+
+	    }
+	    catch(URISyntaxException e) {
+		    Toasty.error(appCtx, getString(R.string.genericError));
+	    }
 
     }
 

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

@@ -1,12 +1,6 @@
 package org.mian.gitnex.activities;
 
-import com.google.android.material.tabs.TabLayout;
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.viewpager.widget.ViewPager;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.Bundle;
@@ -16,13 +10,20 @@ 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.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import com.google.android.material.tabs.TabLayout;
 import org.mian.gitnex.R;
-import org.mian.gitnex.fragments.MembersByOrgFragment;
 import org.mian.gitnex.fragments.BottomSheetOrganizationFragment;
+import org.mian.gitnex.fragments.MembersByOrgFragment;
 import org.mian.gitnex.fragments.OrganizationInfoFragment;
 import org.mian.gitnex.fragments.RepositoriesByOrgFragment;
 import org.mian.gitnex.fragments.TeamsByOrgFragment;
-import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.helpers.TinyDB;
 import java.util.Objects;
 
 /**
@@ -31,6 +32,9 @@ 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;
@@ -38,9 +42,11 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
 
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
+
+        TinyDB tinyDb = new TinyDB(appCtx);
         String orgName = tinyDb.getString("orgName");
 
         Toolbar toolbar = findViewById(R.id.toolbar);
@@ -62,15 +68,15 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
         switch(tinyDb.getInt("customFontId", -1)) {
 
             case 0:
-                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/roboto.ttf");
+                myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf");
                 break;
 
             case 2:
-                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/sourcecodeproregular.ttf");
+                myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf");
                 break;
 
             default:
-                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/manroperegular.ttf");
+                myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/manroperegular.ttf");
                 break;
 
         }
@@ -126,7 +132,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
     @Override
     public void onButtonClicked(String text) {
 
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(appCtx);
 
         switch (text) {
             case "repository":
@@ -151,7 +157,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
         @Override
         public Fragment getItem(int position) {
 
-            TinyDB tinyDb = new TinyDB(getApplicationContext());
+            TinyDB tinyDb = new TinyDB(appCtx);
             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,33 +1,41 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.Nullable;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
+import android.content.Context;
+import android.content.Intent;
 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.helpers.TinyDB;
 import org.mian.gitnex.viewmodels.TeamMembersByOrgViewModel;
-import java.util.List;
 import java.util.Objects;
 
 /**
  * Author M M Arif
  */
 
-public class OrganizationTeamMembersActivity extends BaseActivity {
+public class OrganizationTeamMembersActivity extends BaseActivity implements BottomSheetOrganizationTeamsFragment.BottomSheetListener {
 
     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;
@@ -35,9 +43,13 @@ public class OrganizationTeamMembersActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
 
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        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");
@@ -57,7 +69,6 @@ public class OrganizationTeamMembersActivity extends BaseActivity {
             toolbarTitle.setText(R.string.orgTeamMembers);
         }
 
-        String teamId;
         if(getIntent().getStringExtra("teamId") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamId")).equals("")){
             teamId = getIntent().getStringExtra("teamId");
         }
@@ -65,11 +76,24 @@ public class OrganizationTeamMembersActivity extends BaseActivity {
             teamId = "0";
         }
 
-        getIntent().getStringExtra("teamId");
-        //Log.i("teamId", getIntent().getStringExtra("teamId"));
-
         assert teamId != null;
-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), Integer.valueOf(teamId));
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), Integer.parseInt(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);
+        }
 
     }
 
@@ -77,30 +101,65 @@ public class OrganizationTeamMembersActivity extends BaseActivity {
 
         TeamMembersByOrgViewModel teamMembersModel = new ViewModelProvider(this).get(TeamMembersByOrgViewModel.class);
 
-        teamMembersModel.getMembersByOrgList(instanceUrl, instanceToken, teamId, getApplicationContext()).observe(this, new Observer<List<UserInfo>>() {
-            @Override
-            public void onChanged(@Nullable List<UserInfo> teamMembersListMain) {
-                adapter = new TeamMembersByOrgAdapter(getApplicationContext(), teamMembersListMain);
-                if(adapter.getCount() > 0) {
-                    mGridView.setAdapter(adapter);
-                    noDataMembers.setVisibility(View.GONE);
-                }
-                else {
-                    adapter.notifyDataSetChanged();
-                    mGridView.setAdapter(adapter);
-                    noDataMembers.setVisibility(View.VISIBLE);
-                }
+        teamMembersModel.getMembersByOrgList(instanceUrl, instanceToken, teamId, ctx).observe(this, teamMembersListMain -> {
+
+            adapter = new TeamMembersByOrgAdapter(ctx, teamMembersListMain);
+            if(adapter.getCount() > 0) {
+                mGridView.setAdapter(adapter);
+                noDataMembers.setVisibility(View.GONE);
             }
+            else {
+                adapter.notifyDataSetChanged();
+                mGridView.setAdapter(adapter);
+                noDataMembers.setVisibility(View.VISIBLE);
+            }
+
         });
 
     }
 
-    private void initCloseListener() {
-        onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
+    @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();
     }
 }

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

@@ -1,8 +1,5 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.NonNull;
-import retrofit2.Call;
-import retrofit2.Callback;
 import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
@@ -13,18 +10,21 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
+import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.AddEmail;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -35,6 +35,7 @@ public class ProfileEmailActivity extends BaseActivity {
     private View.OnClickListener onClickListener;
     private EditText userEmail;
     final Context ctx = this;
+    private Context appCtx;
     private Button addEmailButton;
 
     @Override
@@ -44,9 +45,11 @@ public class ProfileEmailActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
+
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -81,8 +84,8 @@ public class ProfileEmailActivity extends BaseActivity {
 
     private void processAddNewEmail() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@@ -91,20 +94,20 @@ public class ProfileEmailActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
 
         }
 
         if(newUserEmail.equals("")) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.emailErrorEmpty));
+            Toasty.info(ctx, getString(R.string.emailErrorEmpty));
             return;
 
         }
         else if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {
 
-            Toasty.info(getApplicationContext(), getString(R.string.emailErrorInvalid));
+            Toasty.info(ctx, getString(R.string.emailErrorInvalid));
             return;
 
         }
@@ -112,19 +115,19 @@ public class ProfileEmailActivity extends BaseActivity {
         List<String> newEmailList = new ArrayList<>(Arrays.asList(newUserEmail.split(",")));
 
         disableProcessButton();
-        addNewEmail(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), newEmailList);
+        addNewEmail(instanceUrl, Authorization.returnAuthentication(ctx, 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(getApplicationContext());
+        final TinyDB tinyDb = new TinyDB(appCtx);
 
         Call<JsonElement> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
                 .addNewEmail(token, addEmailFunc);
 
@@ -135,7 +138,7 @@ public class ProfileEmailActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.emailAddedText));
+                    Toasty.info(ctx, getString(R.string.emailAddedText));
                     tinyDb.putBoolean("emailsRefresh", true);
                     enableProcessButton();
                     finish();
@@ -171,7 +174,7 @@ public class ProfileEmailActivity extends BaseActivity {
                 else {
 
                     enableProcessButton();
-                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
+                    Toasty.info(ctx, getString(R.string.labelGeneralError));
 
                 }
 

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

@@ -1,33 +1,42 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.NonNull;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
 import com.hendraanggrian.appcompat.socialview.Mention;
 import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
 import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.IssueActions;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.database.api.DraftsApi;
 import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.Issues;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
 import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -35,256 +44,374 @@ import java.util.List;
 
 public class ReplyToIssueActivity extends BaseActivity {
 
-    public ImageView closeActivity;
-    private View.OnClickListener onClickListener;
+	public ImageView closeActivity;
+	private View.OnClickListener onClickListener;
 
-    final Context ctx = this;
+	final Context ctx = this;
+	private Context appCtx;
 
-    private SocialAutoCompleteTextView addComment;
-    private ArrayAdapter<Mention> defaultMentionAdapter;
-    private Button replyButton;
+	private TextView draftSaved;
+	private SocialAutoCompleteTextView addComment;
+	private ArrayAdapter<Mention> defaultMentionAdapter;
+	private Button replyButton;
+	private String TAG = StaticGlobalVariables.replyToIssueActivity;
+	private long draftId;
 
-    @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_reply_to_issue;
-    }
+	@Override
+	protected int getLayoutResourceId(){
+		return R.layout.activity_reply_to_issue;
+	}
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
 
-        super.onCreate(savedInstanceState);
+		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
+		Toolbar toolbar = findViewById(R.id.toolbar);
+		setSupportActionBar(toolbar);
 
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        TinyDB tinyDb = new TinyDB(appCtx);
 
-        addComment = findViewById(R.id.addComment);
-        addComment.setShowSoftInputOnFocus(true);
+		draftSaved = findViewById(R.id.draftSaved);
+		addComment = findViewById(R.id.addComment);
+		addComment.setShowSoftInputOnFocus(true);
 
-        defaultMentionAdapter = new MentionArrayAdapter<>(this);
-        loadCollaboratorsList();
+        defaultMentionAdapter = new MentionArrayAdapter<>(ctx);
+		loadCollaboratorsList();
 
-        addComment.setMentionAdapter(defaultMentionAdapter);
+		addComment.setMentionAdapter(defaultMentionAdapter);
 
-        closeActivity = findViewById(R.id.close);
-        TextView toolbar_title = findViewById(R.id.toolbar_title);
+		closeActivity = findViewById(R.id.close);
+		TextView toolbar_title = findViewById(R.id.toolbar_title);
 
-        addComment.requestFocus();
-        assert imm != null;
-        imm.showSoftInput(addComment, InputMethodManager.SHOW_IMPLICIT);
+		addComment.requestFocus();
+		assert imm != null;
+		imm.showSoftInput(addComment, InputMethodManager.SHOW_IMPLICIT);
 
-        if(!tinyDb.getString("issueTitle").isEmpty()) {
-            toolbar_title.setText(tinyDb.getString("issueTitle"));
-        }
+		if(!tinyDb.getString("issueTitle").isEmpty()) {
+			toolbar_title.setText(tinyDb.getString("issueTitle"));
+		}
 
-        initCloseListener();
-        closeActivity.setOnClickListener(onClickListener);
+		initCloseListener();
+		closeActivity.setOnClickListener(onClickListener);
 
-        replyButton = findViewById(R.id.replyButton);
+		replyButton = findViewById(R.id.replyButton);
 
-        if(getIntent().getStringExtra("commentAction") != null && getIntent().getStringExtra("commentAction").equals("edit")) {
+		if(getIntent().getStringExtra("commentBody") != null) {
 
-            addComment.setText(getIntent().getStringExtra("commentBody"));
-            final String commentId = getIntent().getStringExtra("commentId");
+			addComment.setText(getIntent().getStringExtra("commentBody"));
 
-            toolbar_title.setText(getResources().getString(R.string.editCommentTitle));
-            replyButton.setText(getResources().getString(R.string.editCommentButtonText));
+			if(getIntent().getBooleanExtra("cursorToEnd", false)) {
+				addComment.setSelection(addComment.length());
+			}
 
-            replyButton.setOnClickListener(new View.OnClickListener() {
-                public void onClick(View v) {
-                    disableProcessButton();
-                    IssueActions.editIssueComment(ctx, Integer.valueOf(commentId), addComment.getText().toString());
-                }
+		}
 
-            });
+		if(getIntent().getStringExtra("draftTitle") != null) {
 
-            return;
+			toolbar_title.setText(getIntent().getStringExtra("draftTitle"));
 
-        }
+		}
 
-        if(!connToInternet) {
+		if(getIntent().getStringExtra("commentAction") != null && getIntent().getStringExtra("commentAction").equals("edit")) {
 
-            disableProcessButton();
+			final String commentId = getIntent().getStringExtra("commentId");
 
-        } else {
+			toolbar_title.setText(getResources().getString(R.string.editCommentTitle));
+			replyButton.setText(getResources().getString(R.string.editCommentButtonText));
 
-            replyButton.setOnClickListener(replyToIssue);
+			addComment.addTextChangedListener(new TextWatcher() {
 
-        }
+				public void afterTextChanged(Editable s) {
 
-    }
+				}
 
-    public void loadCollaboratorsList() {
+				public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+				}
 
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
+				public void onTextChanged(CharSequence s, int start, int before, int count) {
 
-        Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
-                .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+					saveDraft(addComment.getText().toString());
+					draftSaved.setVisibility(View.VISIBLE);
 
-        call.enqueue(new Callback<List<Collaborators>>() {
+				}
 
-            @Override
-            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
+			});
 
-                if (response.isSuccessful()) {
+			replyButton.setOnClickListener(v -> {
 
-                    assert response.body() != null;
-                    String fullName = "";
-                    for (int i = 0; i < response.body().size(); i++) {
-                        if(!response.body().get(i).getFull_name().equals("")) {
-                            fullName = response.body().get(i).getFull_name();
-                        }
-                        defaultMentionAdapter.add(
-                                new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
-                    }
+				disableProcessButton();
+				assert commentId != null;
+				IssueActions.editIssueComment(ctx, Integer.parseInt(commentId), addComment.getText().toString());
 
-                } else {
+			});
 
-                    Log.i("onResponse", String.valueOf(response.code()));
+			return;
 
-                }
+		}
 
-            }
+		addComment.addTextChangedListener(new TextWatcher() {
 
-            @Override
-            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-                Log.i("onFailure", t.getMessage());
-            }
+			public void afterTextChanged(Editable s) {
 
-        });
-    }
+			}
 
-    private void initCloseListener() {
-        onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        };
-    }
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
-    private View.OnClickListener replyToIssue = new View.OnClickListener() {
-        public void onClick(View v) {
-            processNewCommentReply();
-        }
-    };
+			}
 
-    private void processNewCommentReply() {
+			public void onTextChanged(CharSequence s, int start, int before, int count) {
 
-        String newReplyDT = addComment.getText().toString();
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+				saveDraft(addComment.getText().toString());
+				draftSaved.setVisibility(View.VISIBLE);
 
-        if(!connToInternet) {
+			}
 
-            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
-            return;
+		});
 
-        }
+		if(!connToInternet) {
 
-        if(newReplyDT.equals("")) {
+			disableProcessButton();
 
-            Toasty.info(getApplicationContext(), getString(R.string.commentEmptyError));
+		}
+		else {
 
-        }
-        else {
+			replyButton.setOnClickListener(replyToIssue);
 
-            disableProcessButton();
-            replyComment(newReplyDT);
+		}
 
-        }
+	}
 
-    }
+	private void saveDraft(String draftText) {
 
-    private void replyComment(String newReplyDT) {
+		TinyDB tinyDb = new TinyDB(getApplicationContext());
 
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+		int repositoryId = (int) tinyDb.getLong("repositoryId", 0);
+		int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+		int issueNumber = Integer.parseInt(tinyDb.getString("issueNumber"));
 
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+		DraftsApi draftsApi = new DraftsApi(appCtx);
 
-        Issues issueComment = new Issues(newReplyDT);
+		int countDraft = draftsApi.checkDraft(issueNumber, repositoryId);
 
-        Call<Issues> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
-                .getApiInterface()
-                .replyCommentToIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, issueComment);
+		if(countDraft == 0) {
+			draftId = draftsApi.insertDraft(repositoryId, currentActiveAccountId, issueNumber, draftText, StaticGlobalVariables.draftTypeComment);
+		}
+		else {
+			DraftsApi.updateDraftByIssueIdAsyncTask(draftText, issueNumber, repositoryId);
+		}
 
-        call.enqueue(new Callback<Issues>() {
+	}
 
-            @Override
-            public void onResponse(@NonNull Call<Issues> call, @NonNull retrofit2.Response<Issues> response) {
+	public void loadCollaboratorsList() {
 
-                if(response.code() == 201) {
+		final TinyDB tinyDb = new TinyDB(appCtx);
 
-                    Toasty.info(getApplicationContext(), getString(R.string.commentSuccess));
-                    tinyDb.putBoolean("commentPosted", true);
-                    tinyDb.putBoolean("resumeIssues", true);
-                    tinyDb.putBoolean("resumePullRequests", true);
-                    finish();
+		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];
 
-                }
-                else if(response.code() == 401) {
+		Call<List<Collaborators>> call = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
 
-                    enableProcessButton();
-                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
-                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+		call.enqueue(new Callback<List<Collaborators>>() {
 
-                }
-                else {
+			@Override
+			public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
 
-                    enableProcessButton();
-                    Toasty.info(getApplicationContext(), getString(R.string.commentError));
+				if (response.isSuccessful()) {
 
-                }
+					assert response.body() != null;
+					String fullName = "";
+					for(int i = 0; i < response.body().size(); i++) {
+						if(!response.body().get(i).getFull_name().equals("")) {
+							fullName = response.body().get(i).getFull_name();
+						}
+						defaultMentionAdapter.add(new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
+					}
 
-            }
+				}
+				else {
 
-            @Override
-            public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
-                Log.e("onFailure", t.toString());
-                enableProcessButton();
-            }
-        });
+					Log.i(TAG, String.valueOf(response.code()));
 
-    }
+				}
 
-    private void disableProcessButton() {
+			}
 
-        replyButton.setEnabled(false);
-        GradientDrawable shape =  new GradientDrawable();
-        shape.setCornerRadius( 8 );
-        shape.setColor(getResources().getColor(R.color.hintColor));
-        replyButton.setBackground(shape);
+			@Override
+			public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
 
-    }
+				Log.e(TAG, t.toString());
+			}
 
-    private void enableProcessButton() {
+		});
+	}
 
-        replyButton.setEnabled(true);
-        GradientDrawable shape =  new GradientDrawable();
-        shape.setCornerRadius( 8 );
-        shape.setColor(getResources().getColor(R.color.btnBackground));
-        replyButton.setBackground(shape);
+	private void initCloseListener() {
 
-    }
+		onClickListener = view -> finish();
+	}
+
+	private View.OnClickListener replyToIssue = v -> processNewCommentReply();
+
+	private void processNewCommentReply() {
+
+		String newReplyDT = addComment.getText().toString();
+		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+
+		if(!connToInternet) {
+
+			Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
+			return;
+
+		}
+
+		if(newReplyDT.equals("")) {
+
+			Toasty.info(ctx, getString(R.string.commentEmptyError));
+
+		}
+		else {
+
+			disableProcessButton();
+			replyComment(newReplyDT);
+
+		}
+
+	}
+
+	private void replyComment(String newReplyDT) {
+
+		final TinyDB tinyDb = new TinyDB(appCtx);
+
+		final String instanceUrl = tinyDb.getString("instanceUrl");
+		final String loginUid = tinyDb.getString("loginUid");
+		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+		String repoFullName = tinyDb.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		final String repoOwner = parts[0];
+		final String repoName = parts[1];
+		final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+
+		Issues issueComment = new Issues(newReplyDT);
+
+		Call<Issues> call = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.replyCommentToIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueComment);
+
+		call.enqueue(new Callback<Issues>() {
+
+			@Override
+			public void onResponse(@NonNull Call<Issues> call, @NonNull retrofit2.Response<Issues> response) {
+
+				if(response.code() == 201) {
+
+					Toasty.info(ctx, getString(R.string.commentSuccess));
+					tinyDb.putBoolean("commentPosted", true);
+					tinyDb.putBoolean("resumeIssues", true);
+					tinyDb.putBoolean("resumePullRequests", true);
+
+					// delete draft comment
+					if(tinyDb.getBoolean("draftsCommentsDeletionEnabled")) {
+
+						int repositoryId = (int) tinyDb.getLong("repositoryId", 0);
+						int issueNumber = Integer.parseInt(tinyDb.getString("issueNumber"));
+
+						DraftsApi draftsApi = new DraftsApi(appCtx);
+						draftId = draftsApi.getDraftIdAsync(issueNumber, repositoryId);
+						draftsApi.deleteSingleDraft((int) draftId);
+					}
+
+					finish();
+
+				}
+				else if(response.code() == 401) {
+
+					enableProcessButton();
+					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+						getResources().getString(R.string.alertDialogTokenRevokedMessage),
+						getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+				}
+				else {
+
+					enableProcessButton();
+					Toasty.info(ctx, getString(R.string.commentError));
+
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
+
+				Log.e(TAG, t.toString());
+				enableProcessButton();
+			}
+		});
+
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+
+		MenuInflater inflater = getMenuInflater();
+		inflater.inflate(R.menu.reply_to_issue, menu);
+
+		return super.onCreateOptionsMenu(menu);
+
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+
+		switch(item.getItemId()) {
+
+			case R.id.replyToIssueMenu:
+				Intent fragmentIntent = new Intent(ReplyToIssueActivity.this, MainActivity.class);
+				fragmentIntent.putExtra("launchFragment", "drafts");
+				ReplyToIssueActivity.this.startActivity(fragmentIntent);
+				break;
+
+			default:
+				return super.onOptionsItemSelected(item);
+
+		}
+
+		return true;
+	}
+
+	private void disableProcessButton() {
+
+		replyButton.setEnabled(false);
+		GradientDrawable shape = new GradientDrawable();
+		shape.setCornerRadius(8);
+		shape.setColor(getResources().getColor(R.color.hintColor));
+		replyButton.setBackground(shape);
+
+	}
+
+	private void enableProcessButton() {
+
+		replyButton.setEnabled(true);
+		GradientDrawable shape = new GradientDrawable();
+		shape.setCornerRadius(8);
+		shape.setColor(getResources().getColor(R.color.btnBackground));
+		replyButton.setBackground(shape);
+
+	}
 
 }

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

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

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

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

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

@@ -0,0 +1,328 @@
+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.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+
+/**
+ * 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", "Explore", "Drafts"};
+	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/SettingsDraftsActivity.java

@@ -0,0 +1,67 @@
+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.helpers.TinyDB;
+
+/**
+ * Author M M Arif
+ */
+
+public class SettingsDraftsActivity extends BaseActivity {
+
+	private Context appCtx;
+	private View.OnClickListener onClickListener;
+
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_drafts;
+	}
+
+	@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 commentsDeletionSwitch = findViewById(R.id.commentsDeletionSwitch);
+
+		if(tinyDb.getBoolean("draftsCommentsDeletionEnabled")) {
+			commentsDeletionSwitch.setChecked(true);
+		}
+		else {
+			commentsDeletionSwitch.setChecked(false);
+		}
+
+		// delete comments on submit switcher
+		commentsDeletionSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+
+			if(isChecked) {
+				tinyDb.putBoolean("draftsCommentsDeletionEnabled", true);
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+			}
+			else {
+				tinyDb.putBoolean("draftsCommentsDeletionEnabled", false);
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+			}
+
+		});
+
+	}
+
+	private void initCloseListener() { onClickListener = view -> finish(); }
+
+}

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

@@ -0,0 +1,119 @@
+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.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+
+/**
+ * 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

@@ -0,0 +1,71 @@
+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.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+
+/**
+ * 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

@@ -0,0 +1,261 @@
+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.NumberPicker;
+import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+import org.apache.commons.io.FileUtils;
+import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.FilesData;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
+import org.mian.gitnex.notifications.NotificationsMaster;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+
+/**
+ * Author M M Arif
+ */
+
+public class SettingsSecurityActivity extends BaseActivity {
+
+	private Context appCtx;
+	private Context ctx = this;
+
+	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;
+
+	private static int MINIMUM_POLLING_DELAY = 1;
+	private static int DEFAULT_POLLING_DELAY = 20;
+	private static int MAXIMUM_POLLING_DELAY = 720;
+
+	@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);
+		String currentVersion = tinyDb.getString("giteaVersion");
+
+		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
+		TextView pollingDelaySelected = findViewById(R.id.pollingDelaySelected);
+
+		LinearLayout certsFrame = findViewById(R.id.certsFrame);
+		LinearLayout pollingDelayFrame = findViewById(R.id.pollingDelayFrame);
+		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");
+		}
+
+		if(new Version(currentVersion).less("1.12.3")) {
+			pollingDelayFrame.setVisibility(View.GONE);
+		}
+
+		pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), tinyDb.getInt("pollingDelayMinutes", DEFAULT_POLLING_DELAY)));
+
+		// 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);
+
+				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();
+
+		});
+
+		// polling delay
+		pollingDelayFrame.setOnClickListener(v -> {
+
+			NumberPicker numberPicker = new NumberPicker(ctx);
+			numberPicker.setMinValue(MINIMUM_POLLING_DELAY);
+			numberPicker.setMaxValue(MAXIMUM_POLLING_DELAY);
+			numberPicker.setValue(tinyDb.getInt("pollingDelayMinutes", DEFAULT_POLLING_DELAY));
+			numberPicker.setWrapSelectorWheel(true);
+
+			AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
+			builder.setTitle(getString(R.string.pollingDelayDialogHeaderText));
+			builder.setMessage(getString(R.string.pollingDelayDialogDescriptionText));
+
+			builder.setCancelable(true);
+			builder.setPositiveButton(getString(R.string.okButton), (dialog, which) -> {
+
+				tinyDb.putInt("pollingDelayMinutes", numberPicker.getValue());
+
+				NotificationsMaster.fireWorker(ctx);
+				NotificationsMaster.hireWorker(ctx);
+
+				pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), numberPicker.getValue()));
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+
+			});
+
+			builder.setNegativeButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
+			builder.setView(numberPicker);
+			builder.create().show();
+
+		});
+
+	}
+
+	private void initCloseListener() {
+
+		onClickListener = view -> finish();
+	}
+}

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

@@ -0,0 +1,165 @@
+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.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+
+/**
+ * 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,6 +3,7 @@ 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;
@@ -20,6 +21,7 @@ import java.util.List;
 public class SponsorsActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
+    private Context appCtx;
 
     @Override
     protected int getLayoutResourceId(){
@@ -28,7 +30,9 @@ public class SponsorsActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+
         super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
 
         ImageView closeActivity = findViewById(R.id.close);
 
@@ -43,7 +47,7 @@ public class SponsorsActivity extends BaseActivity {
         RecyclerView mRecyclerView = findViewById(R.id.recyclerView);
 
         mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(appCtx));
 
         DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
                 DividerItemDecoration.VERTICAL);

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

@@ -5,15 +5,16 @@ 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;
-import org.mian.gitnex.models.Branches;
-import org.mian.gitnex.util.TinyDB;
-import java.util.List;
-import java.util.Objects;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.CommitsActivity;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Branches;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -34,7 +35,7 @@ public class BranchesAdapter extends RecyclerView.Adapter<BranchesAdapter.Branch
 
             branchNameTv = itemView.findViewById(R.id.branchName);
             branchCommitAuthor = itemView.findViewById(R.id.branchCommitAuthor);
-            TextView branchCommitHash = itemView.findViewById(R.id.branchCommitHash);
+            Button 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,18 +1,21 @@
 package org.mian.gitnex.adapters;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
+import android.content.Intent;
+import android.net.Uri;
+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 com.mikepenz.fastadapter.FastAdapter;
-import com.mikepenz.fastadapter.items.AbstractItem;
+import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.util.TinyDB;
-import java.util.Date;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Commits;
 import java.util.List;
 import java.util.Locale;
 
@@ -20,142 +23,152 @@ import java.util.Locale;
  * Author M M Arif
  */
 
-public class CommitsAdapter extends AbstractItem<CommitsAdapter, CommitsAdapter.ViewHolder> {
+public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-    final private Context ctx;
-    private String commitTitle;
-    private String commitHtmlUrl;
-    private String commitCommitter;
-    private Date commitDate;
+    private Context ctx;
+    private final int TYPE_LOAD = 0;
+    private List<Commits> commitsList;
+    private CommitsAdapter.OnLoadMoreListener loadMoreListener;
+    private boolean isLoading = false;
+    private boolean isMoreDataAvailable = true;
 
-    private boolean isSelectable = true;
+    public CommitsAdapter(Context ctx, List<Commits> commitsListMain) {
 
-    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 CommitsAdapter.ViewHolder getViewHolder(@NonNull View v) {
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
-        return new CommitsAdapter.ViewHolder(v);
+        LayoutInflater inflater = LayoutInflater.from(ctx);
+
+        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));
+        }
 
     }
 
-    public class ViewHolder extends FastAdapter.ViewHolder<CommitsAdapter> {
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
-        final TinyDB tinyDb = new TinyDB(ctx);
-        final String locale = tinyDb.getString("locale");
-        final String timeFormat = tinyDb.getString("dateFormat");
+        if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
 
-        TextView commitTitleVw;
-        TextView commitCommitterVw;
-        TextView commitDateVw;
-        TextView commitHtmlUrlVw;
+            isLoading = true;
+            loadMoreListener.onLoadMore();
 
-        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);
 
-            commitTitleVw = itemView.findViewById(R.id.commitTitleVw);
-            commitCommitterVw = itemView.findViewById(R.id.commitCommitterVw);
-            commitDateVw = itemView.findViewById(R.id.commitDateVw);
-            commitHtmlUrlVw = itemView.findViewById(R.id.commitHtmlUrlVw);
+            commitTitle = itemView.findViewById(R.id.commitTitleVw);
+            commitCommitter = itemView.findViewById(R.id.commitCommitterVw);
+            commitDate = itemView.findViewById(R.id.commitDateVw);
+            commitHtmlUrl = itemView.findViewById(R.id.commitHtmlUrlVw);
 
         }
 
-        @Override
-        public void bindView(CommitsAdapter item, @NonNull List<Object> payloads) {
+        @SuppressLint("SetTextI18n")
+        void bindData(Commits commitsModel) {
 
-            commitTitleVw.setText(item.getCommitTitle());
-            commitCommitterVw.setText(ctx.getString(R.string.commitCommittedBy, item.getcommitCommitter()));
+            final TinyDB tinyDb = new TinyDB(ctx);
+            final String locale = tinyDb.getString("locale");
+            final String timeFormat = tinyDb.getString("dateFormat");
 
-            commitDateVw.setText(TimeHelper.formatTime(item.getcommitDate(), new Locale(locale), timeFormat, ctx));
+            commitTitle.setText(commitsModel.getCommit().getMessage());
+            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")) {
-                commitDateVw.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(item.getcommitDate()), ctx));
+                commitDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(commitsModel.getCommit().getCommitter().getDate()), ctx));
             }
 
-            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) {
-
-            commitTitleVw.setText(null);
-            commitCommitterVw.setText(null);
-            commitDateVw.setText(null);
-            commitHtmlUrlVw.setText(null);
+            commitHtmlUrl.setOnClickListener(v -> ctx.startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(commitsModel.getHtml_url()))));
 
         }
 
     }
 
+    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(CommitsAdapter.OnLoadMoreListener loadMoreListener) {
+
+        this.loadMoreListener = loadMoreListener;
+
+    }
+
+    public void updateList(List<Commits> list) {
+
+        commitsList = list;
+        notifyDataSetChanged();
+    }
+
 }

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

@@ -0,0 +1,138 @@
+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.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.database.api.DraftsApi;
+import org.mian.gitnex.database.models.DraftWithRepository;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsViewHolder> {
+
+    private List<DraftWithRepository> draftsList;
+    private Context mCtx;
+
+    class DraftsViewHolder extends RecyclerView.ViewHolder {
+
+        private TextView draftText;
+        private TextView repoInfo;
+        private TextView repoId;
+        private TextView draftId;
+        private TextView issueNumber;
+        private TextView issueType;
+        private TextView repoOwner;
+        private TextView repoName;
+
+        private DraftsViewHolder(View itemView) {
+
+            super(itemView);
+
+            draftText = itemView.findViewById(R.id.draftText);
+            repoInfo = itemView.findViewById(R.id.repoInfo);
+            repoId = itemView.findViewById(R.id.repoId);
+            draftId = itemView.findViewById(R.id.draftId);
+            issueNumber = itemView.findViewById(R.id.issueNumber);
+            issueType = itemView.findViewById(R.id.issueType);
+            repoOwner = itemView.findViewById(R.id.repoOwner);
+            repoName = itemView.findViewById(R.id.repoName);
+            ImageView deleteDraft = itemView.findViewById(R.id.deleteDraft);
+
+            deleteDraft.setOnClickListener(itemDelete -> {
+
+                int getDraftId = Integer.parseInt(draftId.getText().toString());
+                deleteDraft(getAdapterPosition());
+	            DraftsApi draftsApi = new DraftsApi(mCtx);
+	            draftsApi.deleteSingleDraft(getDraftId);
+
+            });
+
+	        itemView.setOnClickListener(itemEdit -> {
+
+                Intent intent = new Intent(mCtx, ReplyToIssueActivity.class);
+                intent.putExtra("commentBody", draftText.getText().toString());
+                intent.putExtra("issueNumber", issueNumber.getText().toString());
+                intent.putExtra("repositoryId", repoId.getText().toString());
+                intent.putExtra("draftTitle", repoInfo.getText().toString());
+
+                TinyDB tinyDb = new TinyDB(mCtx);
+                tinyDb.putString("issueNumber", issueNumber.getText().toString());
+                tinyDb.putLong("repositoryId", Long.parseLong(repoId.getText().toString()));
+                //tinyDb.putString("issueType", issueType.getText().toString());
+
+                mCtx.startActivity(intent);
+
+            });
+
+        }
+
+    }
+
+    public DraftsAdapter(Context mCtx, List<DraftWithRepository> draftsListMain) {
+        this.mCtx = mCtx;
+        this.draftsList = draftsListMain;
+    }
+
+    private void deleteDraft(int position) {
+
+        draftsList.remove(position);
+        notifyItemRemoved(position);
+        notifyItemRangeChanged(position, draftsList.size());
+        Toasty.info(mCtx, mCtx.getResources().getString(R.string.draftsSingleDeleteSuccess));
+
+    }
+
+    @NonNull
+    @Override
+    public DraftsAdapter.DraftsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_drafts, parent, false);
+        return new DraftsViewHolder(v);
+    }
+
+    @SuppressLint("DefaultLocale")
+    @Override
+    public void onBindViewHolder(@NonNull DraftsAdapter.DraftsViewHolder holder, int position) {
+
+        DraftWithRepository currentItem = draftsList.get(position);
+
+        holder.repoId.setText(String.valueOf(currentItem.getRepositoryId()));
+        holder.draftId.setText(String.valueOf(currentItem.getDraftId()));
+        holder.issueNumber.setText(String.valueOf(currentItem.getIssueId()));
+        holder.issueType.setText(currentItem.getDraftType());
+        holder.repoOwner.setText(currentItem.getRepositoryOwner());
+        holder.repoName.setText(currentItem.getRepositoryName());
+        holder.draftText.setText(currentItem.getDraftText());
+
+	    String issueNumber = "<font color='" + mCtx.getResources().getColor(R.color.lightGray) + "'>" + mCtx.getResources().getString(R.string.hash) + currentItem.getIssueId() + "</font>";
+	    holder.repoInfo.setText(Html.fromHtml(issueNumber + " " + currentItem.getRepositoryOwner() + " / " + currentItem.getRepositoryName()));
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return draftsList.size();
+    }
+
+	public void updateList(List<DraftWithRepository> list) {
+
+		draftsList = list;
+		notifyDataSetChanged();
+	}
+
+
+}

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

@@ -9,6 +9,7 @@ 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;
@@ -22,11 +23,13 @@ import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.database.api.RepositoriesApi;
+import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
-import org.mian.gitnex.models.WatchRepository;
-import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -58,6 +61,9 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 		private TextView repoStars;
 		private TextView repoForks;
 		private TextView repoOpenIssuesCount;
+		private TextView repoType;
+		private LinearLayout archiveRepo;
+		private TextView repoBranch;
 
 		private ReposSearchViewHolder(View itemView) {
 
@@ -73,6 +79,9 @@ 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);
+			repoType = itemView.findViewById(R.id.repoType);
+			archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
+			repoBranch = itemView.findViewById(R.id.repoBranch);
 
 			itemView.setOnClickListener(v -> {
 
@@ -86,25 +95,47 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 				tinyDb.putString("repoFullName", repoFullName.getText().toString());
 				tinyDb.putBoolean("resumeIssues", true);
 				tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
+				tinyDb.putString("repoBranch", repoBranch.getText().toString());
+
+				String[] parts = fullName.getText().toString().split("/");
+				final String repoOwner = parts[0];
+				final String repoName = parts[1];
+
+				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+				RepositoriesApi repositoryData = new RepositoriesApi(context);
+
+				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
+				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+
+				if(count == 0) {
+
+					long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+					tinyDb.putLong("repositoryId", id);
+
+				}
+				else {
+
+					Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+					tinyDb.putLong("repositoryId", data.getRepositoryId());
+
+				}
 
 				//store if user is watching this repo
 				{
+
 					final String instanceUrl = tinyDb.getString("instanceUrl");
-					String[] parts = repoFullName.getText().toString().split("/");
-					final String repoOwner = parts[0];
-					final String repoName = parts[1];
 					final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-					WatchRepository watch = new WatchRepository();
+					WatchInfo watch = new WatchInfo();
 
-					Call<WatchRepository> call;
+					Call<WatchInfo> call;
 
 					call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-					call.enqueue(new Callback<WatchRepository>() {
+					call.enqueue(new Callback<WatchInfo>() {
 
 						@Override
-						public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
+						public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
 
 							if(response.isSuccessful()) {
 
@@ -126,13 +157,14 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 						}
 
 						@Override
-						public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
+						public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
 
 							tinyDb.putBoolean("repoWatch", false);
 							Toasty.info(context, context.getString(R.string.genericApiStatusError));
 
 						}
 					});
+
 				}
 
 				context.startActivity(intent);
@@ -150,7 +182,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
 				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-				bottomSheetHeader.setText(fullName.getText());
+				bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
 				BottomSheetDialog dialog = new BottomSheetDialog(context);
 				dialog.setContentView(view);
 				dialog.show();
@@ -192,17 +224,16 @@ 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_repos, parent, false);
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
 		return new ExploreRepositoriesAdapter.ReposSearchViewHolder(v);
 	}
 
 	@Override
 	public void onBindViewHolder(@NonNull final ExploreRepositoriesAdapter.ReposSearchViewHolder holder, int position) {
 
-		final UserRepositories currentItem = searchedReposList.get(position);
-
-
+		UserRepositories currentItem = searchedReposList.get(position);
 		holder.repoDescription.setVisibility(View.GONE);
+		holder.repoBranch.setText(currentItem.getDefault_branch());
 
 		ColorGenerator generator = ColorGenerator.MATERIAL;
 		int color = generator.getColor(currentItem.getName());
@@ -229,10 +260,12 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 		}
 		holder.fullName.setText(currentItem.getFullname());
 		if(currentItem.getPrivateFlag()) {
-			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
+			holder.repoType.setText(R.string.strPrivate);
 		}
 		else {
-			holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_unlock);
+			holder.repoType.setText(R.string.strPublic);
 		}
 		holder.repoStars.setText(currentItem.getStars_count());
 		holder.repoForks.setText(currentItem.getForks_count());
@@ -242,6 +275,13 @@ 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

@@ -11,9 +11,9 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Files;
-import org.mian.gitnex.util.AppUtil;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -51,23 +51,20 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 
             //ImageView filesDropdownMenu = itemView.findViewById(R.id.filesDropdownMenu);
 
-            fileName.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+            fileName.setOnClickListener(v -> {
 
-                    Context context = v.getContext();
-
-                    if(fileType.getText().toString().equals("file")) {
-                        filesListener.onClickFile(fileName.getText().toString());
-                    }
-                    else if(fileType.getText().toString().equals("dir")) {
-                        filesListener.onClickDir(fileName.getText().toString());
-                    }
-                    else {
-                        Toasty.info(context, context.getString(R.string.filesGenericError));
-                    }
+                Context context = v.getContext();
 
+                if(fileType.getText().toString().equals("file")) {
+                    filesListener.onClickFile(fileName.getText().toString());
                 }
+                else if(fileType.getText().toString().equals("dir")) {
+                    filesListener.onClickDir(fileName.getText().toString());
+                }
+                else {
+                    Toasty.info(context, context.getString(R.string.filesGenericError));
+                }
+
             });
 
 
@@ -160,15 +157,16 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
         holder.fileName.setText(currentItem.getName());
 
         if(currentItem.getType().equals("file")) {
-            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_file_new));
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_file));
             holder.fileInfo.setVisibility(View.VISIBLE);
             holder.fileInfo.setText(AppUtil.formatFileSizeInDetail(currentItem.getSize()));
         }
         else if(currentItem.getType().equals("dir")) {
-            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_folder_24));
+	        holder.fileInfo.setVisibility(View.GONE);
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_directory));
         }
         else {
-            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_question_mark_24));
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_question));
         }
 
     }

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

@@ -1,139 +1,267 @@
 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.HorizontalScrollView;
+import android.widget.BaseAdapter;
 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 M M Arif
+ * Author opyale
  */
 
-public class FilesDiffAdapter extends RecyclerView.Adapter<FilesDiffAdapter.FilesDiffViewHolder> {
+public class FilesDiffAdapter extends BaseAdapter {
 
-    private List<FileDiffView> dataList;
-    private Context ctx;
+	private static Map<Long, View> selectedViews;
+	private static final int MAXIMUM_LINES = 5000;
 
-    static class FilesDiffViewHolder extends RecyclerView.ViewHolder {
+	private static int COLOR_ADDED;
+	private static int COLOR_REMOVED;
+	private static int COLOR_NORMAL;
+	private static int COLOR_SELECTED;
+	private static int COLOR_FONT;
 
-        private TextView fileContents;
-        private TextView fileName;
-        private TextView fileInfo;
-        private ImageView fileImage;
-        private HorizontalScrollView fileContentsView;
-        private LinearLayout allLines;
+	private Context context;
+	private List<FileDiffView> fileDiffViews;
 
-        private FilesDiffViewHolder(View itemView) {
-            super(itemView);
+	public FilesDiffAdapter(Context context, List<FileDiffView> fileDiffViews) {
 
-            fileContents = itemView.findViewById(R.id.fileContents);
-            fileName = itemView.findViewById(R.id.fileName);
-            fileInfo = itemView.findViewById(R.id.fileInfo);
-            fileImage = itemView.findViewById(R.id.fileImage);
-            fileContentsView = itemView.findViewById(R.id.fileContentsView);
-            allLines = itemView.findViewById(R.id.allLinesLayout);
+		this.context = context;
+		this.fileDiffViews = fileDiffViews;
 
-        }
-    }
+		selectedViews = new ConcurrentSkipListMap<>();
 
-    public FilesDiffAdapter(List<FileDiffView> dataListMain, Context ctx) {
-        this.dataList = dataListMain;
-        this.ctx = ctx;
-    }
+		COLOR_ADDED = getColorFromAttribute(R.attr.diffAddedColor);
+		COLOR_REMOVED = getColorFromAttribute(R.attr.diffRemovedColor);
+		COLOR_NORMAL = getColorFromAttribute(R.attr.primaryBackgroundColor);
+		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
-    public void onBindViewHolder(@NonNull FilesDiffViewHolder holder, int position) {
+	@Override
+	public int getCount() {
 
-        holder.setIsRecyclable(false);
-        FileDiffView data = dataList.get(position);
+		return fileDiffViews.size();
+	}
 
-        if(data.isFileType()) {
+	@Override
+	public Object getItem(int position) {
 
-            holder.fileName.setText(data.getFileName());
+		return fileDiffViews.get(position);
+	}
 
-            holder.fileInfo.setVisibility(View.GONE);
+	@Override
+	public long getItemId(int 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);
+		return position;
+	}
 
-        }
-        else {
+	@SuppressLint({"ViewHolder", "InflateParams"})
+	@Override
+	public View getView(int position, View convertView, ViewGroup parent) {
 
-            String[] splitData = data.getFileContents().split("\\R");
+		convertView = LayoutInflater.from(context).inflate(R.layout.list_files_diffs, null, false);
 
-            for (String eachSplit : splitData) {
+		TextView headerFileName = convertView.findViewById(R.id.headerFileName);
+		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);
 
-                TextView textLine = new TextView(ctx);
-                textLine.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+		FileDiffView data = (FileDiffView) getItem(position);
+		headerFileName.setText(data.getFileName());
 
-                if (eachSplit.startsWith("+")) {
+		if(data.isFileBinary()) {
 
-                    textLine.setText(eachSplit);
-                    holder.allLines.addView(textLine);
+			diffStats.setVisibility(View.GONE);
+			diffLines.addView(getMessageView(context.getResources().getString(R.string.binaryFileError)));
 
-                    textLine.setTextColor(ctx.getResources().getColor(R.color.colorPrimary));
-                    textLine.setPadding(5, 5, 5, 5);
-                    textLine.setBackgroundColor(ctx.getResources().getColor(R.color.diffAddedColor));
+		}
+		else {
 
-                }
-                else if (eachSplit.startsWith("-")) {
+			diffStats.setVisibility(View.VISIBLE);
+			headerFileInfo.setText(data.getFileInfo());
 
-                    textLine.setText(eachSplit);
-                    holder.allLines.addView(textLine);
+			String[] codeLines = getLines(data.toString());
 
-                    textLine.setTextColor(ctx.getResources().getColor(R.color.colorPrimary));
-                    textLine.setPadding(5, 5, 5, 5);
-                    textLine.setBackgroundColor(ctx.getResources().getColor(R.color.diffRemovedColor));
+			if(MAXIMUM_LINES > codeLines.length) {
 
-                }
-                else {
+				for(int l=0; l<codeLines.length; l++) {
 
-                    if(eachSplit.length() > 0) {
-                        textLine.setText(eachSplit);
-                        holder.allLines.addView(textLine);
+					if(codeLines[l].length() > 0) {
 
-                        textLine.setTextColor(ctx.getResources().getColor(R.color.colorPrimary));
-                        textLine.setPadding(5, 5, 5, 5);
-                        textLine.setBackgroundColor(ctx.getResources().getColor(R.color.white));
-                    }
+						int uniquePosition = l + (position * MAXIMUM_LINES);
 
-                }
+						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);
 
-            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);
-            }
+						boolean isSelected = false;
 
-        }
+						for(View view : selectedViews.values()) {
 
-    }
+							if(((DiffTextView) view).getPosition() == uniquePosition) {
 
-    @Override
-    public int getItemCount() {
-        return dataList.size();
-    }
+								diffTextView.setBackgroundColor(COLOR_SELECTED);
+								isSelected = true;
+								break;
+
+							}
+
+						}
+
+
+						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

@@ -1,6 +1,8 @@
 package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -11,29 +13,28 @@ 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.TinyDB;
+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;
@@ -42,7 +43,6 @@ import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
 import io.noties.markwon.ext.tables.TablePlugin;
 import io.noties.markwon.ext.tasklist.TaskListPlugin;
 import io.noties.markwon.html.HtmlPlugin;
-import io.noties.markwon.image.AsyncDrawable;
 import io.noties.markwon.image.DefaultMediaDecoder;
 import io.noties.markwon.image.ImageItem;
 import io.noties.markwon.image.ImagesPlugin;
@@ -50,6 +50,8 @@ 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,14 +62,20 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 	private List<IssueComments> issuesComments;
 	private Context mCtx;
 
-	static class IssueCommentViewHolder extends RecyclerView.ViewHolder {
+	public IssueCommentsAdapter(Context mCtx, List<IssueComments> issuesCommentsMain) {
+
+		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;
@@ -82,7 +90,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);
-			commentsOptionsMenu = itemView.findViewById(R.id.commentsOptionsMenu);
+			ImageView commentsOptionsMenu = itemView.findViewById(R.id.commentsOptionsMenu);
 			commendBodyRaw = itemView.findViewById(R.id.commendBodyRaw);
 			commentModified = itemView.findViewById(R.id.commentModified);
 			commenterUsername = itemView.findViewById(R.id.commenterUsername);
@@ -90,32 +98,38 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 			commentsOptionsMenu.setOnClickListener(v -> {
 
-				final Context context = v.getContext();
-				final TinyDB tinyDb = new TinyDB(context);
+				final Context ctx = v.getContext();
+				final TinyDB tinyDb = new TinyDB(ctx);
 				final String loginUid = tinyDb.getString("loginUid");
 
-				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_issue_comments, null);
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(ctx).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 commentMenuQuote = view.findViewById(R.id.commentMenuQuote);
+				TextView commentMenuCopy = view.findViewById(R.id.commentMenuCopy);
+				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(context);
+				if(issueComment.getText().toString().isEmpty()) {
+					commentMenuCopy.setVisibility(View.GONE);
+				}
+
+				BottomSheetDialog dialog = new BottomSheetDialog(ctx);
 				dialog.setContentView(view);
 				dialog.show();
 
 				commentMenuEdit.setOnClickListener(ediComment -> {
 
-					Intent intent = new Intent(context, ReplyToIssueActivity.class);
+					Intent intent = new Intent(ctx, ReplyToIssueActivity.class);
 					intent.putExtra("commentId", commendId.getText());
 					intent.putExtra("commentAction", "edit");
 					intent.putExtra("commentBody", commendBodyRaw.getText());
-					context.startActivity(intent);
+					ctx.startActivity(intent);
 					dialog.dismiss();
 
 				});
@@ -128,20 +142,63 @@ 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") + context.getResources().getString(R.string.hash) + "issuecomment-" + commendId.getText() + " " + tinyDb.getString("issueTitle");
+					String intentHeader = tinyDb.getString("issueNumber") + ctx.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);
-					context.startActivity(Intent.createChooser(sharingIntent, intentHeader));
+					ctx.startActivity(Intent.createChooser(sharingIntent, intentHeader));
 
 					dialog.dismiss();
 
 				});
 
-                /*commentMenuDelete.setOnClickListener(deleteComment -> {
+				commentMenuQuote.setOnClickListener(v1 -> {
 
-                    dialog.dismiss();
+					StringBuilder stringBuilder = new StringBuilder();
+					String commenterName = commenterUsername.getText().toString();
 
-                });*/
+					if(!commenterName.equals(tinyDb.getString("userLogin"))) {
+
+						stringBuilder.append("@").append(commenterName).append("\n\n");
+					}
+
+					String[] lines = commendBodyRaw.getText().toString().split("\\R");
+
+					for(String line : lines) {
+
+						stringBuilder.append(">").append(line).append("\n");
+					}
+
+					stringBuilder.append("\n");
+
+					Intent intent = new Intent(ctx, ReplyToIssueActivity.class);
+					intent.putExtra("commentBody", stringBuilder.toString());
+					intent.putExtra("cursorToEnd", true);
+					intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+					dialog.dismiss();
+					ctx.startActivity(intent);
+
+				});
+
+				commentMenuCopy.setOnClickListener(view1 -> {
+
+					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
+					assert clipboard != null;
+
+					ClipData clip = ClipData.newPlainText("Comment on issue #" + issueNumber.getText().toString(), issueComment.getText().toString());
+					clipboard.setPrimaryClip(clip);
+
+					dialog.dismiss();
+					Toasty.info(ctx, ctx.getString(R.string.copyIssueCommentToastMsg));
+
+				});
+
+				commentMenuDelete.setOnClickListener(deleteComment -> {
+
+					deleteIssueComment(ctx, Integer.parseInt(commendId.getText().toString()), getAdapterPosition());
+					dialog.dismiss();
+
+				});
 
 			});
 
@@ -149,10 +206,79 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 	}
 
-	public IssueCommentsAdapter(Context mCtx, List<IssueComments> issuesCommentsMain) {
+	private void updateAdapter(int position) {
 
-		this.mCtx = mCtx;
-		this.issuesComments = issuesCommentsMain;
+		issuesComments.remove(position);
+		notifyItemRemoved(position);
+		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));
+
+			}
+
+		});
 
 	}
 
@@ -218,20 +344,13 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 						return Collections.singleton("drawable");
 					}
 				});
-				plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
-
-					@Nullable
-					@Override
-					public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
-
-						return null;
-					}
-				});
+				plugin.placeholderProvider(drawable -> 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,29 +1,28 @@
 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.util.TinyDB;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Issues;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
@@ -31,112 +30,74 @@ import java.util.Locale;
  * Author M M Arif
  */
 
-public class IssuesAdapter extends AbstractItem<IssuesAdapter, IssuesAdapter.ViewHolder> {
+public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-	final private Context ctx;
-	private String issueTitle;
-	private int issueNumber;
-	private String issueAssigneeAvatar;
-	private Date issueCreatedTime;
-	private int issueCommentsCount;
-	private String userFullname;
-	private String userLogin;
+	private Context context;
+	private final int TYPE_LOAD = 0;
+	private List<Issues> issuesList;
+	private OnLoadMoreListener loadMoreListener;
+	private boolean isLoading = false, isMoreDataAvailable = true;
 
-	private boolean isSelectable = true;
+	public IssuesAdapter(Context context, List<Issues> issuesListMain) {
 
-	public IssuesAdapter(Context ctx) {
-		this.ctx = ctx;
-	}
+		this.context = context;
+		this.issuesList = issuesListMain;
 
-	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 IssuesAdapter.ViewHolder getViewHolder(@NonNull View v) {
-		return new IssuesAdapter.ViewHolder(v);
+	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+		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));
+		}
+
 	}
 
-	public class ViewHolder extends FastAdapter.ViewHolder<IssuesAdapter> {
+	@Override
+	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
-		final TinyDB tinyDb = new TinyDB(ctx);
-		final String locale = tinyDb.getString("locale");
-		final String timeFormat = tinyDb.getString("dateFormat");
+		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+
+			isLoading = true;
+			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;
@@ -144,7 +105,7 @@ public class IssuesAdapter extends AbstractItem<IssuesAdapter, IssuesAdapter.Vie
 		private TextView issueCreatedTime;
 		private TextView issueCommentsCount;
 
-		public ViewHolder(View itemView) {
+		IssuesHolder(View itemView) {
 
 			super(itemView);
 
@@ -152,94 +113,124 @@ public class IssuesAdapter extends AbstractItem<IssuesAdapter, IssuesAdapter.Vie
 			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);
+
+			});
+
 		}
 
-		@Override
-		public void bindView(@NonNull IssuesAdapter item, @NonNull List<Object> payloads) {
+		@SuppressLint("SetTextI18n")
+		void bindData(Issues issuesModel) {
 
-			if (!item.getUserFullname().equals("")) {
-				issueAssigneeAvatar.setOnClickListener(new ClickListener(ctx.getResources().getString(R.string.issueCreator) + item.getUserFullname(), ctx));
+			final TinyDB tinyDb = new TinyDB(context);
+			final String locale = tinyDb.getString("locale");
+			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(ctx.getResources().getString(R.string.issueCreator) + item.getUserLogin(), ctx));
+				issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getLogin(), context));
 			}
 
-			PicassoService.getInstance(ctx).get().load(item.getIssueAssigneeAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
+			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);
 
-			String issueNumber_ = "<font color='" + ctx.getResources().getColor(R.color.lightGray) + "'>" + ctx.getResources().getString(R.string.hash) + item.getIssueNumber() + "</font>";
-			issueTitle.setText(Html.fromHtml(issueNumber_ + " " + item.getIssueTitle()));
+			String issueNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + issuesModel.getNumber() + "</font>";
+			issueTitle.setText(Html.fromHtml(issueNumber_ + " " + issuesModel.getTitle()));
 
-			issueNumber.setText(String.valueOf(item.getIssueNumber()));
-			issueCommentsCount.setText(String.valueOf(item.getIssueCommentsCount()));
-
-			switch (timeFormat) {
+			issueNumber.setText(String.valueOf(issuesModel.getNumber()));
+			issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));
 
+			switch(timeFormat) {
 				case "pretty": {
 					PrettyTime prettyTime = new PrettyTime(new Locale(locale));
-					String createdTime = prettyTime.format(item.getIssueCreatedTime());
+					String createdTime = prettyTime.format(issuesModel.getCreated_at());
 					issueCreatedTime.setText(createdTime);
-					issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(item.getIssueCreatedTime()), ctx));
+					issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issuesModel.getCreated_at()), context));
 					break;
 				}
 				case "normal": {
-					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + ctx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-					String createdTime = formatter.format(item.getIssueCreatedTime());
+					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+					String createdTime = formatter.format(issuesModel.getCreated_at());
 					issueCreatedTime.setText(createdTime);
 					break;
 				}
 				case "normal1": {
-					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + ctx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-					String createdTime = formatter.format(item.getIssueCreatedTime());
+					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+					String createdTime = formatter.format(issuesModel.getCreated_at());
 					issueCreatedTime.setText(createdTime);
 					break;
 				}
-
 			}
 
 		}
 
-		@Override
-		public void unbindView(@NonNull IssuesAdapter item) {
-
-			issueTitle.setText(null);
-			issueCommentsCount.setText(null);
-			issueCreatedTime.setText(null);
-
-		}
-
 	}
 
-	public static class IssueTitleClickEvent extends ClickEventHook<IssuesAdapter> {
+	static class LoadHolder extends RecyclerView.ViewHolder {
 
-		@Nullable
-		@Override
-		public List<View> onBindMany(@NonNull RecyclerView.ViewHolder viewHolder) {
-
-			if (viewHolder instanceof IssuesAdapter.ViewHolder) {
-				return EventHookUtil.toList(((ViewHolder) viewHolder).issueTitle);
-			}
-
-			return super.onBindMany(viewHolder);
+		LoadHolder(View itemView) {
 
+			super(itemView);
 		}
 
-		@Override
-		public void onClick(View v, int position, @NonNull FastAdapter<IssuesAdapter> fastAdapter, IssuesAdapter item) {
+	}
 
-			Context context = v.getContext();
+	public void setMoreDataAvailable(boolean moreDataAvailable) {
 
-			Intent intent = new Intent(context, IssueDetailActivity.class);
-			intent.putExtra("issueNumber", item.getIssueNumber());
+		isMoreDataAvailable = moreDataAvailable;
 
-			TinyDB tinyDb = new TinyDB(context);
-			tinyDb.putString("issueNumber", String.valueOf(item.getIssueNumber()));
-			tinyDb.putString("issueType", "issue");
-			context.startActivity(intent);
+	}
 
-		}
+	public void notifyDataChanged() {
 
+		notifyDataSetChanged();
+		isLoading = false;
+
+	}
+
+	public interface OnLoadMoreListener {
+
+		void onLoadMore();
+
+	}
+
+	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/LabelsAdapter.java

@@ -3,26 +3,25 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.ColorStateList;
 import android.graphics.Color;
-import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.amulyakhare.textdrawable.TextDrawable;
+import androidx.annotation.NonNull;
+import androidx.cardview.widget.CardView;
+import androidx.core.widget.ImageViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateLabelActivity;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.ColorInverter;
-import org.mian.gitnex.helpers.LabelWidthCalculator;
 import org.mian.gitnex.models.Labels;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Author M M Arif
@@ -39,12 +38,17 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
         private TextView labelTitle;
         private TextView labelId;
         private TextView labelColor;
-        private ImageView labelsView;
+
+        private CardView labelView;
+        private ImageView labelIcon;
+        private TextView labelName;
 
         private LabelsViewHolder(View itemView) {
             super(itemView);
 
-            labelsView = itemView.findViewById(R.id.labelsView);
+            labelView = itemView.findViewById(R.id.labelView);
+            labelIcon = itemView.findViewById(R.id.labelIcon);
+            labelName = itemView.findViewById(R.id.labelName);
             ImageView labelsOptionsMenu = itemView.findViewById(R.id.labelsOptionsMenu);
             labelTitle = itemView.findViewById(R.id.labelTitle);
             labelId = itemView.findViewById(R.id.labelId);
@@ -119,19 +123,13 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
         String labelName = currentItem.getName();
 
         int color = Color.parseColor("#" + labelColor);
+        int contrastColor = new ColorInverter().getContrastColor(color);
 
-        TextDrawable drawable = TextDrawable.builder()
-                .beginConfig()
-                .useFont(Typeface.DEFAULT)
-                .bold()
-                .textColor(new ColorInverter().getContrastColor(color))
-                .fontSize(35)
-                .width(LabelWidthCalculator.calculateLabelWidth(labelName, Typeface.DEFAULT, 40, 20))
-                .height(55)
-                .endConfig()
-                .buildRoundRect(labelName, color, 10);
+	    ImageViewCompat.setImageTintList(holder.labelIcon, ColorStateList.valueOf(contrastColor));
 
-        holder.labelsView.setImageDrawable(drawable);
+        holder.labelName.setTextColor(contrastColor);
+        holder.labelName.setText(labelName);
+        holder.labelView.setCardBackgroundColor(color);
 
     }
 

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

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

@@ -11,14 +11,14 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.MultiSelectDialog;
-import org.mian.gitnex.models.MultiSelectModel;
-import java.util.ArrayList;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatCheckBox;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.MultiSelectDialog;
+import org.mian.gitnex.models.MultiSelectModel;
+import java.util.List;
 
 /**
  * Author com.github.abumoallim, modified by M M Arif
@@ -26,11 +26,11 @@ import androidx.recyclerview.widget.RecyclerView;
 
 public class MutliSelectAdapter extends RecyclerView.Adapter<MutliSelectAdapter.MultiSelectDialogViewHolder> {
 
-    private ArrayList<MultiSelectModel> mDataSet;
+    private List<MultiSelectModel> mDataSet;
     private String mSearchQuery = "";
     private Context mContext;
 
-    public MutliSelectAdapter(ArrayList<MultiSelectModel> dataSet, Context context) {
+    public MutliSelectAdapter(List<MultiSelectModel> dataSet, Context context) {
         this.mDataSet = dataSet;
         this.mContext = context;
     }
@@ -163,7 +163,7 @@ public class MutliSelectAdapter extends RecyclerView.Adapter<MutliSelectAdapter.
         return mDataSet.size();
     }
 
-    public void setData(ArrayList<MultiSelectModel> data, String query, MutliSelectAdapter mutliSelectAdapter) {
+    public void setData(List<MultiSelectModel> data, String query, MutliSelectAdapter mutliSelectAdapter) {
 
         this.mDataSet = data;
         this.mSearchQuery = query;

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

@@ -7,10 +7,14 @@ 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 androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
@@ -21,15 +25,15 @@ import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.database.api.RepositoriesApi;
+import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
-import org.mian.gitnex.models.WatchRepository;
-import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.ArrayList;
 import java.util.List;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -39,250 +43,297 @@ import retrofit2.Callback;
 
 public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.MyReposViewHolder> implements Filterable {
 
-    private List<UserRepositories> reposList;
-    private Context mCtx;
-    private List<UserRepositories> reposListFull;
+	private List<UserRepositories> reposList;
+	private Context mCtx;
+	private List<UserRepositories> reposListFull;
 
-    static class MyReposViewHolder extends RecyclerView.ViewHolder {
+	static class MyReposViewHolder extends RecyclerView.ViewHolder {
 
-        private ImageView imageMy;
-        private TextView mTextView1My;
-        private TextView mTextView2My;
-        private TextView fullNameMy;
-        private ImageView repoPrivatePublicMy;
-        private TextView repoStarsMy;
-        private TextView repoForksMy;
-        private TextView repoOpenIssuesCountMy;
-        private TextView repoType;
+		private ImageView imageAvatar;
+		private TextView repoName;
+		private TextView repoDescription;
+		private TextView repoFullName;
+		private ImageView repoPrivatePublic;
+		private TextView repoStars;
+		private TextView repoForks;
+		private TextView repoOpenIssuesCount;
+		private TextView repoType;
+		private CheckBox isRepoAdmin;
+		private LinearLayout archiveRepo;
+		private TextView repoBranch;
 
-        private MyReposViewHolder(View itemView) {
-            super(itemView);
-            mTextView1My = itemView.findViewById(R.id.repoNameMy);
-            mTextView2My = itemView.findViewById(R.id.repoDescriptionMy);
-            imageMy = itemView.findViewById(R.id.imageAvatarMy);
-            fullNameMy = itemView.findViewById(R.id.repoFullNameMy);
-            repoPrivatePublicMy = itemView.findViewById(R.id.imageRepoTypeMy);
-            repoStarsMy = itemView.findViewById(R.id.repoStarsMy);
-            repoForksMy = itemView.findViewById(R.id.repoForksMy);
-            repoOpenIssuesCountMy = itemView.findViewById(R.id.repoOpenIssuesCountMy);
-            ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
-            repoType = itemView.findViewById(R.id.repoType);
+		private MyReposViewHolder(View itemView) {
 
-            itemView.setOnClickListener(v -> {
+			super(itemView);
+			repoName = itemView.findViewById(R.id.repoName);
+			repoDescription = itemView.findViewById(R.id.repoDescription);
+			imageAvatar = itemView.findViewById(R.id.imageAvatar);
+			repoFullName = itemView.findViewById(R.id.repoFullName);
+			repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
+			repoStars = itemView.findViewById(R.id.repoStars);
+			repoForks = itemView.findViewById(R.id.repoForks);
+			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+			ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+			repoType = itemView.findViewById(R.id.repoType);
+			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
+			archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
+			repoBranch = itemView.findViewById(R.id.repoBranch);
 
-                Context context = v.getContext();
+			itemView.setOnClickListener(v -> {
 
-                Intent intent = new Intent(context, RepoDetailActivity.class);
-                intent.putExtra("repoFullName", fullNameMy.getText().toString());
+				Context context = v.getContext();
 
-                TinyDB tinyDb = new TinyDB(context);
-                tinyDb.putString("repoFullName", fullNameMy.getText().toString());
-                tinyDb.putString("repoType", repoType.getText().toString());
-                //tinyDb.putBoolean("resumeIssues", true);
+				Intent intent = new Intent(context, RepoDetailActivity.class);
+				intent.putExtra("repoFullName", repoFullName.getText().toString());
 
-                //store if user is watching this repo
-                {
-                    final String instanceUrl = tinyDb.getString("instanceUrl");
-                    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");
+				TinyDB tinyDb = new TinyDB(context);
+				tinyDb.putString("repoFullName", repoFullName.getText().toString());
+				tinyDb.putString("repoType", repoType.getText().toString());
+				//tinyDb.putBoolean("resumeIssues", true);
+				tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
+				tinyDb.putString("repoBranch", repoBranch.getText().toString());
 
-                    WatchRepository watch = new WatchRepository();
+				String[] parts = repoFullName.getText().toString().split("/");
+				final String repoOwner = parts[0];
+				final String repoName = parts[1];
 
-                    Call<WatchRepository> call;
+				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+				RepositoriesApi repositoryData = new RepositoriesApi(context);
 
-                    call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
+				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
+				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
-                    call.enqueue(new Callback<WatchRepository>() {
+				if(count == 0) {
 
-                        @Override
-                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
+					long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+					tinyDb.putLong("repositoryId", id);
 
-                            if(response.isSuccessful()) {
+				}
+				else {
 
-                                assert response.body() != null;
-                                tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
+					Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+					tinyDb.putLong("repositoryId", data.getRepositoryId());
 
-                            } else {
+				}
 
-                                tinyDb.putBoolean("repoWatch", false);
+				//store if user is watching this repo
+				{
 
-                                if(response.code() != 404) {
+					final String instanceUrl = tinyDb.getString("instanceUrl");
+					final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-                                    Toasty.info(context, context.getString(R.string.genericApiStatusError));
+					WatchInfo watch = new WatchInfo();
 
-                                }
+					Call<WatchInfo> call;
 
-                            }
+					call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-                        }
+					call.enqueue(new Callback<WatchInfo>() {
 
-                        @Override
-                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
+						@Override
+						public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
 
-                            tinyDb.putBoolean("repoWatch", false);
-                            Toasty.info(context, context.getString(R.string.genericApiStatusError));
+							if(response.isSuccessful()) {
 
-                        }
-                    });
-                }
+								assert response.body() != null;
+								tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
 
-                context.startActivity(intent);
+							}
+							else {
 
-            });
+								tinyDb.putBoolean("repoWatch", false);
 
-            reposDropdownMenu.setOnClickListener(v -> {
+								if(response.code() != 404) {
 
-                final Context context = v.getContext();
+									Toasty.info(context, context.getString(R.string.genericApiStatusError));
 
-                @SuppressLint("InflateParams")
-                View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
+								}
 
-                TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
-                TextView repoStargazers = view.findViewById(R.id.repoStargazers);
-                TextView repoWatchers = view.findViewById(R.id.repoWatchers);
-                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+							}
 
-                bottomSheetHeader.setText(fullNameMy.getText());
-                BottomSheetDialog dialog = new BottomSheetDialog(context);
-                dialog.setContentView(view);
-                dialog.show();
+						}
 
-                repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+						@Override
+						public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
 
-                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
-                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullNameMy.getText());
-                    context.startActivity(intentOpenInBrowser);
-                    dialog.dismiss();
+							tinyDb.putBoolean("repoWatch", false);
+							Toasty.info(context, context.getString(R.string.genericApiStatusError));
 
-                });
+						}
+					});
 
-                repoStargazers.setOnClickListener(stargazers -> {
+				}
 
-                    Intent intent = new Intent(context, RepoStargazersActivity.class);
-                    intent.putExtra("repoFullNameForStars", fullNameMy.getText());
-                    context.startActivity(intent);
-                    dialog.dismiss();
+				context.startActivity(intent);
 
-                });
+			});
 
-                repoWatchers.setOnClickListener(watchers -> {
+			reposDropdownMenu.setOnClickListener(v -> {
 
-                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
-                    intentW.putExtra("repoFullNameForWatchers", fullNameMy.getText());
-                    context.startActivity(intentW);
-                    dialog.dismiss();
+				final Context context = v.getContext();
 
-                });
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
 
-            });
+				TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
+				TextView repoStargazers = view.findViewById(R.id.repoStargazers);
+				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-        }
-    }
+				bottomSheetHeader.setText(String.format("%s / %s", repoFullName.getText().toString().split("/")[0], repoFullName.getText().toString().split("/")[1]));
+				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				dialog.setContentView(view);
+				dialog.show();
 
-    public MyReposListAdapter(Context mCtx, List<UserRepositories> reposListMain) {
-        this.mCtx = mCtx;
-        this.reposList = reposListMain;
-        reposListFull = new ArrayList<>(reposList);
-    }
+				repoOpenInBrowser.setOnClickListener(openInBrowser -> {
 
-    @NonNull
-    @Override
-    public MyReposListAdapter.MyReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_my_repos, parent, false);
-        return new MyReposListAdapter.MyReposViewHolder(v);
-    }
+					Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+					intentOpenInBrowser.putExtra("repoFullNameBrowser", repoFullName.getText());
+					context.startActivity(intentOpenInBrowser);
+					dialog.dismiss();
 
-    @Override
-    public void onBindViewHolder(@NonNull MyReposListAdapter.MyReposViewHolder holder, int position) {
+				});
 
-        UserRepositories currentItem = reposList.get(position);
-        holder.mTextView2My.setVisibility(View.GONE);
+				repoStargazers.setOnClickListener(stargazers -> {
 
-        ColorGenerator generator = ColorGenerator.MATERIAL;
-        int color = generator.getColor(currentItem.getName());
-        String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
+					Intent intent = new Intent(context, RepoStargazersActivity.class);
+					intent.putExtra("repoFullNameForStars", repoFullName.getText());
+					context.startActivity(intent);
+					dialog.dismiss();
 
-        TextDrawable drawable = TextDrawable.builder()
-                .beginConfig()
-                .useFont(Typeface.DEFAULT)
-                .fontSize(18)
-                .toUpperCase()
-                .width(28)
-                .height(28)
-                .endConfig()
-                .buildRoundRect(firstCharacter, color, 3);
+				});
 
-        if (currentItem.getAvatar_url() != null) {
-            if (!currentItem.getAvatar_url().equals("")) {
-                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.imageMy.setImageDrawable(drawable);
-            }
-        }
-        else {
-            holder.imageMy.setImageDrawable(drawable);
-        }
+				repoWatchers.setOnClickListener(watchers -> {
 
-        holder.mTextView1My.setText(currentItem.getName());
-        if (!currentItem.getDescription().equals("")) {
-            holder.mTextView2My.setVisibility(View.VISIBLE);
-            holder.mTextView2My.setText(currentItem.getDescription());
-        }
-        holder.fullNameMy.setText(currentItem.getFullname());
-        if(currentItem.getPrivateFlag()) {
-            holder.repoPrivatePublicMy.setImageResource(R.drawable.ic_lock_bold);
-            holder.repoType.setText(R.string.strPrivate);
-        }
-        else {
-            holder.repoPrivatePublicMy.setImageResource(R.drawable.ic_public);
-            holder.repoType.setText(R.string.strPublic);
-        }
-        holder.repoStarsMy.setText(currentItem.getStars_count());
-        holder.repoForksMy.setText(currentItem.getForks_count());
-        holder.repoOpenIssuesCountMy.setText(currentItem.getOpen_issues_count());
+					Intent intentW = new Intent(context, RepoWatchersActivity.class);
+					intentW.putExtra("repoFullNameForWatchers", repoFullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
 
-    }
+				});
 
-    @Override
-    public int getItemCount() {
-        return reposList.size();
-    }
+			});
 
-    @Override
-    public Filter getFilter() {
-        return myReposFilter;
-    }
+		}
 
-    private Filter myReposFilter = new Filter() {
-        @Override
-        protected FilterResults performFiltering(CharSequence constraint) {
-            List<UserRepositories> filteredList = new ArrayList<>();
+	}
 
-            if (constraint == null || constraint.length() == 0) {
-                filteredList.addAll(reposListFull);
-            } else {
-                String filterPattern = constraint.toString().toLowerCase().trim();
+	public MyReposListAdapter(Context mCtx, List<UserRepositories> reposListMain) {
 
-                for (UserRepositories item : reposListFull) {
-                    if (item.getFullname().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
-                        filteredList.add(item);
-                    }
-                }
-            }
+		this.mCtx = mCtx;
+		this.reposList = reposListMain;
+		reposListFull = new ArrayList<>(reposList);
+	}
 
-            FilterResults results = new FilterResults();
-            results.values = filteredList;
+	@NonNull
+	@Override
+	public MyReposListAdapter.MyReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
-            return results;
-        }
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
+		return new MyReposListAdapter.MyReposViewHolder(v);
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull MyReposListAdapter.MyReposViewHolder holder, int position) {
+
+		UserRepositories currentItem = reposList.get(position);
+		holder.repoDescription.setVisibility(View.GONE);
+		holder.repoBranch.setText(currentItem.getDefault_branch());
+
+		ColorGenerator generator = ColorGenerator.MATERIAL;
+		int color = generator.getColor(currentItem.getName());
+		String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
+
+		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
+
+		if(currentItem.getAvatar_url() != null) {
+			if(!currentItem.getAvatar_url().equals("")) {
+				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);
+			}
+			else {
+				holder.imageAvatar.setImageDrawable(drawable);
+			}
+		}
+		else {
+			holder.imageAvatar.setImageDrawable(drawable);
+		}
+
+		holder.repoName.setText(currentItem.getName());
+		if(!currentItem.getDescription().equals("")) {
+			holder.repoDescription.setVisibility(View.VISIBLE);
+			holder.repoDescription.setText(currentItem.getDescription());
+		}
+		holder.repoFullName.setText(currentItem.getFullname());
+		if(currentItem.getPrivateFlag()) {
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
+			holder.repoType.setText(R.string.strPrivate);
+		}
+		else {
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_unlock);
+			holder.repoType.setText(R.string.strPublic);
+		}
+		holder.repoStars.setText(currentItem.getStars_count());
+		holder.repoForks.setText(currentItem.getForks_count());
+		holder.repoOpenIssuesCount.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);
+		}
+
+	}
+
+	@Override
+	public int getItemCount() {
+
+		return reposList.size();
+	}
+
+	@Override
+	public Filter getFilter() {
+
+		return myReposFilter;
+	}
+
+	private Filter myReposFilter = new Filter() {
+
+		@Override
+		protected FilterResults performFiltering(CharSequence constraint) {
+
+			List<UserRepositories> filteredList = new ArrayList<>();
+
+			if(constraint == null || constraint.length() == 0) {
+				filteredList.addAll(reposListFull);
+			}
+			else {
+				String filterPattern = constraint.toString().toLowerCase().trim();
+
+				for(UserRepositories item : reposListFull) {
+					if(item.getFullname().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
+						filteredList.add(item);
+					}
+				}
+			}
+
+			FilterResults results = new FilterResults();
+			results.values = filteredList;
+
+			return results;
+		}
+
+		@Override
+		protected void publishResults(CharSequence constraint, FilterResults results) {
+
+			reposList.clear();
+			reposList.addAll((List) results.values);
+			notifyDataSetChanged();
+		}
+	};
 
-        @Override
-        protected void publishResults(CharSequence constraint, FilterResults results) {
-            reposList.clear();
-            reposList.addAll((List) results.values);
-            notifyDataSetChanged();
-        }
-    };
 }

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

@@ -0,0 +1,125 @@
+package org.mian.gitnex.adapters;
+
+import android.content.Context;
+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.recyclerview.widget.RecyclerView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.models.NotificationThread;
+import java.util.List;
+
+/**
+ * Author opyale
+ */
+
+public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdapter.NotificationsViewHolder> {
+
+	private Context context;
+	private List<NotificationThread> notificationThreads;
+	private OnMoreClickedListener onMoreClickedListener;
+	private OnNotificationClickedListener onNotificationClickedListener;
+
+	public NotificationsAdapter(Context context, List<NotificationThread> notificationThreads, OnMoreClickedListener onMoreClickedListener, OnNotificationClickedListener onNotificationClickedListener) {
+
+		this.context = context;
+		this.notificationThreads = notificationThreads;
+		this.onMoreClickedListener = onMoreClickedListener;
+		this.onNotificationClickedListener = onNotificationClickedListener;
+
+	}
+
+	static class NotificationsViewHolder extends RecyclerView.ViewHolder {
+
+		private LinearLayout frame;
+		private TextView subject;
+		private TextView repository;
+		private ImageView type;
+		private ImageView pinned;
+		private ImageView more;
+
+		public NotificationsViewHolder(@NonNull View itemView) {
+
+			super(itemView);
+
+			frame = itemView.findViewById(R.id.frame);
+			subject = itemView.findViewById(R.id.subject);
+			repository = itemView.findViewById(R.id.repository);
+			type = itemView.findViewById(R.id.type);
+			pinned = itemView.findViewById(R.id.pinned);
+			more = itemView.findViewById(R.id.more);
+
+		}
+	}
+
+	@NonNull
+	@Override
+	public NotificationsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+		View v = LayoutInflater.from(context).inflate(R.layout.list_notifications, parent, false);
+		return new NotificationsAdapter.NotificationsViewHolder(v);
+
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull NotificationsViewHolder holder, int position) {
+
+		NotificationThread notificationThread = notificationThreads.get(position);
+
+		String url = notificationThread.getSubject().getUrl();
+		String subjectId = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources()
+			.getString(R.string.hash) + url.substring(url.lastIndexOf("/") + 1) + "</font>";
+
+		holder.subject.setText(Html.fromHtml(subjectId + " " + notificationThread.getSubject().getTitle()));
+		holder.repository.setText(notificationThread.getRepository().getFullname());
+
+		if(notificationThread.isPinned()) {
+			holder.pinned.setVisibility(View.VISIBLE);
+		}
+		else {
+			holder.pinned.setVisibility(View.GONE);
+		}
+
+		switch(notificationThread.getSubject().getType()) {
+
+			case "Pull":
+				holder.type.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_pull_request, null));
+				break;
+
+			case "Issue":
+				holder.type.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_issue, null));
+				break;
+
+			default:
+				holder.type.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_question, null));
+				break;
+
+		}
+
+		holder.frame.setOnClickListener(v -> onNotificationClickedListener.onNotificationClicked(notificationThread));
+		holder.more.setOnClickListener(v -> onMoreClickedListener.onMoreClicked(notificationThread));
+
+	}
+
+	@Override
+	public int getItemCount() {
+
+		return notificationThreads.size();
+	}
+
+	public interface OnNotificationClickedListener {
+
+		void onNotificationClicked(NotificationThread notificationThread);
+	}
+
+	public interface OnMoreClickedListener {
+
+		void onMoreClicked(NotificationThread notificationThread);
+	}
+
+}

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

@@ -1,7 +1,5 @@
 package org.mian.gitnex.adapters;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
@@ -12,12 +10,14 @@ import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OrganizationDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.models.UserOrganizations;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.UserOrganizations;
 import java.util.ArrayList;
 import java.util.List;
 

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

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

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

@@ -10,19 +10,25 @@ 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 com.amulyakhare.textdrawable.TextDrawable;
+import androidx.annotation.NonNull;
+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.helpers.TinyDB;
 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;
@@ -31,7 +37,6 @@ import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
 import io.noties.markwon.ext.tables.TablePlugin;
 import io.noties.markwon.ext.tasklist.TaskListPlugin;
 import io.noties.markwon.html.HtmlPlugin;
-import io.noties.markwon.image.AsyncDrawable;
 import io.noties.markwon.image.DefaultMediaDecoder;
 import io.noties.markwon.image.ImageItem;
 import io.noties.markwon.image.ImagesPlugin;
@@ -49,25 +54,44 @@ 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 ImageView releaseType;
-        private TextView releaseTitle;
-        private TextView releaseDescription;
-        private TextView releaseDownload;
-        private TextView releaseZipDownload;
-        private TextView releaseTarDownload;
+        private TextView releaseType;
+        private TextView releaseName;
+        private ImageView authorAvatar;
+        private TextView authorName;
         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 ImageView downloadDropdownIcon;
+	    private RecyclerView downloadList;
 
         private ReleasesViewHolder(View itemView) {
+
             super(itemView);
 
-            releaseType = itemView.findViewById(R.id.releaseType);
-            releaseTitle = itemView.findViewById(R.id.releaseTitle);
-            releaseDescription = itemView.findViewById(R.id.releaseDescription);
-            releaseZipDownload = itemView.findViewById(R.id.releaseZipDownload);
-            releaseTarDownload = itemView.findViewById(R.id.releaseTarDownload);
-            releaseTag = itemView.findViewById(R.id.releaseTag);
+	        releaseType = itemView.findViewById(R.id.releaseType);
+	        releaseName = itemView.findViewById(R.id.releaseName);
+	        authorAvatar = itemView.findViewById(R.id.authorAvatar);
+	        authorName = itemView.findViewById(R.id.authorName);
+	        releaseTag = itemView.findViewById(R.id.releaseTag);
+	        releaseCommitSha = itemView.findViewById(R.id.releaseCommitSha);
+	        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()));
 
         }
     }
@@ -88,83 +112,74 @@ 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.releaseTitle.setText(currentItem.getName());
+	    holder.releaseName.setText(currentItem.getName());
 
-        if(!currentItem.getTag_name().equals("")) {
-            holder.releaseTag.setText(mCtx.getResources().getString(R.string.releaseTag, currentItem.getTag_name()));
-        }
-        else {
-            holder.releaseTag.setVisibility(View.GONE);
-        }
+	    if(currentItem.isPrerelease()) {
+		    holder.releaseType.setBackgroundResource(R.drawable.shape_pre_release);
+		    holder.releaseType.setText(R.string.releaseTypePre);
+	    }
+	    else if(currentItem.isDraft()) {
+		    holder.releaseType.setVisibility(View.GONE);
+	    }
+	    else {
+		    holder.releaseType.setBackgroundResource(R.drawable.shape_stable_release);
+		    holder.releaseType.setText(R.string.releaseTypeStable);
+	    }
 
-        if(currentItem.isPrerelease()) {
-            TextDrawable drawable = TextDrawable.builder()
-                    .beginConfig()
-                    //.useFont(Typeface.DEFAULT)
-                    .textColor(mCtx.getResources().getColor(R.color.white))
-                    .fontSize(34)
-                    .width(260)
-                    .height(60)
-                    .endConfig()
-                    .buildRoundRect(mCtx.getResources().getString(R.string.releaseTypePre), mCtx.getResources().getColor(R.color.releasePre), 8);
-            holder.releaseType.setImageDrawable(drawable);
-        }
-        else {
-            TextDrawable drawable = TextDrawable.builder()
-                    .beginConfig()
-                    //.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);
-        }
+	    if(currentItem.getAuthor().getAvatar_url() != null) {
+		    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);
+	    }
+
+	    holder.authorName.setText(mCtx.getResources().getString(R.string.releasePublishedBy, currentItem.getAuthor().getUsername()));
+
+	    if(currentItem.getTag_name() != null) {
+	    	holder.releaseTag.setText(currentItem.getTag_name());
+	    }
+
+	    if(currentItem.getPublished_at() != null) {
+		    holder.releaseDate.setText(TimeHelper.formatTime(currentItem.getPublished_at(), new Locale(locale), timeFormat, mCtx));
+	    }
+
+	    if(timeFormat.equals("pretty")) {
+		    holder.releaseDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getPublished_at()), mCtx));
+	    }
 
         final Markwon markwon = Markwon.builder(Objects.requireNonNull(mCtx))
                 .usePlugin(CorePlugin.create())
-                .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
-                    @Override
-                    public void configureImages(@NonNull ImagesPlugin plugin) {
-                        plugin.addSchemeHandler(new SchemeHandler() {
-                            @NonNull
-                            @Override
-                            public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+                .usePlugin(ImagesPlugin.create(plugin -> {
+                    plugin.addSchemeHandler(new SchemeHandler() {
+                        @NonNull
+                        @Override
+                        public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
 
-                                final int resourceId = mCtx.getResources().getIdentifier(
-                                        raw.substring("drawable://".length()),
-                                        "drawable",
-                                        mCtx.getPackageName());
+                            final int resourceId = mCtx.getResources().getIdentifier(
+                                    raw.substring("drawable://".length()),
+                                    "drawable",
+                                    mCtx.getPackageName());
 
-                                final Drawable drawable = mCtx.getDrawable(resourceId);
+                            final Drawable drawable = mCtx.getDrawable(resourceId);
 
-                                assert drawable != null;
-                                return ImageItem.withResult(drawable);
-                            }
+                            assert drawable != null;
+                            return ImageItem.withResult(drawable);
+                        }
 
-                            @NonNull
-                            @Override
-                            public Collection<String> supportedSchemes() {
-                                return Collections.singleton("drawable");
-                            }
-                        });
-                        plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
-                            @Nullable
-                            @Override
-                            public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
-                                return null;
-                            }
-                        });
-                        plugin.addMediaDecoder(GifMediaDecoder.create(false));
-                        plugin.addMediaDecoder(SvgMediaDecoder.create(mCtx.getResources()));
-                        plugin.addMediaDecoder(SvgMediaDecoder.create());
-                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create(mCtx.getResources()));
-                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
-                    }
+                        @NonNull
+                        @Override
+                        public Collection<String> supportedSchemes() {
+                            return Collections.singleton("drawable");
+                        }
+                    });
+                    plugin.placeholderProvider(drawable -> null);
+                    plugin.addMediaDecoder(GifMediaDecoder.create(false));
+                    plugin.addMediaDecoder(SvgMediaDecoder.create(mCtx.getResources()));
+                    plugin.addMediaDecoder(SvgMediaDecoder.create());
+                    plugin.defaultMediaDecoder(DefaultMediaDecoder.create(mCtx.getResources()));
+                    plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
                 }))
                 .usePlugin(new AbstractMarkwonPlugin() {
                     @Override
@@ -185,12 +200,29 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
         Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(currentItem.getBody()));
 
         if(!currentItem.getBody().equals("")) {
-            markwon.setParsedMarkdown(holder.releaseDescription, bodyWithMD);
+            markwon.setParsedMarkdown(holder.releaseBodyContent, bodyWithMD);
         }
         else {
-            holder.releaseDescription.setVisibility(View.GONE);
+	        holder.releaseBodyContent.setText(R.string.noReleaseBodyContent);
         }
 
+	    holder.downloadFrame.setOnClickListener(v -> {
+
+		    if(holder.downloads.getVisibility() == View.GONE) {
+
+			    holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_down);
+			    holder.downloads.setVisibility(View.VISIBLE);
+
+		    }
+		    else {
+
+			    holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_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());
@@ -199,6 +231,9 @@ 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

@@ -0,0 +1,68 @@
+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

@@ -12,8 +12,8 @@ import android.widget.TextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.models.UserInfo;
-import org.mian.gitnex.util.TinyDB;
 import java.util.List;
 
 /**
@@ -109,13 +109,6 @@ 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

@@ -12,8 +12,8 @@ import android.widget.TextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.models.UserInfo;
-import org.mian.gitnex.util.TinyDB;
 import java.util.List;
 
 /**
@@ -109,13 +109,6 @@ 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,6 +11,7 @@ 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;
@@ -24,11 +25,13 @@ import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.database.api.RepositoriesApi;
+import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
-import org.mian.gitnex.models.WatchRepository;
-import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;
@@ -56,6 +59,8 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 		private TextView repoForks;
 		private TextView repoOpenIssuesCount;
 		private TextView repoType;
+		private LinearLayout archiveRepo;
+		private TextView repoBranch;
 
 		private ReposViewHolder(View itemView) {
 
@@ -71,6 +76,8 @@ 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);
+			repoBranch = itemView.findViewById(R.id.repoBranch);
 
 			itemView.setOnClickListener(v -> {
 
@@ -86,25 +93,47 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 				tinyDb.putString("repoType", repoType_.getText().toString());
 				//tinyDb.putBoolean("resumeIssues", true);
 				tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
+				tinyDb.putString("repoBranch", repoBranch.getText().toString());
+
+				String[] parts = repoFullName.getText().toString().split("/");
+				final String repoOwner = parts[0];
+				final String repoName = parts[1];
+
+				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+				RepositoriesApi repositoryData = new RepositoriesApi(context);
+
+				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
+				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+
+				if(count == 0) {
+
+					long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+					tinyDb.putLong("repositoryId", id);
+
+				}
+				else {
+
+					Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+					tinyDb.putLong("repositoryId", data.getRepositoryId());
+
+				}
 
 				//store if user is watching this repo
 				{
+
 					final String instanceUrl = tinyDb.getString("instanceUrl");
-					String[] parts = repoFullName.getText().toString().split("/");
-					final String repoOwner = parts[0];
-					final String repoName = parts[1];
 					final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-					WatchRepository watch = new WatchRepository();
+					WatchInfo watch = new WatchInfo();
 
-					Call<WatchRepository> call;
+					Call<WatchInfo> call;
 
 					call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-					call.enqueue(new Callback<WatchRepository>() {
+					call.enqueue(new Callback<WatchInfo>() {
 
 						@Override
-						public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
+						public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
 
 							if(response.isSuccessful()) {
 
@@ -126,13 +155,14 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 						}
 
 						@Override
-						public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
+						public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
 
 							tinyDb.putBoolean("repoWatch", false);
 							Toasty.info(context, context.getString(R.string.genericApiStatusError));
 
 						}
 					});
+
 				}
 
 				context.startActivity(intent);
@@ -150,7 +180,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
 				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-				bottomSheetHeader.setText(fullName.getText());
+				bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
 				BottomSheetDialog dialog = new BottomSheetDialog(context);
 				dialog.setContentView(view);
 				dialog.show();
@@ -199,7 +229,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_repos, parent, false);
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
 		return new ReposViewHolder(v);
 	}
 
@@ -208,6 +238,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 
 		UserRepositories currentItem = reposList.get(position);
 		holder.repoDescription.setVisibility(View.GONE);
+		holder.repoBranch.setText(currentItem.getDefault_branch());
 
 		ColorGenerator generator = ColorGenerator.MATERIAL;
 		int color = generator.getColor(currentItem.getName());
@@ -234,11 +265,11 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 		}
 		holder.fullName.setText(currentItem.getFullname());
 		if(currentItem.getPrivateFlag()) {
-			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
 			holder.repoType.setText(R.string.strPrivate);
 		}
 		else {
-			holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_unlock);
 			holder.repoType.setText(R.string.strPublic);
 		}
 		holder.repoStars.setText(currentItem.getStars_count());
@@ -249,6 +280,13 @@ 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,10 @@ 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;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
@@ -22,15 +25,15 @@ import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.database.api.RepositoriesApi;
+import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
-import org.mian.gitnex.models.WatchRepository;
-import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.ArrayList;
 import java.util.List;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -56,6 +59,8 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
         private TextView repoForks;
         private TextView repoOpenIssuesCount;
         private TextView repoType;
+	    private LinearLayout archiveRepo;
+	    private TextView repoBranch;
 
         private OrgReposViewHolder(View itemView) {
             super(itemView);
@@ -70,6 +75,8 @@ 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);
+	        repoBranch = itemView.findViewById(R.id.repoBranch);
 
             itemView.setOnClickListener(v -> {
 
@@ -83,25 +90,45 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                 tinyDb.putString("repoType", repoType.getText().toString());
                 //tinyDb.putBoolean("resumeIssues", true);
                 tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
+	            tinyDb.putString("repoBranch", repoBranch.getText().toString());
+
+                String[] parts = fullName.getText().toString().split("/");
+                final String repoOwner = parts[0];
+                final String repoName = parts[1];
+
+                int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+                RepositoriesApi repositoryData = new RepositoriesApi(context);
+
+                //RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
+                Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+
+                if(count == 0) {
+
+                    long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+                    tinyDb.putLong("repositoryId", id);
+
+                }
+                else {
+
+                    Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+                    tinyDb.putLong("repositoryId", data.getRepositoryId());
+
+                }
 
                 //store if user is watching this repo
                 {
+
                     final String instanceUrl = tinyDb.getString("instanceUrl");
-                    String[] parts = fullName.getText().toString().split("/");
-                    final String repoOwner = parts[0];
-                    final String repoName = parts[1];
                     final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-                    WatchRepository watch = new WatchRepository();
-
-                    Call<WatchRepository> call;
+                    Call<WatchInfo> call;
 
                     call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-                    call.enqueue(new Callback<WatchRepository>() {
+                    call.enqueue(new Callback<WatchInfo>() {
 
                         @Override
-                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
+                        public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
 
                             if(response.isSuccessful()) {
 
@@ -123,13 +150,14 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                         }
 
                         @Override
-                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
+                        public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
 
                             tinyDb.putBoolean("repoWatch", false);
                             Toasty.info(context, context.getString(R.string.genericApiStatusError));
 
                         }
                     });
+
                 }
 
                 context.startActivity(intent);
@@ -147,7 +175,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                 TextView repoWatchers = view.findViewById(R.id.repoWatchers);
                 TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-                bottomSheetHeader.setText(fullName.getText());
+	            bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
                 BottomSheetDialog dialog = new BottomSheetDialog(context);
                 dialog.setContentView(view);
                 dialog.show();
@@ -194,7 +222,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_by_org, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
         return new RepositoriesByOrgAdapter.OrgReposViewHolder(v);
     }
 
@@ -203,6 +231,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
 
         UserRepositories currentItem = reposList.get(position);
         holder.repoDescription.setVisibility(View.GONE);
+	    holder.repoBranch.setText(currentItem.getDefault_branch());
 
         ColorGenerator generator = ColorGenerator.MATERIAL;
         int color = generator.getColor(currentItem.getName());
@@ -236,11 +265,11 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
         }
         holder.fullName.setText(currentItem.getFullname());
         if(currentItem.getPrivateFlag()) {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
             holder.repoType.setText(R.string.strPrivate);
         }
         else {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_unlock);
             holder.repoType.setText(R.string.strPublic);
         }
         holder.repoStars.setText(currentItem.getStars_count());
@@ -252,6 +281,13 @@ 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,10 @@ 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;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
@@ -22,15 +25,15 @@ import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.database.api.RepositoriesApi;
+import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
-import org.mian.gitnex.models.WatchRepository;
-import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.ArrayList;
 import java.util.List;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -56,6 +59,8 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
         private TextView repoForks;
         private TextView repoOpenIssuesCount;
         private TextView repoType;
+	    private LinearLayout archiveRepo;
+	    private TextView repoBranch;
 
         private StarredReposViewHolder(View itemView) {
             super(itemView);
@@ -70,6 +75,8 @@ 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);
+	        repoBranch = itemView.findViewById(R.id.repoBranch);
 
             itemView.setOnClickListener(v -> {
 
@@ -83,25 +90,47 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                 tinyDb.putString("repoType", repoType.getText().toString());
                 //tinyDb.putBoolean("resumeIssues", true);
                 tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
+	            tinyDb.putString("repoBranch", repoBranch.getText().toString());
+
+                String[] parts = fullName.getText().toString().split("/");
+                final String repoOwner = parts[0];
+                final String repoName = parts[1];
+
+                int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+                RepositoriesApi repositoryData = new RepositoriesApi(context);
+
+                //RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
+                Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+
+                if(count == 0) {
+
+                    long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+                    tinyDb.putLong("repositoryId", id);
+
+                }
+                else {
+
+                    Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+                    tinyDb.putLong("repositoryId", data.getRepositoryId());
+
+                }
 
                 //store if user is watching this repo
                 {
+
                     final String instanceUrl = tinyDb.getString("instanceUrl");
-                    String[] parts = fullName.getText().toString().split("/");
-                    final String repoOwner = parts[0];
-                    final String repoName = parts[1];
                     final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-                    WatchRepository watch = new WatchRepository();
+                    WatchInfo watch = new WatchInfo();
 
-                    Call<WatchRepository> call;
+                    Call<WatchInfo> call;
 
                     call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-                    call.enqueue(new Callback<WatchRepository>() {
+                    call.enqueue(new Callback<WatchInfo>() {
 
                         @Override
-                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
+                        public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
 
                             if(response.isSuccessful()) {
 
@@ -123,13 +152,14 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                         }
 
                         @Override
-                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
+                        public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
 
                             tinyDb.putBoolean("repoWatch", false);
                             Toasty.info(context, context.getString(R.string.genericApiStatusError));
 
                         }
                     });
+
                 }
 
                 context.startActivity(intent);
@@ -148,7 +178,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                 TextView repoWatchers = view.findViewById(R.id.repoWatchers);
                 TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-                bottomSheetHeader.setText(fullName.getText());
+	            bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
                 BottomSheetDialog dialog = new BottomSheetDialog(context);
                 dialog.setContentView(view);
                 dialog.show();
@@ -195,7 +225,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_starred_repos, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
         return new StarredReposListAdapter.StarredReposViewHolder(v);
     }
 
@@ -204,6 +234,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
 
         UserRepositories currentItem = reposList.get(position);
         holder.repoDescription.setVisibility(View.GONE);
+	    holder.repoBranch.setText(currentItem.getDefault_branch());
 
         ColorGenerator generator = ColorGenerator.MATERIAL;
         int color = generator.getColor(currentItem.getName());
@@ -237,11 +268,11 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
         }
         holder.fullName.setText(currentItem.getFullname());
         if(currentItem.getPrivateFlag()) {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
             holder.repoType.setText(R.string.strPrivate);
         }
         else {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_unlock);
             holder.repoType.setText(R.string.strPublic);
         }
         holder.repoStars.setText(currentItem.getStars_count());
@@ -252,6 +283,13 @@ 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

@@ -11,10 +11,9 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.FontsOverride;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.models.UserInfo;
-import org.mian.gitnex.util.TinyDB;
 import java.util.List;
 
 /**
@@ -111,12 +110,5 @@ 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/UserAccountsAdapter.java

@@ -0,0 +1,116 @@
+package org.mian.gitnex.adapters;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.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.database.models.UserAccount;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import java.util.List;
+import io.mikael.urlbuilder.UrlBuilder;
+
+/**
+ * Author M M Arif
+ */
+
+public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapter.UserAccountsViewHolder> {
+
+	private List<UserAccount> userAccountsList;
+	private Context mCtx;
+	private TinyDB tinyDB;
+
+	static class UserAccountsViewHolder extends RecyclerView.ViewHolder {
+
+		private TextView accountUrl;
+		private TextView userId;
+		private ImageView activeAccount;
+		private ImageView deleteAccount;
+		private ImageView repoAvatar;
+
+		private UserAccountsViewHolder(View itemView) {
+
+			super(itemView);
+
+			accountUrl = itemView.findViewById(R.id.accountUrl);
+			userId = itemView.findViewById(R.id.userId);
+			activeAccount = itemView.findViewById(R.id.activeAccount);
+			deleteAccount = itemView.findViewById(R.id.deleteAccount);
+			repoAvatar = itemView.findViewById(R.id.repoAvatar);
+
+			deleteAccount.setOnClickListener(itemDelete -> {
+				// use later to delete an account
+
+			});
+
+			itemView.setOnClickListener(itemEdit -> {
+				// use later to switch account
+
+			});
+
+		}
+
+	}
+
+	public UserAccountsAdapter(Context mCtx, List<UserAccount> userAccountsListMain) {
+
+		this.mCtx = mCtx;
+		this.userAccountsList = userAccountsListMain;
+	}
+
+	private void deleteAccount(int position) {
+
+		userAccountsList.remove(position);
+		notifyItemRemoved(position);
+		notifyItemRangeChanged(position, userAccountsList.size());
+		Toasty.info(mCtx, mCtx.getResources().getString(R.string.accountDeletedMessage));
+
+	}
+
+	@NonNull
+	@Override
+	public UserAccountsAdapter.UserAccountsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_user_accounts, parent, false);
+		return new UserAccountsViewHolder(v);
+	}
+
+	@SuppressLint("DefaultLocale")
+	@Override
+	public void onBindViewHolder(@NonNull UserAccountsAdapter.UserAccountsViewHolder holder, int position) {
+
+		UserAccount currentItem = userAccountsList.get(position);
+		tinyDB = new TinyDB(mCtx);
+
+		String url = UrlBuilder.fromString(currentItem.getInstanceUrl())
+			.withPath("/")
+			.toString();
+
+		holder.userId.setText(String.format("@%s", currentItem.getUserName()));
+		holder.accountUrl.setText(url);
+
+		PicassoService.getInstance(mCtx).get().load(url + "img/favicon.png").placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.repoAvatar);
+
+		if(tinyDB.getInt("currentActiveAccountId") == currentItem.getAccountId()) {
+			holder.activeAccount.setVisibility(View.VISIBLE);
+		}
+		else {
+			holder.deleteAccount.setVisibility(View.GONE);
+		}
+
+	}
+
+	@Override
+	public int getItemCount() {
+		return userAccountsList.size();
+	}
+
+}

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

@@ -9,6 +9,9 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.CollaboratorActions;
 import org.mian.gitnex.clients.PicassoService;
@@ -16,13 +19,10 @@ 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.TinyDB;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.UserInfo;
-import org.mian.gitnex.util.TinyDB;
 import java.util.List;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.recyclerview.widget.RecyclerView;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;

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

@@ -0,0 +1,182 @@
+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.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.UserInfo;
+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());
+		}
+		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 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/AppApiService.java

@@ -2,20 +2,18 @@ package org.mian.gitnex.clients;
 
 import android.content.Context;
 import android.util.Log;
-import androidx.annotation.NonNull;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.FilesData;
+import org.mian.gitnex.helpers.TinyDB;
 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;
@@ -24,13 +22,14 @@ import retrofit2.converter.gson.GsonConverterFactory;
  * Author M M Arif
  */
 
-public class IssuesService {
+public class AppApiService {
 
 	public static <S> S createService(Class<S> serviceClass, String instanceURL, Context ctx) {
 
-		final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
+		TinyDB tinyDb = new TinyDB(ctx);
+		final boolean connToInternet = AppUtil.hasNetworkConnection(ctx);
 		File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
-		int cacheSize = 50 * 1024 * 1024; // 50MB
+		int cacheSize = FilesData.returnOnlyNumber(tinyDb.getString("cacheSizeStr")) * 1024 * 1024;
 		Cache cache = new Cache(httpCacheDirectory, cacheSize);
 
 		HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
@@ -48,22 +47,18 @@ public class IssuesService {
 					//.addInterceptor(logging)
 					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
 					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()))
-					.addInterceptor(new Interceptor() {
+					.addInterceptor(chain -> {
 
-				@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);
 
-					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();
+					}).build();
 
 			Retrofit.Builder builder = new Retrofit.Builder()
 					.baseUrl(instanceURL)

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

@@ -14,16 +14,18 @@ import javax.net.ssl.X509TrustManager;
 import okhttp3.OkHttpClient;
 
 /**
- * Author anonTree1417
+ * Author opyale
  */
 
 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 {
@@ -45,11 +47,7 @@ public class PicassoService {
 
 			});
 
-			File cachePath = new File(context.getCacheDir() + "/picasso_cache/");
-			//noinspection ResultOfMethodCallIgnored
-			cachePath.mkdirs();
-
-			picasso = builder.memoryCache(new PicassoCache(cachePath)).build();
+			picasso = builder.memoryCache(new PicassoCache(cachePath, context)).build();
 
 		}
 		catch(Exception e) {
@@ -61,7 +59,9 @@ 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

@@ -1,83 +0,0 @@
-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,10 +2,12 @@ package org.mian.gitnex.clients;
 
 import android.content.Context;
 import android.util.Log;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.FilesData;
+import org.mian.gitnex.helpers.TinyDB;
+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 java.io.File;
 import java.security.SecureRandom;
 import javax.net.ssl.HttpsURLConnection;
@@ -29,8 +31,9 @@ public class RetrofitClient {
 
 	private RetrofitClient(String instanceUrl, Context ctx) {
 
-		final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
-		int cacheSize = 50 * 1024 * 1024; // 50MB
+		TinyDB tinyDb = new TinyDB(ctx);
+		final boolean connToInternet = AppUtil.hasNetworkConnection(ctx);
+		int cacheSize = FilesData.returnOnlyNumber(tinyDb.getString("cacheSizeStr")) * 1024 * 1024;
 		File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
 		Cache cache = new Cache(httpCacheDirectory, cacheSize);
 
@@ -44,12 +47,9 @@ 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,11 +61,7 @@ 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();
 
@@ -77,15 +73,18 @@ 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() {
-        return retrofit.create(WebInterface.class);
-    }
+	public WebInterface getWebInterface() {
+
+		return retrofit.create(WebInterface.class);
+	}
 
 }

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

@@ -0,0 +1,125 @@
+package org.mian.gitnex.database.api;
+
+import android.content.Context;
+import android.util.Log;
+import androidx.lifecycle.LiveData;
+import org.mian.gitnex.database.dao.DraftsDao;
+import org.mian.gitnex.database.db.GitnexDatabase;
+import org.mian.gitnex.database.models.Draft;
+import org.mian.gitnex.database.models.DraftWithRepository;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class DraftsApi {
+
+	private static DraftsDao draftsDao;
+	private static long draftId;
+	private static Integer checkDraftFlag;
+
+	public DraftsApi(Context context) {
+
+		GitnexDatabase db;
+		db = GitnexDatabase.getDatabaseInstance(context);
+		draftsDao = db.draftsDao();
+	}
+
+	public long insertDraft(int repositoryId, int draftAccountId, int issueId, String draftText, String draftType) {
+
+		Draft draft = new Draft();
+		draft.setDraftRepositoryId(repositoryId);
+		draft.setDraftAccountId(draftAccountId);
+		draft.setIssueId(issueId);
+		draft.setDraftText(draftText);
+		draft.setDraftType(draftType);
+
+		return insertDraftAsyncTask(draft);
+	}
+
+	private static long insertDraftAsyncTask(final Draft draft) {
+
+		try {
+
+			Thread thread = new Thread(() -> draftId = draftsDao.insertDraft(draft));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(StaticGlobalVariables.draftsRepository, e.toString());
+		}
+
+		return draftId;
+	}
+
+	public long getDraftIdAsync(int issueId, int draftRepositoryId) {
+
+		try {
+
+			Thread thread = new Thread(() -> draftId = draftsDao.getDraftId(issueId, draftRepositoryId));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(StaticGlobalVariables.draftsRepository, e.toString());
+		}
+
+		return draftId;
+	}
+
+	public Integer checkDraft(int issueId, int draftRepositoryId) {
+
+		try {
+
+			Thread thread = new Thread(() -> checkDraftFlag = draftsDao.checkDraftDao(issueId, draftRepositoryId));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(StaticGlobalVariables.draftsRepository, e.toString());
+		}
+
+		return checkDraftFlag;
+	}
+
+	public LiveData<List<DraftWithRepository>> getDrafts(int accountId) {
+
+		return draftsDao.fetchAllDrafts(accountId);
+	}
+
+	public LiveData<Draft> getDraftByIssueId(int issueId) {
+
+		return draftsDao.fetchDraftByIssueId(issueId);
+	}
+
+	public void deleteSingleDraft(final int draftId) {
+
+		final LiveData<Draft> draft = draftsDao.fetchDraftById(draftId);
+
+		if(draft != null) {
+
+			new Thread(() -> draftsDao.deleteByDraftId(draftId)).start();
+		}
+	}
+
+	public static void deleteAllDrafts(final int accountId) {
+
+		new Thread(() -> draftsDao.deleteAllDrafts(accountId)).start();
+	}
+
+	public static void updateDraft(final String draftText, final int draftId) {
+
+		new Thread(() -> draftsDao.updateDraft(draftText, draftId)).start();
+	}
+
+	public static void updateDraftByIssueIdAsyncTask(final String draftText, final int issueId, final int draftRepositoryId) {
+
+		new Thread(() -> draftsDao.updateDraftByIssueId(draftText, issueId, draftRepositoryId)).start();
+	}
+
+}

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

@@ -0,0 +1,140 @@
+package org.mian.gitnex.database.api;
+
+import android.content.Context;
+import android.util.Log;
+import androidx.lifecycle.LiveData;
+import org.mian.gitnex.database.dao.RepositoriesDao;
+import org.mian.gitnex.database.db.GitnexDatabase;
+import org.mian.gitnex.database.models.Repository;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class RepositoriesApi {
+
+	private static RepositoriesDao repositoriesDao;
+	private static long repositoryId;
+	private static Repository repository;
+	private static Integer checkRepository;
+
+	public RepositoriesApi(Context context) {
+
+		GitnexDatabase db;
+		db = GitnexDatabase.getDatabaseInstance(context);
+		repositoriesDao = db.repositoriesDao();
+	}
+
+	public long insertRepository(int repoAccountId, String repositoryOwner, String repositoryName) {
+
+		Repository repository = new Repository();
+		repository.setRepoAccountId(repoAccountId);
+		repository.setRepositoryOwner(repositoryOwner);
+		repository.setRepositoryName(repositoryName);
+
+		return insertRepositoryAsyncTask(repository);
+	}
+
+	public long insertRepositoryAsyncTask(Repository repository) {
+
+		try {
+
+			Thread thread = new Thread(() -> repositoryId = repositoriesDao.newRepository(repository));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+		}
+
+		return repositoryId;
+	}
+
+	public Repository getRepository(int repoAccountId, String repositoryOwner, String repositoryName) {
+
+		try {
+
+			Thread thread = new Thread(() -> repository = repositoriesDao.getSingleRepositoryDao(repoAccountId, repositoryOwner, repositoryName));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+		}
+
+		return repository;
+	}
+
+	public LiveData<List<Repository>> getAllRepositories() {
+
+		return repositoriesDao.fetchAllRepositories();
+	}
+
+	public LiveData<List<Repository>> getAllRepositoriesByAccount(int repoAccountId) {
+
+		return repositoriesDao.getAllRepositoriesByAccountDao(repoAccountId);
+	}
+
+	public Integer checkRepository(int repoAccountId, String repositoryOwner, String repositoryName) {
+
+		try {
+
+			Thread thread = new Thread(() -> checkRepository = repositoriesDao.checkRepositoryDao(repoAccountId, repositoryOwner, repositoryName));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+		}
+
+		return checkRepository;
+	}
+
+	public Repository fetchRepositoryById(int repositoryId) {
+
+		try {
+
+			Thread thread = new Thread(() -> repository = repositoriesDao.fetchRepositoryByIdDao(repositoryId));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+		}
+
+		return repository;
+	}
+
+	public Repository fetchRepositoryByAccountIdByRepositoryId(int repositoryId, int repoAccountId) {
+
+		try {
+
+			Thread thread = new Thread(() -> repository = repositoriesDao.fetchRepositoryByAccountIdByRepositoryIdDao(repositoryId, repoAccountId));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+		}
+
+		return repository;
+	}
+
+	public static void deleteRepositoriesByAccount(final int repoAccountId) {
+
+		new Thread(() -> repositoriesDao.deleteRepositoriesByAccount(repoAccountId)).start();
+	}
+
+	public static void deleteRepository(final int repositoryId) {
+
+		new Thread(() -> repositoriesDao.deleteRepository(repositoryId)).start();
+	}
+
+}

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

@@ -0,0 +1,98 @@
+package org.mian.gitnex.database.api;
+
+import android.content.Context;
+import android.util.Log;
+import androidx.lifecycle.LiveData;
+import org.mian.gitnex.database.dao.UserAccountsDao;
+import org.mian.gitnex.database.db.GitnexDatabase;
+import org.mian.gitnex.database.models.UserAccount;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class UserAccountsApi {
+
+	private static UserAccountsDao userAccountsDao;
+	private static UserAccount userAccount;
+	private static Integer checkAccount;
+
+	public UserAccountsApi(Context context) {
+
+		GitnexDatabase db;
+		db = GitnexDatabase.getDatabaseInstance(context);
+		userAccountsDao = db.userAccountsDao();
+	}
+
+	public void insertNewAccount(String accountName, String instanceUrl, String userName, String token, String serverVersion) {
+
+		UserAccount userAccount = new UserAccount();
+		userAccount.setAccountName(accountName);
+		userAccount.setInstanceUrl(instanceUrl);
+		userAccount.setUserName(userName);
+		userAccount.setToken(token);
+		userAccount.setServerVersion(serverVersion);
+
+		insertNewAccountAsync(userAccount);
+	}
+
+	private static void insertNewAccountAsync(final UserAccount userAccount) {
+
+		new Thread(() -> userAccountsDao.newAccount(userAccount)).start();
+	}
+
+	public static void updateServerVersion(final String serverVersion, final int accountId) {
+
+		new Thread(() -> userAccountsDao.updateServerVersion(serverVersion, accountId)).start();
+	}
+
+	public static void updateToken(final int accountId, final String token) {
+
+		new Thread(() -> userAccountsDao.updateAccountToken(accountId, token)).start();
+	}
+
+	public UserAccount getAccountData(String accountName) {
+
+		try {
+
+			Thread thread = new Thread(() -> userAccount = userAccountsDao.fetchRowByAccount_(accountName));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(StaticGlobalVariables.userAccountsRepository, e.toString());
+		}
+
+		return userAccount;
+	}
+
+	public Integer getCount(String accountName) {
+
+		try {
+
+			Thread thread = new Thread(() -> checkAccount = userAccountsDao.getCount(accountName));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(StaticGlobalVariables.userAccountsRepository, e.toString());
+		}
+
+		return checkAccount;
+	}
+
+	public LiveData<List<UserAccount>> getAllAccounts() {
+
+		return userAccountsDao.fetchAllAccounts();
+	}
+
+	public static void deleteAccount(final int accountId) {
+
+		new Thread(() -> userAccountsDao.deleteAccount(accountId)).start();
+	}
+
+}

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

@@ -0,0 +1,56 @@
+package org.mian.gitnex.database.dao;
+
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.Query;
+import org.mian.gitnex.database.models.Draft;
+import org.mian.gitnex.database.models.DraftWithRepository;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+@Dao
+public interface DraftsDao {
+
+    @Insert
+    long insertDraft(Draft drafts);
+
+    @Query("SELECT * FROM Drafts JOIN Repositories ON Repositories.repositoryId = Drafts.draftRepositoryId WHERE draftAccountId = :accountId" +
+            " ORDER BY " +
+            "draftId DESC")
+    LiveData<List<DraftWithRepository>> fetchAllDrafts(int accountId);
+
+    @Query("SELECT * FROM Drafts WHERE draftAccountId = :accountId ORDER BY draftId DESC")
+    LiveData<List<Draft>> fetchDrafts(int accountId);
+
+    @Query("SELECT * FROM Drafts WHERE draftAccountId = :accountId and draftRepositoryId = :repositoryId")
+    LiveData<Draft> fetchSingleDraftByAccountIdAndRepositoryId(int accountId, int repositoryId);
+
+    @Query("SELECT * FROM Drafts WHERE draftId = :draftId")
+    LiveData<Draft> fetchDraftById(int draftId);
+
+    @Query("SELECT * FROM Drafts WHERE issueId = :issueId")
+    LiveData<Draft> fetchDraftByIssueId(int issueId);
+
+    @Query("SELECT count(draftId) FROM Drafts WHERE issueId = :issueId AND draftRepositoryId = :draftRepositoryId")
+    Integer checkDraftDao(int issueId, int draftRepositoryId);
+
+    @Query("UPDATE Drafts SET draftText= :draftText WHERE draftId = :draftId")
+    void updateDraft(String draftText, int draftId);
+
+    @Query("UPDATE Drafts SET draftText= :draftText WHERE issueId = :issueId AND draftRepositoryId = :draftRepositoryId")
+    void updateDraftByIssueId(String draftText, int issueId, int draftRepositoryId);
+
+	@Query("SELECT draftId FROM Drafts WHERE issueId = :issueId AND draftRepositoryId = :draftRepositoryId")
+	Integer getDraftId(int issueId, int draftRepositoryId);
+
+    @Query("DELETE FROM Drafts WHERE draftId = :draftId")
+    void deleteByDraftId(int draftId);
+
+    @Query("DELETE FROM Drafts WHERE draftAccountId = :accountId")
+    void deleteAllDrafts(int accountId);
+
+}

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

@@ -0,0 +1,47 @@
+package org.mian.gitnex.database.dao;
+
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.Query;
+import org.mian.gitnex.database.models.Repository;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+@Dao
+public interface RepositoriesDao {
+
+    @Insert
+    long newRepository(Repository repositories);
+
+    @Query("SELECT * FROM Repositories ORDER BY repositoryId ASC")
+    LiveData<List<Repository>> fetchAllRepositories();
+
+    @Query("SELECT * FROM Repositories WHERE repoAccountId = :repoAccountId")
+    LiveData<List<Repository>> getAllRepositoriesByAccountDao(int repoAccountId);
+
+    @Query("SELECT count(repositoryId) FROM Repositories WHERE repoAccountId = :repoAccountId AND repositoryOwner = :repositoryOwner AND repositoryName = :repositoryName")
+    Integer checkRepositoryDao(int repoAccountId, String repositoryOwner, String repositoryName);
+
+	@Query("SELECT * FROM Repositories WHERE repoAccountId = :repoAccountId AND repositoryOwner = :repositoryOwner AND repositoryName = :repositoryName")
+	Repository getSingleRepositoryDao(int repoAccountId, String repositoryOwner, String repositoryName);
+
+    @Query("SELECT * FROM Repositories WHERE repositoryId = :repositoryId")
+    Repository fetchRepositoryByIdDao(int repositoryId);
+
+    @Query("SELECT * FROM Repositories WHERE repositoryId = :repositoryId AND repoAccountId = :repoAccountId")
+    Repository fetchRepositoryByAccountIdByRepositoryIdDao(int repositoryId, int repoAccountId);
+
+    @Query("UPDATE Repositories SET repositoryOwner = :repositoryOwner, repositoryName = :repositoryName  WHERE repositoryId = :repositoryId")
+    void updateRepositoryOwnerAndName(String repositoryOwner, String repositoryName, int repositoryId);
+
+    @Query("DELETE FROM Repositories WHERE repositoryId = :repositoryId")
+    void deleteRepository(int repositoryId);
+
+    @Query("DELETE FROM Repositories WHERE repoAccountId = :repoAccountId")
+    void deleteRepositoriesByAccount(int repoAccountId);
+
+}