Merge pull request 'prepare release 2.5' (#434 ) from prepare-release-2.5 into release-2.5

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/434
prepare release 2.5
2020-04-21 16:02:15 +00:00 · 2020-04-21 19:19:16 +05:00 · 2020-04-21 13:54:07 +00:00 · 2020-04-21 08:50:51 +00:00 · 2020-04-18 14:21:48 +00:00
559 changed files with 14192 additions and 26246 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,65 +1,21 @@
 ---
 kind: pipeline
-type: docker
-name: tests
+name: gitnex-ci-test

 steps:

-  - name: unit-tests
+  - name: test
    image: nextcloudci/android:android-49
-    depends_on: [ clone ]
    commands:
      - ./gradlew test

-  - name: check-formatting
-    image: zosiab/eclint:latest
-    depends_on: [ clone ]
-    commands:
-      - git pull origin master
-      - eclint check $(git diff --name-only origin/master)
-
-  # This may be used in the future, because it makes of intellij's native code inspection/formatting capabilities.
-  # Additional information: https://www.jetbrains.com/help/idea/command-line-formatter.html
-  #
-  #  - name: do-or-check-formatting
-  #    image: dlsniper/docker-intellij
-  #    depends_on: [ clone ]
-  #    commands:
-  #      - /opt/intellij/bin/idea.sh inspect/format ...
-  #
-  #  - 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
-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
+name: gitnex-ci-build

 steps:

@ -71,7 +27,7 @@ steps:
  - name: sign
    image: nextcloudci/android:android-49
    environment:
-      BOT_TOKEN:
+      TOKEN:
        from_secret: BOT_TOKEN
      KS_PASS:
        from_secret: KS_PASS
@ -91,11 +47,8 @@ steps:
      WEBDAV_USERNAME: GitNexBot
      WEBDAV_PASSWORD:
        from_secret: NC_TOKEN
-      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'
+      PLUGIN_FILE: signed.apk
+      PLUGIN_DESTINATION: https://cloud.swatian.com/remote.php/dav/files/GitNexBot/GitNex-Builds/latest.apk

 trigger:
  event:
--- a/.editorconfig
+++ b/.editorconfig
@ -1,25 +0,0 @@
-[*]
-charset = utf-8
-end_of_line = lf
-indent_size = 4
-indent_style = space
-insert_final_newline = true
-trim_trailing_whitespace = true
-max_line_length = 150
-
-[*.java]
-indent_style = tab
-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
--- a/.gitea/issue_template.md
+++ b/.gitea/issue_template.md
@ -20,7 +20,6 @@ _(This step is optional; an example is shown below)_

 * The version of **Gitea** you are using: 
 * The version of **GitNex** you are using: 
-* Phone **OS** version and model: 
 * The type of certificate you are using (self-signed, signed): 
 * How you used to log in (via password or token): 

--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,63 +0,0 @@
-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'
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@ -29,7 +29,6 @@
      <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" />
@ -37,13 +36,8 @@
      <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" />
@ -162,4 +156,4 @@
      </arrangement>
    </codeStyleSettings>
  </code_scheme>
-</component>
+</component>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,2 +1,2 @@
 # Changelog
-[Check out the release notes](https://codeberg.org/gitnex/GitNex/releases)
+[Check out the release notes](https://gitea.com/gitnex/GitNex/releases)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -10,7 +10,7 @@ Please ask if you are not sure about the scope of work to be submitted to avoid
 **Code Standards**
 Please follow the code standards, this will help other developers to understand your code too.  
 It also helps maintaining the code afterwards.  
-It is documented in the Wiki: [Code-Standards](https://codeberg.org/gitnex/GitNex/wiki/Code-Standards)
+It is documented in the Wiki: [Code-Standards](https://gitea.com/gitnex/GitNex/wiki/Code-Standards)

 **How to submit a PR**  
 Fork this repository. Pull the forked repository from your namespace to your local machine. Create new branch and work on the bug/feature/enhancement you would like to submit. Push it to your forked version. From there create Pull Request(PR) against **master** branch.
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -3,7 +3,6 @@ This part lists all PUBLIC individuals having contributed content to the code.

 * M M Arif (mmarif)
 * 6543
- * opyale
 * Unpublished

 # Translators
--- a/63
+++ b/63
@ -1,7 +1,7 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@ -620,18 +620,55 @@ copy of the Program in return for a fee.

                     END OF TERMS AND CONDITIONS

-  GitNex is an Android client/application for Gitea.
-  Copyright (C) 2019  The GitNex Authors
+            How to Apply These Terms to Your New Programs

-  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.
+  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 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.
+  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.

-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    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>.
--- a/README.md
+++ b/README.md
@ -1,22 +1,28 @@
-[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://codeberg.org/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://codeberg.org/gitnex/GitNex/releases) [![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex) [![Join the Discord chat at https://discord.gg/FbSS4rf](https://img.shields.io/discord/632219664587685908.svg)](https://discord.gg/FbSS4rf)
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+[![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://gitea.com/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://gitea.com/gitnex/GitNex/releases)
+[![Build Status](https://drone.gitea.com/api/badges/gitnex/GitNex/status.svg)](https://drone.gitea.com/gitnex/GitNex)
+[![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex)
+[![Join the Discord chat at https://discord.gg/FbSS4rf](https://img.shields.io/discord/632219664587685908.svg)](https://discord.gg/FbSS4rf)

-[<img alt="Become a Patroen" src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" height="40"/>](https://www.patreon.com/mmarif) [<img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="40"/>](https://liberapay.com/mmarif/donate)
+[<img alt="Become a Patroen" src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" height="40"/>](https://www.patreon.com/mmarif)
+[<img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="40"/>](https://liberapay.com/mmarif/donate)

 # GitNex - Android client for Gitea

 GitNex is a free, open-source Android client for Git repository management tool Gitea. Gitea is a community managed fork of Gogs, lightweight code hosting solution written in Go.

-GitNex is licensed under GPLv3 License. See the LICENSE file for the full license text. No trackers are used and source code is available here for anyone to audit.
+GitNex is licensed under GPLv3 License. See the LICENSE file for the full license text.
+No trackers are used and source code is available here for anyone to audit.

 ## Downloads
 [<img alt='Get it on F-droid' src='https://gitlab.com/fdroid/artwork/raw/master/badge/get-it-on.png' height="80"/>](https://f-droid.org/en/packages/org.mian.gitnex/)
 [<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=org.mian.gitnex)
-[<img alt='Download builds and releases' src='assets/apk-badge.png' height="82"/>](https://cloud.swatian.com/s/DN7E5xxtaw4fRbE)
+[<img alt='Download APK' src='https://gitnex.com/img/download-apk.png' height="80"/>](https://gitea.com/gitnex/GitNex/releases)

 ## Note about Gitea version
 Please make sure that you are on latest stable release or later for better app experience.

-Check the versions [compatibility page](https://codeberg.org/gitnex/GitNex/wiki/Compatibility) which lists all the supported versions with compatibility ratio.
+Check the versions [compatibility page](https://gitea.com/gitnex/GitNex/wiki/Compatibility) which lists all the supported versions with compatibility ratio.

 ## Build from source
 Option 1 - Download the source code, open it in Android Studio and build it there.
@ -24,51 +30,48 @@ 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
- Multiple accounts support
- Repositories / issues/ org list
 - File and directory browser
- File viewer
 - Create files
 - Explore repositories
+- Issues list
 - Pull requests
- Files diff for PRs
- Notifications
- Drafts
- [MANY MORE](https://codeberg.org/gitnex/GitNex/wiki/Features)
+- Merge pull request
+- [MANY MORE](https://gitea.com/gitnex/GitNex/wiki/Features)

 ## Contributing
-[CONTRIBUTING](https://codeberg.org/gitnex/GitNex/src/branch/master/CONTRIBUTING.md)
+[CONTRIBUTING](https://gitea.com/gitnex/GitNex/src/branch/master/CONTRIBUTING.md)

 ## Translation
 Help us translate GitNex to your native language.

-We use [Crowdin](https://crowdin.com/project/gitnex) for translation. If your language is not listed, please request [here](https://codeberg.org/gitnex/GitNex/issues) to add it to the project.
+We use [Crowdin](https://crowdin.com/project/gitnex) for translation.
+If your language is not listed, please request [here](https://gitea.com/gitnex/GitNex/issues) to add it to the project.

 **Link: https://crowdin.com/project/GitNex**

 ## Screenshots:

-<img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/001.png" alt="001.png" width="200"/>  | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/002.png" alt="002.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/003.png" alt="003.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/004.png" alt="004.png" width="200"/>
+<img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/001.png" alt="001.png" width="200"/>  | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/002.png" alt="002.png" width="200"/> | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/003.png" alt="003.png" width="200"/> | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/004.png" alt="004.png" width="200"/>
 ---|---|---|---
-<img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/005.png" alt="005.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/006.png" alt="006.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/007.png" alt="007.png" width="200"/>  | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/008.png" alt="008.png" width="200"/>
+<img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/005.png" alt="005.png" width="200"/> | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/006.png" alt="006.png" width="200"/> | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/007.png" alt="007.png" width="200"/>  | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/008.png" alt="008.png" width="200"/>


 ## FAQ
-[Faq](https://codeberg.org/gitnex/GitNex/wiki/FAQ)
+[Faq](https://gitea.com/gitnex/GitNex/wiki/FAQ)

 ## Links
 [Website](https://gitnex.com)

-[Wiki](https://codeberg.org/gitnex/GitNex/wiki/Home)
+[Wiki](https://gitea.com/gitnex/GitNex/wiki/Home)

 [Website Repository](https://gitlab.com/mmarif4u/gitnex-website)

-[Troubleshoot Guide](https://codeberg.org/gitnex/GitNex/wiki/Troubleshoot-Guide)
+[Troubleshoot Guide](https://gitea.com/gitnex/GitNex/wiki/Troubleshoot-Guide)

 ## Thanks
 Thanks to all the open source libraries, contributors and donators.

-#### Open source libraries
+Open source libraries
 - Retrofit
 - Gson
 - Okhttp
@ -87,9 +90,8 @@ Thanks to all the open source libraries, contributors and donators.
 - Apache/commons-io
 - Caverock/androidsvg
 - Droidsonroids.gif/android-gif-drawable
- Barteksc/androidPdfViewer
- Ge0rg/memorizingTrustManager
- Dimezis/blurView
- Mikaelhg/urlbuilder
+- Barteksc/AndroidPdfViewer
+- Mikepenz/fastadapter
+- Ge0rg/MemorizingTrustManager

 [Follow me on Fediverse - mastodon.social/@mmarif](https://mastodon.social/@mmarif)
--- a/app/build.gradle
+++ b/app/build.gradle
@ -6,13 +6,10 @@ android {
        applicationId "org.mian.gitnex"
        minSdkVersion 21
        targetSdkVersion 29
-        versionCode 312
-        versionName "3.1.2"
+        versionCode 250
+        versionName "2.5.0"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
-    buildFeatures {
-        viewBinding = true
-    }
    buildTypes {
        release {
            minifyEnabled false
@ -28,9 +25,6 @@ android {
        targetCompatibility = "8"
        sourceCompatibility = "8"
    }
-    defaultConfig{
-        vectorDrawables.useSupportLibrary = true
-    }
 }

 configurations {
@ -39,30 +33,29 @@ configurations {
 }

 dependencies {
-    def lifecycle_version = "2.3.0-alpha06"
-    def markwon_version = "4.4.0"
-    def work_version = "2.4.0"
+    def lifecycle_version = "2.2.0"
+    def markwon_version = '4.3.1'
+    def fastadapter = "3.3.1"
    def acra = "5.5.0"

    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "androidx.appcompat:appcompat:1.3.0-alpha01"
-    implementation "com.google.android.material:material:1.3.0-alpha02"
+    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "com.google.android.material:material:1.2.0-alpha06"
    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
    implementation "androidx.legacy:legacy-support-v4:1.0.0"
-    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.8.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.5.0'
    implementation "com.google.code.gson:gson:2.8.6"
    implementation "com.squareup.picasso:picasso:2.71828"
    implementation "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1"
-    implementation 'com.squareup.retrofit2:retrofit:2.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.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.vdurmont:emoji-java:5.1.1"
    implementation "com.pes.materialcolorpicker:library:1.2.5"
    implementation "io.noties.markwon:core:$markwon_version"
@ -82,18 +75,19 @@ 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.11'
    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"

 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -4,19 +4,17 @@
    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"
@ -48,6 +46,8 @@
            android:name=".activities.OrganizationDetailActivity"
            android:label="@string/title_activity_org_detail"
            android:theme="@style/AppTheme.NoActionBar" />
+        <activity android:name=".activities.SponsorsActivity" />
+        <activity android:name=".activities.CreditsActivity" />
        <activity android:name=".activities.CreateLabelActivity" />
        <activity android:name=".activities.CreateIssueActivity" />
        <activity android:name=".activities.CreateMilestoneActivity" />
@ -59,7 +59,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" android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation">
+        <activity android:name=".activities.MainActivity" android:theme="@android:style/Theme.NoTitleBar">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

@ -75,21 +75,6 @@
        <activity android:name=".activities.FileDiffActivity" />
        <activity android:name=".activities.CommitsActivity" />
        <activity android:name=".helpers.ssl.MemorizingActivity" android:theme="@android:style/Theme.Material.Dialog" />
-        <activity android:name=".activities.SettingsAppearanceActivity" />
-        <activity android:name=".activities.SettingsFileViewerActivity" />
-        <activity android:name=".activities.SettingsSecurityActivity" />
-        <activity android:name=".activities.SettingsTranslationActivity" />
-        <activity android:name=".activities.SettingsReportsActivity" />
-        <activity android:name=".activities.AddNewTeamMemberActivity" />
-        <activity android:name=".activities.SettingsDraftsActivity" />
-        <activity android:name=".activities.RepoForksActivity" />
-        <activity android:name=".activities.AddNewAccountActivity" />
-
-        <!-- 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>
+</manifest>
--- a/app/src/main/assets/highlightjs/highlight.pack.js
+++ b/app/src/main/assets/highlightjs/highlight.pack.js
--- a/app/src/main/assets/highlightjs/highlightjs-line-numbers.min.js
+++ b/app/src/main/assets/highlightjs/highlightjs-line-numbers.min.js
@ -1 +0,0 @@
-!function(e){"use strict";function t(){"complete"===document.readyState?n():e.addEventListener("DOMContentLoaded",n)}function n(){try{var e=document.querySelectorAll("code.hljs");for(var t in e)e.hasOwnProperty(t)&&r(e[t])}catch(n){console.error("LineNumbers error: ",n)}}function r(e){if("object"==typeof e){var t=e.parentNode,n=o(t.textContent);if(n>1){for(var r="",c=0;n>c;c++)r+=c+1+"\n";var l=document.createElement("code");l.className="hljs hljs-line-numbers",l.style["float"]="left",l.textContent=r,t.insertBefore(l,e)}}}function o(e){if(0===e.length)return 0;var t=/\r\n|\r|\n/g,n=e.match(t);return n=n?n.length:0,e[e.length-1].match(t)||(n+=1),n}"undefined"==typeof e.hljs?console.error("highlight.js not detected!"):(e.hljs.initLineNumbersOnLoad=t,e.hljs.lineNumbersBlock=r)}(window);
--- a/app/src/main/assets/highlightjs/themes/androidstudio.css
+++ b/app/src/main/assets/highlightjs/themes/androidstudio.css
@ -1,66 +0,0 @@
-/*
-Date: 24 Fev 2015
-Author: Pedro Oliveira <kanytu@gmail . com>
-*/
-
-.hljs {
-  color: #a9b7c6;
-  background: #282b2e;
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-}
-
-.hljs-number,
-.hljs-literal,
-.hljs-symbol,
-.hljs-bullet {
-  color: #6897BB;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-deletion {
-  color: #cc7832;
-}
-
-.hljs-variable,
-.hljs-template-variable,
-.hljs-link {
-  color: #629755;
-}
-
-.hljs-comment,
-.hljs-quote {
-  color: #808080;
-}
-
-.hljs-meta {
-  color: #bbb529;
-}
-
-.hljs-string,
-.hljs-attribute,
-.hljs-addition {
-  color: #6A8759;
-}
-
-.hljs-section,
-.hljs-title,
-.hljs-type {
-  color: #ffc66d;
-}
-
-.hljs-name,
-.hljs-selector-id,
-.hljs-selector-class {
-  color: #e8bf6a;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}
--- a/app/src/main/assets/highlightjs/themes/arduino-light.css
+++ b/app/src/main/assets/highlightjs/themes/arduino-light.css
@ -1,87 +0,0 @@
-/*
-
-Arduino® Light Theme - Stefania Mellai <s.mellai@arduino.cc>
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  background: #FFFFFF;
-}
-
-.hljs,
-.hljs-subst {
-  color: #434f54;
-}
-
-.hljs-keyword,
-.hljs-attribute,
-.hljs-selector-tag,
-.hljs-doctag,
-.hljs-name {
-  color: #00979D;
-}
-
-.hljs-built_in,
-.hljs-literal,
-.hljs-bullet,
-.hljs-code,
-.hljs-addition {
-  color: #D35400;
-}
-
-.hljs-regexp,
-.hljs-symbol,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-link,
-.hljs-selector-attr,
-.hljs-selector-pseudo {
-  color: #00979D;
-}
-
-.hljs-type,
-.hljs-string,
-.hljs-selector-id,
-.hljs-selector-class,
-.hljs-quote,
-.hljs-template-tag,
-.hljs-deletion {
-  color: #005C5F;
-}
-
-.hljs-title,
-.hljs-section {
-  color: #880000;
-  font-weight: bold;
-}
-
-.hljs-comment {
-  color: rgba(149,165,166,.8);
-}
-
-.hljs-meta-keyword {
-  color: #728E00;
-}
-
-.hljs-meta {
-  color: #434f54;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}
-
-.hljs-function {
-  color: #728E00;
-}
-
-.hljs-number {
-  color: #8A7B52;  
-}
--- a/app/src/main/assets/highlightjs/themes/far.css
+++ b/app/src/main/assets/highlightjs/themes/far.css
@ -1,71 +0,0 @@
-/*
-
-FAR Style (c) MajestiC <majestic2k@gmail.com>
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  background: #000080;
-}
-
-.hljs,
-.hljs-subst {
-  color: #0ff;
-}
-
-.hljs-string,
-.hljs-attribute,
-.hljs-symbol,
-.hljs-bullet,
-.hljs-built_in,
-.hljs-builtin-name,
-.hljs-template-tag,
-.hljs-template-variable,
-.hljs-addition {
-  color: #ff0;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-section,
-.hljs-type,
-.hljs-name,
-.hljs-selector-id,
-.hljs-selector-class,
-.hljs-variable {
-  color: #fff;
-}
-
-.hljs-comment,
-.hljs-quote,
-.hljs-doctag,
-.hljs-deletion {
-  color: #888;
-}
-
-.hljs-number,
-.hljs-regexp,
-.hljs-literal,
-.hljs-link {
-  color: #0f0;
-}
-
-.hljs-meta {
-  color: #008080;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-title,
-.hljs-section,
-.hljs-name,
-.hljs-strong {
-  font-weight: bold;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
--- a/app/src/main/assets/highlightjs/themes/github.css
+++ b/app/src/main/assets/highlightjs/themes/github.css
@ -1,99 +0,0 @@
-/*
-
-github.com style (c) Vasily Polovnyov <vast@whiteants.net>
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  color: #333;
-  background: #f8f8f8;
-}
-
-.hljs-comment,
-.hljs-quote {
-  color: #998;
-  font-style: italic;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-subst {
-  color: #333;
-  font-weight: bold;
-}
-
-.hljs-number,
-.hljs-literal,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-tag .hljs-attr {
-  color: #008080;
-}
-
-.hljs-string,
-.hljs-doctag {
-  color: #d14;
-}
-
-.hljs-title,
-.hljs-section,
-.hljs-selector-id {
-  color: #900;
-  font-weight: bold;
-}
-
-.hljs-subst {
-  font-weight: normal;
-}
-
-.hljs-type,
-.hljs-class .hljs-title {
-  color: #458;
-  font-weight: bold;
-}
-
-.hljs-tag,
-.hljs-name,
-.hljs-attribute {
-  color: #000080;
-  font-weight: normal;
-}
-
-.hljs-regexp,
-.hljs-link {
-  color: #009926;
-}
-
-.hljs-symbol,
-.hljs-bullet {
-  color: #990073;
-}
-
-.hljs-built_in,
-.hljs-builtin-name {
-  color: #0086b3;
-}
-
-.hljs-meta {
-  color: #999;
-  font-weight: bold;
-}
-
-.hljs-deletion {
-  background: #fdd;
-}
-
-.hljs-addition {
-  background: #dfd;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}
--- a/app/src/main/assets/highlightjs/themes/ir-black.css
+++ b/app/src/main/assets/highlightjs/themes/ir-black.css
@ -1,73 +0,0 @@
-/*
-  IR_Black style (c) Vasily Mikhailitchenko <vaskas@programica.ru>
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  background: #000;
-  color: #f8f8f8;
-}
-
-.hljs-comment,
-.hljs-quote,
-.hljs-meta {
-  color: #7c7c7c;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-tag,
-.hljs-name {
-  color: #96cbfe;
-}
-
-.hljs-attribute,
-.hljs-selector-id {
-  color: #ffffb6;
-}
-
-.hljs-string,
-.hljs-selector-attr,
-.hljs-selector-pseudo,
-.hljs-addition {
-  color: #a8ff60;
-}
-
-.hljs-subst {
-  color: #daefa3;
-}
-
-.hljs-regexp,
-.hljs-link {
-  color: #e9c062;
-}
-
-.hljs-title,
-.hljs-section,
-.hljs-type,
-.hljs-doctag {
-  color: #ffffb6;
-}
-
-.hljs-symbol,
-.hljs-bullet,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-literal {
-  color: #c6c5fe;
-}
-
-.hljs-number,
-.hljs-deletion {
-  color:#ff73fd;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}
--- a/app/src/main/assets/highlightjs/themes/monokai-sublime.css
+++ b/app/src/main/assets/highlightjs/themes/monokai-sublime.css
@ -1,83 +0,0 @@
-/*
-
-Monokai Sublime style. Derived from Monokai by noformnocontent http://nn.mit-license.org/
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  background: #23241f;
-}
-
-.hljs,
-.hljs-tag,
-.hljs-subst {
-  color: #f8f8f2;
-}
-
-.hljs-strong,
-.hljs-emphasis {
-  color: #a8a8a2;
-}
-
-.hljs-bullet,
-.hljs-quote,
-.hljs-number,
-.hljs-regexp,
-.hljs-literal,
-.hljs-link {
-  color: #ae81ff;
-}
-
-.hljs-code,
-.hljs-title,
-.hljs-section,
-.hljs-selector-class {
-  color: #a6e22e;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-name,
-.hljs-attr {
-  color: #f92672;
-}
-
-.hljs-symbol,
-.hljs-attribute {
-  color: #66d9ef;
-}
-
-.hljs-params,
-.hljs-class .hljs-title {
-  color: #f8f8f2;
-}
-
-.hljs-string,
-.hljs-type,
-.hljs-built_in,
-.hljs-builtin-name,
-.hljs-selector-id,
-.hljs-selector-attr,
-.hljs-selector-pseudo,
-.hljs-addition,
-.hljs-variable,
-.hljs-template-variable {
-  color: #e6db74;
-}
-
-.hljs-comment,
-.hljs-deletion,
-.hljs-meta {
-  color: #75715e;
-}
--- a/app/src/main/java/org/mian/gitnex/actions/CollaboratorActions.java
+++ b/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;

@ -47,7 +47,7 @@ public class CollaboratorActions {
                if(response.isSuccessful()) {
                    if(response.code() == 204) {

-                        Toasty.success(context, context.getString(R.string.removeCollaboratorToastText));
+                        Toasty.info(context, context.getString(R.string.removeCollaboratorToastText));
                        ((AddCollaboratorToRepositoryActivity)context).finish();
                        //Log.i("addCollaboratorSearch", addCollaboratorSearch.getText().toString());
                        //tinyDb.putBoolean("updateDataSet", true);
@ -66,17 +66,17 @@ public class CollaboratorActions {
                }
                else if(response.code() == 403) {

-                    Toasty.error(context, context.getString(R.string.authorizeError));
+                    Toasty.info(context, context.getString(R.string.authorizeError));

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

-                    Toasty.warning(context, context.getString(R.string.apiNotFound));
+                    Toasty.info(context, context.getString(R.string.apiNotFound));

                }
                else {

-                    Toasty.error(context, context.getString(R.string.genericError));
+                    Toasty.info(context, context.getString(R.string.genericError));

                }

@ -117,7 +117,7 @@ public class CollaboratorActions {
                if(response.isSuccessful()) {
                    if(response.code() == 204) {

-                        Toasty.success(context, context.getString(R.string.addCollaboratorToastText));
+                        Toasty.info(context, context.getString(R.string.addCollaboratorToastText));
                        ((AddCollaboratorToRepositoryActivity)context).finish();
                        //AddCollaboratorToRepositoryActivity usersSearchData = new AddCollaboratorToRepositoryActivity();
                        //usersSearchData.loadUserSearchList(instanceUrl, instanceToken, searchKeyword, context);
@ -134,17 +134,17 @@ public class CollaboratorActions {
                }
                else if(response.code() == 403) {

-                    Toasty.error(context, context.getString(R.string.authorizeError));
+                    Toasty.info(context, context.getString(R.string.authorizeError));

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

-                    Toasty.warning(context, context.getString(R.string.apiNotFound));
+                    Toasty.info(context, context.getString(R.string.apiNotFound));

                }
                else {

-                    Toasty.error(context, context.getString(R.string.genericError));
+                    Toasty.info(context, context.getString(R.string.genericError));

                }

--- a/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
@ -2,18 +2,19 @@ package org.mian.gitnex.actions;

 import android.content.Context;
 import android.util.Log;
-import androidx.annotation.NonNull;
+import android.view.View;
+import android.widget.TextView;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.ReplyToIssueActivity;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.DraftsApi;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.models.IssueComments;
 import org.mian.gitnex.models.UpdateIssueState;
+import org.mian.gitnex.models.IssueComments;
+import org.mian.gitnex.util.TinyDB;
+import androidx.annotation.NonNull;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -23,263 +24,273 @@ import retrofit2.Callback;

 public class IssueActions {

-	public static void editIssueComment(final Context ctx, final int commentId, final String commentBody, long draftIdOnCreate) {
+    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));
+                        tinyDb.putBoolean("commentEdited", true);
+                        Toasty.info(ctx, ctx.getString(R.string.editCommentUpdatedText));
+                        ((ReplyToIssueActivity)ctx).finish();

-						DraftsApi draftsApi = new DraftsApi(ctx);
-						draftsApi.deleteSingleDraft((int) draftIdOnCreate);
+                    }
+                }
+                else if(response.code() == 401) {

-						((ReplyToIssueActivity) ctx).finish();
+                    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.error(ctx, ctx.getString(R.string.authorizeError));
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));

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

-					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+                    Toasty.info(ctx, ctx.getString(R.string.genericError));

-				}
-				else {
+                }

-					Toasty.error(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) {
+    public static void closeReopenIssue(final Context ctx, final int issueIndex, final String issueState) {

-				Log.e("onFailure", t.toString());
-			}
-		});
+        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];

-	}
+        UpdateIssueState issueStatJson = new UpdateIssueState(issueState);
+        Call<JsonElement> call;

-	public static void closeReopenIssue(final Context ctx, final int issueIndex, final String issueState) {
+        call = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .closeReopenIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueStatJson);

-		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.enqueue(new Callback<JsonElement>() {

-		UpdateIssueState issueStatJson = new UpdateIssueState(issueState);
-		Call<JsonElement> call;
+            @Override
+            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {

-		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().closeReopenIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueStatJson);
+                if(response.isSuccessful()) {
+                    if(response.code() == 201) {

-		call.enqueue(new Callback<JsonElement>() {
+                        tinyDb.putBoolean("resumeIssues", true);
+                        tinyDb.putBoolean("resumeClosedIssues", true);

-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+                        if(issueState.equals("closed")) {

-				if(response.isSuccessful()) {
-					if(response.code() == 201) {
+                            Toasty.info(ctx, ctx.getString(R.string.issueStateClosed));
+                            tinyDb.putString("issueState", "closed");

-						tinyDb.putBoolean("resumeIssues", true);
-						tinyDb.putBoolean("resumeClosedIssues", true);
+                        }
+                        else if(issueState.equals("open")) {

-						if(issueState.equals("closed")) {
+                            Toasty.info(ctx, ctx.getString(R.string.issueStateReopened));
+                            tinyDb.putString("issueState", "open");

-							Toasty.success(ctx, ctx.getString(R.string.issueStateClosed));
-							tinyDb.putString("issueState", "closed");
+                        }

-						}
-						else if(issueState.equals("open")) {
+                    }
+                }
+                else if(response.code() == 401) {

-							Toasty.success(ctx, ctx.getString(R.string.issueStateReopened));
-							tinyDb.putString("issueState", "open");
+                    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() == 401) {
+                    Toasty.info(ctx, ctx.getString(R.string.authorizeError));

-					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() == 404) {

-				}
-				else if(response.code() == 403) {
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));

-					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+                }
+                else {

-				}
-				else if(response.code() == 404) {
+                    Toasty.info(ctx, ctx.getString(R.string.genericError));

-					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+                }

-				}
-				else {
+            }

-					Toasty.error(ctx, ctx.getString(R.string.genericError));
+            @Override
+            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });

-				}
+    }

-			}
+    public static void subscribe(final Context ctx, final TextView subscribeIssue, final TextView unsubscribeIssue) {

-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+        final TinyDB tinyDB = new TinyDB(ctx);

-				Log.e("onFailure", t.toString());
-			}
-		});
+        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"));

-	}
+        Call<Void> call;

-	public static void subscribe(final Context ctx) {
+        call = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .addIssueSubscriber(token, repoOwner, repoName, issueNr, userLogin);

-		final TinyDB tinyDB = new TinyDB(ctx);
+        call.enqueue(new Callback<Void>() {

-		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"));
+            @Override
+            public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {

-		Call<Void> call;
+                if(response.isSuccessful()) {

-		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().addIssueSubscriber(token, repoFullName[0], repoFullName[1], issueNr, userLogin);
+                    if(response.code() == 201) {

-		call.enqueue(new Callback<Void>() {
+                        unsubscribeIssue.setVisibility(View.VISIBLE);
+                        subscribeIssue.setVisibility(View.GONE);
+                        Toasty.info(ctx, ctx.getString(R.string.issueSubscribtion));
+                        tinyDB.putString("issueSubscriptionState", "unsubscribeToIssue");

-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+                    }

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

-					if(response.code() == 201) {
+                    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.success(ctx, ctx.getString(R.string.subscribedSuccessfully));
-						tinyDB.putBoolean("issueSubscribed", true);
+                }
+                else {

-					}
-					else if(response.code() == 200) {
+                    Toasty.info(ctx, ctx.getString(R.string.issueSubscribtionError));

-						tinyDB.putBoolean("issueSubscribed", true);
-						Toasty.success(ctx, ctx.getString(R.string.alreadySubscribed));
+                }

-					}
+            }

-				}
-				else if(response.code() == 401) {
+            @Override
+            public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+                Toasty.info(ctx, ctx.getString(R.string.issueSubscribtionError));
+            }
+        });

-					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 {
+    public static void unsubscribe(final Context ctx, final TextView subscribeIssue, final TextView unsubscribeIssue) {

-					Toasty.error(ctx, ctx.getString(R.string.subscriptionError));
+        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"));

-			}
+        Call<Void> call;

-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+        call = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .delIssueSubscriber(token, repoOwner, repoName, issueNr, userLogin);

-				Toasty.success(ctx, ctx.getString(R.string.unsubscribedSuccessfully));
-			}
-		});
+        call.enqueue(new Callback<Void>() {

-	}
+            @Override
+            public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {

-	public static void unsubscribe(final Context ctx) {
+                if(response.isSuccessful()) {

-		final TinyDB tinyDB = new TinyDB(ctx);
+                    if(response.code() == 201) {

-		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"));
+                        unsubscribeIssue.setVisibility(View.GONE);
+                        subscribeIssue.setVisibility(View.VISIBLE);
+                        Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtion));
+                        tinyDB.putString("issueSubscriptionState", "subscribeToIssue");

-		Call<Void> call;
+                    }

-		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().delIssueSubscriber(token, repoFullName[0], repoFullName[1], issueNr, userLogin);
+                }
+                else if(response.code() == 401) {

-		call.enqueue(new Callback<Void>() {
+                    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 onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+                }
+                else {

-				if(response.isSuccessful()) {
+                    Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtionError));

-					if(response.code() == 201) {
+                }

-						Toasty.success(ctx, ctx.getString(R.string.unsubscribedSuccessfully));
-						tinyDB.putBoolean("issueSubscribed", false);
+            }

-					}
-					else if(response.code() == 200) {
-
-						tinyDB.putBoolean("issueSubscribed", false);
-						Toasty.success(ctx, ctx.getString(R.string.alreadyUnsubscribed));
-
-					}
-
-				}
-				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.error(ctx, ctx.getString(R.string.unsubscriptionError));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.unsubscriptionError));
-			}
-		});
-	}
+            @Override
+            public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+                Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtionError));
+            }
+        });
+    }

 }
--- a/app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
@ -7,9 +7,11 @@ import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Milestones;
+import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.viewmodels.MilestonesViewModel;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -48,7 +50,8 @@ public class MilestoneActions {

 				if(response.isSuccessful()) {

-					Toasty.success(ctx, ctx.getString(R.string.milestoneStatusUpdate));
+					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) {
@ -61,7 +64,7 @@ public class MilestoneActions {
 				}
 				else {

-					Toasty.error(ctx, ctx.getString(R.string.genericError));
+					Toasty.info(ctx, ctx.getString(R.string.genericError));

 				}

@ -106,7 +109,8 @@ public class MilestoneActions {

 				if(response.isSuccessful()) {

-					Toasty.success(ctx, ctx.getString(R.string.milestoneStatusUpdate));
+					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) {
@ -119,7 +123,7 @@ public class MilestoneActions {
 				}
 				else {

-					Toasty.error(ctx, ctx.getString(R.string.genericError));
+					Toasty.info(ctx, ctx.getString(R.string.genericError));

 				}

--- a/app/src/main/java/org/mian/gitnex/actions/NotificationsActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/NotificationsActions.java
@ -1,59 +0,0 @@
-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();
-
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/actions/RepositoryActions.java
+++ b/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;

@ -46,7 +46,7 @@ public class RepositoryActions {
                    if(response.code() == 204) {

                        tinyDb.putBoolean("repoCreated", true);
-                        Toasty.success(context, context.getString(R.string.starRepositorySuccess));
+                        Toasty.info(context, context.getString(R.string.starRepositorySuccess));

                    }
                }
@ -60,17 +60,17 @@ public class RepositoryActions {
                }
                else if(response.code() == 403) {

-                    Toasty.error(context, context.getString(R.string.authorizeError));
+                    Toasty.info(context, context.getString(R.string.authorizeError));

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

-                    Toasty.warning(context, context.getString(R.string.apiNotFound));
+                    Toasty.info(context, context.getString(R.string.apiNotFound));

                }
                else {

-                    Toasty.error(context, context.getString(R.string.genericError));
+                    Toasty.info(context, context.getString(R.string.genericError));

                }

@ -111,7 +111,7 @@ public class RepositoryActions {
                    if(response.code() == 204) {

                        tinyDb.putBoolean("repoCreated", true);
-                        Toasty.success(context, context.getString(R.string.unStarRepositorySuccess));
+                        Toasty.info(context, context.getString(R.string.unStarRepositorySuccess));

                    }
                }
@ -125,17 +125,17 @@ public class RepositoryActions {
                }
                else if(response.code() == 403) {

-                    Toasty.error(context, context.getString(R.string.authorizeError));
+                    Toasty.info(context, context.getString(R.string.authorizeError));

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

-                    Toasty.warning(context, context.getString(R.string.apiNotFound));
+                    Toasty.info(context, context.getString(R.string.apiNotFound));

                }
                else {

-                    Toasty.error(context, context.getString(R.string.genericError));
+                    Toasty.info(context, context.getString(R.string.genericError));

                }

@ -176,7 +176,7 @@ public class RepositoryActions {
                    if(response.code() == 200) {

                        tinyDb.putBoolean("repoCreated", true);
-                        Toasty.success(context, context.getString(R.string.watchRepositorySuccess));
+                        Toasty.info(context, context.getString(R.string.watchRepositorySuccess));

                    }
                }
@ -190,17 +190,17 @@ public class RepositoryActions {
                }
                else if(response.code() == 403) {

-                    Toasty.error(context, context.getString(R.string.authorizeError));
+                    Toasty.info(context, context.getString(R.string.authorizeError));

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

-                    Toasty.warning(context, context.getString(R.string.apiNotFound));
+                    Toasty.info(context, context.getString(R.string.apiNotFound));

                }
                else {

-                    Toasty.error(context, context.getString(R.string.genericError));
+                    Toasty.info(context, context.getString(R.string.genericError));

                }

@ -240,7 +240,7 @@ public class RepositoryActions {
                if(response.code() == 204) {

                    tinyDb.putBoolean("repoCreated", true);
-                    Toasty.success(context, context.getString(R.string.unWatchRepositorySuccess));
+                    Toasty.info(context, context.getString(R.string.unWatchRepositorySuccess));

                }
                else if(response.code() == 401) {
@ -253,17 +253,17 @@ public class RepositoryActions {
                }
                else if(response.code() == 403) {

-                    Toasty.error(context, context.getString(R.string.authorizeError));
+                    Toasty.info(context, context.getString(R.string.authorizeError));

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

-                    Toasty.warning(context, context.getString(R.string.apiNotFound));
+                    Toasty.info(context, context.getString(R.string.apiNotFound));

                }
                else {

-                    Toasty.error(context, context.getString(R.string.genericError));
+                    Toasty.info(context, context.getString(R.string.genericError));

                }

--- a/app/src/main/java/org/mian/gitnex/actions/TeamActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/TeamActions.java
@ -1,154 +0,0 @@
-package org.mian.gitnex.actions;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import com.google.gson.JsonElement;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.AddNewTeamMemberActivity;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.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.success(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.error(context, context.getString(R.string.authorizeError));
-
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(context, context.getString(R.string.apiNotFound));
-
-				}
-				else {
-
-					Toasty.error(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.success(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.error(context, context.getString(R.string.authorizeError));
-
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(context, context.getString(R.string.apiNotFound));
-
-				}
-				else {
-
-					Toasty.error(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));
-
-			}
-		});
-
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
@ -1,29 +1,30 @@
 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.helpers.TinyDB;
-import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.models.UserSearch;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.util.TinyDB;
 import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;

 /**
 * Author M M Arif
@ -33,7 +34,6 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {

    private View.OnClickListener onClickListener;
    final Context ctx = this;
-    private Context appCtx;
    private TextView addCollaboratorSearch;
    private TextView noData;
    private ProgressBar mProgressBar;
@ -47,13 +47,11 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {

    @Override
    public void onCreate(Bundle savedInstanceState) {
-
        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();

        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        String repoFullName = tinyDb.getString("repoFullName");
@ -73,26 +71,26 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);

-        addCollaboratorSearch.setOnEditorActionListener((v, actionId, event) -> {
-
-            if (actionId == EditorInfo.IME_ACTION_SEND) {
-                if(!addCollaboratorSearch.getText().toString().equals("")) {
-                    loadUserSearchList(instanceUrl, instanceToken, addCollaboratorSearch.getText().toString(), loginUid);
+        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);
+                    }
                }
+                return false;
            }
-
-            return false;
-
        });

    }

-    public void loadUserSearchList(String instanceUrl, String token, String searchKeyword, String loginUid) {
+    public void loadUserSearchList(String instanceUrl, String token, String searchKeyword, final Context context, String loginUid) {

        Call<UserSearch> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
-                .getUserBySearch(Authorization.returnAuthentication(ctx, loginUid, token), searchKeyword, 10);
+                .getUserBySearch(Authorization.returnAuthentication(getApplicationContext(), loginUid, token), searchKeyword, 10);

        call.enqueue(new Callback<UserSearch>() {

@ -101,7 +99,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {

                if (response.isSuccessful()) {
                    assert response.body() != null;
-                    getUsersList(response.body().getData(), ctx);
+                    getUsersList(response.body().getData(), context);
                } else {
                    Log.i("onResponse", String.valueOf(response.code()));
                }
@ -121,7 +119,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
        UserSearchAdapter adapter = new UserSearchAdapter(dataList, context);

        mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
                DividerItemDecoration.VERTICAL);
        mRecyclerView.addItemDecoration(dividerItemDecoration);
@ -141,7 +139,12 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
    }

    private void initCloseListener() {
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }


--- a/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
@ -1,269 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.UserAccountsApi;
-import org.mian.gitnex.databinding.ActivityAddNewAccountBinding;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.PathsHelper;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.UrlHelper;
-import org.mian.gitnex.helpers.Version;
-import org.mian.gitnex.models.GiteaVersion;
-import org.mian.gitnex.models.UserInfo;
-import java.net.URI;
-import io.mikael.urlbuilder.UrlBuilder;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class AddNewAccountActivity extends BaseActivity {
-
-	final Context ctx = this;
-	private Context appCtx;
-	private TinyDB tinyDB;
-
-	private View.OnClickListener onClickListener;
-	private ActivityAddNewAccountBinding viewBinding;
-
-	private enum Protocol {HTTPS, HTTP}
-
-	@Override
-	protected int getLayoutResourceId(){
-		return R.layout.activity_add_new_account;
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-		appCtx = getApplicationContext();
-		tinyDB = new TinyDB(appCtx);
-
-		viewBinding = ActivityAddNewAccountBinding.inflate(getLayoutInflater());
-		View view = viewBinding.getRoot();
-		setContentView(view);
-
-		getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
-
-		initCloseListener();
-		viewBinding.close.setOnClickListener(onClickListener);
-
-		ArrayAdapter<AddNewAccountActivity.Protocol> adapterProtocols = new ArrayAdapter<>(AddNewAccountActivity.this, R.layout.spinner_item, AddNewAccountActivity.Protocol.values());
-		adapterProtocols.setDropDownViewResource(R.layout.spinner_dropdown_item);
-
-		viewBinding.protocolSpinner.setAdapter(adapterProtocols);
-
-		viewBinding.addNewAccount.setOnClickListener(login  -> {
-
-			boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-			if(!connToInternet) {
-
-				Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
-
-			}
-			else {
-
-				processLogin();
-			}
-		 });
-
-	}
-
-	private void processLogin() {
-
-		try {
-
-			String instanceUrlET = viewBinding.instanceUrl.getText().toString();
-			String loginToken = viewBinding.loginToken.getText().toString();
-			Protocol protocol = (Protocol) viewBinding.protocolSpinner.getSelectedItem();
-
-			if(instanceUrlET.equals("")) {
-
-				Toasty.error(ctx, getResources().getString(R.string.emptyFieldURL));
-				return;
-			}
-
-			if(loginToken.equals("")) {
-
-				Toasty.error(ctx, getResources().getString(R.string.loginTokenError));
-				return;
-			}
-
-			URI rawInstanceUrl = UrlBuilder.fromString(UrlHelper.fixScheme(instanceUrlET, "http")).toUri();
-
-			URI instanceUrlWithProtocol = UrlBuilder.fromUri(rawInstanceUrl).withPath(PathsHelper.join(rawInstanceUrl.getPath()))
-				.withScheme(protocol.name().toLowerCase()).toUri();
-
-			URI instanceUrl = UrlBuilder.fromUri(instanceUrlWithProtocol).withPath(PathsHelper.join(instanceUrlWithProtocol.getPath(), "/api/v1/"))
-				.toUri();
-
-			versionCheck(instanceUrl.toString(), loginToken);
-
-		}
-		catch(Exception e) {
-
-			Log.e("onFailure-login", e.toString());
-			Toasty.error(ctx, getResources().getString(R.string.malformedUrl));
-		}
-
-	}
-
-	private void versionCheck(final String instanceUrl, final String loginToken) {
-
-		Call<GiteaVersion> callVersion;
-
-		callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken("token " + loginToken);
-
-		callVersion.enqueue(new Callback<GiteaVersion>() {
-
-			@Override
-			public void onResponse(@NonNull final Call<GiteaVersion> callVersion, @NonNull retrofit2.Response<GiteaVersion> responseVersion) {
-
-				if(responseVersion.code() == 200) {
-
-					GiteaVersion version = responseVersion.body();
-					Version giteaVersion;
-
-					assert version != null;
-
-					tinyDB.putString("giteaVersion", version.getVersion());
-
-					try {
-						giteaVersion = new Version(version.getVersion());
-					}
-					catch(Exception e) {
-
-						Toasty.error(ctx, getResources().getString(R.string.versionUnknown));
-						return;
-					}
-
-					if(giteaVersion.less(getString(R.string.versionLow))) {
-
-						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx).setTitle(getString(R.string.versionAlertDialogHeader))
-							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setIcon(R.drawable.ic_warning)
-							.setCancelable(true);
-
-						alertDialogBuilder.setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> {
-
-							dialog.dismiss();
-							//enableProcessButton();
-						});
-
-						alertDialogBuilder.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
-
-							dialog.dismiss();
-							login(instanceUrl, loginToken);
-						});
-
-						alertDialogBuilder.create().show();
-
-					}
-					else if(giteaVersion.lessOrEqual(getString(R.string.versionHigh))) {
-
-						login(instanceUrl, loginToken);
-					}
-					else {
-
-						Toasty.warning(ctx, getResources().getString(R.string.versionUnsupportedNew));
-						login(instanceUrl, loginToken);
-
-					}
-
-				}
-				else if(responseVersion.code() == 403) {
-
-					login(instanceUrl, loginToken);
-				}
-			}
-
-			private void login(String instanceUrl, String loginToken) {
-
-				setupNewAccountWithToken(instanceUrl, loginToken);
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<GiteaVersion> callVersion, @NonNull Throwable t) {
-
-				Log.e("onFailure-versionCheck", t.toString());
-				Toasty.error(ctx, getResources().getString(R.string.errorOnLogin));
-			}
-		});
-	}
-
-	private void setupNewAccountWithToken(String instanceUrl, final String loginToken) {
-
-		Call<UserInfo> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserInfo("token " + loginToken);
-
-		call.enqueue(new Callback<UserInfo>() {
-
-			@Override
-			public void onResponse(@NonNull Call<UserInfo> call, @NonNull retrofit2.Response<UserInfo> response) {
-
-				UserInfo userDetails = response.body();
-
-				switch(response.code()) {
-
-					case 200:
-
-						assert userDetails != null;
-						// insert new account to db if does not exist
-						String accountName = userDetails.getUsername() + "@" + instanceUrl;
-						UserAccountsApi userAccountsApi = new UserAccountsApi(ctx);
-						int checkAccount = userAccountsApi.getCount(accountName);
-
-						if(checkAccount == 0) {
-
-							userAccountsApi.insertNewAccount(accountName, instanceUrl, userDetails.getUsername(), loginToken, "");
-							Toasty.success(ctx, getResources().getString(R.string.accountAddedMessage));
-							finish();
-						}
-						else {
-
-							Toasty.warning(ctx, getResources().getString(R.string.accountAlreadyExistsError));
-						}
-						break;
-
-					case 401:
-
-						Toasty.error(ctx,getResources().getString(R.string.unauthorizedApiError));
-						break;
-
-					default:
-
-						Toasty.error(ctx,getResources().getString(R.string.genericApiStatusError) + response.code());
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				Toasty.error(ctx,getResources().getString(R.string.genericError));
-			}
-		});
-
-	}
-
-	private void initCloseListener() {
-
-		onClickListener = view -> finish();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java
@ -1,170 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.adapters.UserSearchForTeamMemberAdapter;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.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;
-
-/**
- * Author M M Arif
- */
-
-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.addNewTeamMember);
-		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);
-
-		mProgressBar.setVisibility(View.VISIBLE);
-
-		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();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
+++ b/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,7 +34,6 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
    private Boolean assigneesFlag = false;
    private MultiSelectDialog multiSelectDialogAssignees;
    final Context ctx = this;
-    private Context appCtx;

    @Override
    protected int getLayoutResourceId(){
@ -45,12 +44,11 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
        //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);

        getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));

-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        String repoFullName = tinyDb.getString("repoFullName");
@ -66,12 +64,12 @@ public class AddRemoveAssigneesActivity extends BaseActivity {

    private void getAssignees(final String instanceUrl, final String instanceToken, final String repoOwner, final String repoName, final int issueIndex, final String loginUid) {

-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());

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

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

@ -94,9 +92,9 @@ public class AddRemoveAssigneesActivity extends BaseActivity {

                        // get current issue assignees
                        Call<Issues> callSingleIssueAssignees = RetrofitClient
-                                .getInstance(instanceUrl, ctx)
+                                .getInstance(instanceUrl, getApplicationContext())
                                .getApiInterface()
-                                .getIssueByIndex(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
+                                .getIssueByIndex(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);

                        callSingleIssueAssignees.enqueue(new Callback<Issues>() {

@ -139,11 +137,11 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
                                                .multiSelectList(listOfCollaborators)
                                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
                                                    @Override
-                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
+                                                    public void onSelected(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {

                                                        Log.i("selectedNames", String.valueOf(selectedNames));

-                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
+                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
                                                        tinyDb.putBoolean("singleIssueUpdate", true);
                                                        CloseActivity();
                                                    }
@ -167,9 +165,9 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
                                                .multiSelectList(listOfCollaborators)
                                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
                                                    @Override
-                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
+                                                    public void onSelected(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {

-                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
+                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
                                                        tinyDb.putBoolean("singleIssueUpdate", true);
                                                        CloseActivity();

@ -207,17 +205,17 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
                    }
                    else if(response.code() == 403) {

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

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

-                        Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+                        Toasty.info(ctx, ctx.getString(R.string.apiNotFound));

                    }
                    else {

-                        Toasty.error(ctx, getString(R.string.genericError));
+                        Toasty.info(getApplicationContext(), getString(R.string.genericError));

                    }
                }
@ -243,9 +241,9 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
        Call<JsonElement> call3;

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

        call3.enqueue(new Callback<JsonElement>() {

@ -254,7 +252,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity {

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

-                    Toasty.success(ctx, ctx.getString(R.string.assigneesUpdated));
+                    Toasty.info(ctx, ctx.getString(R.string.assigneesUpdated));

                }
                else if(response2.code() == 401) {
@ -267,17 +265,17 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
                }
                else if(response2.code() == 403) {

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

                }
                else if(response2.code() == 404) {

-                    Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));

                }
                else {

-                    Toasty.error(ctx, getString(R.string.genericError));
+                    Toasty.info(getApplicationContext(), getString(R.string.genericError));

                }

--- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
+++ b/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,7 +32,6 @@ public class AddRemoveLabelsActivity extends BaseActivity {
    private Boolean labelsFlag = false;
    private MultiSelectDialog multiSelectDialogLabels;
    final Context ctx = this;
-    private Context appCtx;

    @Override
    protected int getLayoutResourceId(){
@ -41,14 +40,12 @@ public class AddRemoveLabelsActivity extends BaseActivity {

    @Override
    public void onCreate(Bundle savedInstanceState) {
-
        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
        //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);

        getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));

-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        String repoFullName = tinyDb.getString("repoFullName");
@ -64,12 +61,12 @@ public class AddRemoveLabelsActivity extends BaseActivity {

    private void getLabels(final String instanceUrl, final String instanceToken, final String repoOwner, final String repoName, final int issueIndex, final String loginUid) {

-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());

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

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

@ -92,9 +89,9 @@ public class AddRemoveLabelsActivity extends BaseActivity {

                        // get current issue labels
                        Call<List<Labels>> callSingleIssueLabels = RetrofitClient
-                                .getInstance(instanceUrl, ctx)
+                                .getInstance(instanceUrl, getApplicationContext())
                                .getApiInterface()
-                                .getIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
+                                .getIssueLabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);

                        callSingleIssueLabels.enqueue(new Callback<List<Labels>>() {

@ -128,7 +125,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                                                .multiSelectList(listOfLabels)
                                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
                                                    @Override
-                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
+                                                    public void onSelected(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {

                                                        String labelIds = selectedIds.toString();
                                                        int[] integers;
@ -145,7 +142,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                                                            integers = new int[0];
                                                        }

-                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
+                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
                                                        tinyDb.putBoolean("singleIssueUpdate", true);
                                                        CloseActivity();
                                                    }
@ -169,7 +166,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                                                .multiSelectList(listOfLabels)
                                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
                                                    @Override
-                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
+                                                    public void onSelected(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {

                                                        String labelIds = selectedIds.toString();
                                                        int[] integers;
@ -186,7 +183,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                                                            integers = new int[0];
                                                        }

-                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
+                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
                                                        tinyDb.putBoolean("singleIssueUpdate", true);
                                                        CloseActivity();

@ -224,17 +221,17 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                    }
                    else if(response.code() == 403) {

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

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

-                        Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+                        Toasty.info(ctx, ctx.getString(R.string.apiNotFound));

                    }
                    else {

-                        Toasty.error(ctx, getString(R.string.genericError));
+                        Toasty.info(getApplicationContext(), getString(R.string.genericError));

                    }
                }
@ -254,9 +251,9 @@ public class AddRemoveLabelsActivity extends BaseActivity {
        Labels patchIssueLabels = new Labels(issueLabels);

        Call<JsonElement> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
-                .updateIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, patchIssueLabels);
+                .updateIssueLabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, patchIssueLabels);

        call.enqueue(new Callback<JsonElement>() {

@ -265,7 +262,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {

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

-                    Toasty.success(ctx, ctx.getString(R.string.labelsUpdated));
+                    Toasty.info(ctx, ctx.getString(R.string.labelsUpdated));

                }
                else if(response.code() == 401) {
@ -278,17 +275,17 @@ public class AddRemoveLabelsActivity extends BaseActivity {
                }
                else if(response.code() == 403) {

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

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

-                    Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));

                }
                else {

-                    Toasty.error(ctx, getString(R.string.genericError));
+                    Toasty.info(getApplicationContext(), getString(R.string.genericError));

                }

--- a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java
@ -1,5 +1,13 @@
 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;
@ -11,20 +19,16 @@ 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.helpers.TinyDB;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.viewmodels.AdminGetUsersViewModel;
+import java.util.List;
+import java.util.Objects;

 /**
 * Author M M Arif
@ -34,7 +38,6 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd

    private View.OnClickListener onClickListener;
    final Context ctx = this;
-    private Context appCtx;
    private AdminGetUsersAdapter adapter;
    private RecyclerView mRecyclerView;
    private TextView noDataUsers;
@ -49,9 +52,8 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();

-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@ -69,43 +71,50 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
        closeActivity.setOnClickListener(onClickListener);

        mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));

        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
                DividerItemDecoration.VERTICAL);
        mRecyclerView.addItemDecoration(dividerItemDecoration);

-        swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+        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.setRefreshing(false);
-            AdminGetUsersViewModel.loadUsersList(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken));
-
-        }, 500));
-
-        fetchDataAsync(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken));
+        fetchDataAsync(getApplicationContext(), instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken));

    }

    private void fetchDataAsync(Context ctx, String instanceUrl, String instanceToken) {

-        AdminGetUsersViewModel usersModel = new ViewModelProvider(this).get(AdminGetUsersViewModel.class);
+        AdminGetUsersViewModel usersModel = ViewModelProviders.of(this).get(AdminGetUsersViewModel.class);

-        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;
+        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);
+                }
            }
-            else {
-                //adapter.notifyDataSetChanged();
-                //mRecyclerView.setAdapter(adapter);
-                mRecyclerView.setVisibility(View.GONE);
-                noDataUsers.setVisibility(View.VISIBLE);
-            }
-
        });

    }
@ -116,36 +125,37 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
        final MenuInflater inflater = getMenuInflater();
        inflater.inflate(R.menu.generic_nav_dotted_menu, menu);

-        new Handler().postDelayed(() -> {
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                if(searchFilter) {

-            if(searchFilter) {
+                    boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getApplicationContext()));

-                boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+                    inflater.inflate(R.menu.search_menu, menu);

-                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);

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

        return true;
@ -182,7 +192,12 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
    }

    private void initCloseListener() {
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@ -1,80 +1,54 @@
 package org.mian.gitnex.activities;

-import android.content.Context;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import org.acra.ACRA;
 import org.acra.BuildConfig;
-import org.acra.annotation.AcraCore;
 import org.acra.annotation.AcraNotification;
 import org.acra.config.CoreConfigurationBuilder;
 import org.acra.config.LimiterConfigurationBuilder;
 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.helpers.TinyDB;
-import org.mian.gitnex.notifications.NotificationsMaster;
-import static org.acra.ReportField.*;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;

 /**
 * Author M M Arif
 */

-@AcraNotification(resIcon = R.drawable.gitnex_transparent,
+@AcraNotification(resIcon = R.mipmap.app_logo,
 		resTitle = R.string.crashTitle,
 		resChannelName = R.string.setCrashReports,
 		resText = R.string.crashMessage)
-@AcraCore(reportContent = { ANDROID_VERSION, PHONE_MODEL, STACK_TRACE })

 public abstract class BaseActivity extends AppCompatActivity {

-	private Context appCtx;
-
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

-		appCtx = getApplicationContext();
-		final TinyDB tinyDb = new TinyDB(appCtx);
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());

-		switch(tinyDb.getInt("themeId")) {
+		if(tinyDb.getInt("themeId") == 1) {
+			setTheme(R.style.AppThemeLight);
+		}
+		else if(tinyDb.getInt("themeId") == 2) {

-			case 1:
-				setTheme(R.style.AppThemeLight);
-				break;
+			boolean timeSetterFlag = TimeHelper.timeBetweenHours(18, 6); // 6pm to 6am

-			case 2:
-				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
-					setTheme(R.style.AppTheme);
-				}
-				else {
-					setTheme(R.style.AppThemeLight);
-				}
-				break;
-
-			case 3:
-				setTheme(R.style.AppThemeRetro);
-				break;
-
-			case 4:
-				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
-					setTheme(R.style.AppTheme);
-				}
-				else {
-					setTheme(R.style.AppThemeRetro);
-				}
-				break;
-
-			default:
+			if(timeSetterFlag) {
 				setTheme(R.style.AppTheme);
-				break;
+			}
+			else {
+				setTheme(R.style.AppThemeLight);
+			}

 		}
-
-		String appLocale = tinyDb.getString("locale");
-		AppUtil.setAppLocale(getResources(), appLocale);
+		else {
+			setTheme(R.style.AppTheme);
+		}

 		super.onCreate(savedInstanceState);
 		setContentView(getLayoutResourceId());
@ -104,17 +78,11 @@ public abstract class BaseActivity extends AppCompatActivity {

 		}

-        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");
-        }
+		// 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()) {
@ -122,25 +90,6 @@ public abstract class BaseActivity extends AppCompatActivity {
 			tinyDb.putString("crashReportingEnabledInit", "yes");
 		}

-		// default cache setter
-		if(tinyDb.getString("cacheSizeStr").isEmpty()) {
-			tinyDb.putString("cacheSizeStr", getResources().getString(R.string.cacheSizeDataSelectionSelectedText));
-		}
-		if(tinyDb.getString("cacheSizeImagesStr").isEmpty()) {
-			tinyDb.putString("cacheSizeImagesStr", getResources().getString(R.string.cacheSizeImagesSelectionSelectedText));
-		}
-
-		// 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);
--- a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
@ -1,6 +1,5 @@
 package org.mian.gitnex.activities;

-import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.method.ScrollingMovementMethod;
@ -14,270 +13,312 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import com.mikepenz.fastadapter.IItemAdapter;
+import com.mikepenz.fastadapter.adapters.ItemAdapter;
+import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter;
+import com.mikepenz.fastadapter.listeners.ItemFilterListener;
+import com.mikepenz.fastadapter_extensions.items.ProgressItem;
+import com.mikepenz.fastadapter_extensions.scroll.EndlessRecyclerOnScrollListener;
 import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.adapters.CommitsAdapter;
-import org.mian.gitnex.clients.AppApiService;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.StaticGlobalVariables;
-import org.mian.gitnex.helpers.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 {
+public class CommitsActivity extends BaseActivity implements ItemFilterListener<CommitsAdapter> {

-	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 View.OnClickListener onClickListener;
+    private TextView noData;
+    private ProgressBar progressBar;
+    private SwipeRefreshLayout swipeRefreshLayout;
+    private String TAG = "CommitsActivity - ";
+    private int resultLimit = 50;
+    private boolean loadNextFlag = false;

-	private RecyclerView recyclerView;
-	private List<Commits> commitsList;
-	private CommitsAdapter adapter;
-	private ApiInterface api;
-	private ProgressBar progressLoadMore;
+    private List<CommitsAdapter> items = new ArrayList<>();
+    private FastItemAdapter<CommitsAdapter> fastItemAdapter;
+    private ItemAdapter footerAdapter;
+    private EndlessRecyclerOnScrollListener endlessRecyclerOnScrollListener;

-	@Override
-	protected int getLayoutResourceId() {
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_commits;
+    }

-		return R.layout.activity_commits;
-	}
+    @Override
+    public void onCreate(Bundle savedInstanceState) {

-	@Override
-	public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);

-		super.onCreate(savedInstanceState);
-		appCtx = getApplicationContext();
-		Toolbar toolbar = findViewById(R.id.toolbar);
-		setSupportActionBar(toolbar);
+        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];

-		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];
+        String branchName = getIntent().getStringExtra("branchName");

-		String branchName = getIntent().getStringExtra("branchName");
+        TextView toolbar_title = findViewById(R.id.toolbar_title);
+        toolbar_title.setMovementMethod(new ScrollingMovementMethod());
+        toolbar_title.setText(branchName);

-		TextView toolbar_title = findViewById(R.id.toolbar_title);
-		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
-		toolbar_title.setText(branchName);
+        ImageView closeActivity = findViewById(R.id.close);
+        noData = findViewById(R.id.noDataCommits);
+        progressBar = findViewById(R.id.progress_bar);
+        swipeRefreshLayout = findViewById(R.id.pullToRefresh);

-		ImageView closeActivity = findViewById(R.id.close);
-		noData = findViewById(R.id.noDataCommits);
-		progressLoadMore = findViewById(R.id.progressLoadMore);
-		progressBar = findViewById(R.id.progress_bar);
-		SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);
+        RecyclerView recyclerView = findViewById(R.id.recyclerView);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+        recyclerView.setHasFixedSize(true);

-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);

-		// if gitea is 1.12 or higher use the new limit (resultLimitNewGiteaInstances)
-		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12")) {
-			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
-		}
+        fastItemAdapter = new FastItemAdapter<>();
+        fastItemAdapter.withSelectable(true);

-		recyclerView = findViewById(R.id.recyclerView);
-		commitsList = new ArrayList<>();
+        footerAdapter = items();
+        //noinspection unchecked
+        fastItemAdapter.addAdapter(1, footerAdapter);

-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+        fastItemAdapter.getItemFilter().withFilterPredicate((IItemAdapter.Predicate<CommitsAdapter>) (item, constraint) -> item.getCommitTitle().toLowerCase().contains(Objects.requireNonNull(constraint).toString().toLowerCase()));

-			swipeRefresh.setRefreshing(false);
-			loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName, resultLimit);
-			adapter.notifyDataChanged();
+        fastItemAdapter.getItemFilter().withItemFilterListener(this);

-		}, 200));
+        recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+        recyclerView.setItemAnimator(new DefaultItemAnimator());
+        recyclerView.setAdapter(fastItemAdapter);

-		adapter = new CommitsAdapter(ctx, commitsList);
-		adapter.setLoadMoreListener(() -> recyclerView.post(() -> {
+        endlessRecyclerOnScrollListener = new EndlessRecyclerOnScrollListener(footerAdapter) {

-			if(commitsList.size() == resultLimit || pageSize == resultLimit) {
+            @Override
+            public void onLoadMore(final int currentPage) {

-				int page = (commitsList.size() + resultLimit) / resultLimit;
-				loadMore(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, page, branchName, resultLimit);
+                loadNext(instanceUrl, instanceToken, repoOwner, repoName, currentPage, branchName);

-			}
+            }

-		}));
+        };

-		recyclerView.setHasFixedSize(true);
-		recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
-		recyclerView.setAdapter(adapter);
+        swipeRefreshLayout.setOnRefreshListener(() -> {

-		api = AppApiService.createService(ApiInterface.class, instanceUrl, ctx);
-		loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName, resultLimit);
+            progressBar.setVisibility(View.VISIBLE);
+            fastItemAdapter.clear();
+            endlessRecyclerOnScrollListener.resetPageCount();
+            swipeRefreshLayout.setRefreshing(false);

-	}
+        });

-	private void loadInitial(String token, String repoOwner, String repoName, String branchName, int resultLimit) {
+        recyclerView.addOnScrollListener(endlessRecyclerOnScrollListener);

-		Call<List<Commits>> call = api.getRepositoryCommits(token, repoOwner, repoName, 1, branchName, resultLimit);
+        loadInitial(instanceUrl, instanceToken, repoOwner, repoName, branchName);

-		call.enqueue(new Callback<List<Commits>>() {
+        assert savedInstanceState != null;
+        fastItemAdapter.withSavedInstanceState(savedInstanceState);

-			@Override
-			public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {
+    }

-				if(response.isSuccessful()) {
+    private void loadInitial(String instanceUrl, String token, String repoOwner, String repoName, String branchName) {

-					assert response.body() != null;
-					if(response.body().size() > 0) {
+        Call<List<Commits>> call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .getRepositoryCommits(token, repoOwner, repoName,  1, branchName);

-						commitsList.clear();
-						commitsList.addAll(response.body());
-						adapter.notifyDataChanged();
-						noData.setVisibility(View.GONE);
+        call.enqueue(new Callback<List<Commits>>() {

-					}
-					else {
-						commitsList.clear();
-						adapter.notifyDataChanged();
-						noData.setVisibility(View.VISIBLE);
-					}
+            @Override
+            public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {

-					progressBar.setVisibility(View.GONE);
+                if (response.isSuccessful()) {

-				}
-				else {
+                    assert response.body() != null;

-					Log.e(TAG, String.valueOf(response.code()));
+                    if(response.body().size() > 0) {

-				}
+                        if(response.body().size() == resultLimit) {
+                            loadNextFlag = true;
+                        }

-			}
+                        for (int i = 0; i < response.body().size(); i++) {

-			@Override
-			public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
+                            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()));

-				Log.e(TAG, t.toString());
-			}
+                        }

-		});
+                        fastItemAdapter.add(items);

-	}
+                    }
+                    else {

-	private void loadMore(String token, String repoOwner, String repoName, final int page, String branchName, int resultLimit) {
+                        noData.setVisibility(View.VISIBLE);

-		progressLoadMore.setVisibility(View.VISIBLE);
+                    }

-		Call<List<Commits>> call = api.getRepositoryCommits(token, repoOwner, repoName, page, branchName, resultLimit);
+                    progressBar.setVisibility(View.GONE);

-		call.enqueue(new Callback<List<Commits>>() {
+                }
+                else {

-			@Override
-			public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {
+                    Log.e(TAG, String.valueOf(response.code()));

-				if(response.isSuccessful()) {
+                }

-					List<Commits> result = response.body();
+            }

-					assert result != null;
-					if(result.size() > 0) {
+            @Override
+            public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {

-						pageSize = result.size();
-						commitsList.addAll(result);
+                Log.e(TAG, t.toString());

-					}
-					else {
+            }

-						adapter.setMoreDataAvailable(false);
+        });

-					}
+    }

-					adapter.notifyDataChanged();
-					progressLoadMore.setVisibility(View.GONE);
+    private void loadNext(String instanceUrl, String token, String repoOwner, String repoName, final int currentPage, String branchName) {

-				}
-				else {
+        footerAdapter.clear();
+        //noinspection unchecked
+        footerAdapter.add(new ProgressItem().withEnabled(false));
+        Handler handler = new Handler();

-					Log.e(TAG, String.valueOf(response.code()));
+        handler.postDelayed(() -> {

-				}
+            Call<List<Commits>> call = RetrofitClient
+                    .getInstance(instanceUrl, getApplicationContext())
+                    .getApiInterface()
+                    .getRepositoryCommits(token, repoOwner, repoName, currentPage + 1, branchName);

-			}
+            call.enqueue(new Callback<List<Commits>>() {

-			@Override
-			public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
+                @Override
+                public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {

-				Log.e(TAG, t.toString());
+                    if (response.isSuccessful()) {

-			}
+                        assert response.body() != null;

-		});
+                        if (response.body().size() > 0) {

-	}
+                            loadNextFlag = response.body().size() == resultLimit;

-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
+                            for (int i = 0; i < response.body().size(); i++) {

-		MenuInflater inflater = getMenuInflater();
-		inflater.inflate(R.menu.search_menu, menu);
+                                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()));

-		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() {
+                            footerAdapter.clear();

-			@Override
-			public boolean onQueryTextSubmit(String query) {
+                        }
+                        else {

-				return false;
-			}
+                            footerAdapter.clear();
+                        }

-			@Override
-			public boolean onQueryTextChange(String newText) {
+                        progressBar.setVisibility(View.GONE);

-				filter(newText);
-				return true;
-			}
+                    }
+                    else {

-		});
+                        Log.e(TAG, String.valueOf(response.code()));

-		return super.onCreateOptionsMenu(menu);
+                    }

-	}
+                }

-	private void filter(String text) {
+                @Override
+                public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {

-		List<Commits> arr = new ArrayList<>();
+                    Log.e(TAG, t.toString());

-		for(Commits d : commitsList) {
-			if(d.getCommit().getMessage().toLowerCase().contains(text) || d.getSha().toLowerCase().contains(text)) {
-				arr.add(d);
-			}
-		}
+                }

-		adapter.updateList(arr);
-	}
+            });

-	private void initCloseListener() {
+        }, 1000);

-		onClickListener = view -> {
-			getIntent().removeExtra("branchName");
-			finish();
-		};
-	}
+        if(!loadNextFlag) {
+
+            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();
+        };
+    }

 }

--- a/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
@ -1,6 +1,8 @@
 package org.mian.gitnex.activities;

 import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@ -11,20 +13,17 @@ 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.DeleteFile;
-import org.mian.gitnex.models.EditFile;
 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,12 +44,7 @@ public class CreateFileActivity extends BaseActivity {
    private EditText newFileBranchName;
    private EditText newFileCommitMessage;
    private Spinner newFileBranchesSpinner;
-	private String filePath;
-	private String fileSha;
-	private int fileAction = 0; // 0 = create, 1 = delete, 2 = edit
    final Context ctx = this;
-    private Context appCtx;
-    private TinyDB tinyDb;

    List<Branches> branchesList = new ArrayList<>();

@ -63,13 +57,12 @@ public class CreateFileActivity extends BaseActivity {
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
-	    tinyDb = new TinyDB(appCtx);

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        String repoFullName = tinyDb.getString("repoFullName");
@ -83,10 +76,6 @@ public class CreateFileActivity extends BaseActivity {
        newFileContent = findViewById(R.id.newFileContent);
        newFileBranchName = findViewById(R.id.newFileBranchName);
        newFileCommitMessage = findViewById(R.id.newFileCommitMessage);
-        TextView branchNameId = findViewById(R.id.branchNameId);
-        TextView branchNameHintText = findViewById(R.id.branchNameHintText);
-	    TextView toolbarTitle = findViewById(R.id.toolbarTitle);
-	    TextView fileNameHint = findViewById(R.id.fileNameHint);

        newFileName.requestFocus();
        assert imm != null;
@ -97,50 +86,11 @@ public class CreateFileActivity extends BaseActivity {

        newFileCreate = findViewById(R.id.newFileCreate);

-	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", 1) == 1) {
-
-		    fileNameHint.setVisibility(View.GONE);
-		    fileAction = getIntent().getIntExtra("fileAction", 1);
-
-		    filePath = getIntent().getStringExtra("filePath");
-		    String fileContents = getIntent().getStringExtra("fileContents");
-		    fileSha = getIntent().getStringExtra("fileSha");
-
-		    toolbarTitle.setText(getString(R.string.deleteFileText, filePath));
-
-		    newFileCreate.setText(R.string.deleteFile);
-		    newFileName.setText(filePath);
-		    newFileName.setEnabled(false);
-		    newFileName.setFocusable(false);
-
-		    newFileContent.setText(fileContents);
-		    newFileContent.setEnabled(false);
-		    newFileContent.setFocusable(false);
-	    }
-
-	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", 2) == 2) {
-
-		    fileNameHint.setVisibility(View.GONE);
-		    fileAction = getIntent().getIntExtra("fileAction", 2);
-
-		    filePath = getIntent().getStringExtra("filePath");
-		    String fileContents = getIntent().getStringExtra("fileContents");
-		    fileSha = getIntent().getStringExtra("fileSha");
-
-		    toolbarTitle.setText(getString(R.string.editFileText, filePath));
-
-		    newFileCreate.setText(R.string.editFile);
-		    newFileName.setText(filePath);
-		    newFileName.setEnabled(false);
-		    newFileName.setFocusable(false);
-
-		    newFileContent.setText(fileContents);
-	    }
-
        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);

        newFileBranchesSpinner = findViewById(R.id.newFileBranchesSpinner);
+        newFileBranchesSpinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
        getBranches(instanceUrl, instanceToken, repoOwner, repoName, loginUid);

        newFileBranchesSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
@ -149,18 +99,13 @@ public class CreateFileActivity extends BaseActivity {
                                       View arg1, int arg2, long arg3)
            {
                Branches bModelValue = (Branches) newFileBranchesSpinner.getSelectedItem();
+                Log.i("bModelSelected", bModelValue.toString());

                if(bModelValue.toString().equals("No branch")) {
                    newFileBranchName.setEnabled(true);
-                    newFileBranchName.setVisibility(View.VISIBLE);
-                    branchNameId.setVisibility(View.VISIBLE);
-                    branchNameHintText.setVisibility(View.VISIBLE);
                }
                else {
                    newFileBranchName.setEnabled(false);
-                    newFileBranchName.setVisibility(View.GONE);
-                    branchNameId.setVisibility(View.GONE);
-                    branchNameHintText.setVisibility(View.GONE);
                    newFileBranchName.setText("");
                }

@ -174,21 +119,30 @@ public class CreateFileActivity extends BaseActivity {
        if(!connToInternet) {

            newFileCreate.setEnabled(false);
-        }
-        else {
+            GradientDrawable shape =  new GradientDrawable();
+            shape.setCornerRadius( 8 );
+            shape.setColor(getResources().getColor(R.color.hintColor));
+            newFileCreate.setBackground(shape);
+
+        } else {

            newFileCreate.setOnClickListener(createFileListener);
+
        }

    }

-    private View.OnClickListener createFileListener = v -> processNewFile();
+    private View.OnClickListener createFileListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processNewFile();
+        }
+    };

    private void processNewFile() {

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
        AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@ -206,14 +160,14 @@ public class CreateFileActivity extends BaseActivity {

        if(!connToInternet) {

-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
            return;

        }

        if(newFileName_.equals("") || newFileContent_.equals("") || newFileCommitMessage_.equals("")) {

-            Toasty.error(ctx, getString(R.string.newFileRequiredFields));
+            Toasty.info(getApplicationContext(), getString(R.string.newFileRequiredFields));
            return;

        }
@ -221,13 +175,13 @@ public class CreateFileActivity extends BaseActivity {
        if(currentBranch.toString().equals("No branch")) {

            if(newFileBranchName_.equals("")) {
-                Toasty.error(ctx, getString(R.string.newFileRequiredFieldNewBranchName));
+                Toasty.info(getApplicationContext(), getString(R.string.newFileRequiredFieldNewBranchName));
                return;
            }
            else {
                if(!appUtil.checkStringsWithDash(newFileBranchName_)) {

-                    Toasty.error(ctx, getString(R.string.newFileInvalidBranchName));
+                    Toasty.info(getApplicationContext(), getString(R.string.newFileInvalidBranchName));
                    return;

                }
@ -237,28 +191,13 @@ public class CreateFileActivity extends BaseActivity {

        if(appUtil.charactersLength(newFileCommitMessage_) > 255) {

-            Toasty.warning(ctx, getString(R.string.newFileCommitMessageError));
+            Toasty.info(getApplicationContext(), getString(R.string.newFileCommitMessageError));

        }
        else {

            disableProcessButton();
-
-            if(fileAction == 1) {
-
-	            deleteFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, filePath,
-		            newFileBranchName_, newFileCommitMessage_, currentBranch.toString(), fileSha);
-            }
-            else if(fileAction == 2) {
-
-	            editFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, filePath,
-		           appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString(), fileSha);
-            }
-            else {
-
-	            createNewFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newFileName_,
-		            appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString());
-            }
+            createNewFile(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newFileName_, appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString());

        }

@ -275,7 +214,7 @@ public class CreateFileActivity extends BaseActivity {
        }

        Call<JsonElement> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
                .createNewFile(token, repoOwner, repoName, fileName, createNewFileJsonStr);

@ -287,7 +226,7 @@ public class CreateFileActivity extends BaseActivity {
                if(response.code() == 201) {

                    enableProcessButton();
-                    Toasty.success(ctx, getString(R.string.newFileSuccessMessage));
+                    Toasty.info(getApplicationContext(), getString(R.string.newFileSuccessMessage));
                    finish();

                }
@ -304,11 +243,11 @@ public class CreateFileActivity extends BaseActivity {

                    if(response.code() == 404) {
                        enableProcessButton();
-                        Toasty.warning(ctx, getString(R.string.apiNotFound));
+                        Toasty.info(getApplicationContext(), getString(R.string.apiNotFound));
                    }
                    else {
                        enableProcessButton();
-                        Toasty.error(ctx, getString(R.string.orgCreatedError));
+                        Toasty.info(getApplicationContext(), getString(R.string.orgCreatedError));
                    }

                }
@ -317,7 +256,6 @@ public class CreateFileActivity extends BaseActivity {

            @Override
            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
                Log.e("onFailure", t.toString());
                enableProcessButton();
            }
@ -325,155 +263,12 @@ public class CreateFileActivity extends BaseActivity {

    }

-	private void deleteFile(final String instanceUrl, final String token, String repoOwner, String repoName, String fileName, String fileBranchName, String fileCommitMessage, String currentBranch, String fileSha) {
-
-    	String branchName;
-		DeleteFile deleteFileJsonStr;
-		if(currentBranch.equals("No branch")) {
-
-			branchName = fileBranchName;
-			deleteFileJsonStr = new DeleteFile("", fileCommitMessage, fileBranchName, fileSha);
-		}
-		else {
-
-			branchName = currentBranch;
-			deleteFileJsonStr = new DeleteFile(currentBranch, fileCommitMessage, "", fileSha);
-		}
-
-		Call<JsonElement> call = RetrofitClient
-			.getInstance(instanceUrl, ctx)
-			.getApiInterface()
-			.deleteFile(token, repoOwner, repoName, fileName, deleteFileJsonStr);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				if(response.code() == 200) {
-
-					enableProcessButton();
-					Toasty.info(ctx, getString(R.string.deleteFileMessage, branchName));
-					getIntent().removeExtra("filePath");
-					getIntent().removeExtra("fileSha");
-					getIntent().removeExtra("fileContents");
-					finish();
-
-				}
-				else if(response.code() == 401) {
-
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-						getResources().getString(R.string.alertDialogTokenRevokedMessage),
-						getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
-				}
-				else {
-
-					if(response.code() == 404) {
-
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.apiNotFound));
-					}
-					else {
-
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.genericError));
-					}
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
-
-	}
-
-	private void editFile(final String instanceUrl, final String token, String repoOwner, String repoName, String fileName, String fileContent, String fileBranchName, String fileCommitMessage, String currentBranch, String fileSha) {
-
-		String branchName;
-		EditFile editFileJsonStr;
-		if(currentBranch.equals("No branch")) {
-
-			branchName = fileBranchName;
-			editFileJsonStr = new EditFile("", fileCommitMessage, fileBranchName, fileSha, fileContent);
-		}
-		else {
-
-			branchName = currentBranch;
-			editFileJsonStr = new EditFile(currentBranch, fileCommitMessage, "", fileSha, fileContent);
-		}
-
-		Call<JsonElement> call = RetrofitClient
-			.getInstance(instanceUrl, ctx)
-			.getApiInterface()
-			.editFile(token, repoOwner, repoName, fileName, editFileJsonStr);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				if(response.code() == 200) {
-
-					enableProcessButton();
-					Toasty.info(ctx, getString(R.string.editFileMessage, branchName));
-					getIntent().removeExtra("filePath");
-					getIntent().removeExtra("fileSha");
-					getIntent().removeExtra("fileContents");
-					tinyDb.putBoolean("fileModified", true);
-					finish();
-
-				}
-				else if(response.code() == 401) {
-
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-						getResources().getString(R.string.alertDialogTokenRevokedMessage),
-						getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
-				}
-				else {
-
-					if(response.code() == 404) {
-
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.apiNotFound));
-					}
-					else {
-
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.genericError));
-					}
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
-
-	}
-
    private void getBranches(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {

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

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

@ -498,7 +293,7 @@ public class CreateFileActivity extends BaseActivity {
                            }
                        }

-                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreateFileActivity.this,
+                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(getApplicationContext(),
                                R.layout.spinner_item, branchesList);

                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
@ -519,17 +314,32 @@ public class CreateFileActivity extends BaseActivity {
    }

    private void initCloseListener() {
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }

    private void disableProcessButton() {

        newFileCreate.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        newFileCreate.setBackground(shape);
+
    }

    private void enableProcessButton() {

        newFileCreate.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        newFileCreate.setBackground(shape);
+
    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
@ -1,7 +1,13 @@
 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;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@ -13,7 +19,6 @@ 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;
@ -21,25 +26,20 @@ 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,8 +61,6 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
    private boolean assigneesFlag;
    private boolean labelsFlag;
    final Context ctx = this;
-    private Context appCtx;
-    private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;

    List<Milestones> milestonesList = new ArrayList<>();
    ArrayList<MultiSelectModel> listOfAssignees = new ArrayList<>();
@ -76,15 +74,13 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis

    @Override
    public void onCreate(Bundle savedInstanceState) {
-
        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String loginFullName = tinyDb.getString("userFullname");
@ -94,11 +90,6 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
        final String repoName = parts[1];
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

-        // if gitea is 1.12 or higher use the new limit
-        if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
-            resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
-        }
-
        ImageView closeActivity = findViewById(R.id.close);
        assigneesList = findViewById(R.id.newIssueAssigneesList);
        newIssueLabels = findViewById(R.id.newIssueLabels);
@ -125,7 +116,8 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
        newIssueDueDate.setOnClickListener(this);

        newIssueMilestoneSpinner = findViewById(R.id.newIssueMilestoneSpinner);
-        getMilestones(instanceUrl, instanceToken, repoOwner, repoName, loginUid, resultLimit);
+        newIssueMilestoneSpinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+        getMilestones(instanceUrl, instanceToken, repoOwner, repoName, loginUid);

        getLabels(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
        getCollaborators(instanceUrl, instanceToken, repoOwner, repoName, loginUid, loginFullName);
@ -135,18 +127,23 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
        if(!connToInternet) {

            createNewIssueButton.setEnabled(false);
-        }
-        else {
+            GradientDrawable shape =  new GradientDrawable();
+            shape.setCornerRadius( 8 );
+            shape.setColor(getResources().getColor(R.color.hintColor));
+            createNewIssueButton.setBackground(shape);
+
+        } else {

            createNewIssueButton.setOnClickListener(this);
+
        }

    }

    private void processNewIssue() {

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-        TinyDB tinyDb = new TinyDB(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        String repoFullName = tinyDb.getString("repoFullName");
@ -167,21 +164,21 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis

        if(!connToInternet) {

-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
            return;

        }

        if (newIssueTitleForm.equals("")) {

-            Toasty.error(ctx, getString(R.string.issueTitleEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.issueTitleEmpty));
            return;

        }

        /*if (newIssueDescriptionForm.equals("")) {

-            Toasty.error(ctx, getString(R.string.issueDescriptionEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.issueDescriptionEmpty));
            return;

        }*/
@ -220,7 +217,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis

    public void loadCollaboratorsList() {

-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());

        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
@ -231,9 +228,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
        final String repoName = parts[1];

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

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

@ -275,9 +272,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
        Call<JsonElement> call3;

        call3 = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
-                .createNewIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, createNewIssueJson);
+                .createNewIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, createNewIssueJson);

        call3.enqueue(new Callback<JsonElement>() {

@ -288,10 +285,10 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                    if(response2.code() == 201) {

                        //Log.i("isSuccessful1", String.valueOf(response2.body()));
-                        TinyDB tinyDb = new TinyDB(appCtx);
+                        TinyDB tinyDb = new TinyDB(getApplicationContext());
                        tinyDb.putBoolean("resumeIssues", true);

-                        Toasty.success(ctx, getString(R.string.issueCreated));
+                        Toasty.info(getApplicationContext(), getString(R.string.issueCreated));
                        enableProcessButton();
                        finish();

@ -309,7 +306,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                }
                else {

-                    Toasty.error(ctx, getString(R.string.issueCreatedError));
+                    Toasty.info(getApplicationContext(), getString(R.string.issueCreatedError));
                    enableProcessButton();
                    //Log.i("isSuccessful2", String.valueOf(response2.body()));

@ -327,17 +324,21 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
    }

    private void initCloseListener() {
-
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }

-    private void getMilestones(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid, int resultLimit) {
+    private void getMilestones(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {

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

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

@ -366,7 +367,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                            }
                        }

-                        ArrayAdapter<Milestones> adapter = new ArrayAdapter<>(CreateIssueActivity.this,
+                        ArrayAdapter<Milestones> adapter = new ArrayAdapter<>(getApplicationContext(),
                                R.layout.spinner_item, milestonesList);

                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
@ -389,9 +390,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
    private void getCollaborators(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid, String loginFullName) {

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

        listOfAssignees.add(new MultiSelectModel(-1, loginFullName));

@ -432,7 +433,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                                .multiSelectList(listOfAssignees)
                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
                                    @Override
-                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
+                                    public void onSelected(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {

                                        assigneesList.setText(dataString);

@ -461,9 +462,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
    private void getLabels(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {

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

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

@ -495,7 +496,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                                .multiSelectList(listOfLabels)
                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
                                    @Override
-                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
+                                    public void onSelected(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {

                                        newIssueLabels.setText(dataString.trim());
                                        labelsIdHolder.setText(selectedIds.toString());
@ -529,7 +530,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                multiSelectDialog.show(getSupportFragmentManager(), "multiSelectDialog");
            }
            else {
-                Toasty.warning(ctx, getResources().getString(R.string.noAssigneesFound));
+                Toasty.info(getApplicationContext(), getResources().getString(R.string.noAssigneesFound));
            }
        }
        else if (v == newIssueLabels) {
@ -537,7 +538,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                multiSelectDialogLabels.show(getSupportFragmentManager(), "multiSelectDialogLabels");
            }
            else {
-                Toasty.warning(ctx, getResources().getString(R.string.noLabelsFound));
+                Toasty.info(getApplicationContext(), getResources().getString(R.string.noLabelsFound));
            }
        }
        else if (v == newIssueDueDate) {
@ -569,10 +570,20 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
    private void disableProcessButton() {

        createNewIssueButton.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        createNewIssueButton.setBackground(shape);
+
    }

    private void enableProcessButton() {

        createNewIssueButton.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        createNewIssueButton.setBackground(shape);
+
    }
 }
--- a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
@ -1,7 +1,13 @@
 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;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@ -10,24 +16,19 @@ 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
@ -40,7 +41,6 @@ public class CreateLabelActivity extends BaseActivity {
    private EditText labelName;
    private Button createLabelButton;
    final Context ctx = this;
-    private Context appCtx;

    @Override
    protected int getLayoutResourceId(){
@ -49,13 +49,11 @@ public class CreateLabelActivity extends BaseActivity {

    @Override
    public void onCreate(Bundle savedInstanceState) {
-
        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();

        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
        String repoFullName = tinyDb.getString("repoFullName");
        String[] parts = repoFullName.split("/");
        final String repoOwner = parts[0];
@ -72,7 +70,7 @@ public class CreateLabelActivity extends BaseActivity {

        }

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

        ImageView closeActivity = findViewById(R.id.close);
        colorPicker = findViewById(R.id.colorPicker);
@ -117,28 +115,43 @@ public class CreateLabelActivity extends BaseActivity {
            createLabelButton.setText(getResources().getString(R.string.newUpdateButtonCopy));

            createLabelButton.setOnClickListener(updateLabelListener);
+
            return;
+
        }

        if(!connToInternet) {

            createLabelButton.setEnabled(false);
-        }
-        else {
+            GradientDrawable shape =  new GradientDrawable();
+            shape.setCornerRadius( 8 );
+            shape.setColor(getResources().getColor(R.color.hintColor));
+            createLabelButton.setBackground(shape);
+
+        } else {

            createLabelButton.setOnClickListener(createLabelListener);
+
        }

    }

-    private View.OnClickListener createLabelListener = v -> processCreateLabel();
+    private View.OnClickListener createLabelListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processCreateLabel();
+        }
+    };

-    private View.OnClickListener updateLabelListener = v -> processUpdateLabel();
+    private View.OnClickListener updateLabelListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processUpdateLabel();
+        }
+    };

    private void processUpdateLabel() {

-        final TinyDB tinyDb = new TinyDB(appCtx);
-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
        AppUtil appUtil = new AppUtil();
        String repoFullName = tinyDb.getString("repoFullName");
        String[] parts = repoFullName.split("/");
@ -160,36 +173,35 @@ public class CreateLabelActivity extends BaseActivity {

        if(!connToInternet) {

-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
            return;

        }

        if(updateLabelName.equals("")) {

-            Toasty.error(ctx, getString(R.string.labelEmptyError));
+            Toasty.info(getApplicationContext(), getString(R.string.labelEmptyError));
            return;

        }

        if(!appUtil.checkStrings(updateLabelName)) {

-            Toasty.error(ctx, getString(R.string.labelNameError));
+            Toasty.info(getApplicationContext(), getString(R.string.labelNameError));
            return;

        }

        disableProcessButton();
-        patchLabel(instanceUrl, instanceToken, repoOwner, repoName, updateLabelName, updateLabelColor, Integer.parseInt(
-	        Objects.requireNonNull(getIntent().getStringExtra("labelId"))), loginUid);
+        patchLabel(instanceUrl, instanceToken, repoOwner, repoName, updateLabelName, updateLabelColor, Integer.valueOf(getIntent().getStringExtra("labelId")), loginUid);

    }

    private void processCreateLabel() {

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
        AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        String repoFullName = tinyDb.getString("repoFullName");
        String[] parts = repoFullName.split("/");
        final String repoOwner = parts[0];
@ -201,7 +213,7 @@ public class CreateLabelActivity extends BaseActivity {
        String newLabelName = labelName.getText().toString();
        String newLabelColor;
        if(tinyDb.getString("labelColor").isEmpty()) {
-            newLabelColor = String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(ctx, R.color.releasePre)));
+            newLabelColor = String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(getApplicationContext(), R.color.releasePre)));
        }
        else {
            newLabelColor = tinyDb.getString("labelColor");
@ -209,21 +221,21 @@ public class CreateLabelActivity extends BaseActivity {

        if(!connToInternet) {

-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
            return;

        }

        if(newLabelName.equals("")) {

-            Toasty.error(ctx, getString(R.string.labelEmptyError));
+            Toasty.info(getApplicationContext(), getString(R.string.labelEmptyError));
            return;

        }

        if(!appUtil.checkStrings(newLabelName)) {

-            Toasty.error(ctx, getString(R.string.labelNameError));
+            Toasty.info(getApplicationContext(), getString(R.string.labelNameError));
            return;

        }
@ -236,14 +248,14 @@ public class CreateLabelActivity extends BaseActivity {
    private void createNewLabel(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String newLabelName, String newLabelColor, String loginUid) {

        CreateLabel createLabelFunc = new CreateLabel(newLabelName, newLabelColor);
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());

        Call<CreateLabel> call;

        call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
-                .createLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, createLabelFunc);
+                .createLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, createLabelFunc);

        call.enqueue(new Callback<CreateLabel>() {

@ -252,7 +264,7 @@ public class CreateLabelActivity extends BaseActivity {

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

-                    Toasty.success(ctx, getString(R.string.labelCreated));
+                    Toasty.info(getApplicationContext(), getString(R.string.labelCreated));
                    tinyDb.putString("labelColor", "");
                    tinyDb.putBoolean("labelsRefresh", true);
                    finish();
@ -271,7 +283,7 @@ public class CreateLabelActivity extends BaseActivity {

                    enableProcessButton();
                    tinyDb.putString("labelColor", "");
-                    Toasty.error(ctx, getString(R.string.labelGeneralError));
+                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));

                }

@ -279,7 +291,6 @@ public class CreateLabelActivity extends BaseActivity {

            @Override
            public void onFailure(@NonNull Call<CreateLabel> call, @NonNull Throwable t) {
-
                tinyDb.putString("labelColor", "");
                Log.e("onFailure", t.toString());
                enableProcessButton();
@ -291,14 +302,14 @@ public class CreateLabelActivity extends BaseActivity {
    private void patchLabel(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String updateLabelName, String updateLabelColor, int labelId, String loginUid) {

        CreateLabel createLabelFunc = new CreateLabel(updateLabelName, updateLabelColor);
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());

        Call<CreateLabel> call;

        call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
-                .patchLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, labelId, createLabelFunc);
+                .patchLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, labelId, createLabelFunc);

        call.enqueue(new Callback<CreateLabel>() {

@ -308,7 +319,7 @@ public class CreateLabelActivity extends BaseActivity {
                if(response.isSuccessful()) {
                    if(response.code() == 200) {

-                        Toasty.success(ctx, getString(R.string.labelUpdated));
+                        Toasty.info(getApplicationContext(), getString(R.string.labelUpdated));
                        tinyDb.putString("labelColor", "");
                        tinyDb.putBoolean("labelsRefresh", true);
                        tinyDb.putString("labelColorDefault", "");
@ -334,7 +345,7 @@ public class CreateLabelActivity extends BaseActivity {
                    enableProcessButton();
                    tinyDb.putString("labelColor", "");
                    tinyDb.putString("labelColorDefault", "");
-                    Toasty.error(ctx, getString(R.string.labelGeneralError));
+                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));

                }

@ -342,7 +353,6 @@ public class CreateLabelActivity extends BaseActivity {

            @Override
            public void onFailure(@NonNull Call<CreateLabel> call, @NonNull Throwable t) {
-
                tinyDb.putString("labelColor", "");
                tinyDb.putString("labelColorDefault", "");
                Log.e("onFailure", t.toString());
@ -370,9 +380,9 @@ public class CreateLabelActivity extends BaseActivity {
        Call<Labels> call;

        call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
-                .deleteLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, labelId);
+                .deleteLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, labelId);

        call.enqueue(new Callback<Labels>() {

@ -382,8 +392,8 @@ public class CreateLabelActivity extends BaseActivity {
                if(response.isSuccessful()) {
                    if(response.code() == 204) {

-                        Toasty.success(ctx, getString(R.string.labelDeleteText));
-                        LabelsViewModel.loadLabelsList(instanceUrl, instanceToken, repoOwner, repoName, ctx);
+                        Toasty.info(getApplicationContext(), getString(R.string.labelDeleteText));
+                        LabelsViewModel.loadLabelsList(instanceUrl, instanceToken, repoOwner, repoName, getApplicationContext());
                        getIntent().removeExtra("labelAction");
                        getIntent().removeExtra("labelId");

@ -399,7 +409,7 @@ public class CreateLabelActivity extends BaseActivity {
                }
                else {

-                    Toasty.error(ctx, getString(R.string.labelDeleteErrorText));
+                    Toasty.info(getApplicationContext(), getString(R.string.labelDeleteErrorText));

                }

@ -416,11 +426,21 @@ public class CreateLabelActivity extends BaseActivity {
    private void disableProcessButton() {

        createLabelButton.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        createLabelButton.setBackground(shape);
+
    }

    private void enableProcessButton() {

        createLabelButton.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        createLabelButton.setBackground(shape);
+
    }

-}
+}
--- a/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
@ -1,7 +1,11 @@
 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;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@ -10,19 +14,16 @@ 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.TinyDB;
+import org.mian.gitnex.helpers.VersionCheck;
 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
@ -36,7 +37,6 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
    private EditText milestoneDescription;
    private Button createNewMilestoneButton;
    final Context ctx = this;
-    private Context appCtx;

    @Override
    protected int getLayoutResourceId(){
@ -45,11 +45,9 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic

    @Override
    public void onCreate(Bundle savedInstanceState) {
-
        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

@ -70,21 +68,30 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
        if(!connToInternet) {

            createNewMilestoneButton.setEnabled(false);
-        }
-        else {
+            GradientDrawable shape =  new GradientDrawable();
+            shape.setCornerRadius( 8 );
+            shape.setColor(getResources().getColor(R.color.hintColor));
+            createNewMilestoneButton.setBackground(shape);
+
+        } else {

            createNewMilestoneButton.setOnClickListener(createMilestoneListener);
+
        }

    }

-    private View.OnClickListener createMilestoneListener = v -> processNewMilestone();
+    private View.OnClickListener createMilestoneListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processNewMilestone();
+        }
+    };

    private void processNewMilestone() {

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
        AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        String repoFullName = tinyDb.getString("repoFullName");
        String[] parts = repoFullName.split("/");
        final String repoOwner = parts[0];
@ -100,14 +107,14 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic

        if(!connToInternet) {

-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
            return;

        }

        if(newMilestoneTitle.equals("")) {

-            Toasty.error(ctx, getString(R.string.milestoneNameErrorEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.milestoneNameErrorEmpty));
            return;

        }
@ -115,7 +122,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
        if(!newMilestoneDescription.equals("")) {
            if (appUtil.charactersLength(newMilestoneDescription) > 255) {

-                Toasty.warning(ctx, getString(R.string.milestoneDescError));
+                Toasty.info(getApplicationContext(), getString(R.string.milestoneDescError));
                return;

            }
@ -123,18 +130,15 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic

        String finalMilestoneDueDate = null;
        if(!newMilestoneDueDate.isEmpty()) {
-
            finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate)));
-        }
-        else if (new Version(tinyDb.getString("giteaVersion")).less("1.10.0")) {
-
+        } else if (VersionCheck.compareVersion("1.10.0", tinyDb.getString("giteaVersion")) > 1) {
            // if Gitea version is less than 1.10.0 DueDate is required
-            Toasty.warning(ctx, getString(R.string.milestoneDateEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.milestoneDateEmpty));
            return;
        }

        disableProcessButton();
-        createNewMilestone(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate);
+        createNewMilestone(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate);

    }

@ -145,7 +149,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
        Call<Milestones> call;

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

@ -157,9 +161,9 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
                if(response.isSuccessful()) {
                    if(response.code() == 201) {

-                        TinyDB tinyDb = new TinyDB(appCtx);
+                        TinyDB tinyDb = new TinyDB(getApplicationContext());
                        tinyDb.putBoolean("milestoneCreated", true);
-                        Toasty.success(ctx, getString(R.string.milestoneCreated));
+                        Toasty.info(getApplicationContext(), getString(R.string.milestoneCreated));
                        enableProcessButton();
                        finish();

@ -177,7 +181,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
                else {

                    enableProcessButton();
-                    Toasty.error(ctx, getString(R.string.milestoneCreatedError));
+                    Toasty.info(getApplicationContext(), getString(R.string.milestoneCreatedError));

                }

@ -219,18 +223,32 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
    }

    private void initCloseListener() {
-
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }

    private void disableProcessButton() {

        createNewMilestoneButton.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        createNewMilestoneButton.setBackground(shape);
+
    }

    private void enableProcessButton() {

        createNewMilestoneButton.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        createNewMilestoneButton.setBackground(shape);
+
    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
@ -1,6 +1,10 @@
 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;
 import android.util.Log;
 import android.util.Patterns;
@ -9,17 +13,14 @@ 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 retrofit2.Call;
-import retrofit2.Callback;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;

 /**
 * Author M M Arif
@ -34,7 +35,6 @@ public class CreateNewUserActivity extends BaseActivity {
    private EditText userPassword;
    private Button createUserButton;
    final Context ctx = this;
-    private Context appCtx;

    @Override
    protected int getLayoutResourceId(){
@ -45,9 +45,8 @@ public class CreateNewUserActivity extends BaseActivity {
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

@ -68,19 +67,20 @@ public class CreateNewUserActivity extends BaseActivity {
        if(!connToInternet) {

            disableProcessButton();
-        }
-        else {
+
+        } else {

            createUserButton.setOnClickListener(createNewUserListener);
+
        }

    }

    private void processCreateNewUser() {

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
        AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@ -92,41 +92,41 @@ public class CreateNewUserActivity extends BaseActivity {

        if(!connToInternet) {

-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
            return;

        }

        if(newFullName.equals("") || newUserName.equals("") | newUserEmail.equals("") || newUserPassword.equals("")) {

-            Toasty.error(ctx, getString(R.string.emptyFields));
+            Toasty.info(getApplicationContext(), getString(R.string.emptyFields));
            return;

        }

        if(!appUtil.checkStrings(newFullName)) {

-            Toasty.error(ctx, getString(R.string.userInvalidFullName));
+            Toasty.info(getApplicationContext(), getString(R.string.userInvalidFullName));
            return;

        }

        if(!appUtil.checkStringsWithAlphaNumeric(newUserName)) {

-            Toasty.error(ctx, getString(R.string.userInvalidUserName));
+            Toasty.info(getApplicationContext(), getString(R.string.userInvalidUserName));
            return;

        }

        if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {

-            Toasty.error(ctx, getString(R.string.userInvalidEmail));
+            Toasty.info(getApplicationContext(), getString(R.string.userInvalidEmail));
            return;

        }

        disableProcessButton();
-        createNewUser(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newFullName, newUserName, newUserEmail, newUserPassword);
+        createNewUser(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), newFullName, newUserName, newUserEmail, newUserPassword);

    }

@ -137,7 +137,7 @@ public class CreateNewUserActivity extends BaseActivity {
        Call<UserInfo> call;

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

@ -148,7 +148,7 @@ public class CreateNewUserActivity extends BaseActivity {

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

-                    Toasty.success(ctx, getString(R.string.userCreatedText));
+                    Toasty.info(getApplicationContext(), getString(R.string.userCreatedText));
                    enableProcessButton();
                    finish();

@ -165,25 +165,25 @@ public class CreateNewUserActivity extends BaseActivity {
                else if(response.code() == 403) {

                    enableProcessButton();
-                    Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+                    Toasty.info(ctx, ctx.getString(R.string.authorizeError));

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

                    enableProcessButton();
-                    Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));

                }
                else if(response.code() == 422) {

                    enableProcessButton();
-                    Toasty.warning(ctx, ctx.getString(R.string.userExistsError));
+                    Toasty.info(ctx, ctx.getString(R.string.userExistsError));

                }
                else {

                    enableProcessButton();
-                    Toasty.error(ctx, getString(R.string.genericError));
+                    Toasty.info(getApplicationContext(), getString(R.string.genericError));

                }

@ -191,7 +191,6 @@ public class CreateNewUserActivity extends BaseActivity {

            @Override
            public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
-
                Log.e("onFailure", t.toString());
                enableProcessButton();
            }
@ -199,21 +198,39 @@ public class CreateNewUserActivity extends BaseActivity {

    }

-    private View.OnClickListener createNewUserListener = v -> processCreateNewUser();
+    private View.OnClickListener createNewUserListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processCreateNewUser();
+        }
+    };

    private void initCloseListener() {
-
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }

    private void disableProcessButton() {

        createUserButton.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        createUserButton.setBackground(shape);
+
    }

    private void enableProcessButton() {

        createUserButton.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        createUserButton.setBackground(shape);
+
    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java
@ -1,22 +1,23 @@
 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;

@ -33,7 +34,6 @@ public class CreateOrganizationActivity extends BaseActivity {
    private EditText orgName;
    private EditText orgDesc;
    final Context ctx = this;
-    private Context appCtx;

    @Override
    protected int getLayoutResourceId(){
@ -42,11 +42,9 @@ public class CreateOrganizationActivity extends BaseActivity {

    @Override
    public void onCreate(Bundle savedInstanceState) {
-
        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

@ -66,10 +64,15 @@ public class CreateOrganizationActivity extends BaseActivity {
        if(!connToInternet) {

            createOrganizationButton.setEnabled(false);
-        }
-        else {
+            GradientDrawable shape =  new GradientDrawable();
+            shape.setCornerRadius( 8 );
+            shape.setColor(getResources().getColor(R.color.hintColor));
+            createOrganizationButton.setBackground(shape);
+
+        } else {

            createOrganizationButton.setOnClickListener(createOrgListener);
+
        }

    }
@ -91,9 +94,9 @@ public class CreateOrganizationActivity extends BaseActivity {

    private void processNewOrganization() {

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
        AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@ -103,7 +106,7 @@ public class CreateOrganizationActivity extends BaseActivity {

        if(!connToInternet) {

-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
            return;

        }
@ -111,7 +114,7 @@ public class CreateOrganizationActivity extends BaseActivity {
        if(!newOrgDesc.equals("")) {
            if (appUtil.charactersLength(newOrgDesc) > 255) {

-                Toasty.warning(ctx, getString(R.string.orgDescError));
+                Toasty.info(getApplicationContext(), getString(R.string.orgDescError));
                return;

            }
@ -119,18 +122,18 @@ public class CreateOrganizationActivity extends BaseActivity {

        if(newOrgName.equals("")) {

-            Toasty.error(ctx, getString(R.string.orgNameErrorEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.orgNameErrorEmpty));

        }
        else if(!appUtil.checkStrings(newOrgName)) {

-            Toasty.warning(ctx, getString(R.string.orgNameErrorInvalid));
+            Toasty.info(getApplicationContext(), getString(R.string.orgNameErrorInvalid));

        }
        else {

            disableProcessButton();
-            createNewOrganization(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newOrgName, newOrgDesc);
+            createNewOrganization(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), newOrgName, newOrgDesc);

        }

@ -141,7 +144,7 @@ public class CreateOrganizationActivity extends BaseActivity {
        UserOrganizations createOrganization = new UserOrganizations(orgName, null, orgDesc, null, null);

        Call<UserOrganizations> call = RetrofitClient
-            .getInstance(instanceUrl, ctx)
+            .getInstance(instanceUrl, getApplicationContext())
            .getApiInterface()
            .createNewOrganization(token, createOrganization);

@ -152,10 +155,10 @@ public class CreateOrganizationActivity extends BaseActivity {

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

-                    TinyDB tinyDb = new TinyDB(appCtx);
+                    TinyDB tinyDb = new TinyDB(getApplicationContext());
                    tinyDb.putBoolean("orgCreated", true);
                    enableProcessButton();
-                    Toasty.success(ctx, getString(R.string.orgCreated));
+                    Toasty.info(getApplicationContext(), getString(R.string.orgCreated));
                    finish();

                }
@ -171,24 +174,24 @@ public class CreateOrganizationActivity extends BaseActivity {
                else if(response.code() == 409) {

                    enableProcessButton();
-                    Toasty.warning(ctx, getString(R.string.orgExistsError));
+                    Toasty.info(getApplicationContext(), getString(R.string.orgExistsError));

                }
                else if(response.code() == 422) {

                    enableProcessButton();
-                    Toasty.warning(ctx, getString(R.string.orgExistsError));
+                    Toasty.info(getApplicationContext(), getString(R.string.orgExistsError));

                }
                else {

                    if(response.code() == 404) {
                        enableProcessButton();
-                        Toasty.warning(ctx, getString(R.string.apiNotFound));
+                        Toasty.info(getApplicationContext(), getString(R.string.apiNotFound));
                    }
                    else {
                        enableProcessButton();
-                        Toasty.error(ctx, getString(R.string.orgCreatedError));
+                        Toasty.info(getApplicationContext(), getString(R.string.orgCreatedError));
                    }

                }
@ -207,11 +210,21 @@ public class CreateOrganizationActivity extends BaseActivity {
    private void disableProcessButton() {

        createOrganizationButton.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        createOrganizationButton.setBackground(shape);
+
    }

    private void enableProcessButton() {

        createOrganizationButton.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        createOrganizationButton.setBackground(shape);
+
    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
@ -1,6 +1,11 @@
 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;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@ -12,20 +17,17 @@ 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
@ -43,7 +45,6 @@ public class CreateReleaseActivity extends BaseActivity {
    private CheckBox releaseDraft;
    private Button createNewRelease;
    final Context ctx = this;
-    private Context appCtx;

    List<Branches> branchesList = new ArrayList<>();

@ -56,13 +57,12 @@ public class CreateReleaseActivity extends BaseActivity {
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@ -86,7 +86,8 @@ public class CreateReleaseActivity extends BaseActivity {
        closeActivity.setOnClickListener(onClickListener);

        releaseBranch = findViewById(R.id.releaseBranch);
-        getBranches(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+        releaseBranch.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+        getBranches(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
        releaseBranch.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
            @Override
            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@ -105,21 +106,26 @@ public class CreateReleaseActivity extends BaseActivity {
        if(!connToInternet) {

            disableProcessButton();
-        }
-        else {
+
+        } else {

            createNewRelease.setOnClickListener(createReleaseListener);
+
        }

    }

-    private View.OnClickListener createReleaseListener = v -> processNewRelease();
+    private View.OnClickListener createReleaseListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processNewRelease();
+        }
+    };

    private void processNewRelease() {

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@ -137,27 +143,27 @@ public class CreateReleaseActivity extends BaseActivity {

        if(!connToInternet) {

-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
            return;

        }

        if(newReleaseTagName.equals("")) {

-            Toasty.error(ctx, getString(R.string.tagNameErrorEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.tagNameErrorEmpty));
            return;

        }

        if(newReleaseTitle.equals("")) {

-            Toasty.error(ctx, getString(R.string.titleErrorEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.titleErrorEmpty));
            return;

        }

        disableProcessButton();
-        createNewReleaseFunc(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, newReleaseBranch, newReleaseType, newReleaseDraft);
+        createNewReleaseFunc(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, newReleaseBranch, newReleaseType, newReleaseDraft);

    }

@ -168,7 +174,7 @@ public class CreateReleaseActivity extends BaseActivity {
        Call<Releases> call;

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

@ -179,9 +185,9 @@ public class CreateReleaseActivity extends BaseActivity {

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

-                    TinyDB tinyDb = new TinyDB(appCtx);
+                    TinyDB tinyDb = new TinyDB(getApplicationContext());
                    tinyDb.putBoolean("updateReleases", true);
-                    Toasty.success(ctx, getString(R.string.releaseCreatedText));
+                    Toasty.info(getApplicationContext(), getString(R.string.releaseCreatedText));
                    enableProcessButton();
                    finish();

@ -198,19 +204,19 @@ public class CreateReleaseActivity extends BaseActivity {
                else if(response.code() == 403) {

                    enableProcessButton();
-                    Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+                    Toasty.info(ctx, ctx.getString(R.string.authorizeError));

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

                    enableProcessButton();
-                    Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));

                }
                else {

                    enableProcessButton();
-                    Toasty.error(ctx, ctx.getString(R.string.genericError));
+                    Toasty.info(ctx, ctx.getString(R.string.genericError));

                }

@ -228,7 +234,7 @@ public class CreateReleaseActivity extends BaseActivity {
    private void getBranches(String instanceUrl, String instanceToken, final String repoOwner, final String repoName) {

        Call<List<Branches>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
                .getBranches(instanceToken, repoOwner, repoName);

@ -254,7 +260,7 @@ public class CreateReleaseActivity extends BaseActivity {
                            }
                        }

-                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreateReleaseActivity.this,
+                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(getApplicationContext(),
                                R.layout.spinner_item, branchesList);

                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
@ -294,11 +300,21 @@ public class CreateReleaseActivity extends BaseActivity {
    private void disableProcessButton() {

        createNewRelease.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        createNewRelease.setBackground(shape);
+
    }

    private void enableProcessButton() {

        createNewRelease.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        createNewRelease.setBackground(shape);
+
    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
@ -1,7 +1,10 @@
 package org.mian.gitnex.activities;

 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;
@ -12,16 +15,15 @@ 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;
@ -43,7 +45,6 @@ public class CreateRepoActivity extends BaseActivity {
    private EditText repoDesc;
    private CheckBox repoAccess;
    final Context ctx = this;
-    private Context appCtx;

    List<OrgOwner> organizationsList = new ArrayList<>();

@ -58,13 +59,11 @@ public class CreateRepoActivity extends BaseActivity {

    @Override
    public void onCreate(Bundle savedInstanceState) {
-
        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();

-        boolean connToInternet = AppUtil.hasNetworkConnection(ctx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String userLogin = tinyDb.getString("userLogin");
@ -85,8 +84,8 @@ public class CreateRepoActivity extends BaseActivity {
        closeActivity.setOnClickListener(onClickListener);

        spinner = findViewById(R.id.ownerSpinner);
-        getOrganizations(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), userLogin);
-
+        spinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+        getOrganizations(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), userLogin);
        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
            @Override
            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@ -105,10 +104,12 @@ public class CreateRepoActivity extends BaseActivity {
        if(!connToInternet) {

            disableProcessButton();
+
        }
        else {

            createRepo.setOnClickListener(createRepoListener);
+
        }
    }

@ -120,9 +121,9 @@ public class CreateRepoActivity extends BaseActivity {

    private void processNewRepo() {

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
        AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@ -134,38 +135,45 @@ public class CreateRepoActivity extends BaseActivity {

        if(!connToInternet) {

-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
            return;
+
        }

        if(!newRepoDesc.equals("")) {
            if (appUtil.charactersLength(newRepoDesc) > 255) {

-                Toasty.warning(ctx, getString(R.string.repoDescError));
+                Toasty.info(getApplicationContext(), getString(R.string.repoDescError));
                return;
+
            }
        }

        if(newRepoName.equals("")) {

-            Toasty.error(ctx, getString(R.string.repoNameErrorEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorEmpty));
+
        }
        else if(!appUtil.checkStrings(newRepoName)) {

-            Toasty.warning(ctx, getString(R.string.repoNameErrorInvalid));
+            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorInvalid));
+
        }
        else if (reservedRepoNames.contains(newRepoName)) {

-            Toasty.warning(ctx, getString(R.string.repoNameErrorReservedName));
+            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorReservedName));
+
        }
        else if (reservedRepoPatterns.matcher(newRepoName).find()) {

-            Toasty.warning(ctx, getString(R.string.repoNameErrorReservedPatterns));
+            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorReservedPatterns));
+
        }
        else {

            disableProcessButton();
-            createNewRepository(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, repoOwner, newRepoAccess);
+            createNewRepository(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, repoOwner, newRepoAccess);
+
        }
    }

@ -177,16 +185,18 @@ public class CreateRepoActivity extends BaseActivity {
        if(repoOwner.equals(loginUid)) {

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

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

        call.enqueue(new Callback<OrganizationRepository>() {
@ -196,9 +206,9 @@ public class CreateRepoActivity extends BaseActivity {

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

-                    TinyDB tinyDb = new TinyDB(appCtx);
+                    TinyDB tinyDb = new TinyDB(getApplicationContext());
                    tinyDb.putBoolean("repoCreated", true);
-                    Toasty.success(ctx, getString(R.string.repoCreated));
+                    Toasty.info(getApplicationContext(), getString(R.string.repoCreated));
                    enableProcessButton();
                    finish();
                }
@ -209,23 +219,25 @@ public class CreateRepoActivity extends BaseActivity {
                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
                }
                else if(response.code() == 409) {

                    enableProcessButton();
-                    Toasty.warning(ctx, getString(R.string.repoExistsError));
+                    Toasty.info(getApplicationContext(), getString(R.string.repoExistsError));
+
                }
                else {

                    enableProcessButton();
-                    Toasty.error(ctx, getString(R.string.repoCreatedError));
+                    Toasty.info(getApplicationContext(), getString(R.string.repoCreatedError));
+
                }

            }

            @Override
            public void onFailure(@NonNull Call<OrganizationRepository> call, @NonNull Throwable t) {
-
                Log.e("onFailure", t.toString());
                enableProcessButton();
            }
@ -234,10 +246,10 @@ public class CreateRepoActivity extends BaseActivity {

    private void getOrganizations(String instanceUrl, String instanceToken, final String userLogin) {

-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());

        Call<List<OrgOwner>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
                .getOrgOwners(instanceToken);

@ -256,16 +268,13 @@ public class CreateRepoActivity extends BaseActivity {
                        organizationsList.add(new OrgOwner(userLogin));
                        assert organizationsList_ != null;
                        if(organizationsList_.size() > 0) {
-
                            for (int i = 0; i < organizationsList_.size(); i++) {

                                if(!tinyDb.getString("organizationId").isEmpty()) {
-
                                    if (Integer.parseInt(tinyDb.getString("organizationId")) == organizationsList_.get(i).getId()) {
                                        organizationId = i + 1;
                                    }
                                }
-
                                OrgOwner data = new OrgOwner(
                                        organizationsList_.get(i).getUsername()
                                );
@ -274,14 +283,13 @@ public class CreateRepoActivity extends BaseActivity {
                            }
                        }

-                        ArrayAdapter<OrgOwner> adapter = new ArrayAdapter<>(CreateRepoActivity.this,
+                        ArrayAdapter<OrgOwner> adapter = new ArrayAdapter<>(getApplicationContext(),
                                R.layout.spinner_item, organizationsList);

                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
                        spinner.setAdapter(adapter);

                        if (tinyDb.getBoolean("organizationAction") & organizationId != 0) {
-
                            spinner.setSelection(organizationId);
                            tinyDb.putBoolean("organizationAction", false);
                        }
@ -297,13 +305,13 @@ public class CreateRepoActivity extends BaseActivity {
                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
                }

            }

            @Override
            public void onFailure(@NonNull Call<List<OrgOwner>> call, @NonNull Throwable t) {
-
                Log.e("onFailure", t.toString());
                enableProcessButton();
            }
@ -311,18 +319,32 @@ public class CreateRepoActivity extends BaseActivity {
    }

    private void initCloseListener() {
-
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }

    private void disableProcessButton() {

        createRepo.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        createRepo.setBackground(shape);
+
    }

    private void enableProcessButton() {

        createRepo.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        createRepo.setBackground(shape);
+
    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
@ -1,29 +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 retrofit2.Call;
-import retrofit2.Callback;
+import android.util.Log;

 /**
 * Author M M Arif
@ -32,7 +33,6 @@ import retrofit2.Callback;
 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,11 +73,9 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic

    @Override
    public void onCreate(Bundle savedInstanceState) {
-
        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

@ -97,120 +95,134 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);

-        teamPermission.setOnClickListener(view -> {
+        teamPermission.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {

-            AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
+                AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
+
+                pBuilder.setTitle(R.string.newTeamPermission);
+                if(permissionSelectedChoice != -1) {
+                    pBuilder.setCancelable(true);
+                }
+                else {
+                    pBuilder.setCancelable(false);
+                }
+                pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+
+                        permissionSelectedChoice = i;
+                        teamPermission.setText(permissionList[i]);
+
+                        if(permissionList[i].equals("Read")) {
+                            teamPermissionDetail.setVisibility(View.VISIBLE);
+                            teamPermissionDetail.setText(R.string.newTeamPermissionRead);
+                        }
+                        else if(permissionList[i].equals("Write")) {
+                            teamPermissionDetail.setVisibility(View.VISIBLE);
+                            teamPermissionDetail.setText(R.string.newTeamPermissionWrite);
+                        }
+                        else if(permissionList[i].equals("Admin")) {
+                            teamPermissionDetail.setVisibility(View.VISIBLE);
+                            teamPermissionDetail.setText(R.string.newTeamPermissionAdmin);
+                        }
+                        else {
+                            teamPermissionDetail.setVisibility(View.GONE);
+                        }
+
+                        dialogInterface.dismiss();
+
+                    }
+                });
+
+                AlertDialog pDialog = pBuilder.create();
+                pDialog.show();

-            pBuilder.setTitle(R.string.newTeamPermission);
-            if(permissionSelectedChoice != -1) {
-                pBuilder.setCancelable(true);
            }
-            else {
-                pBuilder.setCancelable(false);
-            }
-            pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, (dialogInterface, i) -> {
-
-                permissionSelectedChoice = i;
-                teamPermission.setText(permissionList[i]);
-
-	            switch(permissionList[i]) {
-		            case "Read":
-
-			            teamPermissionDetail.setVisibility(View.VISIBLE);
-			            teamPermissionDetail.setText(R.string.newTeamPermissionRead);
-			            break;
-		            case "Write":
-
-			            teamPermissionDetail.setVisibility(View.VISIBLE);
-			            teamPermissionDetail.setText(R.string.newTeamPermissionWrite);
-			            break;
-		            case "Admin":
-
-			            teamPermissionDetail.setVisibility(View.VISIBLE);
-			            teamPermissionDetail.setText(R.string.newTeamPermissionAdmin);
-			            break;
-		            default:
-
-			            teamPermissionDetail.setVisibility(View.GONE);
-			            break;
-	            }
-
-                dialogInterface.dismiss();
-
-            });
-
-            AlertDialog pDialog = pBuilder.create();
-            pDialog.show();
-
        });


-        teamAccessControls.setOnClickListener(v -> {
+        teamAccessControls.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {

-            teamAccessControls.setText("");
-            teamAccessControlsArray.setText("");
-            pushAccessList = Arrays.asList(accessControlsList);
+                teamAccessControls.setText("");
+                teamAccessControlsArray.setText("");
+                pushAccessList = Arrays.asList(accessControlsList);

-            AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx);
+                AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx);

-            aDialogBuilder.setMultiChoiceItems(accessControlsList, selectedAccessControlsTrueFalse, (dialog, which, isChecked) -> {
+                aDialogBuilder.setMultiChoiceItems(accessControlsList, selectedAccessControlsTrueFalse, new DialogInterface.OnMultiChoiceClickListener() {

-            })
-                .setCancelable(false)
-                .setTitle(R.string.newTeamAccessControls)
-                .setPositiveButton(R.string.okButton, (dialog, which) -> {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which, boolean isChecked) {

-                    int selectedVal = 0;
-                    while(selectedVal < selectedAccessControlsTrueFalse.length)
-                    {
-                        boolean value = selectedAccessControlsTrueFalse[selectedVal];
-
-                        String repoCode = "";
-                        if(selectedVal == 0) {
-                            repoCode = "repo.code";
-                        }
-                        if(selectedVal == 1) {
-                            repoCode = "repo.issues";
-                        }
-                        if(selectedVal == 2) {
-                            repoCode = "repo.pulls";
-                        }
-                        if(selectedVal == 3) {
-                            repoCode = "repo.releases";
-                        }
-                        if(selectedVal == 4) {
-                            repoCode = "repo.wiki";
-                        }
-                        if(selectedVal == 5) {
-                            repoCode = "repo.ext_wiki";
-                        }
-                        if(selectedVal == 6) {
-                            repoCode = "repo.ext_issues";
                        }

-                        if(value){
-                            teamAccessControls.setText(getString(R.string.newTeamPermissionValues, teamAccessControls.getText(), pushAccessList.get(selectedVal)));
-                            teamAccessControlsArray.setText(getString(R.string.newTeamPermissionValuesFinal, teamAccessControlsArray.getText(), repoCode));
+                    })
+                    .setCancelable(false)
+                    .setTitle(R.string.newTeamAccessControls)
+                    .setPositiveButton(R.string.okButton, new DialogInterface.OnClickListener() {
+
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+
+                            int selectedVal = 0;
+                            while(selectedVal < selectedAccessControlsTrueFalse.length)
+                            {
+                                boolean value = selectedAccessControlsTrueFalse[selectedVal];
+
+                                String repoCode = "";
+                                if(selectedVal == 0) {
+                                    repoCode = "repo.code";
+                                }
+                                if(selectedVal == 1) {
+                                    repoCode = "repo.issues";
+                                }
+                                if(selectedVal == 2) {
+                                    repoCode = "repo.pulls";
+                                }
+                                if(selectedVal == 3) {
+                                    repoCode = "repo.releases";
+                                }
+                                if(selectedVal == 4) {
+                                    repoCode = "repo.wiki";
+                                }
+                                if(selectedVal == 5) {
+                                    repoCode = "repo.ext_wiki";
+                                }
+                                if(selectedVal == 6) {
+                                    repoCode = "repo.ext_issues";
+                                }
+
+                                if(value){
+                                    teamAccessControls.setText(getString(R.string.newTeamPermissionValues, teamAccessControls.getText(), pushAccessList.get(selectedVal)));
+                                    teamAccessControlsArray.setText(getString(R.string.newTeamPermissionValuesFinal, teamAccessControlsArray.getText(), repoCode));
+                                }
+
+                                selectedVal++;
+                            }
+
+                            String data = String.valueOf(teamAccessControls.getText());
+                            if(!data.equals("")) {
+                                teamAccessControls.setText(data.substring(0, data.length() - 2));
+                            }
+
+                            String dataArray = String.valueOf(teamAccessControlsArray.getText());
+                            if(!dataArray.equals("")) {
+                                teamAccessControlsArray.setText(dataArray.substring(0, dataArray.length() - 2));
+                            }
+                            //Log.i("orgName", String.valueOf(teamAccessControlsArray.getText()));
+
                        }

-                        selectedVal++;
-                    }

-                    String data = String.valueOf(teamAccessControls.getText());
-                    if(!data.equals("")) {
-                        teamAccessControls.setText(data.substring(0, data.length() - 2));
-                    }
+                    });

-                    String dataArray = String.valueOf(teamAccessControlsArray.getText());
-                    if(!dataArray.equals("")) {
-                        teamAccessControlsArray.setText(dataArray.substring(0, dataArray.length() - 2));
-                    }
-                    //Log.i("orgName", String.valueOf(teamAccessControlsArray.getText()));
-
-                });
-
-            AlertDialog aDialog = aDialogBuilder.create();
-            aDialog.show();
+                AlertDialog aDialog = aDialogBuilder.create();
+                aDialog.show();
+            }
        });

        createTeamButton.setEnabled(false);
@ -235,13 +247,13 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
    private void processCreateTeam() {

        AppUtil appUtil = new AppUtil();
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
        final String orgName = tinyDb.getString("orgName");;

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
        String newTeamName = teamName.getText().toString();
        String newTeamDesc = teamDesc.getText().toString();
        String newTeamPermission = teamPermission.getText().toString().toLowerCase();
@ -249,21 +261,21 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic

        if(!connToInternet) {

-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
            return;

        }

        if (newTeamName.equals("")) {

-            Toasty.error(ctx, getString(R.string.teamNameEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.teamNameEmpty));
            return;

        }

        if(!appUtil.checkStringsWithAlphaNumericDashDotUnderscore(newTeamName)) {

-            Toasty.warning(ctx, getString(R.string.teamNameError));
+            Toasty.info(getApplicationContext(), getString(R.string.teamNameError));
            return;

        }
@ -271,12 +283,12 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
        if(!newTeamDesc.equals("")) {

            if(!appUtil.checkStrings(newTeamDesc)) {
-                Toasty.warning(ctx, getString(R.string.teamDescError));
+                Toasty.info(getApplicationContext(), getString(R.string.teamDescError));
                return;
            }

            if(newTeamDesc.length() > 100) {
-                Toasty.warning(ctx, getString(R.string.teamDescLimit));
+                Toasty.info(getApplicationContext(), getString(R.string.teamDescLimit));
                return;
            }

@ -284,7 +296,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic

        if (newTeamPermission.equals("")) {

-            Toasty.error(ctx, getString(R.string.teamPermissionEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.teamPermissionEmpty));
            return;

        }
@ -306,9 +318,9 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
        Call<Teams> call3;

        call3 = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
-                .createTeamsByOrg(Authorization.returnAuthentication(ctx, loginUid, instanceToken), orgName, createNewTeamJson);
+                .createTeamsByOrg(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), orgName, createNewTeamJson);

        call3.enqueue(new Callback<Teams>() {

@ -318,17 +330,19 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
                if(response2.isSuccessful()) {
                    if(response2.code() == 201) {

-                        TinyDB tinyDb = new TinyDB(appCtx);
+                        TinyDB tinyDb = new TinyDB(getApplicationContext());
                        tinyDb.putBoolean("resumeTeams", true);

-                        Toasty.success(ctx, getString(R.string.teamCreated));
+                        Toasty.info(getApplicationContext(), getString(R.string.teamCreated));
                        finish();
+
                    }

                }
                else if(response2.code() == 404) {

-                    Toasty.warning(ctx, getString(R.string.apiNotFound));
+                    Toasty.info(getApplicationContext(), getString(R.string.apiNotFound));
+
                }
                else if(response2.code() == 401) {

@ -336,10 +350,12 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
                }
                else {

-                    Toasty.error(ctx, getString(R.string.teamCreatedError));
+                    Toasty.info(getApplicationContext(), getString(R.string.teamCreatedError));
+
                }

            }
@ -354,15 +370,19 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic

    @Override
    public void onClick(View v) {
-
        if(v == createTeamButton) {
            processCreateTeam();
        }
+
    }

    private void initCloseListener() {
-
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
@ -0,0 +1,66 @@
+package org.mian.gitnex.activities;
+
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.adapters.CreditsAdapter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class CreditsActivity extends BaseActivity {
+
+    private View.OnClickListener onClickListener;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_credits;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+
+        ImageView closeActivity = findViewById(R.id.close);
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        Resources res = getResources();
+        CharSequence[] creditsInfo = res.getTextArray(R.array.creditsInfo);
+
+        List<CharSequence> creditsList = new ArrayList<>(Arrays.asList(creditsInfo));
+
+        RecyclerView mRecyclerView = findViewById(R.id.recyclerView);
+
+        mRecyclerView.setHasFixedSize(true);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
+                DividerItemDecoration.VERTICAL);
+        mRecyclerView.addItemDecoration(dividerItemDecoration);
+
+        CreditsAdapter adapter = new CreditsAdapter(creditsList);
+        mRecyclerView.setAdapter(adapter);
+
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
+    }
+}
--- a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
@ -1,8 +1,14 @@
 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;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@ -14,7 +20,6 @@ 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;
@ -22,24 +27,19 @@ 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,9 +48,7 @@ import retrofit2.Response;
 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;
@ -72,11 +70,10 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();

        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());

        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
@ -94,11 +91,6 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
        editIssueDescription = findViewById(R.id.editIssueDescription);
        editIssueDueDate = findViewById(R.id.editIssueDueDate);

-        // if gitea is 1.12 or higher use the new limit
-        if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
-            resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
-        }
-
        editIssueTitle.requestFocus();
        assert imm != null;
        imm.showSoftInput(editIssueTitle, InputMethodManager.SHOW_IMPLICIT);
@ -107,6 +99,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
        loadCollaboratorsList();

        editIssueMilestoneSpinner = findViewById(R.id.editIssueMilestoneSpinner);
+        editIssueMilestoneSpinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);

        editIssueDescription.setMentionAdapter(defaultMentionAdapter);

@ -118,7 +111,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe

        if(!tinyDb.getString("issueNumber").isEmpty()) {

-            if(tinyDb.getString("issueType").equalsIgnoreCase("Pull")) {
+            if(tinyDb.getString("issueType").equals("pr")) {
                toolbar_title.setText(getString(R.string.editPrNavHeader, String.valueOf(issueIndex)));
            }
            else {
@ -127,14 +120,14 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
        }

        disableProcessButton();
-        getIssue(instanceUrl, instanceToken, loginUid, repoOwner, repoName, issueIndex, resultLimit);
+        getIssue(instanceUrl, instanceToken, loginUid, repoOwner, repoName, issueIndex);


    }

    public void loadCollaboratorsList() {

-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());

        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
@ -145,9 +138,9 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
        final String repoName = parts[1];

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

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

@ -193,8 +186,8 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe

    private void processEditIssue() {

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-        TinyDB tinyDb = new TinyDB(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        String repoFullName = tinyDb.getString("repoFullName");
@ -214,21 +207,21 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe

        if(!connToInternet) {

-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
            return;

        }

        if (editIssueTitleForm.equals("")) {

-            Toasty.error(ctx, getString(R.string.issueTitleEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.issueTitleEmpty));
            return;

        }

        /*if (editIssueDescriptionForm.equals("")) {

-            Toasty.info(ctx, getString(R.string.issueDescriptionEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.issueDescriptionEmpty));
            return;

        }*/
@ -247,14 +240,14 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe

    private void editIssue(String instanceUrl, String instanceToken, String repoOwner, String repoName, int issueIndex, String loginUid, String title, String description, String dueDate, int editIssueMilestoneId) {

-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());

        CreateIssue issueData = new CreateIssue(title, description, dueDate, editIssueMilestoneId);

        Call<JsonElement> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
-                .patchIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueData);
+                .patchIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, issueData);

        call.enqueue(new Callback<JsonElement>() {

@ -263,11 +256,11 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe

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

-                    if(tinyDb.getString("issueType").equalsIgnoreCase("Pull")) {
-                        Toasty.success(ctx, getString(R.string.editPrSuccessMessage));
+                    if(tinyDb.getString("issueType").equals("pr")) {
+                        Toasty.info(getApplicationContext(), getString(R.string.editPrSuccessMessage));
                    }
                    else {
-                        Toasty.success(ctx, getString(R.string.editIssueSuccessMessage));
+                        Toasty.info(getApplicationContext(), getString(R.string.editIssueSuccessMessage));
                    }

                    tinyDb.putBoolean("issueEdited", true);
@ -287,7 +280,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                else {

                    enableProcessButton();
-                    Toasty.error(ctx, getString(R.string.genericError));
+                    Toasty.info(getApplicationContext(), getString(R.string.genericError));

                }

@ -333,12 +326,12 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe

    }

-    private void getIssue(final String instanceUrl, final String instanceToken, final String loginUid, final String repoOwner, final String repoName, int issueIndex, int resultLimit) {
+    private void getIssue(final String instanceUrl, final String instanceToken, final String loginUid, final String repoOwner, final String repoName, int issueIndex) {

        Call<Issues> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
-                .getIssueByIndex(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
+                .getIssueByIndex(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex);

        call.enqueue(new Callback<Issues>() {

@ -360,9 +353,9 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                    if(response.body().getId() > 0) {

                        Call<List<Milestones>> call_ = RetrofitClient
-                                .getInstance(instanceUrl, ctx)
+                                .getInstance(instanceUrl, getApplicationContext())
                                .getApiInterface()
-                                .getMilestones(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, 1, resultLimit, msState);
+                                .getMilestones(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, msState);

                        final int finalMsId = msId;

@ -395,7 +388,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                                        }
                                    }

-                                    ArrayAdapter<Milestones> adapter_ = new ArrayAdapter<>(EditIssueActivity.this,
+                                    ArrayAdapter<Milestones> adapter_ = new ArrayAdapter<>(getApplicationContext(),
                                            R.layout.spinner_item, milestonesList);

                                    adapter_.setDropDownViewResource(R.layout.spinner_dropdown_item);
@ -424,6 +417,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                        @SuppressLint("SimpleDateFormat") DateFormat formatter = new SimpleDateFormat("yyyy-M-dd");
                        String dueDate = formatter.format(response.body().getDue_date());
                        editIssueDueDate.setText(dueDate);
+
                    }
                    //enableProcessButton();

@ -434,10 +428,12 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
                }
                else {

-                    Toasty.error(ctx, getString(R.string.genericError));
+                    Toasty.info(getApplicationContext(), getString(R.string.genericError));
+
                }

            }
@ -453,11 +449,21 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
    private void disableProcessButton() {

        editIssueButton.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        editIssueButton.setBackground(shape);
+
    }

    private void enableProcessButton() {

        editIssueButton.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        editIssueButton.setBackground(shape);
+
    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java
+++ b/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,147 +32,188 @@ import retrofit2.Callback;

 public class FileDiffActivity extends BaseActivity {

-	private View.OnClickListener onClickListener;
-	private TextView toolbarTitle;
-	private ListView mListView;
-	private ProgressBar mProgressBar;
-	final Context ctx = this;
-	private Context appCtx;
+    private View.OnClickListener onClickListener;
+    private TextView toolbar_title;
+    private RecyclerView mRecyclerView;
+    private ProgressBar mProgressBar;

-	@Override
-	protected int getLayoutResourceId() {
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_file_diff;
+    }

-		return R.layout.activity_file_diff;
-	}
+    @Override
+    public void onCreate(Bundle savedInstanceState) {

-	@Override
-	public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);

-		super.onCreate(savedInstanceState);
-		appCtx = getApplicationContext();
+        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");

-		Toolbar toolbar = findViewById(R.id.toolbar);
-		setSupportActionBar(toolbar);
+        ImageView closeActivity = findViewById(R.id.close);
+        toolbar_title = findViewById(R.id.toolbar_title);
+        mRecyclerView = findViewById(R.id.recyclerView);
+        mProgressBar = findViewById(R.id.progress_bar);

-		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");
+        mRecyclerView.setHasFixedSize(true);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));

-		ImageView closeActivity = findViewById(R.id.close);
-		toolbarTitle = findViewById(R.id.toolbar_title);
-		mListView = findViewById(R.id.listView);
-		mProgressBar = findViewById(R.id.progress_bar);
+        toolbar_title.setText(R.string.processingText);
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);

-		mListView.setDivider(null);
+        mProgressBar.setVisibility(View.VISIBLE);

-		toolbarTitle.setText(R.string.processingText);
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
+        String pullIndex = tinyDb.getString("issueNumber");

-		mProgressBar.setVisibility(View.VISIBLE);
+        getPullDiffContent(tinyDb.getString("instanceUrlWithProtocol"), repoOwner, repoName, pullIndex);

-		String pullIndex = tinyDb.getString("issueNumber");
+    }

-		boolean apiCall = true;
-		String instanceUrl = tinyDb.getString("instanceUrl");
+    private void getPullDiffContent(String instanceUrl, String owner, String repo, String filename) {

-		// fallback for old gitea instances
-		if(new Version(tinyDb.getString("giteaVersion")).less("1.13.0")) {
+        Call<ResponseBody> call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getWebInterface()
+                .getPullDiffContent(owner, repo, filename);

-			apiCall = false;
-			instanceUrl = instanceUrl.substring(0, instanceUrl.lastIndexOf("api/v1/"));
-		}
+        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.error(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.warning(ctx, ctx.getString(R.string.apiNotFound));
+                                    String fileExtension = FileUtils.getExtension(getFileNameFinal);

-				}
-				else {
+                                    if(appUtil.imageExtension(FileUtils.getExtension(getFileNameFinal))) {

-					Toasty.error(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 = view -> {
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }

-			getIntent().removeExtra("singleFileName");
-			finish();
-		};
-	}
+                }
+                else if(response.code() == 401) {
+
+                    AlertDialogs.authorizationTokenRevokedDialog(getApplicationContext(), getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else if(response.code() == 403) {
+
+                    Toasty.info(getApplicationContext(), getApplicationContext().getString(R.string.authorizeError));
+
+                }
+                else if(response.code() == 404) {
+
+                    Toasty.info(getApplicationContext(), getApplicationContext().getString(R.string.apiNotFound));
+
+                }
+                else {
+
+                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                getIntent().removeExtra("singleFileName");
+                finish();
+            }
+        };
+    }


 }
--- a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
@ -1,14 +1,14 @@
 package org.mian.gitnex.activities;

 import android.content.Context;
-import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.BitmapFactory;
 import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
-import android.text.Spanned;
+import android.os.Environment;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Base64;
 import android.util.Log;
@ -22,45 +22,29 @@ 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.Collection;
-import java.util.Collections;
 import java.util.Objects;
-import io.noties.markwon.AbstractMarkwonPlugin;
-import io.noties.markwon.Markwon;
-import io.noties.markwon.core.CorePlugin;
-import io.noties.markwon.core.MarkwonTheme;
-import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
-import io.noties.markwon.ext.tables.TablePlugin;
-import io.noties.markwon.ext.tasklist.TaskListPlugin;
-import io.noties.markwon.html.HtmlPlugin;
-import io.noties.markwon.image.DefaultMediaDecoder;
-import io.noties.markwon.image.ImageItem;
-import io.noties.markwon.image.ImagesPlugin;
-import io.noties.markwon.image.SchemeHandler;
-import io.noties.markwon.image.gif.GifMediaDecoder;
-import io.noties.markwon.image.svg.SvgMediaDecoder;
-import io.noties.markwon.linkify.LinkifyPlugin;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -76,17 +60,13 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 	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 String singleFileName;
-	private String fileSha;
-	private AppUtil appUtil;
-	private TinyDB tinyDb;
+	private static final int PERMISSION_REQUEST_CODE = 1;

 	@Override
 	protected int getLayoutResourceId() {
@ -98,15 +78,11 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);
-		appCtx = getApplicationContext();
-		appUtil = new AppUtil();
-		tinyDb = new TinyDB(appCtx);
-
 		Toolbar toolbar = findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);

+		final TinyDB tinyDb = new TinyDB(getApplicationContext());
 		String repoFullName = tinyDb.getString("repoFullName");
-		String repoBranch = tinyDb.getString("repoBranch");
 		String[] parts = repoFullName.split("/");
 		final String repoOwner = parts[0];
 		final String repoName = parts[1];
@ -114,8 +90,6 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		final String loginUid = tinyDb.getString("loginUid");
 		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

-		tinyDb.putBoolean("enableMarkdownInFileView", false);
-
 		ImageView closeActivity = findViewById(R.id.close);
 		singleFileContents = findViewById(R.id.singleFileContents);
 		singleCodeContents = findViewById(R.id.singleCodeContents);
@ -125,7 +99,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		pdfViewFrame = findViewById(R.id.pdfViewFrame);
 		singleFileContentsFrame = findViewById(R.id.singleFileContentsFrame);

-		singleFileName = getIntent().getStringExtra("singleFileName");
+		String singleFileName = getIntent().getStringExtra("singleFileName");

 		TextView toolbar_title = findViewById(R.id.toolbar_title);
 		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
@ -144,40 +118,22 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		}
 		catch(UnsupportedEncodingException e) {

+			assert singleFileName != null;
 			Log.i("singleFileName", singleFileName);

 		}

 		toolbar_title.setText(singleFileName);

-		getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName, repoBranch);
+		getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName);

 	}

-	@Override
-	public void onResume() {
+	private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename) {

-		super.onResume();
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());

-		String repoFullName = tinyDb.getString("repoFullName");
-		String repoBranch = tinyDb.getString("repoBranch");
-		String[] parts = repoFullName.split("/");
-		String repoOwner = parts[0];
-		String repoName = parts[1];
-		String instanceUrl = tinyDb.getString("instanceUrl");
-		String loginUid = tinyDb.getString("loginUid");
-		String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-
-		if(tinyDb.getBoolean("fileModified")) {
-			getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName, repoBranch);
-			tinyDb.putBoolean("fileModified", false);
-		}
-	}
-
-
-	private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename, String ref) {
-
-		Call<Files> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getSingleFileContents(token, owner, repo, filename, ref);
+		Call<Files> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getSingleFileContents(token, owner, repo, filename);

 		call.enqueue(new Callback<Files>() {

@ -186,6 +142,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie

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

+					AppUtil appUtil = new AppUtil();
 					assert response.body() != null;

 					if(!response.body().getContent().equals("")) {
@ -193,8 +150,6 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 						String fileExtension = FileUtils.getExtension(filename);
 						mProgressBar.setVisibility(View.GONE);

-						fileSha = response.body().getSha();
-
 						// download file meta
 						tinyDb.putString("downloadFileName", filename);
 						tinyDb.putString("downloadFileContents", response.body().getContent());
@ -238,6 +193,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 									singleCodeContents.setTheme(Theme.MONOKAI_SUBLIME);
 							}

+							singleCodeContents.setShowLineNumbers(true);
 							singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));

 						}
@ -291,17 +247,17 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 				}
 				else if(response.code() == 403) {

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

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

-					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+					Toasty.info(ctx, ctx.getString(R.string.apiNotFound));

 				}
 				else {

-					Toasty.error(ctx, getString(R.string.labelGeneralError));
+					Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));

 				}

@ -321,13 +277,6 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie

 		MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
-		inflater.inflate(R.menu.files_view_menu, menu);
-
-		String fileExtension = FileUtils.getExtension(singleFileName);
-		if(!fileExtension.equalsIgnoreCase("md")) {
-			menu.getItem(0).setVisible(false);
-		}
-
 		return true;
 	}

@ -338,82 +287,11 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie

 		switch(id) {
 			case android.R.id.home:
-
 				finish();
 				return true;
 			case R.id.genericMenu:
-
 				BottomSheetFileViewerFragment bottomSheet = new BottomSheetFileViewerFragment();
 				bottomSheet.show(getSupportFragmentManager(), "fileViewerBottomSheet");
-				return true;
-			case R.id.markdown:
-
-				final Markwon markwon = Markwon.builder(Objects.requireNonNull(ctx)).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 = ctx.getResources().getIdentifier(
-									raw.substring("drawable://".length()),
-									"drawable",
-									ctx.getPackageName());
-
-								final Drawable drawable = ctx.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(ctx.getResources()));
-						plugin.addMediaDecoder(SvgMediaDecoder.create());
-						plugin.defaultMediaDecoder(DefaultMediaDecoder.create(ctx.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(getResources().getColor(R.color.lightBlue));
-						}
-					})
-					.usePlugin(TablePlugin.create(ctx))
-					.usePlugin(TaskListPlugin.create(ctx))
-					.usePlugin(HtmlPlugin.create())
-					.usePlugin(StrikethroughPlugin.create())
-					.usePlugin(LinkifyPlugin.create())
-					.build();
-
-				if(!tinyDb.getBoolean("enableMarkdownInFileView")) {
-
-					singleCodeContents.setVisibility(View.GONE);
-					singleFileContentsFrame.setVisibility(View.VISIBLE);
-					singleFileContents.setVisibility(View.VISIBLE);
-					Spanned bodyWithMD = markwon.toMarkdown(appUtil.decodeBase64(tinyDb.getString("downloadFileContents")));
-					markwon.setParsedMarkdown(singleFileContents, bodyWithMD);
-					tinyDb.putBoolean("enableMarkdownInFileView", true);
-				}
-				else {
-
-					singleCodeContents.setVisibility(View.VISIBLE);
-					singleFileContentsFrame.setVisibility(View.GONE);
-					singleFileContents.setVisibility(View.GONE);
-					singleCodeContents.setSource(appUtil.decodeBase64(tinyDb.getString("downloadFileContents")));
-					tinyDb.putBoolean("enableMarkdownInFileView", false);
-				}
-
 				return true;
 			default:
 				return super.onOptionsItemSelected(item);
@ -424,113 +302,95 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 	@Override
 	public void onButtonClicked(String text) {

-		if("downloadFile".equals(text)) {
+		switch(text) {
+			case "downloadFile":

-			requestFileDownload();
-		}
+				if(Build.VERSION.SDK_INT >= 23) {
+					if(checkPermission()) {
+						requestFileDownload();
+					}
+					else {
+						requestPermission();
+					}
+				}
+				else {
+					requestFileDownload();
+				}
+				break;

-		if("deleteFile".equals(text)) {
-
-			String fileExtension = FileUtils.getExtension(singleFileName);
-			String data = appUtil.decodeBase64(tinyDb.getString("downloadFileContents"));
-			Intent intent = new Intent(ctx, CreateFileActivity.class);
-			intent.putExtra("fileAction", 1);
-			intent.putExtra("filePath", singleFileName);
-			intent.putExtra("fileSha", fileSha);
-			if(!appUtil.imageExtension(fileExtension)) {
-				intent.putExtra("fileContents", data);
-			}
-			else {
-				intent.putExtra("fileContents", "");
-			}
-
-			ctx.startActivity(intent);
-		}
-
-		if("editFile".equals(text)) {
-
-			String fileExtension = FileUtils.getExtension(singleFileName);
-			String data = appUtil.decodeBase64(tinyDb.getString("downloadFileContents"));
-			Intent intent = new Intent(ctx, CreateFileActivity.class);
-			intent.putExtra("fileAction", 2);
-			intent.putExtra("filePath", singleFileName);
-			intent.putExtra("fileSha", fileSha);
-			if(!appUtil.imageExtension(fileExtension)) {
-				intent.putExtra("fileContents", data);
-			}
-			else {
-				intent.putExtra("fileContents", "");
-			}
-
-			ctx.startActivity(intent);
 		}

 	}

 	private void requestFileDownload() {

+		final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
 		if(!tinyDb.getString("downloadFileContents").isEmpty()) {

-			int CREATE_REQUEST_CODE = 40;
-
 			File outputFileName = new File(tinyDb.getString("downloadFileName"));
+			final File downloadFilePath = new File(Environment.getExternalStorageDirectory().getPath() + "/Download/" + outputFileName.getName());

-			Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
-
-			intent.addCategory(Intent.CATEGORY_OPENABLE);
-			intent.setType("*/*");
-			intent.putExtra(Intent.EXTRA_TITLE, outputFileName.getName());
-
-			startActivityForResult(intent, CREATE_REQUEST_CODE);
-
-		}
-		else {
-
-			Toasty.warning(ctx, getString(R.string.waitLoadingDownloadFile));
-		}
-
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-
-		super.onActivityResult(requestCode, resultCode, data);
-
-		if(requestCode == 40 && resultCode == RESULT_OK) {
+			byte[] pdfAsBytes = Base64.decode(tinyDb.getString("downloadFileContents"), 0);
+			FileOutputStream fileOutputStream = null;

 			try {

-				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.success(ctx, getString(R.string.downloadFileSaved));
+				fileOutputStream = new FileOutputStream(downloadFilePath, false);
+				Objects.requireNonNull(fileOutputStream).write(pdfAsBytes);
+				fileOutputStream.flush();
+				fileOutputStream.close();
+				Toasty.info(getApplicationContext(), getString(R.string.downloadFileSaved));

 			}
 			catch(IOException e) {
-
 				Log.e("errorFileDownloading", Objects.requireNonNull(e.getMessage()));
 			}

 		}
+		else {
+			Toasty.error(getApplicationContext(), getString(R.string.waitLoadingDownloadFile));
+		}

 	}

+	private boolean checkPermission() {
+
+		int result = ContextCompat.checkSelfPermission(this, android.Manifest.permission.WRITE_EXTERNAL_STORAGE);
+		return result == PackageManager.PERMISSION_GRANTED;
+	}
+
+	private void requestPermission() {
+
+		ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.WRITE_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
+	}
+
+	@Override
+	public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+
+		switch(requestCode) {
+			case PERMISSION_REQUEST_CODE:
+				if(grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+					Log.i("PermissionsCheck", "Permission Granted");
+				}
+				else {
+					Log.e("PermissionsCheck", "Permission Denied");
+				}
+				break;
+		}
+	}
+
 	private void initCloseListener() {

-		onClickListener = view -> {
+		onClickListener = new View.OnClickListener() {

-			getIntent().removeExtra("singleFileName");
-			finish();
+			@Override
+			public void onClick(View view) {
+
+				getIntent().removeExtra("singleFileName");
+				finish();
+			}
 		};
 	}

-}
+}
--- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
--- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
--- a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
@ -2,28 +2,33 @@ 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.Version;
+import org.mian.gitnex.helpers.VersionCheck;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.MergePullRequest;
 import org.mian.gitnex.models.MergePullRequestSpinner;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
 import okhttp3.ResponseBody;
@ -37,12 +42,16 @@ import retrofit2.Response;

 public class MergePullRequestActivity extends BaseActivity {

+	public ImageView closeActivity;
 	private View.OnClickListener onClickListener;
-	final Context ctx = this;
-	private Context appCtx;
-	private ActivityMergePullRequestBinding viewBinding;

+	final Context ctx = this;
+
+	private SocialAutoCompleteTextView mergeDescription;
+	private EditText mergeTitle;
+	private Spinner mergeModeSpinner;
 	private ArrayAdapter<Mention> defaultMentionAdapter;
+	private Button mergeButton;
 	private String Do;

 	@Override
@ -56,24 +65,23 @@ public class MergePullRequestActivity extends BaseActivity {
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);
-		appCtx = getApplicationContext();

-		viewBinding = ActivityMergePullRequestBinding.inflate(getLayoutInflater());
-		View view = viewBinding.getRoot();
-		setContentView(view);
-
-		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-		TinyDB tinyDb = new TinyDB(appCtx);
+		boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+		TinyDB tinyDb = new TinyDB(getApplicationContext());

 		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

-		viewBinding.mergeTitle.requestFocus();
+		mergeModeSpinner = findViewById(R.id.mergeSpinner);
+		mergeDescription = findViewById(R.id.mergeDescription);
+		mergeTitle = findViewById(R.id.mergeTitle);
+
+		mergeTitle.requestFocus();
 		assert imm != null;
-		imm.showSoftInput(viewBinding.mergeTitle, InputMethodManager.SHOW_IMPLICIT);
+		imm.showSoftInput(mergeTitle, InputMethodManager.SHOW_IMPLICIT);

 		setMergeAdapter();

-		viewBinding.mergeSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+		mergeModeSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {

 			@Override
 			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@ -93,70 +101,57 @@ public class MergePullRequestActivity extends BaseActivity {
 		defaultMentionAdapter = new MentionArrayAdapter<>(this);
 		loadCollaboratorsList();

-		viewBinding.mergeDescription.setMentionAdapter(defaultMentionAdapter);
+		mergeDescription.setMentionAdapter(defaultMentionAdapter);
+
+		closeActivity = findViewById(R.id.close);
+		TextView toolbar_title = findViewById(R.id.toolbar_title);

 		if(!tinyDb.getString("issueTitle").isEmpty()) {
-			viewBinding.toolbarTitle.setText(tinyDb.getString("issueTitle"));
-			viewBinding.mergeTitle.setText(tinyDb.getString("issueTitle") + " (#" + tinyDb.getString("issueNumber") + ")");
+			toolbar_title.setText(tinyDb.getString("issueTitle"));
+			mergeTitle.setText(tinyDb.getString("issueTitle") + " (#" + tinyDb.getString("issueNumber")+ ")");
 		}

 		initCloseListener();
-		viewBinding.close.setOnClickListener(onClickListener);
+		closeActivity.setOnClickListener(onClickListener);

-		// if gitea version is greater/equal(1.12.0) than user installed version (installed.higherOrEqual(compareVer))
-		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);
-		}
+		mergeButton = findViewById(R.id.mergeButton);

 		if(!connToInternet) {

 			disableProcessButton();
+
 		}
 		else {

-			viewBinding.mergeButton.setOnClickListener(mergePullRequest);
+			mergeButton.setOnClickListener(mergePullRequest);
+
 		}

 	}

 	private void setMergeAdapter() {

-		TinyDB tinyDb = new TinyDB(appCtx);
+		TinyDB tinyDb = new TinyDB(getApplicationContext());

 		ArrayList<MergePullRequestSpinner> mergeList = new ArrayList<>();

 		mergeList.add(new MergePullRequestSpinner("merge", getResources().getString(R.string.mergeOptionMerge)));
 		mergeList.add(new MergePullRequestSpinner("rebase", getResources().getString(R.string.mergeOptionRebase)));
 		mergeList.add(new MergePullRequestSpinner("rebase-merge", getResources().getString(R.string.mergeOptionRebaseCommit)));
-		// squash merge works only on gitea > v1.11.4 due to a bug
-		if(new Version(tinyDb.getString("giteaVersion")).higher("1.11.4")) {
+		//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) {
 			mergeList.add(new MergePullRequestSpinner("squash", getResources().getString(R.string.mergeOptionSquash)));
 		}

-		ArrayAdapter<MergePullRequestSpinner> adapter = new ArrayAdapter<>(MergePullRequestActivity.this, R.layout.spinner_item, mergeList);
+		ArrayAdapter<MergePullRequestSpinner> adapter = new ArrayAdapter<>(ctx, R.layout.spinner_item, mergeList);
 		adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
-		viewBinding.mergeSpinner.setAdapter(adapter);
+		mergeModeSpinner.setAdapter(adapter);

 	}

 	public void loadCollaboratorsList() {

-		final TinyDB tinyDb = new TinyDB(appCtx);
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());

 		final String instanceUrl = tinyDb.getString("instanceUrl");
 		final String loginUid = tinyDb.getString("loginUid");
@ -166,7 +161,7 @@ public class MergePullRequestActivity extends BaseActivity {
 		final String repoOwner = parts[0];
 		final String repoName = parts[1];

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

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

@ -211,27 +206,26 @@ public class MergePullRequestActivity extends BaseActivity {

 	private void processMergePullRequest() {

-		String mergePRDesc = viewBinding.mergeDescription.getText().toString();
-		String mergePRTitle = viewBinding.mergeTitle.getText().toString();
-		boolean deleteBranch = viewBinding.deleteBranch.isChecked();
+		String mergePRDesc = mergeDescription.getText().toString();
+		String mergePRTitle = mergeTitle.getText().toString();

-		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+		boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

 		if(!connToInternet) {

-			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+			Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
 			return;

 		}

 		disableProcessButton();
-		mergeFunction(Do, mergePRDesc, mergePRTitle, deleteBranch);
+		mergeFunction(Do, mergePRDesc, mergePRTitle);

 	}

-	private void mergeFunction(String Do, String mergePRDT, String mergeTitle, boolean deleteBranch) {
+	private void mergeFunction(String Do, String mergePRDT, String mergeTitle) {

-		final TinyDB tinyDb = new TinyDB(appCtx);
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());

 		final String instanceUrl = tinyDb.getString("instanceUrl");
 		final String loginUid = tinyDb.getString("loginUid");
@ -244,7 +238,7 @@ public class MergePullRequestActivity extends BaseActivity {

 		MergePullRequest mergePR = new MergePullRequest(Do, mergePRDT, mergeTitle);

-		Call<ResponseBody> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().mergePullRequest(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, prIndex, mergePR);
+		Call<ResponseBody> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().mergePullRequest(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, prIndex, mergePR);

 		call.enqueue(new Callback<ResponseBody>() {

@ -253,48 +247,10 @@ public class MergePullRequestActivity extends BaseActivity {

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

-					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.success(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.success(ctx, getString(R.string.mergePRSuccessMsg));
-							tinyDb.putBoolean("prMerged", true);
-							tinyDb.putBoolean("resumePullRequests", true);
-							finish();
-
-						}
-
-					}
-					else {
-
-						Toasty.success(ctx, getString(R.string.mergePRSuccessMsg));
-						tinyDb.putBoolean("prMerged", true);
-						tinyDb.putBoolean("resumePullRequests", true);
-						finish();
-
-					}
+					Toasty.info(getApplicationContext(), getString(R.string.mergePRSuccessMsg));
+					tinyDb.putBoolean("prMerged", true);
+					tinyDb.putBoolean("resumePullRequests", true);
+					finish();

 				}
 				else if(response.code() == 401) {
@ -306,13 +262,13 @@ public class MergePullRequestActivity extends BaseActivity {
 				else if(response.code() == 404) {

 					enableProcessButton();
-					Toasty.warning(ctx, getString(R.string.mergePR404ErrorMsg));
+					Toasty.info(getApplicationContext(), getString(R.string.mergePR404ErrorMsg));

 				}
 				else {

 					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.genericError));
+					Toasty.info(getApplicationContext(), getString(R.string.genericError));

 				}

@ -329,53 +285,24 @@ public class MergePullRequestActivity extends BaseActivity {

 	}

-	private void deleteBranchFunction(String repoOwner, String repoName) {
-
-		TinyDB tinyDb = new TinyDB(appCtx);
-
-		String instanceUrl = tinyDb.getString("instanceUrl");
-		String loginUid = tinyDb.getString("loginUid");
-		String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-		String branchName = tinyDb.getString("prHeadBranch");
-
-		Call<JsonElement> call = RetrofitClient
-				.getInstance(instanceUrl, ctx)
-				.getApiInterface()
-				.deleteBranch(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				if(response.code() == 204) {
-
-					Log.i("deleteBranch", "Branch deleted successfully");
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-
-			}
-
-		});
-
-	}
-
 	private void disableProcessButton() {

-		viewBinding.mergeButton.setEnabled(false);
+		mergeButton.setEnabled(false);
+		GradientDrawable shape = new GradientDrawable();
+		shape.setCornerRadius(8);
+		shape.setColor(getResources().getColor(R.color.hintColor));
+		mergeButton.setBackground(shape);
+
 	}

 	private void enableProcessButton() {

-		viewBinding.mergeButton.setEnabled(true);
+		mergeButton.setEnabled(true);
+		GradientDrawable shape = new GradientDrawable();
+		shape.setCornerRadius(8);
+		shape.setColor(getResources().getColor(R.color.btnBackground));
+		mergeButton.setBackground(shape);
+
 	}

 }
--- a/app/src/main/java/org/mian/gitnex/activities/OpenRepoInBrowserActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OpenRepoInBrowserActivity.java
@ -1,17 +1,10 @@
 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.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;
+import org.mian.gitnex.util.TinyDB;

 /**
 * Author M M Arif
@ -19,35 +12,23 @@ import io.mikael.urlbuilder.UrlBuilder;

 public class OpenRepoInBrowserActivity extends AppCompatActivity {

-    private Context appCtx;

    @Override
    protected void onCreate(Bundle savedInstanceState) {

-	    super.onCreate(savedInstanceState);
-	    appCtx = getApplicationContext();
-	    TinyDB tinyDb = new TinyDB(appCtx);
+        super.onCreate(savedInstanceState);

-	    try {
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        String instanceUrlWithProtocol = "https://" + tinyDb.getString("instanceUrlRaw");
+        if (!tinyDb.getString("instanceUrlWithProtocol").isEmpty()) {
+            instanceUrlWithProtocol = tinyDb.getString("instanceUrlWithProtocol");
+        }

-		    URI instanceUrl = new URI(UrlBuilder.fromString(tinyDb.getString("instanceUrl"))
-			    .withPath("/")
-			    .toString());
-
-		    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));
-	    }
+        String repoFullNameBrowser = getIntent().getStringExtra("repoFullNameBrowser");
+        Uri url = Uri.parse(instanceUrlWithProtocol + "/" + repoFullNameBrowser);
+        Intent i = new Intent(Intent.ACTION_VIEW, url);
+        startActivity(i);
+        finish();

    }

--- a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java
@ -1,8 +1,12 @@
 package org.mian.gitnex.activities;

-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
+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.Intent;
 import android.graphics.Typeface;
 import android.os.Bundle;
@ -12,23 +16,14 @@ 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.BottomSheetOrganizationFragment;
 import org.mian.gitnex.fragments.MembersByOrgFragment;
+import org.mian.gitnex.fragments.BottomSheetOrganizationFragment;
 import org.mian.gitnex.fragments.OrganizationInfoFragment;
 import org.mian.gitnex.fragments.RepositoriesByOrgFragment;
 import org.mian.gitnex.fragments.TeamsByOrgFragment;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.util.TinyDB;
 import java.util.Objects;
-import io.mikael.urlbuilder.UrlBuilder;

 /**
 * Author M M Arif
@ -36,10 +31,6 @@ import io.mikael.urlbuilder.UrlBuilder;

 public class OrganizationDetailActivity extends BaseActivity implements BottomSheetOrganizationFragment.BottomSheetListener {

-    final Context ctx = this;
-    private Context appCtx;
-	private TinyDB tinyDb;
-
    @Override
    protected int getLayoutResourceId(){
        return R.layout.activity_org_detail;
@ -47,12 +38,9 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh

    @Override
    public void onCreate(Bundle savedInstanceState) {
-
        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
-	    tinyDb = new TinyDB(appCtx);

-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        String orgName = tinyDb.getString("orgName");

        Toolbar toolbar = findViewById(R.id.toolbar);
@ -74,15 +62,15 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
        switch(tinyDb.getInt("customFontId", -1)) {

            case 0:
-                myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf");
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/roboto.ttf");
                break;

            case 2:
-                myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf");
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/sourcecodeproregular.ttf");
                break;

            default:
-                myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/manroperegular.ttf");
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/manroperegular.ttf");
                break;

        }
@ -111,7 +99,6 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh

    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
-
        MenuInflater inflater = getMenuInflater();
        inflater.inflate(R.menu.repo_dotted_menu, menu);
        return true;
@ -139,28 +126,19 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
    @Override
    public void onButtonClicked(String text) {

+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+
        switch (text) {
            case "repository":
-
                tinyDb.putBoolean("organizationAction", true);
                startActivity(new Intent(OrganizationDetailActivity.this, CreateRepoActivity.class));
                break;
            case "team":
-
                startActivity(new Intent(OrganizationDetailActivity.this, CreateTeamByOrgActivity.class));
                break;
-	        case "copyOrgUrl":
-
-		        String url = UrlBuilder.fromString(tinyDb.getString("instanceUrl"))
-			        .withPath("/")
-			        .toString();
-		        ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
-		        ClipData clip = ClipData.newPlainText("orgUrl", url + tinyDb.getString("orgName"));
-		        assert clipboard != null;
-		        clipboard.setPrimaryClip(clip);
-		        Toasty.info(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
-		        break;
        }
+        //Log.i("clicked", text);
+
    }

    public class SectionsPagerAdapter extends FragmentPagerAdapter {
@ -173,6 +151,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
        @Override
        public Fragment getItem(int position) {

+            TinyDB tinyDb = new TinyDB(getApplicationContext());
            String orgName;
            if(getIntent().getStringExtra("orgName") != null || !Objects.equals(getIntent().getStringExtra("orgName"), "")) {
                orgName = getIntent().getStringExtra("orgName");
--- a/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamMembersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamMembersActivity.java
@ -1,42 +1,32 @@
 package org.mian.gitnex.activities;

-import android.content.Context;
-import android.content.Intent;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
 import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.GridView;
 import android.widget.ImageView;
-import android.widget.ProgressBar;
 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.helpers.TinyDB;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.viewmodels.TeamMembersByOrgViewModel;
+import java.util.List;
 import java.util.Objects;

 /**
 * Author M M Arif
 */

-public class OrganizationTeamMembersActivity extends BaseActivity implements BottomSheetOrganizationTeamsFragment.BottomSheetListener {
+public class OrganizationTeamMembersActivity extends BaseActivity {

    private TextView noDataMembers;
    private View.OnClickListener onClickListener;
    private TeamMembersByOrgAdapter adapter;
    private GridView mGridView;
-	private ProgressBar progressBar;
-
-    final Context ctx = this;
-    private Context appCtx;
-
-    private String teamId;

    @Override
    protected int getLayoutResourceId(){
@ -45,13 +35,9 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot

    @Override
    public void onCreate(Bundle savedInstanceState) {
-
        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);

-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@ -60,7 +46,6 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
        TextView toolbarTitle = findViewById(R.id.toolbar_title);
        noDataMembers = findViewById(R.id.noDataMembers);
        mGridView = findViewById(R.id.gridView);
-	    progressBar = findViewById(R.id.progressBar);

        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);
@ -72,6 +57,7 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
            toolbarTitle.setText(R.string.orgTeamMembers);
        }

+        String teamId;
        if(getIntent().getStringExtra("teamId") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamId")).equals("")){
            teamId = getIntent().getStringExtra("teamId");
        }
@ -79,24 +65,11 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
            teamId = "0";
        }

+        getIntent().getStringExtra("teamId");
+        //Log.i("teamId", getIntent().getStringExtra("teamId"));
+
        assert teamId != null;
-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), Integer.parseInt(teamId));
-
-    }
-
-    @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);
-        }
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), Integer.valueOf(teamId));

    }

@ -104,66 +77,30 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot

        TeamMembersByOrgViewModel teamMembersModel = new ViewModelProvider(this).get(TeamMembersByOrgViewModel.class);

-        teamMembersModel.getMembersByOrgList(instanceUrl, instanceToken, teamId, ctx).observe(this, teamMembersListMain -> {
-
-            adapter = new TeamMembersByOrgAdapter(ctx, teamMembersListMain);
-            if(adapter.getCount() > 0) {
-                mGridView.setAdapter(adapter);
-                noDataMembers.setVisibility(View.GONE);
+        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);
+                }
            }
-            else {
-                adapter.notifyDataSetChanged();
-                mGridView.setAdapter(adapter);
-                noDataMembers.setVisibility(View.VISIBLE);
-            }
-
-	        progressBar.setVisibility(View.GONE);
        });

    }

-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
-        return true;
-
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-
-        int id = item.getItemId();
-
-        switch(id) {
-            case android.R.id.home:
-                finish();
-                return true;
-            case R.id.genericMenu:
-                BottomSheetOrganizationTeamsFragment bottomSheet = new BottomSheetOrganizationTeamsFragment();
-                bottomSheet.show(getSupportFragmentManager(), "orgTeamsBottomSheet");
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-
-    }
-
-    @Override
-    public void onButtonClicked(String text) {
-
-        TinyDB tinyDb = new TinyDB(appCtx);
-
-        if("newMember".equals(text)) {
-            Intent intent = new Intent(OrganizationTeamMembersActivity.this, AddNewTeamMemberActivity.class);
-            intent.putExtra("teamId", teamId);
-            startActivity(intent);
-        }
-
-    }
-
    private void initCloseListener() {
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }
 }
--- a/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java
@ -1,6 +1,10 @@
 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;
 import android.util.Log;
 import android.util.Patterns;
@ -9,21 +13,18 @@ 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
@ -34,7 +35,6 @@ public class ProfileEmailActivity extends BaseActivity {
    private View.OnClickListener onClickListener;
    private EditText userEmail;
    final Context ctx = this;
-    private Context appCtx;
    private Button addEmailButton;

    @Override
@ -44,11 +44,9 @@ public class ProfileEmailActivity extends BaseActivity {

    @Override
    public void onCreate(Bundle savedInstanceState) {
-
        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

@ -66,9 +64,11 @@ public class ProfileEmailActivity extends BaseActivity {
        if(!connToInternet) {

            disableProcessButton();
+
        } else {

            addEmailButton.setOnClickListener(addEmailListener);
+
        }

    }
@ -81,8 +81,8 @@ public class ProfileEmailActivity extends BaseActivity {

    private void processAddNewEmail() {

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-        TinyDB tinyDb = new TinyDB(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        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");
@ -91,20 +91,20 @@ public class ProfileEmailActivity extends BaseActivity {

        if(!connToInternet) {

-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
            return;

        }

        if(newUserEmail.equals("")) {

-            Toasty.error(ctx, getString(R.string.emailErrorEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.emailErrorEmpty));
            return;

        }
        else if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {

-            Toasty.warning(ctx, getString(R.string.emailErrorInvalid));
+            Toasty.info(getApplicationContext(), getString(R.string.emailErrorInvalid));
            return;

        }
@ -112,19 +112,19 @@ public class ProfileEmailActivity extends BaseActivity {
        List<String> newEmailList = new ArrayList<>(Arrays.asList(newUserEmail.split(",")));

        disableProcessButton();
-        addNewEmail(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newEmailList);
+        addNewEmail(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), newEmailList);

    }

    private void addNewEmail(final String instanceUrl, final String token, List<String> newUserEmail) {

        AddEmail addEmailFunc = new AddEmail(newUserEmail);
-        final TinyDB tinyDb = new TinyDB(appCtx);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());

        Call<JsonElement> call;

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

@ -135,7 +135,7 @@ public class ProfileEmailActivity extends BaseActivity {

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

-                    Toasty.success(ctx, getString(R.string.emailAddedText));
+                    Toasty.info(getApplicationContext(), getString(R.string.emailAddedText));
                    tinyDb.putBoolean("emailsRefresh", true);
                    enableProcessButton();
                    finish();
@ -153,25 +153,25 @@ public class ProfileEmailActivity extends BaseActivity {
                else if(response.code() == 403) {

                    enableProcessButton();
-                    Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+                    Toasty.info(ctx, ctx.getString(R.string.authorizeError));

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

                    enableProcessButton();
-                    Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));

                }
                else if(response.code() == 422) {

                    enableProcessButton();
-                    Toasty.warning(ctx, ctx.getString(R.string.emailErrorInUse));
+                    Toasty.info(ctx, ctx.getString(R.string.emailErrorInUse));

                }
                else {

                    enableProcessButton();
-                    Toasty.error(ctx, getString(R.string.labelGeneralError));
+                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));

                }

@ -187,18 +187,32 @@ public class ProfileEmailActivity extends BaseActivity {
    }

    private void initCloseListener() {
-
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }

    private void disableProcessButton() {

        addEmailButton.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        addEmailButton.setBackground(shape);
+
    }

    private void enableProcessButton() {

        addEmailButton.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        addEmailButton.setBackground(shape);
+
    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
@ -1,42 +1,33 @@
 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 java.util.Objects;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;

 /**
 * Author M M Arif
@ -44,388 +35,256 @@ import retrofit2.Response;

 public class ReplyToIssueActivity extends BaseActivity {

-	public ImageView closeActivity;
-	private View.OnClickListener onClickListener;
+    public ImageView closeActivity;
+    private View.OnClickListener onClickListener;

-	final Context ctx = this;
-	private Context appCtx;
+    final Context ctx = this;

-	private TextView draftSaved;
-	private SocialAutoCompleteTextView addComment;
-	private ArrayAdapter<Mention> defaultMentionAdapter;
-	private Button replyButton;
-	private String TAG = StaticGlobalVariables.replyToIssueActivity;
-	private long draftIdOnCreate;
+    private SocialAutoCompleteTextView addComment;
+    private ArrayAdapter<Mention> defaultMentionAdapter;
+    private Button replyButton;

-	@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);
-		appCtx = getApplicationContext();
-		Toolbar toolbar = findViewById(R.id.toolbar);
-		setSupportActionBar(toolbar);
+        super.onCreate(savedInstanceState);

-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-        TinyDB tinyDb = new TinyDB(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(getApplicationContext());

-		draftSaved = findViewById(R.id.draftSaved);
-		addComment = findViewById(R.id.addComment);
-		addComment.setShowSoftInputOnFocus(true);
+        addComment = findViewById(R.id.addComment);
+        addComment.setShowSoftInputOnFocus(true);

-        defaultMentionAdapter = new MentionArrayAdapter<>(ctx);
-		loadCollaboratorsList();
+        defaultMentionAdapter = new MentionArrayAdapter<>(this);
+        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);

-		if(getIntent().getStringExtra("draftId") != null) {
+        replyButton = findViewById(R.id.replyButton);

-			draftIdOnCreate = Long.parseLong(Objects.requireNonNull(getIntent().getStringExtra("draftId")));
-		}
-		else {
+        if(getIntent().getStringExtra("commentAction") != null && getIntent().getStringExtra("commentAction").equals("edit")) {

-			if(getIntent().getStringExtra("commentBody") != null) {
-				draftIdOnCreate = returnDraftId(getIntent().getStringExtra("commentBody"));
-			}
-			else {
-				draftIdOnCreate = returnDraftId("");
-			}
-		}
+            addComment.setText(getIntent().getStringExtra("commentBody"));
+            final String commentId = getIntent().getStringExtra("commentId");

-		replyButton = findViewById(R.id.replyButton);
+            toolbar_title.setText(getResources().getString(R.string.editCommentTitle));
+            replyButton.setText(getResources().getString(R.string.editCommentButtonText));

-		if(getIntent().getStringExtra("commentBody") != null) {
+            replyButton.setOnClickListener(new View.OnClickListener() {
+                public void onClick(View v) {
+                    disableProcessButton();
+                    IssueActions.editIssueComment(ctx, Integer.valueOf(commentId), addComment.getText().toString());
+                }

-			addComment.setText(getIntent().getStringExtra("commentBody"));
+            });

-			if(getIntent().getBooleanExtra("cursorToEnd", false)) {
-				addComment.setSelection(addComment.length());
-			}
+            return;

-		}
+        }

-		if(getIntent().getStringExtra("draftTitle") != null) {
+        if(!connToInternet) {

-			toolbar_title.setText(getIntent().getStringExtra("draftTitle"));
+            disableProcessButton();

-		}
+        } else {

-		if(getIntent().getStringExtra("commentAction") != null && Objects.equals(getIntent().getStringExtra("commentAction"), "edit") && !Objects.equals(getIntent().getStringExtra("commentId"), "new")) {
+            replyButton.setOnClickListener(replyToIssue);

-			final String commentId = getIntent().getStringExtra("commentId");
+        }

-			toolbar_title.setText(getResources().getString(R.string.editCommentTitle));
-			replyButton.setText(getResources().getString(R.string.editCommentButtonText));
+    }

-			addComment.addTextChangedListener(new TextWatcher() {
+    public void loadCollaboratorsList() {

-				public void afterTextChanged(Editable s) {
+        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 beforeTextChanged(CharSequence s, int start, int count, int after) {
+        Call<List<Collaborators>> call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);

-				}
+        call.enqueue(new Callback<List<Collaborators>>() {

-				public void onTextChanged(CharSequence s, int start, int before, int count) {
+            @Override
+            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {

-					saveDraft(addComment.getText().toString(), commentId, draftIdOnCreate);
-					draftSaved.setVisibility(View.VISIBLE);
+                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 {

-			replyButton.setOnClickListener(v -> {
+                    Log.i("onResponse", String.valueOf(response.code()));

-				disableProcessButton();
-				assert commentId != null;
-				IssueActions.editIssueComment(ctx, Integer.parseInt(commentId), addComment.getText().toString(), draftIdOnCreate);
+                }

-			});
+            }

-			return;
+            @Override
+            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
+                Log.i("onFailure", t.getMessage());
+            }

-		}
+        });
+    }

-		addComment.addTextChangedListener(new TextWatcher() {
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
+    }

-			public void afterTextChanged(Editable s) {
+    private View.OnClickListener replyToIssue = new View.OnClickListener() {
+        public void onClick(View v) {
+            processNewCommentReply();
+        }
+    };

-			}
+    private void processNewCommentReply() {

-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        String newReplyDT = addComment.getText().toString();
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

-			}
+        if(!connToInternet) {

-			public void onTextChanged(CharSequence s, int start, int before, int count) {
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            return;

-				saveDraft(addComment.getText().toString(), "new", draftIdOnCreate);
-				draftSaved.setVisibility(View.VISIBLE);
+        }

-			}
+        if(newReplyDT.equals("")) {

-		});
+            Toasty.info(getApplicationContext(), getString(R.string.commentEmptyError));

-		if(!connToInternet) {
+        }
+        else {

-			disableProcessButton();
+            disableProcessButton();
+            replyComment(newReplyDT);

-		}
-		else {
+        }

-			replyButton.setOnClickListener(replyToIssue);
+    }

-		}
+    private void replyComment(String newReplyDT) {

-	}
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());

-	private void saveDraft(String draftText, String commentId, long draftIdOnCreate) {
+        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"));

-		TinyDB tinyDb = new TinyDB(getApplicationContext());
+        Issues issueComment = new Issues(newReplyDT);

-		int repositoryId = (int) tinyDb.getLong("repositoryId", 0);
-		int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-		int issueNumber = Integer.parseInt(tinyDb.getString("issueNumber"));
+        Call<Issues> call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .replyCommentToIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, issueComment);

-		DraftsApi draftsApi = new DraftsApi(appCtx);
+        call.enqueue(new Callback<Issues>() {

-		if(draftIdOnCreate == 0) {
+            @Override
+            public void onResponse(@NonNull Call<Issues> call, @NonNull retrofit2.Response<Issues> response) {

-			draftsApi.insertDraft(repositoryId, currentActiveAccountId, issueNumber, draftText, StaticGlobalVariables.draftTypeComment, commentId);
-		}
-		else {
+                if(response.code() == 201) {

-			DraftsApi.updateDraft(draftText, (int) draftIdOnCreate, commentId); //updateDraftByIssueIdAsyncTask(draftText, issueNumber, repositoryId, commentId);
-		}
+                    Toasty.info(getApplicationContext(), getString(R.string.commentSuccess));
+                    tinyDb.putBoolean("commentPosted", true);
+                    tinyDb.putBoolean("resumeIssues", true);
+                    tinyDb.putBoolean("resumePullRequests", true);
+                    finish();

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

-	private long returnDraftId(String draftText) {
+                    enableProcessButton();
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));

-		TinyDB tinyDb = new TinyDB(getApplicationContext());
+                }
+                else {

-		int repositoryId = (int) tinyDb.getLong("repositoryId", 0);
-		int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-		int issueNumber = Integer.parseInt(tinyDb.getString("issueNumber"));
+                    enableProcessButton();
+                    Toasty.info(getApplicationContext(), getString(R.string.commentError));

-		DraftsApi draftsApi = new DraftsApi(appCtx);
+                }

-		return draftsApi.insertDraft(repositoryId, currentActiveAccountId, issueNumber, draftText, StaticGlobalVariables.draftTypeComment, "");
+            }

-	}
+            @Override
+            public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+                enableProcessButton();
+            }
+        });

-	public void loadCollaboratorsList() {
+    }

-		final TinyDB tinyDb = new TinyDB(appCtx);
+    private void disableProcessButton() {

-		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];
+        replyButton.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        replyButton.setBackground(shape);

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

-		call.enqueue(new Callback<List<Collaborators>>() {
+    private void enableProcessButton() {

-			@Override
-			public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
+        replyButton.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        replyButton.setBackground(shape);

-				if (response.isSuccessful()) {
-
-					assert response.body() != null;
-					String fullName = "";
-					for(int i = 0; i < response.body().size(); i++) {
-						if(!response.body().get(i).getFull_name().equals("")) {
-							fullName = response.body().get(i).getFull_name();
-						}
-						defaultMentionAdapter.add(new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
-					}
-
-				}
-				else {
-
-					Log.i(TAG, String.valueOf(response.code()));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-
-				Log.e(TAG, t.toString());
-			}
-
-		});
-	}
-
-	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.error(ctx, getResources().getString(R.string.checkNetConnection));
-			return;
-
-		}
-
-		if(newReplyDT.equals("")) {
-
-			Toasty.error(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.success(ctx, getString(R.string.commentSuccess));
-					tinyDb.putBoolean("commentPosted", true);
-					tinyDb.putBoolean("resumeIssues", true);
-					tinyDb.putBoolean("resumePullRequests", true);
-
-					// delete draft comment
-					if(tinyDb.getBoolean("draftsCommentsDeletionEnabled")) {
-
-						DraftsApi draftsApi = new DraftsApi(appCtx);
-						draftsApi.deleteSingleDraft((int) draftIdOnCreate);
-					}
-
-					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.error(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);
-	}
-
-	private void enableProcessButton() {
-
-		replyButton.setEnabled(true);
-	}
+    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
--- a/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java
@ -1,296 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Handler;
-import android.text.method.ScrollingMovementMethod;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.widget.Toolbar;
-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.RepoForksAdapter;
-import org.mian.gitnex.clients.RetrofitClient;
-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.models.UserRepositories;
-import java.util.ArrayList;
-import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-/**
- * Author M M Arif
- */
-
-public class RepoForksActivity extends BaseActivity {
-
-	final Context ctx = this;
-	private Context appCtx;
-	private View.OnClickListener onClickListener;
-	private TextView noData;
-	private ProgressBar progressBar;
-	private String TAG = "RepositoryForks";
-	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
-	private int pageSize = 1;
-
-	private RecyclerView recyclerView;
-	private List<UserRepositories> forksList;
-	private RepoForksAdapter adapter;
-	private ProgressBar progressLoadMore;
-
-	@Override
-	protected int getLayoutResourceId() {
-
-		return R.layout.activity_forks;
-	}
-
-	@SuppressLint("DefaultLocale")
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		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");
-
-		String repoFullNameForForks = getIntent().getStringExtra("repoFullNameForForks");
-		assert repoFullNameForForks != null;
-		String[] parts = repoFullNameForForks.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(String.format("%s : %s", ctx.getResources().getString(R.string.infoTabRepoForksCount), repoName));
-
-		ImageView closeActivity = findViewById(R.id.close);
-		noData = findViewById(R.id.noData);
-		progressLoadMore = findViewById(R.id.progressLoadMore);
-		progressBar = findViewById(R.id.progress_bar);
-		SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		// if gitea is 1.12 or higher use the new limit (resultLimitNewGiteaInstances)
-		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12")) {
-			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
-		}
-
-		recyclerView = findViewById(R.id.recyclerView);
-		forksList = new ArrayList<>();
-
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(recyclerView.getContext(),
-			DividerItemDecoration.VERTICAL);
-		recyclerView.addItemDecoration(dividerItemDecoration);
-
-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
-
-			swipeRefresh.setRefreshing(false);
-			loadInitial(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, pageSize, resultLimit);
-			adapter.notifyDataChanged();
-
-		}, 200));
-
-		adapter = new RepoForksAdapter(ctx, forksList);
-		adapter.setLoadMoreListener(() -> recyclerView.post(() -> {
-
-			if(forksList.size() == resultLimit || pageSize == resultLimit) {
-
-				int page = (forksList.size() + resultLimit) / resultLimit;
-				loadMore(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, page, resultLimit);
-
-			}
-
-		}));
-
-		recyclerView.setHasFixedSize(true);
-		recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
-		recyclerView.setAdapter(adapter);
-
-		loadInitial(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, pageSize, resultLimit);
-
-	}
-
-	private void loadInitial(String instanceUrl, String instanceToken, String repoOwner, String repoName, int pageSize, int resultLimit) {
-
-		Call<List<UserRepositories>> call = RetrofitClient
-			.getInstance(instanceUrl, ctx)
-			.getApiInterface()
-			.getRepositoryForks(instanceToken, repoOwner, repoName, pageSize, resultLimit);
-
-		call.enqueue(new Callback<List<UserRepositories>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<UserRepositories>> call, @NonNull Response<List<UserRepositories>> response) {
-
-				if(response.isSuccessful()) {
-
-					assert response.body() != null;
-					if(response.body().size() > 0) {
-
-						forksList.clear();
-						forksList.addAll(response.body());
-						adapter.notifyDataChanged();
-						noData.setVisibility(View.GONE);
-
-					}
-					else {
-						forksList.clear();
-						adapter.notifyDataChanged();
-						noData.setVisibility(View.VISIBLE);
-					}
-
-					progressBar.setVisibility(View.GONE);
-
-				}
-				else {
-
-					Log.e(TAG, String.valueOf(response.code()));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<UserRepositories>> call, @NonNull Throwable t) {
-
-				Log.e(TAG, t.toString());
-			}
-
-		});
-
-	}
-
-	private void loadMore(String instanceUrl, String instanceToken, String repoOwner, String repoName, int page, int resultLimit) {
-
-		progressLoadMore.setVisibility(View.VISIBLE);
-
-		Call<List<UserRepositories>> call = RetrofitClient
-			.getInstance(instanceUrl, ctx)
-			.getApiInterface()
-			.getRepositoryForks(instanceToken, repoOwner, repoName, page, resultLimit);
-
-		call.enqueue(new Callback<List<UserRepositories>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<UserRepositories>> call, @NonNull Response<List<UserRepositories>> response) {
-
-				if(response.isSuccessful()) {
-
-					//remove loading view
-					forksList.remove(forksList.size() - 1);
-
-					List<UserRepositories> result = response.body();
-
-					assert result != null;
-					if(result.size() > 0) {
-
-						pageSize = result.size();
-						forksList.addAll(result);
-
-					}
-					else {
-
-						adapter.setMoreDataAvailable(false);
-
-					}
-
-					adapter.notifyDataChanged();
-					progressLoadMore.setVisibility(View.GONE);
-
-				}
-				else {
-
-					Log.e(TAG, String.valueOf(response.code()));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<UserRepositories>> call, @NonNull Throwable t) {
-
-				Log.e(TAG, t.toString());
-
-			}
-
-		});
-
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-
-		MenuInflater inflater = getMenuInflater();
-		inflater.inflate(R.menu.search_menu, menu);
-
-		MenuItem searchItem = menu.findItem(R.id.action_search);
-		SearchView searchView = (SearchView) searchItem.getActionView();
-		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
-
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-
-				return false;
-			}
-
-			@Override
-			public boolean onQueryTextChange(String newText) {
-
-				filter(newText);
-				return true;
-			}
-
-		});
-
-		return super.onCreateOptionsMenu(menu);
-
-	}
-
-	private void filter(String text) {
-
-		List<UserRepositories> arr = new ArrayList<>();
-
-		for(UserRepositories d : forksList) {
-			if(d.getName().toLowerCase().contains(text) || d.getDescription().toLowerCase().contains(text)) {
-				arr.add(d);
-			}
-		}
-
-		adapter.updateList(arr);
-	}
-
-	private void initCloseListener() {
-
-		onClickListener = view -> {
-			getIntent().removeExtra("repoFullNameForForks");
-			finish();
-		};
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
@ -1,20 +1,19 @@
 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;

@ -30,9 +29,6 @@ public class RepoStargazersActivity extends BaseActivity {
    private GridView mGridView;
    private ProgressBar mProgressBar;

-    final Context ctx = this;
-    private Context appCtx;
-
    @Override
    protected int getLayoutResourceId(){
        return R.layout.activity_repo_stargazers;
@ -40,11 +36,9 @@ public class RepoStargazersActivity extends BaseActivity {

    @Override
    public void onCreate(Bundle savedInstanceState) {
-
        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();

-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@ -65,7 +59,7 @@ public class RepoStargazersActivity extends BaseActivity {

        toolbarTitle.setText(R.string.repoStargazersInMenu);

-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);

    }

@ -73,10 +67,10 @@ public class RepoStargazersActivity extends BaseActivity {

        RepoStargazersViewModel repoStargazersModel = new ViewModelProvider(this).get(RepoStargazersViewModel.class);

-        repoStargazersModel.getRepoStargazers(instanceUrl, instanceToken, repoOwner, repoName, ctx).observe(this, new Observer<List<UserInfo>>() {
+        repoStargazersModel.getRepoStargazers(instanceUrl, instanceToken, repoOwner, repoName, getApplicationContext()).observe(this, new Observer<List<UserInfo>>() {
            @Override
            public void onChanged(@Nullable List<UserInfo> stargazersListMain) {
-                adapter = new RepoStargazersAdapter(ctx, stargazersListMain);
+                adapter = new RepoStargazersAdapter(getApplicationContext(), stargazersListMain);
                if(adapter.getCount() > 0) {
                    mGridView.setAdapter(adapter);
                    noDataStargazers.setVisibility(View.GONE);
@ -93,8 +87,12 @@ public class RepoStargazersActivity extends BaseActivity {
    }

    private void initCloseListener() {
-
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java
@ -1,20 +1,19 @@
 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;

@ -30,9 +29,6 @@ public class RepoWatchersActivity extends BaseActivity {
    private GridView mGridView;
    private ProgressBar mProgressBar;

-    final Context ctx = this;
-    private Context appCtx;
-
    @Override
    protected int getLayoutResourceId(){
        return R.layout.activity_repo_watchers;
@ -40,11 +36,9 @@ public class RepoWatchersActivity extends BaseActivity {

    @Override
    public void onCreate(Bundle savedInstanceState) {
-
        super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();

-        TinyDB tinyDb = new TinyDB(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@ -65,7 +59,7 @@ public class RepoWatchersActivity extends BaseActivity {

        toolbarTitle.setText(R.string.repoWatchersInMenu);

-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);

    }

@ -73,10 +67,10 @@ public class RepoWatchersActivity extends BaseActivity {

        RepoWatchersViewModel repoWatchersModel = new ViewModelProvider(this).get(RepoWatchersViewModel.class);

-        repoWatchersModel.getRepoWatchers(instanceUrl, instanceToken, repoOwner, repoName, ctx).observe(this, new Observer<List<UserInfo>>() {
+        repoWatchersModel.getRepoWatchers(instanceUrl, instanceToken, repoOwner, repoName, getApplicationContext()).observe(this, new Observer<List<UserInfo>>() {
            @Override
            public void onChanged(@Nullable List<UserInfo> watchersListMain) {
-                adapter = new RepoWatchersAdapter(ctx, watchersListMain);
+                adapter = new RepoWatchersAdapter(getApplicationContext(), watchersListMain);
                if(adapter.getCount() > 0) {
                    mGridView.setAdapter(adapter);
                    noDataWatchers.setVisibility(View.GONE);
@ -93,8 +87,12 @@ public class RepoWatchersActivity extends BaseActivity {
    }

    private void initCloseListener() {
-
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
@ -1,333 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Switch;
-import android.widget.TextView;
-import androidx.appcompat.app.AlertDialog;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.Version;
-
-/**
- * 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 String[] homeScreenListNew = {"My Repositories", "Starred Repositories", "Organizations", "Repositories", "Profile", "Explore", "Drafts",  "Notifications"};
-	private static int homeScreenSelectedChoice = 0;
-
-	private static String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
-	private static int customFontSelectedChoice = 0;
-
-	private static String[] themeList = {"Dark", "Light", "Auto (Light / Dark)", "Retro", "Auto (Retro / Dark)"};
-	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(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.3")) {
-
-			homeScreenList = homeScreenListNew;
-		}
-
-		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.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-			else {
-				tinyDb.putBoolean("enableCounterBadges", false);
-				Toasty.success(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.success(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.success(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.success(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.colorWhite));
-						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.colorWhite));
-						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.colorWhite));
-						break;
-					default:
-						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorLightGreen));
-						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
-						break;
-				}
-
-				dialogInterfaceCodeBlock.dismiss();
-				Toasty.success(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.success(appCtx, getResources().getString(R.string.settingsSave));
-
-			});
-
-			AlertDialog tDialog = tBuilder.create();
-			tDialog.show();
-
-
-		});
-
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> finish();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsDraftsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsDraftsActivity.java
@ -1,67 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.Switch;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.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.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-			else {
-				tinyDb.putBoolean("draftsCommentsDeletionEnabled", false);
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-
-		});
-
-	}
-
-	private void initCloseListener() { onClickListener = view -> finish(); }
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsFileViewerActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsFileViewerActivity.java
@ -1,119 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Switch;
-import android.widget.TextView;
-import androidx.appcompat.app.AlertDialog;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.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.success(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.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-			else {
-				tinyDb.putBoolean("enablePdfMode", false);
-				tinyDb.putString("enablePdfModeInit", "yes");
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-
-		});
-
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> finish();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java
@ -1,69 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.Switch;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.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.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-			else {
-				tinyDb.putBoolean("crashReportingEnabled", false);
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-
-		});
-
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> finish();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
@ -1,261 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.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.success(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.success(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.success(appCtx, getResources().getString(R.string.settingsSave));
-
-			});
-
-			builder.setNeutralButton(R.string.cancelButton, null);
-			builder.setView(numberPicker);
-			builder.create().show();
-
-		});
-
-	}
-
-	private void initCloseListener() {
-
-		onClickListener = view -> finish();
-	}
-}
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
@ -1,163 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.appcompat.app.AlertDialog;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.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.success(appCtx, getResources().getString(R.string.settingsSave));
-
-			});
-
-			lBuilder.setNeutralButton(getString(R.string.cancelButton), null);
-
-			AlertDialog lDialog = lBuilder.create();
-			lDialog.show();
-
-		});
-
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> finish();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
@ -0,0 +1,66 @@
+package org.mian.gitnex.activities;
+
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.adapters.SponsorsAdapter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class SponsorsActivity extends BaseActivity {
+
+    private View.OnClickListener onClickListener;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_sponsors;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        ImageView closeActivity = findViewById(R.id.close);
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        Resources res = getResources();
+        CharSequence[] sponsorsInfo = res.getTextArray(R.array.sponsorsInfo);
+
+        List<CharSequence> sponsorsList = new ArrayList<>(Arrays.asList(sponsorsInfo));
+
+        RecyclerView mRecyclerView = findViewById(R.id.recyclerView);
+
+        mRecyclerView.setHasFixedSize(true);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
+                DividerItemDecoration.VERTICAL);
+        mRecyclerView.addItemDecoration(dividerItemDecoration);
+
+        SponsorsAdapter adapter = new SponsorsAdapter(sponsorsList);
+        mRecyclerView.setAdapter(adapter);
+
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
@ -86,7 +86,7 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
            holder.userRole.setVisibility(View.VISIBLE);
            TextDrawable drawable = TextDrawable.builder()
                    .beginConfig()
-                    .textColor(mCtx.getResources().getColor(R.color.colorWhite))
+                    .textColor(mCtx.getResources().getColor(R.color.white))
                    .fontSize(44)
                    .width(180)
                    .height(60)
--- a/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java
@ -5,16 +5,15 @@ import android.content.Intent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CommitsActivity;
-import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.util.TinyDB;
 import java.util.List;
 import java.util.Objects;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;

 /**
 * Author M M Arif
@ -35,7 +34,7 @@ public class BranchesAdapter extends RecyclerView.Adapter<BranchesAdapter.Branch

            branchNameTv = itemView.findViewById(R.id.branchName);
            branchCommitAuthor = itemView.findViewById(R.id.branchCommitAuthor);
-            Button branchCommitHash = itemView.findViewById(R.id.branchCommitHash);
+            TextView branchCommitHash = itemView.findViewById(R.id.branchCommitHash);

            branchCommitHash.setOnClickListener(new View.OnClickListener() {
                public void onClick(View v) {
--- a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
@ -1,21 +1,18 @@
 package org.mian.gitnex.adapters;

-import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.view.LayoutInflater;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
+import com.mikepenz.fastadapter.FastAdapter;
+import com.mikepenz.fastadapter.items.AbstractItem;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.Commits;
+import org.mian.gitnex.util.TinyDB;
+import java.util.Date;
 import java.util.List;
 import java.util.Locale;

@ -23,152 +20,142 @@ import java.util.Locale;
 * Author M M Arif
 */

-public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class CommitsAdapter extends AbstractItem<CommitsAdapter, CommitsAdapter.ViewHolder> {

-    private Context ctx;
-    private final int TYPE_LOAD = 0;
-    private List<Commits> commitsList;
-    private CommitsAdapter.OnLoadMoreListener loadMoreListener;
-    private boolean isLoading = false;
-    private boolean isMoreDataAvailable = true;
+    final private Context ctx;
+    private String commitTitle;
+    private String commitHtmlUrl;
+    private String commitCommitter;
+    private Date commitDate;

-    public CommitsAdapter(Context ctx, List<Commits> commitsListMain) {
+    private boolean isSelectable = true;

+    public CommitsAdapter(Context ctx) {
        this.ctx = ctx;
-        this.commitsList = commitsListMain;
+    }

+    public CommitsAdapter withNewItems(String commitTitle, String commitHtmlUrl, String commitCommitter, Date commitDate) {
+
+        this.setNewItems(commitTitle, commitHtmlUrl, commitCommitter, commitDate);
+        return this;
+
+    }
+
+    private void setNewItems(String commitTitle, String commitHtmlUrl, String commitCommitter, Date commitDate) {
+
+        this.commitTitle = commitTitle;
+        this.commitHtmlUrl = commitHtmlUrl;
+        this.commitCommitter = commitCommitter;
+        this.commitDate = commitDate;
+
+    }
+
+    public String getCommitTitle() {
+        return commitTitle;
+    }
+
+    private String getCommitHtmlUrl() {
+        return commitHtmlUrl;
+    }
+
+    private String getcommitCommitter() {
+        return commitCommitter;
+    }
+
+    private Date getcommitDate() {
+        return commitDate;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public CommitsAdapter withEnabled(boolean enabled) {
+        return null;
+    }
+
+    @Override
+    public boolean isSelectable() {
+        return isSelectable;
+    }
+
+    @Override
+    public CommitsAdapter withSelectable(boolean selectable) {
+
+        this.isSelectable = selectable;
+        return this;
+
+    }
+
+    @Override
+    public int getType() {
+        return R.id.commitList;
+    }
+
+    @Override
+    public int getLayoutRes() {
+        return R.layout.list_commits;
    }

    @NonNull
    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    public CommitsAdapter.ViewHolder getViewHolder(@NonNull View v) {

-        LayoutInflater inflater = LayoutInflater.from(ctx);
-
-        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));
-        }
+        return new CommitsAdapter.ViewHolder(v);

    }

-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+    public class ViewHolder extends FastAdapter.ViewHolder<CommitsAdapter> {

-        if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+        final TinyDB tinyDb = new TinyDB(ctx);
+        final String locale = tinyDb.getString("locale");
+        final String timeFormat = tinyDb.getString("dateFormat");

-            isLoading = true;
-            loadMoreListener.onLoadMore();
+        TextView commitTitleVw;
+        TextView commitCommitterVw;
+        TextView commitDateVw;
+        TextView commitHtmlUrlVw;

-        }
-
-        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) {
+        public ViewHolder(View itemView) {

            super(itemView);

-            commitTitle = itemView.findViewById(R.id.commitTitleVw);
-            commitCommitter = itemView.findViewById(R.id.commitCommitterVw);
-            commitDate = itemView.findViewById(R.id.commitDateVw);
-            commitHtmlUrl = itemView.findViewById(R.id.commitHtmlUrlVw);
+            commitTitleVw = itemView.findViewById(R.id.commitTitleVw);
+            commitCommitterVw = itemView.findViewById(R.id.commitCommitterVw);
+            commitDateVw = itemView.findViewById(R.id.commitDateVw);
+            commitHtmlUrlVw = itemView.findViewById(R.id.commitHtmlUrlVw);

        }

-        @SuppressLint("SetTextI18n")
-        void bindData(Commits commitsModel) {
+        @Override
+        public void bindView(CommitsAdapter item, @NonNull List<Object> payloads) {

-            final TinyDB tinyDb = new TinyDB(ctx);
-            final String locale = tinyDb.getString("locale");
-            final String timeFormat = tinyDb.getString("dateFormat");
+            commitTitleVw.setText(item.getCommitTitle());
+            commitCommitterVw.setText(ctx.getString(R.string.commitCommittedBy, item.getcommitCommitter()));

-            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));
+            commitDateVw.setText(TimeHelper.formatTime(item.getcommitDate(), new Locale(locale), timeFormat, ctx));

            if(timeFormat.equals("pretty")) {
-                commitDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(commitsModel.getCommit().getCommitter().getDate()), ctx));
+                commitDateVw.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(item.getcommitDate()), ctx));
            }

-            commitHtmlUrl.setOnClickListener(v -> ctx.startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(commitsModel.getHtml_url()))));
+            commitHtmlUrlVw.setText(Html.fromHtml("<a href='" + item.getCommitHtmlUrl() + "'>" + ctx.getResources().getString(R.string.viewInBrowser) + "</a> "));
+            commitHtmlUrlVw.setMovementMethod(LinkMovementMethod.getInstance());

        }

-    }
+        @Override
+        public void unbindView(@NonNull CommitsAdapter item) {

-    static class LoadHolder extends RecyclerView.ViewHolder {
+            commitTitleVw.setText(null);
+            commitCommitterVw.setText(null);
+            commitDateVw.setText(null);
+            commitHtmlUrlVw.setText(null);

-        LoadHolder(View itemView) {
-
-            super(itemView);
        }

    }

-    public void setMoreDataAvailable(boolean moreDataAvailable) {
-
-        isMoreDataAvailable = moreDataAvailable;
-
-    }
-
-    public void notifyDataChanged() {
-
-        notifyDataSetChanged();
-        isLoading = false;
-
-    }
-
-    public interface OnLoadMoreListener {
-
-        void onLoadMore();
-
-    }
-
-    public void setLoadMoreListener(CommitsAdapter.OnLoadMoreListener loadMoreListener) {
-
-        this.loadMoreListener = loadMoreListener;
-
-    }
-
-    public void updateList(List<Commits> list) {
-
-        commitsList = list;
-        notifyDataSetChanged();
-    }
-
 }
--- a/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java
@ -1,158 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.text.Html;
-import android.text.Spanned;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-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 TextView commentId;
-	    private ImageView editCommentStatus;
-
-        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);
-	        commentId = itemView.findViewById(R.id.commentId);
-            ImageView deleteDraft = itemView.findViewById(R.id.deleteDraft);
-	        editCommentStatus = itemView.findViewById(R.id.editCommentStatus);
-
-            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());
-		        intent.putExtra("commentId", commentId.getText().toString());
-		        intent.putExtra("draftId", draftId.getText().toString());
-
-                if(!commentId.getText().toString().equalsIgnoreCase("")) {
-	                intent.putExtra("commentAction", "edit");
-                }
-
-                TinyDB tinyDb = new TinyDB(mCtx);
-                tinyDb.putString("issueNumber", issueNumber.getText().toString());
-                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.success(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());
-	    holder.commentId.setText(currentItem.getCommentId());
-
-	    String issueNumber = "<font color='" + mCtx.getResources().getColor(R.color.lightGray) + "'>" + mCtx.getResources().getString(R.string.hash) + currentItem.getIssueId() + "</font>";
-	    Spanned headTitle = Html.fromHtml(issueNumber + " " + currentItem.getRepositoryOwner() + " / " + currentItem.getRepositoryName());
-	    holder.repoInfo.setText(headTitle);
-
-	    if(!currentItem.getCommentId().equalsIgnoreCase("new")) {
-		    holder.editCommentStatus.setVisibility(View.VISIBLE);
-	    }
-	    else {
-	    	holder.editCommentStatus.setVisibility(View.GONE);
-	    }
-
-    }
-
-    @Override
-    public int getItemCount() {
-        return draftsList.size();
-    }
-
-	public void updateList(List<DraftWithRepository> list) {
-
-		draftsList = list;
-		notifyDataSetChanged();
-	}
-
-
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
@ -1,8 +1,6 @@
 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.Typeface;
@ -11,7 +9,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
@ -21,20 +18,16 @@ import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
-import org.mian.gitnex.activities.RepoForksActivity;
 import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.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.WatchInfo;
+import org.mian.gitnex.models.WatchRepository;
+import org.mian.gitnex.util.TinyDB;
 import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -44,6 +37,7 @@ import retrofit2.Callback;

 public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepositoriesAdapter.ReposSearchViewHolder> {

+
 	private List<UserRepositories> searchedReposList;
 	private Context mCtx;

@ -64,10 +58,6 @@ 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 TextView htmlUrl;

 		private ReposSearchViewHolder(View itemView) {

@ -83,10 +73,6 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 			repoForks = itemView.findViewById(R.id.repoForks);
 			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
 			ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
-			repoType = itemView.findViewById(R.id.repoType);
-			archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
-			repoBranch = itemView.findViewById(R.id.repoBranch);
-			htmlUrl = itemView.findViewById(R.id.htmlUrl);

 			itemView.setOnClickListener(v -> {

@ -100,47 +86,25 @@ 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");

-					WatchInfo watch = new WatchInfo();
+					WatchRepository watch = new WatchRepository();

-					Call<WatchInfo> call;
+					Call<WatchRepository> call;

 					call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);

-					call.enqueue(new Callback<WatchInfo>() {
+					call.enqueue(new Callback<WatchRepository>() {

 						@Override
-						public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
+						public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {

 							if(response.isSuccessful()) {

@ -153,7 +117,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo

 								if(response.code() != 404) {

-									Toasty.error(context, context.getString(R.string.genericApiStatusError));
+									Toasty.info(context, context.getString(R.string.genericApiStatusError));

 								}

@ -162,14 +126,13 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 						}

 						@Override
-						public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
+						public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {

 							tinyDb.putBoolean("repoWatch", false);
-							Toasty.error(context, context.getString(R.string.genericApiStatusError));
+							Toasty.info(context, context.getString(R.string.genericApiStatusError));

 						}
 					});
-
 				}

 				context.startActivity(intent);
@ -185,26 +148,13 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 				TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
 				TextView repoStargazers = view.findViewById(R.id.repoStargazers);
 				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
-				TextView repoForksList = view.findViewById(R.id.repoForksList);
-				TextView repoCopyUrl = view.findViewById(R.id.repoCopyUrl);
 				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);

-				bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
+				bottomSheetHeader.setText(fullName.getText());
 				BottomSheetDialog dialog = new BottomSheetDialog(context);
 				dialog.setContentView(view);
 				dialog.show();

-				repoCopyUrl.setOnClickListener(openInBrowser -> {
-
-					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
-					ClipData clip = ClipData.newPlainText("repoUrl", htmlUrl.getText().toString());
-					assert clipboard != null;
-					clipboard.setPrimaryClip(clip);
-
-					Toasty.info(context, context.getString(R.string.copyIssueUrlToastMsg));
-					dialog.dismiss();
-				});
-
 				repoOpenInBrowser.setOnClickListener(openInBrowser -> {

 					Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
@ -232,15 +182,6 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo

 				});

-				repoForksList.setOnClickListener(forks -> {
-
-					Intent intentW = new Intent(context, RepoForksActivity.class);
-					intentW.putExtra("repoFullNameForForks", fullName.getText());
-					context.startActivity(intentW);
-					dialog.dismiss();
-
-				});
-
 			});

 		}
@ -251,17 +192,17 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 	@Override
 	public ExploreRepositoriesAdapter.ReposSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {

-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repos, parent, false);
 		return new ExploreRepositoriesAdapter.ReposSearchViewHolder(v);
 	}

 	@Override
 	public void onBindViewHolder(@NonNull final ExploreRepositoriesAdapter.ReposSearchViewHolder holder, int position) {

-		UserRepositories currentItem = searchedReposList.get(position);
+		final UserRepositories currentItem = searchedReposList.get(position);
+
+
 		holder.repoDescription.setVisibility(View.GONE);
-		holder.repoBranch.setText(currentItem.getDefault_branch());
-		holder.htmlUrl.setText(currentItem.getHtml_url());

 		ColorGenerator generator = ColorGenerator.MATERIAL;
 		int color = generator.getColor(currentItem.getName());
@ -288,12 +229,10 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 		}
 		holder.fullName.setText(currentItem.getFullname());
 		if(currentItem.getPrivateFlag()) {
-			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
-			holder.repoType.setText(R.string.strPrivate);
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
 		}
 		else {
-			holder.repoPrivatePublic.setVisibility(View.GONE);
-			holder.repoType.setText(R.string.strPublic);
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
 		}
 		holder.repoStars.setText(currentItem.getStars_count());
 		holder.repoForks.setText(currentItem.getForks_count());
@ -303,13 +242,6 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 		}
 		holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());

-		if(currentItem.isArchived()) {
-			holder.archiveRepo.setVisibility(View.VISIBLE);
-		}
-		else {
-			holder.archiveRepo.setVisibility(View.GONE);
-		}
-
 	}

 	@Override
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
+++ b/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;

@ -37,8 +37,6 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
    class FilesViewHolder extends RecyclerView.ViewHolder {

        private ImageView fileTypeImage;
-	    private ImageView dirTypeImage;
-	    private ImageView unknownTypeImage;
        private TextView fileName;
        private TextView fileType;
        private TextView fileInfo;
@ -48,27 +46,28 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
            super(itemView);
            fileName = itemView.findViewById(R.id.fileName);
            fileTypeImage = itemView.findViewById(R.id.fileImage);
-	        dirTypeImage = itemView.findViewById(R.id.dirImage);
-	        unknownTypeImage = itemView.findViewById(R.id.unknownImage);
            fileType = itemView.findViewById(R.id.fileType);
            fileInfo = itemView.findViewById(R.id.fileInfo);

            //ImageView filesDropdownMenu = itemView.findViewById(R.id.filesDropdownMenu);

-            fileName.setOnClickListener(v -> {
+            fileName.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {

-                Context context = v.getContext();
+                    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.warning(context, context.getString(R.string.filesGenericError));
-                }
+                    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));
+                    }

+                }
            });


@ -161,22 +160,15 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
        holder.fileName.setText(currentItem.getName());

        if(currentItem.getType().equals("file")) {
-            holder.fileTypeImage.setVisibility(View.VISIBLE);
-	        holder.dirTypeImage.setVisibility(View.GONE);
-	        holder.unknownTypeImage.setVisibility(View.GONE);
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_file_new));
            holder.fileInfo.setVisibility(View.VISIBLE);
            holder.fileInfo.setText(AppUtil.formatFileSizeInDetail(currentItem.getSize()));
        }
        else if(currentItem.getType().equals("dir")) {
-	        holder.dirTypeImage.setVisibility(View.VISIBLE);
-	        holder.unknownTypeImage.setVisibility(View.GONE);
-	        holder.fileTypeImage.setVisibility(View.GONE);
-	        holder.fileInfo.setVisibility(View.GONE);
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_folder_24));
        }
        else {
-	        holder.unknownTypeImage.setVisibility(View.VISIBLE);
-	        holder.dirTypeImage.setVisibility(View.GONE);
-	        holder.fileTypeImage.setVisibility(View.GONE);
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_question_mark_24));
        }

    }
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesDiffAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/FilesDiffAdapter.java
@ -1,267 +1,138 @@
 package org.mian.gitnex.adapters;

-import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
-import android.graphics.Typeface;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.BaseAdapter;
+import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ReplyToIssueActivity;
-import org.mian.gitnex.helpers.DiffTextView;
 import org.mian.gitnex.models.FileDiffView;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentSkipListMap;

 /**
- * Author opyale
+ * Author M M Arif
 */

-public class FilesDiffAdapter extends BaseAdapter {
+public class FilesDiffAdapter extends RecyclerView.Adapter<FilesDiffAdapter.FilesDiffViewHolder> {

-	private static Map<Long, View> selectedViews;
-	private static final int MAXIMUM_LINES = 5000;
+    private List<FileDiffView> dataList;
+    private Context ctx;

-	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;
+    static class FilesDiffViewHolder extends RecyclerView.ViewHolder {

-	private Context context;
-	private List<FileDiffView> fileDiffViews;
+        private TextView fileContents;
+        private TextView fileName;
+        private TextView fileInfo;
+        private ImageView fileImage;
+        private HorizontalScrollView fileContentsView;
+        private LinearLayout allLines;

-	public FilesDiffAdapter(Context context, List<FileDiffView> fileDiffViews) {
+        private FilesDiffViewHolder(View itemView) {
+            super(itemView);

-		this.context = context;
-		this.fileDiffViews = 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);

-		selectedViews = new ConcurrentSkipListMap<>();
+        }
+    }

-		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);
+    public FilesDiffAdapter(List<FileDiffView> dataListMain, Context ctx) {
+        this.dataList = dataListMain;
+        this.ctx = ctx;
+    }

-	}
+    @NonNull
+    @Override
+    public FilesDiffAdapter.FilesDiffViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_files_diffs, parent, false);
+        return new FilesDiffAdapter.FilesDiffViewHolder(v);
+    }

-	@Override
-	public int getCount() {
+    @Override
+    public void onBindViewHolder(@NonNull FilesDiffViewHolder holder, int position) {

-		return fileDiffViews.size();
-	}
+        FileDiffView data = dataList.get(position);

-	@Override
-	public Object getItem(int position) {
+        if(data.isFileType()) {

-		return fileDiffViews.get(position);
-	}
+            holder.fileName.setText(data.getFileName());

-	@Override
-	public long getItemId(int position) {
+            holder.fileInfo.setVisibility(View.GONE);

-		return position;
-	}
+            //byte[] imageData = Base64.decode(data.getFileContents(), Base64.DEFAULT);
+            //Drawable imageDrawable = new BitmapDrawable(ctx.getResources(), BitmapFactory.decodeByteArray(imageData, 0, imageData.length));
+            //holder.fileImage.setImageDrawable(imageDrawable);
+            holder.fileContentsView.setVisibility(View.GONE);

-	@SuppressLint({"ViewHolder", "InflateParams"})
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent) {
+        }
+        else {

-		convertView = LayoutInflater.from(context).inflate(R.layout.list_files_diffs, null, false);
+            String[] splitData = data.getFileContents().split("\\R");

-		TextView headerFileName = convertView.findViewById(R.id.headerFileName);
-		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);
+            for (String eachSplit : splitData) {

-		FileDiffView data = (FileDiffView) getItem(position);
-		headerFileName.setText(data.getFileName());
+                TextView textLine = new TextView(ctx);
+                textLine.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));

-		if(data.isFileBinary()) {
+                if (eachSplit.startsWith("+")) {

-			diffStats.setVisibility(View.GONE);
-			diffLines.addView(getMessageView(context.getResources().getString(R.string.binaryFileError)));
+                    textLine.setText(eachSplit);
+                    holder.allLines.addView(textLine);

-		}
-		else {
+                    textLine.setTextColor(ctx.getResources().getColor(R.color.colorPrimary));
+                    textLine.setPadding(5, 5, 5, 5);
+                    textLine.setBackgroundColor(ctx.getResources().getColor(R.color.diffAddedColor));

-			diffStats.setVisibility(View.VISIBLE);
-			headerFileInfo.setText(data.getFileInfo());
+                }
+                else if (eachSplit.startsWith("-")) {

-			String[] codeLines = getLines(data.toString());
+                    textLine.setText(eachSplit);
+                    holder.allLines.addView(textLine);

-			if(MAXIMUM_LINES > codeLines.length) {
+                    textLine.setTextColor(ctx.getResources().getColor(R.color.colorPrimary));
+                    textLine.setPadding(5, 5, 5, 5);
+                    textLine.setBackgroundColor(ctx.getResources().getColor(R.color.diffRemovedColor));

-				for(int l=0; l<codeLines.length; l++) {
+                }
+                else {

-					if(codeLines[l].length() > 0) {
+                    if(eachSplit.length() > 0) {
+                        textLine.setText(eachSplit);
+                        holder.allLines.addView(textLine);

-						int uniquePosition = l + (position * MAXIMUM_LINES);
+                        textLine.setTextColor(ctx.getResources().getColor(R.color.colorPrimary));
+                        textLine.setPadding(5, 5, 5, 5);
+                        textLine.setBackgroundColor(ctx.getResources().getColor(R.color.white));
+                    }

-						DiffTextView diffTextView = new DiffTextView(context);
+                }

-						diffTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);
-						diffTextView.setPadding(15, 2, 15, 2);
-						diffTextView.setTypeface(Typeface.createFromAsset(context.getAssets(), "fonts/sourcecodeproregular.ttf"));
-						diffTextView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-						diffTextView.setPosition(uniquePosition);
+            }

-						boolean isSelected = false;
+            holder.fileName.setText(data.getFileName());
+            if(!data.getFileInfo().equals("")) {
+                holder.fileInfo.setText(ctx.getResources().getString(R.string.fileDiffInfoChanges, data.getFileInfo()));
+            }
+            else {
+                holder.fileInfo.setVisibility(View.GONE);
+            }

-						for(View view : selectedViews.values()) {
+        }

-							if(((DiffTextView) view).getPosition() == uniquePosition) {
+    }

-								diffTextView.setBackgroundColor(COLOR_SELECTED);
-								isSelected = true;
-								break;
+    @Override
+    public int getItemCount() {
+        return dataList.size();
+    }

-							}
-
-						}
-
-
-						if(codeLines[l].startsWith("+")) {
-
-							diffTextView.setText(codeLines[l]);
-							diffTextView.setTextColor(COLOR_FONT);
-
-							if(!isSelected) {
-
-								diffTextView.setInitialBackgroundColor(COLOR_ADDED);
-							}
-
-						}
-						else if(codeLines[l].startsWith("-")) {
-
-							diffTextView.setText(codeLines[l]);
-							diffTextView.setTextColor(COLOR_FONT);
-
-							if(!isSelected) {
-
-								diffTextView.setInitialBackgroundColor(COLOR_REMOVED);
-							}
-
-						}
-						else {
-
-							diffTextView.setText(codeLines[l]);
-							diffTextView.setTextColor(COLOR_FONT);
-
-							if(!isSelected) {
-
-								diffTextView.setInitialBackgroundColor(COLOR_NORMAL);
-							}
-
-						}
-
-
-						diffTextView.setOnClickListener(v -> {
-
-							if(((DiffTextView) v).getCurrentBackgroundColor() != COLOR_SELECTED) {
-
-								selectedViews.put(((DiffTextView) v).getPosition(), v);
-								v.setBackgroundColor(COLOR_SELECTED);
-
-							}
-							else {
-
-								selectedViews.remove(((DiffTextView) v).getPosition());
-								v.setBackgroundColor(((DiffTextView) v).getInitialBackgroundColor());
-
-							}
-
-						});
-
-
-						diffTextView.setOnLongClickListener(v -> {
-
-							if(((DiffTextView) v).getCurrentBackgroundColor() == COLOR_SELECTED) {
-
-								StringBuilder stringBuilder = new StringBuilder();
-								stringBuilder.append("```\n");
-
-								for(View view : selectedViews.values()) {
-
-									stringBuilder.append(((DiffTextView) view).getText());
-									stringBuilder.append("\n");
-
-								}
-
-								stringBuilder.append("```\n\n");
-
-								selectedViews.clear();
-
-								Intent intent = new Intent(context, ReplyToIssueActivity.class);
-								intent.putExtra("commentBody", stringBuilder.toString());
-								intent.putExtra("cursorToEnd", true);
-								intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-								context.startActivity(intent);
-
-							}
-
-							return true;
-
-						});
-
-						diffLines.addView(diffTextView);
-
-					}
-
-				}
-
-			}
-			else {
-
-				diffLines.addView(getMessageView(context.getResources().getString(R.string.fileTooLarge)));
-
-			}
-
-		}
-
-		return convertView;
-
-	}
-
-	private TextView getMessageView(String message) {
-
-		TextView textView = new TextView(context);
-
-		textView.setTextColor(COLOR_FONT);
-		textView.setBackgroundColor(COLOR_NORMAL);
-		textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
-		textView.setPadding(15, 15, 15, 15);
-		textView.setTypeface(Typeface.DEFAULT);
-		textView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-		textView.setText(message);
-
-		return textView;
-
-	}
-
-	private String[] getLines(String content) {
-
-		return content.split("\\R");
-
-	}
-
-	private int getColorFromAttribute(int resid) {
-
-		TypedValue typedValue = new TypedValue();
-		context.getTheme().resolveAttribute(resid, typedValue, true);
-
-		return typedValue.data;
-
-	}
-
-}
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
@ -1,8 +1,6 @@
 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;
@ -13,28 +11,29 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import com.google.gson.JsonElement;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.ReplyToIssueActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.ClickListener;
-import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.helpers.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;
@ -43,6 +42,7 @@ import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
 import io.noties.markwon.ext.tables.TablePlugin;
 import io.noties.markwon.ext.tasklist.TaskListPlugin;
 import io.noties.markwon.html.HtmlPlugin;
+import io.noties.markwon.image.AsyncDrawable;
 import io.noties.markwon.image.DefaultMediaDecoder;
 import io.noties.markwon.image.ImageItem;
 import io.noties.markwon.image.ImagesPlugin;
@ -50,8 +50,6 @@ import io.noties.markwon.image.SchemeHandler;
 import io.noties.markwon.image.gif.GifMediaDecoder;
 import io.noties.markwon.image.svg.SvgMediaDecoder;
 import io.noties.markwon.linkify.LinkifyPlugin;
-import retrofit2.Call;
-import retrofit2.Callback;

 /**
 * Author M M Arif
@ -62,20 +60,14 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 	private List<IssueComments> issuesComments;
 	private Context mCtx;

-	public IssueCommentsAdapter(Context mCtx, List<IssueComments> issuesCommentsMain) {
-
-		this.mCtx = mCtx;
-		this.issuesComments = issuesCommentsMain;
-
-	}
-
-	class IssueCommentViewHolder extends RecyclerView.ViewHolder {
+	static 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;
@ -90,7 +82,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 			issueCommenterAvatar = itemView.findViewById(R.id.issueCommenterAvatar);
 			issueComment = itemView.findViewById(R.id.issueComment);
 			issueCommentDate = itemView.findViewById(R.id.issueCommentDate);
-			ImageView commentsOptionsMenu = itemView.findViewById(R.id.commentsOptionsMenu);
+			commentsOptionsMenu = itemView.findViewById(R.id.commentsOptionsMenu);
 			commendBodyRaw = itemView.findViewById(R.id.commendBodyRaw);
 			commentModified = itemView.findViewById(R.id.commentModified);
 			commenterUsername = itemView.findViewById(R.id.commenterUsername);
@ -98,39 +90,32 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap

 			commentsOptionsMenu.setOnClickListener(v -> {

-				final Context ctx = v.getContext();
-				final TinyDB tinyDb = new TinyDB(ctx);
+				final Context context = v.getContext();
+				final TinyDB tinyDb = new TinyDB(context);
 				final String loginUid = tinyDb.getString("loginUid");

-				@SuppressLint("InflateParams") View view = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_issue_comments, null);
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_issue_comments, null);

 				TextView commentMenuEdit = view.findViewById(R.id.commentMenuEdit);
 				TextView commentShare = view.findViewById(R.id.issueCommentShare);
-				TextView commentMenuQuote = view.findViewById(R.id.commentMenuQuote);
-				TextView commentMenuCopy = view.findViewById(R.id.commentMenuCopy);
-				TextView commentMenuDelete = view.findViewById(R.id.commentMenuDelete);
-				TextView issueCommentCopyUrl = view.findViewById(R.id.issueCommentCopyUrl);
+				//TextView commentMenuDelete = view.findViewById(R.id.commentMenuDelete);

 				if(!loginUid.contentEquals(commenterUsername.getText())) {
 					commentMenuEdit.setVisibility(View.GONE);
-					commentMenuDelete.setVisibility(View.GONE);
+					//commentMenuDelete.setVisibility(View.GONE);
 				}

-				if(issueComment.getText().toString().isEmpty()) {
-					commentMenuCopy.setVisibility(View.GONE);
-				}
-
-				BottomSheetDialog dialog = new BottomSheetDialog(ctx);
+				BottomSheetDialog dialog = new BottomSheetDialog(context);
 				dialog.setContentView(view);
 				dialog.show();

 				commentMenuEdit.setOnClickListener(ediComment -> {

-					Intent intent = new Intent(ctx, ReplyToIssueActivity.class);
+					Intent intent = new Intent(context, ReplyToIssueActivity.class);
 					intent.putExtra("commentId", commendId.getText());
 					intent.putExtra("commentAction", "edit");
 					intent.putExtra("commentBody", commendBodyRaw.getText());
-					ctx.startActivity(intent);
+					context.startActivity(intent);
 					dialog.dismiss();

 				});
@ -143,79 +128,20 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 					// share issue comment
 					Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
 					sharingIntent.setType("text/plain");
-					String intentHeader = tinyDb.getString("issueNumber") + ctx.getResources().getString(R.string.hash) + "issuecomment-" + commendId.getText() + " " + tinyDb.getString("issueTitle");
+					String intentHeader = tinyDb.getString("issueNumber") + context.getResources().getString(R.string.hash) + "issuecomment-" + commendId.getText() + " " + tinyDb.getString("issueTitle");
 					sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, intentHeader);
 					sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, commentUrl);
-					ctx.startActivity(Intent.createChooser(sharingIntent, intentHeader));
+					context.startActivity(Intent.createChooser(sharingIntent, intentHeader));

 					dialog.dismiss();

 				});

-				issueCommentCopyUrl.setOnClickListener(ediComment -> {
+                /*commentMenuDelete.setOnClickListener(deleteComment -> {

-					// comment Url
-					CharSequence commentUrl = htmlUrl.getText();
+                    dialog.dismiss();

-					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
-					assert clipboard != null;
-
-					ClipData clip = ClipData.newPlainText(commentUrl, commentUrl);
-					clipboard.setPrimaryClip(clip);
-
-					dialog.dismiss();
-					Toasty.success(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
-
-				});
-
-				commentMenuQuote.setOnClickListener(v1 -> {
-
-					StringBuilder stringBuilder = new StringBuilder();
-					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.success(ctx, ctx.getString(R.string.copyIssueCommentToastMsg));
-
-				});
-
-				commentMenuDelete.setOnClickListener(deleteComment -> {
-
-					deleteIssueComment(ctx, Integer.parseInt(commendId.getText().toString()), getAdapterPosition());
-					dialog.dismiss();
-
-				});
+                });*/

 			});

@ -223,79 +149,10 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap

 	}

-	private void updateAdapter(int position) {
+	public IssueCommentsAdapter(Context mCtx, List<IssueComments> issuesCommentsMain) {

-		issuesComments.remove(position);
-		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.success(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.error(ctx, ctx.getString(R.string.authorizeError));
-
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-
-				}
-				else {
-
-					Toasty.error(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));
-
-			}
-
-		});
+		this.mCtx = mCtx;
+		this.issuesComments = issuesCommentsMain;

 	}

@ -361,13 +218,20 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 						return Collections.singleton("drawable");
 					}
 				});
-				plugin.placeholderProvider(drawable -> null);
+				plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
+
+					@Nullable
+					@Override
+					public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
+
+						return null;
+					}
+				});
 				plugin.addMediaDecoder(GifMediaDecoder.create(false));
 				plugin.addMediaDecoder(SvgMediaDecoder.create(mCtx.getResources()));
 				plugin.addMediaDecoder(SvgMediaDecoder.create());
 				plugin.defaultMediaDecoder(DefaultMediaDecoder.create(mCtx.getResources()));
 				plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
-
 			}
 		})).usePlugin(new AbstractMarkwonPlugin() {

--- a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
@ -1,28 +1,29 @@
 package org.mian.gitnex.adapters;

-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.text.Html;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
+import com.mikepenz.fastadapter.FastAdapter;
+import com.mikepenz.fastadapter.items.AbstractItem;
+import com.mikepenz.fastadapter.listeners.ClickEventHook;
+import com.mikepenz.fastadapter.utils.EventHookUtil;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.util.TinyDB;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Locale;

@ -30,74 +31,112 @@ import java.util.Locale;
 * Author M M Arif
 */

-public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class IssuesAdapter extends AbstractItem<IssuesAdapter, IssuesAdapter.ViewHolder> {

-	private Context context;
-	private final int TYPE_LOAD = 0;
-	private List<Issues> issuesList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
+	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;

-	public IssuesAdapter(Context context, List<Issues> issuesListMain) {
+	private boolean isSelectable = true;

-		this.context = context;
-		this.issuesList = issuesListMain;
+	public IssuesAdapter(Context ctx) {
+		this.ctx = ctx;
+	}

+	public IssuesAdapter withNewItems(String issueTitle, int issueNumber, String issueAssigneeAvatar, Date issueCreatedTime, int issueCommentsCount, String userFullname, String userLogin) {
+
+		this.setNewItems(issueTitle, issueNumber, issueAssigneeAvatar, issueCreatedTime, issueCommentsCount, userFullname, userLogin);
+		return this;
+
+	}
+
+	private void setNewItems(String issueTitle, int issueNumber, String issueAssigneeAvatar, Date issueCreatedTime, int issueCommentsCount, String userFullname, String userLogin) {
+
+		this.issueTitle = issueTitle;
+		this.issueNumber = issueNumber;
+		this.issueAssigneeAvatar = issueAssigneeAvatar;
+		this.issueCreatedTime = issueCreatedTime;
+		this.issueCommentsCount = issueCommentsCount;
+		this.userFullname = userFullname;
+		this.userLogin = userLogin;
+
+	}
+
+	private int getIssueNumber() {
+		return issueNumber;
+	}
+
+	public String getIssueTitle() {
+		return issueTitle;
+	}
+
+	private String getIssueAssigneeAvatar() {
+		return issueAssigneeAvatar;
+	}
+
+	private Date getIssueCreatedTime() {
+		return issueCreatedTime;
+	}
+
+	private int getIssueCommentsCount() {
+		return issueCommentsCount;
+	}
+
+	private String getUserFullname() {
+		return userFullname;
+	}
+
+	private String getUserLogin() {
+		return userLogin;
+	}
+
+	@Override
+	public boolean isEnabled() {
+		return true;
+	}
+
+	@Override
+	public IssuesAdapter withEnabled(boolean enabled) {
+		return null;
+	}
+
+	@Override
+	public boolean isSelectable() {
+		return isSelectable;
+	}
+
+	@Override
+	public IssuesAdapter withSelectable(boolean selectable) {
+		this.isSelectable = selectable;
+		return this;
+	}
+
+	@Override
+	public int getType() {
+		return R.id.relativeLayoutFrameIssuesList;
+	}
+
+	@Override
+	public int getLayoutRes() {
+		return R.layout.list_issues;
 	}

 	@NonNull
 	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		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 IssuesAdapter.ViewHolder getViewHolder(@NonNull View v) {
+		return new IssuesAdapter.ViewHolder(v);
 	}

-	@Override
-	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+	public class ViewHolder extends FastAdapter.ViewHolder<IssuesAdapter> {

-		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 {
+		final TinyDB tinyDb = new TinyDB(ctx);
+		final String locale = tinyDb.getString("locale");
+		final String timeFormat = tinyDb.getString("dateFormat");

 		private TextView issueNumber;
 		private ImageView issueAssigneeAvatar;
@ -105,7 +144,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		private TextView issueCreatedTime;
 		private TextView issueCommentsCount;

-		IssuesHolder(View itemView) {
+		public ViewHolder(View itemView) {

 			super(itemView);

@ -113,124 +152,94 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 			issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
 			issueTitle = itemView.findViewById(R.id.issueTitle);
 			issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
-			LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
 			issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);

-			issueTitle.setOnClickListener(v -> {
-
-				Context context = v.getContext();
-
-				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", issueNumber.getText());
-
-				TinyDB tinyDb = new TinyDB(context);
-				tinyDb.putString("issueNumber", issueNumber.getText().toString());
-				tinyDb.putString("issueType", "Issue");
-				context.startActivity(intent);
-
-			});
-			frameCommentsCount.setOnClickListener(v -> {
-
-				Context context = v.getContext();
-
-				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", issueNumber.getText());
-
-				TinyDB tinyDb = new TinyDB(context);
-				tinyDb.putString("issueNumber", issueNumber.getText().toString());
-				tinyDb.putString("issueType", "Issue");
-				context.startActivity(intent);
-
-			});
-
 		}

-		@SuppressLint("SetTextI18n")
-		void bindData(Issues issuesModel) {
+		@Override
+		public void bindView(@NonNull IssuesAdapter item, @NonNull List<Object> payloads) {

-			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));
+			if (!item.getUserFullname().equals("")) {
+				issueAssigneeAvatar.setOnClickListener(new ClickListener(ctx.getResources().getString(R.string.issueCreator) + item.getUserFullname(), ctx));
 			}
 			else {
-				issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getLogin(), context));
+				issueAssigneeAvatar.setOnClickListener(new ClickListener(ctx.getResources().getString(R.string.issueCreator) + item.getUserLogin(), ctx));
 			}

-			PicassoService.getInstance(context).get().load(issuesModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
+			PicassoService.getInstance(ctx).get().load(item.getIssueAssigneeAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);

-			String issueNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + issuesModel.getNumber() + "</font>";
-			issueTitle.setText(Html.fromHtml(issueNumber_ + " " + issuesModel.getTitle()));
+			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()));

-			issueNumber.setText(String.valueOf(issuesModel.getNumber()));
-			issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));
+			issueNumber.setText(String.valueOf(item.getIssueNumber()));
+			issueCommentsCount.setText(String.valueOf(item.getIssueCommentsCount()));
+
+			switch (timeFormat) {

-			switch(timeFormat) {
 				case "pretty": {
 					PrettyTime prettyTime = new PrettyTime(new Locale(locale));
-					String createdTime = prettyTime.format(issuesModel.getCreated_at());
+					String createdTime = prettyTime.format(item.getIssueCreatedTime());
 					issueCreatedTime.setText(createdTime);
-					issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issuesModel.getCreated_at()), context));
+					issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(item.getIssueCreatedTime()), ctx));
 					break;
 				}
 				case "normal": {
-					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-					String createdTime = formatter.format(issuesModel.getCreated_at());
+					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + ctx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+					String createdTime = formatter.format(item.getIssueCreatedTime());
 					issueCreatedTime.setText(createdTime);
 					break;
 				}
 				case "normal1": {
-					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-					String createdTime = formatter.format(issuesModel.getCreated_at());
+					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + ctx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+					String createdTime = formatter.format(item.getIssueCreatedTime());
 					issueCreatedTime.setText(createdTime);
 					break;
 				}
+
 			}

 		}

-	}
+		@Override
+		public void unbindView(@NonNull IssuesAdapter item) {

-	static class LoadHolder extends RecyclerView.ViewHolder {
+			issueTitle.setText(null);
+			issueCommentsCount.setText(null);
+			issueCreatedTime.setText(null);

-		LoadHolder(View itemView) {
-
-			super(itemView);
 		}

 	}

-	public void setMoreDataAvailable(boolean moreDataAvailable) {
+	public static class IssueTitleClickEvent extends ClickEventHook<IssuesAdapter> {

-		isMoreDataAvailable = moreDataAvailable;
+		@Nullable
+		@Override
+		public List<View> onBindMany(@NonNull RecyclerView.ViewHolder viewHolder) {

-	}
+			if (viewHolder instanceof IssuesAdapter.ViewHolder) {
+				return EventHookUtil.toList(((ViewHolder) viewHolder).issueTitle);
+			}

-	public void notifyDataChanged() {
+			return super.onBindMany(viewHolder);

-		notifyDataSetChanged();
-		isLoading = false;
+		}

-	}
+		@Override
+		public void onClick(View v, int position, @NonNull FastAdapter<IssuesAdapter> fastAdapter, IssuesAdapter item) {

-	public interface OnLoadMoreListener {
+			Context context = v.getContext();

-		void onLoadMore();
+			Intent intent = new Intent(context, IssueDetailActivity.class);
+			intent.putExtra("issueNumber", item.getIssueNumber());

-	}
+			TinyDB tinyDb = new TinyDB(context);
+			tinyDb.putString("issueNumber", String.valueOf(item.getIssueNumber()));
+			tinyDb.putString("issueType", "issue");
+			context.startActivity(intent);

-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
+		}

-		this.loadMoreListener = loadMoreListener;
-
-	}
-
-	public void updateList(List<Issues> list) {
-
-		issuesList = list;
-		notifyDataSetChanged();
 	}

 }
--- a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
@ -3,25 +3,26 @@ 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 androidx.annotation.NonNull;
-import androidx.cardview.widget.CardView;
-import androidx.core.widget.ImageViewCompat;
-import androidx.recyclerview.widget.RecyclerView;
+import com.amulyakhare.textdrawable.TextDrawable;
 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
@ -38,17 +39,12 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
        private TextView labelTitle;
        private TextView labelId;
        private TextView labelColor;
-
-        private CardView labelView;
-        private ImageView labelIcon;
-        private TextView labelName;
+        private ImageView labelsView;

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

-            labelView = itemView.findViewById(R.id.labelView);
-            labelIcon = itemView.findViewById(R.id.labelIcon);
-            labelName = itemView.findViewById(R.id.labelName);
+            labelsView = itemView.findViewById(R.id.labelsView);
            ImageView labelsOptionsMenu = itemView.findViewById(R.id.labelsOptionsMenu);
            labelTitle = itemView.findViewById(R.id.labelTitle);
            labelId = itemView.findViewById(R.id.labelId);
@ -123,13 +119,19 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
        String labelName = currentItem.getName();

        int color = Color.parseColor("#" + labelColor);
-        int contrastColor = new ColorInverter().getContrastColor(color);

-	    ImageViewCompat.setImageTintList(holder.labelIcon, ColorStateList.valueOf(contrastColor));
+        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);

-        holder.labelName.setTextColor(contrastColor);
-        holder.labelName.setText(labelName);
-        holder.labelView.setCardBackgroundColor(color);
+        holder.labelsView.setImageDrawable(drawable);

    }

@ -138,4 +140,4 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
        return labelsList.size();
    }

-}
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
@ -2,36 +2,39 @@ package org.mian.gitnex.adapters;

 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.text.Spanned;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Filter;
+import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
+import com.amulyakhare.textdrawable.TextDrawable;
 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;
@ -52,348 +55,308 @@ import io.noties.markwon.linkify.LinkifyPlugin;
 * Author M M Arif
 */

-public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.MilestonesViewHolder> implements Filterable {

-	private Context context;
-	private 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;
+    private List<Milestones> milestonesList;
+    private Context mCtx;
+    private List<Milestones> milestonesListFull;

-	public MilestonesAdapter(Context context, List<Milestones> dataListMain) {
+    static class MilestonesViewHolder extends RecyclerView.ViewHolder {

-		this.context = context;
-		this.dataList = 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;

-	}
+        private MilestonesViewHolder(View itemView) {
+            super(itemView);

-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            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);

-		LayoutInflater inflater = LayoutInflater.from(context);
+            milestonesMenu.setOnClickListener(v -> {

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

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

 }
--- a/app/src/main/java/org/mian/gitnex/adapters/MutliSelectAdapter.java
+++ b/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 java.util.List;

 public class MutliSelectAdapter extends RecyclerView.Adapter<MutliSelectAdapter.MultiSelectDialogViewHolder> {

-    private List<MultiSelectModel> mDataSet;
+    private ArrayList<MultiSelectModel> mDataSet;
    private String mSearchQuery = "";
    private Context mContext;

-    public MutliSelectAdapter(List<MultiSelectModel> dataSet, Context context) {
+    public MutliSelectAdapter(ArrayList<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(List<MultiSelectModel> data, String query, MutliSelectAdapter mutliSelectAdapter) {
+    public void setData(ArrayList<MultiSelectModel> data, String query, MutliSelectAdapter mutliSelectAdapter) {

        this.mDataSet = data;
        this.mSearchQuery = query;
@ -187,4 +187,4 @@ public class MutliSelectAdapter extends RecyclerView.Adapter<MutliSelectAdapter.
        }

    }
-}
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
@ -1,43 +1,35 @@
 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.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;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
-import org.mian.gitnex.activities.RepoForksActivity;
 import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.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.WatchInfo;
+import org.mian.gitnex.models.WatchRepository;
+import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -47,322 +39,250 @@ 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 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 TextView htmlUrl;
+        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 MyReposViewHolder(View itemView) {
+        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);

-			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);
-			htmlUrl = itemView.findViewById(R.id.htmlUrl);
+            itemView.setOnClickListener(v -> {

-			itemView.setOnClickListener(v -> {
+                Context context = v.getContext();

-				Context context = v.getContext();
+                Intent intent = new Intent(context, RepoDetailActivity.class);
+                intent.putExtra("repoFullName", fullNameMy.getText().toString());

-				Intent intent = new Intent(context, RepoDetailActivity.class);
-				intent.putExtra("repoFullName", repoFullName.getText().toString());
+                TinyDB tinyDb = new TinyDB(context);
+                tinyDb.putString("repoFullName", fullNameMy.getText().toString());
+                tinyDb.putString("repoType", repoType.getText().toString());
+                //tinyDb.putBoolean("resumeIssues", true);

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

-				String[] parts = repoFullName.getText().toString().split("/");
-				final String repoOwner = parts[0];
-				final String repoName = parts[1];
+                    WatchRepository watch = new WatchRepository();

-				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-				RepositoriesApi repositoryData = new RepositoriesApi(context);
+                    Call<WatchRepository> call;

-				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
-				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+                    call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);

-				if(count == 0) {
+                    call.enqueue(new Callback<WatchRepository>() {

-					long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
-					tinyDb.putLong("repositoryId", id);
+                        @Override
+                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {

-				}
-				else {
+                            if(response.isSuccessful()) {

-					Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
-					tinyDb.putLong("repositoryId", data.getRepositoryId());
+                                assert response.body() != null;
+                                tinyDb.putBoolean("repoWatch", response.body().getSubscribed());

-				}
+                            } else {

-				//store if user is watching this repo
-				{
+                                tinyDb.putBoolean("repoWatch", false);

-					final String instanceUrl = tinyDb.getString("instanceUrl");
-					final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
+                                if(response.code() != 404) {

-					WatchInfo watch = new WatchInfo();
+                                    Toasty.info(context, context.getString(R.string.genericApiStatusError));

-					Call<WatchInfo> call;
+                                }

-					call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
+                            }

-					call.enqueue(new Callback<WatchInfo>() {
+                        }

-						@Override
-						public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
+                        @Override
+                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {

-							if(response.isSuccessful()) {
+                            tinyDb.putBoolean("repoWatch", false);
+                            Toasty.info(context, context.getString(R.string.genericApiStatusError));

-								assert response.body() != null;
-								tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
+                        }
+                    });
+                }

-							}
-							else {
+                context.startActivity(intent);

-								tinyDb.putBoolean("repoWatch", false);
+            });

-								if(response.code() != 404) {
+            reposDropdownMenu.setOnClickListener(v -> {

-									Toasty.error(context, context.getString(R.string.genericApiStatusError));
+                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(fullNameMy.getText());
+                BottomSheetDialog dialog = new BottomSheetDialog(context);
+                dialog.setContentView(view);
+                dialog.show();

-						@Override
-						public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
+                repoOpenInBrowser.setOnClickListener(openInBrowser -> {

-							tinyDb.putBoolean("repoWatch", false);
-							Toasty.error(context, context.getString(R.string.genericApiStatusError));
+                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullNameMy.getText());
+                    context.startActivity(intentOpenInBrowser);
+                    dialog.dismiss();

-						}
-					});
+                });

-				}
+                repoStargazers.setOnClickListener(stargazers -> {

-				context.startActivity(intent);
+                    Intent intent = new Intent(context, RepoStargazersActivity.class);
+                    intent.putExtra("repoFullNameForStars", fullNameMy.getText());
+                    context.startActivity(intent);
+                    dialog.dismiss();

-			});
+                });

-			reposDropdownMenu.setOnClickListener(v -> {
+                repoWatchers.setOnClickListener(watchers -> {

-				final Context context = v.getContext();
+                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
+                    intentW.putExtra("repoFullNameForWatchers", fullNameMy.getText());
+                    context.startActivity(intentW);
+                    dialog.dismiss();

-				@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 repoForksList = view.findViewById(R.id.repoForksList);
-				TextView repoCopyUrl = view.findViewById(R.id.repoCopyUrl);
-				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();
+        }
+    }

-				repoCopyUrl.setOnClickListener(openInBrowser -> {
+    public MyReposListAdapter(Context mCtx, List<UserRepositories> reposListMain) {
+        this.mCtx = mCtx;
+        this.reposList = reposListMain;
+        reposListFull = new ArrayList<>(reposList);
+    }

-					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
-					ClipData clip = ClipData.newPlainText("repoUrl", htmlUrl.getText().toString());
-					assert clipboard != null;
-					clipboard.setPrimaryClip(clip);
+    @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);
+    }

-					Toasty.info(context, context.getString(R.string.copyIssueUrlToastMsg));
-					dialog.dismiss();
-				});
+    @Override
+    public void onBindViewHolder(@NonNull MyReposListAdapter.MyReposViewHolder holder, int position) {

-				repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+        UserRepositories currentItem = reposList.get(position);
+        holder.mTextView2My.setVisibility(View.GONE);

-					Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
-					intentOpenInBrowser.putExtra("repoFullNameBrowser", repoFullName.getText());
-					context.startActivity(intentOpenInBrowser);
-					dialog.dismiss();
-
-				});
-
-				repoStargazers.setOnClickListener(stargazers -> {
-
-					Intent intent = new Intent(context, RepoStargazersActivity.class);
-					intent.putExtra("repoFullNameForStars", repoFullName.getText());
-					context.startActivity(intent);
-					dialog.dismiss();
-
-				});
-
-				repoWatchers.setOnClickListener(watchers -> {
-
-					Intent intentW = new Intent(context, RepoWatchersActivity.class);
-					intentW.putExtra("repoFullNameForWatchers", repoFullName.getText());
-					context.startActivity(intentW);
-					dialog.dismiss();
-
-				});
-
-				repoForksList.setOnClickListener(forks -> {
-
-					Intent intentW = new Intent(context, RepoForksActivity.class);
-					intentW.putExtra("repoFullNameForForks", repoFullName.getText());
-					context.startActivity(intentW);
-					dialog.dismiss();
-
-				});
-
-			});
-
-		}
-
-	}
-
-	public MyReposListAdapter(Context mCtx, List<UserRepositories> reposListMain) {
-
-		this.mCtx = mCtx;
-		this.reposList = reposListMain;
-		reposListFull = new ArrayList<>(reposList);
-	}
-
-	@NonNull
-	@Override
-	public MyReposListAdapter.MyReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		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());
-		holder.htmlUrl.setText(currentItem.getHtml_url());
-
-		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.setVisibility(View.GONE);
-			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();
-		}
-	};
+        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.imageMy);
+            } else {
+                holder.imageMy.setImageDrawable(drawable);
+            }
+        }
+        else {
+            holder.imageMy.setImageDrawable(drawable);
+        }
+
+        holder.mTextView1My.setText(currentItem.getName());
+        if (!currentItem.getDescription().equals("")) {
+            holder.mTextView2My.setVisibility(View.VISIBLE);
+            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());
+
+    }
+
+    @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();
+        }
+    };
 }
--- a/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
@ -1,166 +0,0 @@
-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.database.api.RepositoriesApi;
-import org.mian.gitnex.database.models.Repository;
-import org.mian.gitnex.helpers.TinyDB;
-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;
-	private TinyDB tinyDb;
-
-	public NotificationsAdapter(Context context, List<NotificationThread> notificationThreads, OnMoreClickedListener onMoreClickedListener, OnNotificationClickedListener onNotificationClickedListener) {
-
-		this.tinyDb = new TinyDB(context);
-		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 typePr;
-		private ImageView typeIssue;
-		private ImageView typeUnknown;
-		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);
-			typePr = itemView.findViewById(R.id.typePr);
-			typeIssue = itemView.findViewById(R.id.typeIssue);
-			typeUnknown = itemView.findViewById(R.id.typeUnknown);
-			pinned = itemView.findViewById(R.id.pinned);
-			more = itemView.findViewById(R.id.more);
-
-		}
-	}
-
-	@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.typePr.setVisibility(View.VISIBLE);
-				holder.typeIssue.setVisibility(View.GONE);
-				holder.typeUnknown.setVisibility(View.GONE);
-				break;
-
-			case "Issue":
-				holder.typePr.setVisibility(View.GONE);
-				holder.typeIssue.setVisibility(View.VISIBLE);
-				holder.typeUnknown.setVisibility(View.GONE);
-				break;
-
-			default:
-				holder.typePr.setVisibility(View.GONE);
-				holder.typeIssue.setVisibility(View.GONE);
-				holder.typeUnknown.setVisibility(View.VISIBLE);
-				break;
-
-		}
-
-		holder.frame.setOnClickListener(v -> {
-
-			onNotificationClickedListener.onNotificationClicked(notificationThread);
-
-			String[] parts = notificationThread.getRepository().getFullname().split("/");
-			final String repoOwner = parts[0];
-			final String repoName = parts[1];
-
-			int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-			RepositoriesApi repositoryData = new RepositoriesApi(context);
-
-			Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
-
-			if(count == 0) {
-
-				long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
-				tinyDb.putLong("repositoryId", id);
-
-			}
-			else {
-
-				Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
-				tinyDb.putLong("repositoryId", data.getRepositoryId());
-
-			}
-		});
-
-		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);
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
@ -1,5 +1,7 @@
 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;
@ -10,14 +12,12 @@ 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.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.models.UserOrganizations;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;

--- a/app/src/main/java/org/mian/gitnex/adapters/ProfileEmailsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ProfileEmailsAdapter.java
@ -58,7 +58,7 @@ public class ProfileEmailsAdapter extends RecyclerView.Adapter<ProfileEmailsAdap
        if(currentItem.getPrimary()) {
            TextDrawable drawable = TextDrawable.builder()
                    .beginConfig()
-                    .textColor(mCtx.getResources().getColor(R.color.colorWhite))
+                    .textColor(mCtx.getResources().getColor(R.color.white))
                    .fontSize(36)
                    .width(220)
                    .height(60)
--- a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
@ -7,6 +7,8 @@ import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Filter;
+import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@ -18,8 +20,12 @@ 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;

@ -27,229 +33,231 @@ import java.util.Locale;
 * Author M M Arif
 */

-public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable {

-	private Context context;
-	private final int TYPE_LOAD = 0;
-	private List<PullRequests> prList;
-	private PullRequestsAdapter.OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
+    private Context context;
+    private final int TYPE_LOAD = 0;
+    private List<PullRequests> prList;
+    private List<PullRequests> prListFull;
+    private PullRequestsAdapter.OnLoadMoreListener loadMoreListener;
+    private boolean isLoading = false, isMoreDataAvailable = true;

-	public PullRequestsAdapter(Context context, List<PullRequests> prListMain) {
+    public PullRequestsAdapter(Context context, List<PullRequests> prListMain) {

-		this.context = context;
-		this.prList = prListMain;
+        this.context = context;
+        this.prList = prListMain;
+        prListFull = new ArrayList<>(prList);

-	}
+    }

-	@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 TextView prMergeable;
-		private TextView prHeadBranch;
-		private TextView prIsFork;
-		private TextView prForkFullName;
-		private ImageView assigneeAvatar;
-		private TextView prTitle;
-		private TextView prCreatedTime;
-		private TextView prCommentsCount;
+        private TextView prNumber;
+        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);
-			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);
+            prNumber = itemView.findViewById(R.id.prNumber);
+            assigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
+            prTitle = itemView.findViewById(R.id.prTitle);
+            prCommentsCount = itemView.findViewById(R.id.prCommentsCount);
+            LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
+            prCreatedTime = itemView.findViewById(R.id.prCreatedTime);

-			prTitle.setOnClickListener(v -> {
+            prTitle.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {

-				Context context = v.getContext();
+                    Context context = v.getContext();

-				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", prNumber.getText());
-				intent.putExtra("prMergeable", prMergeable.getText());
-				intent.putExtra("prHeadBranch", prHeadBranch.getText());
+                    Intent intent = new Intent(context, IssueDetailActivity.class);
+                    intent.putExtra("issueNumber", prNumber.getText());

-				TinyDB tinyDb = new TinyDB(context);
-				tinyDb.putString("issueNumber", prNumber.getText().toString());
-				tinyDb.putString("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);
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("issueNumber", prNumber.getText().toString());
+                    tinyDb.putString("issueType", "pr");
+                    context.startActivity(intent);

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

-				Context context = v.getContext();
+                    Context context = v.getContext();

-				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", prNumber.getText());
-				intent.putExtra("prMergeable", prMergeable.getText());
-				intent.putExtra("prHeadBranch", prHeadBranch.getText());
+                    Intent intent = new Intent(context, IssueDetailActivity.class);
+                    intent.putExtra("issueNumber", prNumber.getText());

-				TinyDB tinyDb = new TinyDB(context);
-				tinyDb.putString("issueNumber", prNumber.getText().toString());
-				tinyDb.putString("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);
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("issueNumber", prNumber.getText().toString());
+                    tinyDb.putString("issueType", "pr");
+                    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()));
-			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()));
+            prNumber.setText(String.valueOf(prModel.getNumber()));
+            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) {
+        LoadHolder(View itemView) {
+            super(itemView);
+        }

-			super(itemView);
-		}
+    }

-	}
+    public void setMoreDataAvailable(boolean moreDataAvailable) {

-	public void setMoreDataAvailable(boolean moreDataAvailable) {
+        isMoreDataAvailable = moreDataAvailable;

-		isMoreDataAvailable = moreDataAvailable;
+    }

-	}
+    public void notifyDataChanged() {

-	public void notifyDataChanged() {
+        notifyDataSetChanged();
+        isLoading = false;

-		notifyDataSetChanged();
-		isLoading = false;
+    }

-	}
+    public interface OnLoadMoreListener {

-	public interface OnLoadMoreListener {
+        void onLoadMore();

-		void onLoadMore();
+    }

-	}
+    public void setLoadMoreListener(PullRequestsAdapter.OnLoadMoreListener loadMoreListener) {

-	public void setLoadMoreListener(PullRequestsAdapter.OnLoadMoreListener loadMoreListener) {
+        this.loadMoreListener = loadMoreListener;

-		this.loadMoreListener = loadMoreListener;
+    }

-	}
+    @Override
+    public Filter getFilter() {
+        return prFilter;
+    }

-	public void updateList(List<PullRequests> list) {
+    private Filter prFilter = new Filter() {
+        @Override
+        protected FilterResults performFiltering(CharSequence constraint) {
+            List<PullRequests> filteredList = new ArrayList<>();

-		prList = list;
-		notifyDataSetChanged();
-	}
+            if (constraint == null || constraint.length() == 0) {
+                filteredList.addAll(prList);
+            } else {
+                String filterPattern = constraint.toString().toLowerCase().trim();
+
+                for (PullRequests item : prList) {
+                    if (item.getTitle().toLowerCase().contains(filterPattern) || item.getBody().toLowerCase().contains(filterPattern)) {
+                        filteredList.add(item);
+                    }
+                }
+            }
+
+            FilterResults results = new FilterResults();
+            results.values = filteredList;
+
+            return results;
+        }
+
+        @Override
+        protected void publishResults(CharSequence constraint, FilterResults results) {
+            prList.clear();
+            prList.addAll((List) results.values);
+            notifyDataSetChanged();
+        }
+    };

 }
--- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
@ -10,25 +10,19 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
+import com.amulyakhare.textdrawable.TextDrawable;
 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;
@ -37,6 +31,7 @@ import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
 import io.noties.markwon.ext.tables.TablePlugin;
 import io.noties.markwon.ext.tasklist.TaskListPlugin;
 import io.noties.markwon.html.HtmlPlugin;
+import io.noties.markwon.image.AsyncDrawable;
 import io.noties.markwon.image.DefaultMediaDecoder;
 import io.noties.markwon.image.ImageItem;
 import io.noties.markwon.image.ImagesPlugin;
@ -54,44 +49,25 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
    private List<Releases> releasesList;
    private Context mCtx;

-	static class ReleasesViewHolder extends RecyclerView.ViewHolder {
+    static class ReleasesViewHolder extends RecyclerView.ViewHolder {

-        private TextView releaseType;
-        private 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 ImageView releaseType;
+        private TextView releaseTitle;
+        private TextView releaseDescription;
+        private TextView releaseDownload;
        private TextView releaseZipDownload;
-	    private TextView releaseTarDownload;
-	    private ImageView downloadDropdownIcon;
-	    private RecyclerView downloadList;
+        private TextView releaseTarDownload;
+        private TextView releaseTag;

        private ReleasesViewHolder(View itemView) {
-
            super(itemView);

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

        }
    }
@ -112,74 +88,83 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
    public void onBindViewHolder(@NonNull ReleasesAdapter.ReleasesViewHolder holder, int position) {

        final TinyDB tinyDb = new TinyDB(mCtx);
-	    final String locale = tinyDb.getString("locale");
-	    final String timeFormat = tinyDb.getString("dateFormat");

        Releases currentItem = releasesList.get(position);

-	    holder.releaseName.setText(currentItem.getName());
+        holder.releaseTitle.setText(currentItem.getName());

-	    if(currentItem.isPrerelease()) {
-		    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.getTag_name().equals("")) {
+            holder.releaseTag.setText(mCtx.getResources().getString(R.string.releaseTag, currentItem.getTag_name()));
+        }
+        else {
+            holder.releaseTag.setVisibility(View.GONE);
+        }

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

        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) {
+                .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
+                    @Override
+                    public void configureImages(@NonNull ImagesPlugin plugin) {
+                        plugin.addSchemeHandler(new SchemeHandler() {
+                            @NonNull
+                            @Override
+                            public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {

-                            final int resourceId = mCtx.getResources().getIdentifier(
-                                    raw.substring("drawable://".length()),
-                                    "drawable",
-                                    mCtx.getPackageName());
+                                final 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(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());
+                            @NonNull
+                            @Override
+                            public Collection<String> supportedSchemes() {
+                                return Collections.singleton("drawable");
+                            }
+                        });
+                        plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
+                            @Nullable
+                            @Override
+                            public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
+                                return null;
+                            }
+                        });
+                        plugin.addMediaDecoder(GifMediaDecoder.create(false));
+                        plugin.addMediaDecoder(SvgMediaDecoder.create(mCtx.getResources()));
+                        plugin.addMediaDecoder(SvgMediaDecoder.create());
+                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create(mCtx.getResources()));
+                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
+                    }
                }))
                .usePlugin(new AbstractMarkwonPlugin() {
                    @Override
@ -200,29 +185,12 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
        Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(currentItem.getBody()));

        if(!currentItem.getBody().equals("")) {
-            markwon.setParsedMarkdown(holder.releaseBodyContent, bodyWithMD);
+            markwon.setParsedMarkdown(holder.releaseDescription, bodyWithMD);
        }
        else {
-	        holder.releaseBodyContent.setText(R.string.noReleaseBodyContent);
+            holder.releaseDescription.setVisibility(View.GONE);
        }

-	    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());
@ -231,9 +199,6 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
                Html.fromHtml("<a href='" + currentItem.getTarball_url() + "'>" + mCtx.getResources().getString(R.string.tarArchiveDownloadReleasesTab) + "</a> "));
        holder.releaseTarDownload.setMovementMethod(LinkMovementMethod.getInstance());

-	    ReleasesDownloadsAdapter adapter = new ReleasesDownloadsAdapter(currentItem.getAssets());
-	    holder.downloadList.setAdapter(adapter);
-
    }

    @Override
--- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesDownloadsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReleasesDownloadsAdapter.java
@ -1,68 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.models.Releases;
-import java.util.List;
-
-/**
- * Author M M Arif
- **/
-
-public class ReleasesDownloadsAdapter extends RecyclerView.Adapter<ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder> {
-
-	private List<Releases.assetsObject> releasesDownloadsList;
-
-	static class ReleasesDownloadsViewHolder extends RecyclerView.ViewHolder {
-
-		private TextView downloadName;
-
-		private ReleasesDownloadsViewHolder(View itemView) {
-
-			super(itemView);
-
-			downloadName = itemView.findViewById(R.id.downloadName);
-
-		}
-	}
-
-	ReleasesDownloadsAdapter(List<Releases.assetsObject> releasesDownloadsMain) {
-
-		this.releasesDownloadsList = releasesDownloadsMain;
-	}
-
-	@NonNull
-	@Override
-	public ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_releases_downloads, parent, false);
-		return new ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder(v);
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder holder, int position) {
-
-		Releases.assetsObject currentItem = releasesDownloadsList.get(position);
-
-		if(currentItem.getName() != null) {
-
-			holder.downloadName.setText(
-				Html.fromHtml("<a href='" + currentItem.getBrowser_download_url() + "'>" + currentItem.getName() + "</a> "));
-			holder.downloadName.setMovementMethod(LinkMovementMethod.getInstance());
-
-		}
-
-	}
-
-	@Override
-	public int getItemCount() {
-		return releasesDownloadsList.size();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java
@ -1,396 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Typeface;
-import android.view.LayoutInflater;
-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;
-import com.amulyakhare.textdrawable.TextDrawable;
-import com.amulyakhare.textdrawable.util.ColorGenerator;
-import com.google.android.material.bottomsheet.BottomSheetDialog;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
-import org.mian.gitnex.activities.RepoDetailActivity;
-import org.mian.gitnex.activities.RepoForksActivity;
-import org.mian.gitnex.activities.RepoStargazersActivity;
-import org.mian.gitnex.activities.RepoWatchersActivity;
-import org.mian.gitnex.clients.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.WatchInfo;
-import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-	private Context ctx;
-	private final int TYPE_LOAD = 0;
-	private List<UserRepositories> forksList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false;
-	private boolean isMoreDataAvailable = true;
-
-	public RepoForksAdapter(Context ctx, List<UserRepositories> forksListMain) {
-
-		this.ctx = ctx;
-		this.forksList = forksListMain;
-
-	}
-
-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		LayoutInflater inflater = LayoutInflater.from(ctx);
-
-		if(viewType == TYPE_LOAD) {
-			return new RepoForksAdapter.ForksHolder(inflater.inflate(R.layout.list_repositories, parent, false));
-		}
-		else {
-			return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
-		}
-
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
-
-			isLoading = true;
-			loadMoreListener.onLoadMore();
-
-		}
-
-		if(getItemViewType(position) == TYPE_LOAD) {
-
-			((RepoForksAdapter.ForksHolder) holder).bindData(forksList.get(position));
-
-		}
-
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-
-		if(forksList.get(position).getName() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-
-	}
-
-	@Override
-	public int getItemCount() {
-
-		return forksList.size();
-
-	}
-
-	class ForksHolder extends RecyclerView.ViewHolder {
-
-		private ImageView image;
-		private TextView repoName;
-		private TextView repoDescription;
-		private TextView fullName;
-		private CheckBox isRepoAdmin;
-		private ImageView repoPrivatePublic;
-		private TextView repoStars;
-		private TextView repoForks;
-		private TextView repoOpenIssuesCount;
-		private TextView repoType;
-		private LinearLayout archiveRepo;
-		private TextView repoBranch;
-		private ImageView reposDropdownMenu;
-
-		ForksHolder(View itemView) {
-
-			super(itemView);
-
-			repoName = itemView.findViewById(R.id.repoName);
-			repoDescription = itemView.findViewById(R.id.repoDescription);
-			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
-			image = itemView.findViewById(R.id.imageAvatar);
-			fullName = itemView.findViewById(R.id.repoFullName);
-			repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
-			repoStars = itemView.findViewById(R.id.repoStars);
-			repoForks = itemView.findViewById(R.id.repoForks);
-			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
-			reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
-			repoType = itemView.findViewById(R.id.repoType);
-			archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
-			repoBranch = itemView.findViewById(R.id.repoBranch);
-
-		}
-
-		@SuppressLint("SetTextI18n")
-		void bindData(UserRepositories forksModel) {
-
-			repoDescription.setVisibility(View.GONE);
-			repoBranch.setText(forksModel.getDefault_branch());
-
-			ColorGenerator generator = ColorGenerator.MATERIAL;
-			int color = generator.getColor(forksModel.getName());
-			String firstCharacter = String.valueOf(forksModel.getName().charAt(0));
-
-			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28)
-				.endConfig().buildRoundRect(firstCharacter, color, 3);
-
-			if(forksModel.getAvatar_url() != null) {
-				if(!forksModel.getAvatar_url().equals("")) {
-					PicassoService.getInstance(ctx).get().load(forksModel.getAvatar_url()).placeholder(R.drawable.loader_animated)
-						.transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(image);
-				}
-				else {
-					image.setImageDrawable(drawable);
-				}
-			}
-			else {
-				image.setImageDrawable(drawable);
-			}
-
-			repoName.setText(forksModel.getName());
-
-			if(!forksModel.getDescription().equals("")) {
-				repoDescription.setVisibility(View.VISIBLE);
-				repoDescription.setText(forksModel.getDescription());
-			}
-			fullName.setText(forksModel.getFullname());
-
-			if(forksModel.getPrivateFlag()) {
-				repoPrivatePublic.setImageResource(R.drawable.ic_lock);
-				repoType.setText(R.string.strPrivate);
-			}
-			else {
-				repoPrivatePublic.setVisibility(View.GONE);
-				repoType.setText(R.string.strPublic);
-			}
-
-			repoStars.setText(forksModel.getStars_count());
-			repoForks.setText(forksModel.getForks_count());
-			repoOpenIssuesCount.setText(forksModel.getOpen_issues_count());
-
-			if(isRepoAdmin == null) {
-				isRepoAdmin = new CheckBox(ctx);
-			}
-			isRepoAdmin.setChecked(forksModel.getPermissions().isAdmin());
-
-			if(forksModel.isArchived()) {
-				archiveRepo.setVisibility(View.VISIBLE);
-			}
-			else {
-				archiveRepo.setVisibility(View.GONE);
-			}
-
-			itemView.setOnClickListener(v -> {
-
-				Context context = v.getContext();
-				TextView repoFullName = v.findViewById(R.id.repoFullName);
-				TextView repoType_ = v.findViewById(R.id.repoType);
-
-				Intent intent = new Intent(context, RepoDetailActivity.class);
-				intent.putExtra("repoFullName", repoFullName.getText().toString());
-
-				TinyDB tinyDb = new TinyDB(context);
-				tinyDb.putString("repoFullName", repoFullName.getText().toString());
-				tinyDb.putString("repoType", repoType_.getText().toString());
-				//tinyDb.putBoolean("resumeIssues", true);
-				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");
-					final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
-
-					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 onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
-
-							if(response.isSuccessful()) {
-
-								assert response.body() != null;
-								tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
-
-							}
-							else {
-
-								tinyDb.putBoolean("repoWatch", false);
-
-								if(response.code() != 404) {
-
-									Toasty.error(context, context.getString(R.string.genericApiStatusError));
-
-								}
-
-							}
-
-						}
-
-						@Override
-						public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
-
-							tinyDb.putBoolean("repoWatch", false);
-							Toasty.error(context, context.getString(R.string.genericApiStatusError));
-
-						}
-					});
-
-				}
-
-				context.startActivity(intent);
-
-			});
-
-			reposDropdownMenu.setOnClickListener(v -> {
-
-				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 repoForksList = view.findViewById(R.id.repoForksList);
-				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
-
-				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();
-
-				repoOpenInBrowser.setOnClickListener(openInBrowser -> {
-
-					Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
-					intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
-					context.startActivity(intentOpenInBrowser);
-					dialog.dismiss();
-
-				});
-
-				repoStargazers.setOnClickListener(stargazers -> {
-
-					Intent intent = new Intent(context, RepoStargazersActivity.class);
-					intent.putExtra("repoFullNameForStars", fullName.getText());
-					context.startActivity(intent);
-					dialog.dismiss();
-
-				});
-
-				repoWatchers.setOnClickListener(watchers -> {
-
-					Intent intentW = new Intent(context, RepoWatchersActivity.class);
-					intentW.putExtra("repoFullNameForWatchers", fullName.getText());
-					context.startActivity(intentW);
-					dialog.dismiss();
-
-				});
-
-				repoForksList.setOnClickListener(watchers -> {
-
-					Intent intentW = new Intent(context, RepoForksActivity.class);
-					intentW.putExtra("repoFullNameForForks", fullName.getText());
-					context.startActivity(intentW);
-					dialog.dismiss();
-
-				});
-
-			});
-
-		}
-
-	}
-
-	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(RepoForksAdapter.OnLoadMoreListener loadMoreListener) {
-
-		this.loadMoreListener = loadMoreListener;
-
-	}
-
-	public void updateList(List<UserRepositories> list) {
-
-		forksList = list;
-		notifyDataSetChanged();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
+++ b/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,6 +109,13 @@ public class RepoStargazersAdapter extends BaseAdapter {
            viewHolder.memberName.setTypeface(myTypeface);
        }

+        if(tinyDb.getInt("themeId") == 1) { //light
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
+        }
+        else { // dark
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
+        }
+
    }

 }
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
+++ b/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,6 +109,13 @@ public class RepoWatchersAdapter extends BaseAdapter {
            viewHolder.memberName.setTypeface(myTypeface);
        }

+        if(tinyDb.getInt("themeId") == 1) { //light
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
+        }
+        else { // dark
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
+        }
+
    }

 }
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@ -1,8 +1,6 @@
 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.Typeface;
@ -13,7 +11,6 @@ import android.widget.CheckBox;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
@ -25,19 +22,15 @@ import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
-import org.mian.gitnex.activities.RepoForksActivity;
 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.WatchInfo;
+import org.mian.gitnex.models.WatchRepository;
+import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -63,9 +56,6 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 		private TextView repoForks;
 		private TextView repoOpenIssuesCount;
 		private TextView repoType;
-		private LinearLayout archiveRepo;
-		private TextView repoBranch;
-		private TextView htmlUrl;

 		private ReposViewHolder(View itemView) {

@ -81,9 +71,6 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
 			ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
 			repoType = itemView.findViewById(R.id.repoType);
-			archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
-			repoBranch = itemView.findViewById(R.id.repoBranch);
-			htmlUrl = itemView.findViewById(R.id.htmlUrl);

 			itemView.setOnClickListener(v -> {

@ -99,47 +86,25 @@ 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");

-					WatchInfo watch = new WatchInfo();
+					WatchRepository watch = new WatchRepository();

-					Call<WatchInfo> call;
+					Call<WatchRepository> call;

 					call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);

-					call.enqueue(new Callback<WatchInfo>() {
+					call.enqueue(new Callback<WatchRepository>() {

 						@Override
-						public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
+						public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {

 							if(response.isSuccessful()) {

@ -152,7 +117,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo

 								if(response.code() != 404) {

-									Toasty.error(context, context.getString(R.string.genericApiStatusError));
+									Toasty.info(context, context.getString(R.string.genericApiStatusError));

 								}

@ -161,14 +126,13 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 						}

 						@Override
-						public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
+						public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {

 							tinyDb.putBoolean("repoWatch", false);
-							Toasty.error(context, context.getString(R.string.genericApiStatusError));
+							Toasty.info(context, context.getString(R.string.genericApiStatusError));

 						}
 					});
-
 				}

 				context.startActivity(intent);
@ -184,26 +148,13 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 				TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
 				TextView repoStargazers = view.findViewById(R.id.repoStargazers);
 				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
-				TextView repoForksList = view.findViewById(R.id.repoForksList);
-				TextView repoCopyUrl = view.findViewById(R.id.repoCopyUrl);
 				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);

-				bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
+				bottomSheetHeader.setText(fullName.getText());
 				BottomSheetDialog dialog = new BottomSheetDialog(context);
 				dialog.setContentView(view);
 				dialog.show();

-				repoCopyUrl.setOnClickListener(openInBrowser -> {
-
-					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
-					ClipData clip = ClipData.newPlainText("repoUrl", htmlUrl.getText().toString());
-					assert clipboard != null;
-					clipboard.setPrimaryClip(clip);
-
-					Toasty.info(context, context.getString(R.string.copyIssueUrlToastMsg));
-					dialog.dismiss();
-				});
-
 				repoOpenInBrowser.setOnClickListener(openInBrowser -> {

 					Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
@ -231,15 +182,6 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo

 				});

-				repoForksList.setOnClickListener(forks -> {
-
-					Intent intentW = new Intent(context, RepoForksActivity.class);
-					intentW.putExtra("repoFullNameForForks", fullName.getText());
-					context.startActivity(intentW);
-					dialog.dismiss();
-
-				});
-
 			});

 		}
@ -257,7 +199,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 	@Override
 	public ReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {

-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repos, parent, false);
 		return new ReposViewHolder(v);
 	}

@ -266,8 +208,6 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo

 		UserRepositories currentItem = reposList.get(position);
 		holder.repoDescription.setVisibility(View.GONE);
-		holder.repoBranch.setText(currentItem.getDefault_branch());
-		holder.htmlUrl.setText(currentItem.getHtml_url());

 		ColorGenerator generator = ColorGenerator.MATERIAL;
 		int color = generator.getColor(currentItem.getName());
@ -294,11 +234,11 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 		}
 		holder.fullName.setText(currentItem.getFullname());
 		if(currentItem.getPrivateFlag()) {
-			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
 			holder.repoType.setText(R.string.strPrivate);
 		}
 		else {
-			holder.repoPrivatePublic.setVisibility(View.GONE);
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
 			holder.repoType.setText(R.string.strPublic);
 		}
 		holder.repoStars.setText(currentItem.getStars_count());
@ -309,13 +249,6 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 		}
 		holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());

-		if(currentItem.isArchived()) {
-			holder.archiveRepo.setVisibility(View.VISIBLE);
-		}
-		else {
-			holder.archiveRepo.setVisibility(View.GONE);
-		}
-
 	}

 	@Override
--- a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
@ -1,8 +1,6 @@
 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.Typeface;
@ -13,10 +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;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
@ -25,19 +20,17 @@ import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
-import org.mian.gitnex.activities.RepoForksActivity;
 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.WatchInfo;
+import org.mian.gitnex.models.WatchRepository;
+import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -63,9 +56,6 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
        private TextView repoForks;
        private TextView repoOpenIssuesCount;
        private TextView repoType;
-	    private LinearLayout archiveRepo;
-	    private TextView repoBranch;
-	    private TextView htmlUrl;

        private OrgReposViewHolder(View itemView) {
            super(itemView);
@ -80,9 +70,6 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
            repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
            ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
            repoType = itemView.findViewById(R.id.repoType);
-	        archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
-	        repoBranch = itemView.findViewById(R.id.repoBranch);
-	        htmlUrl = itemView.findViewById(R.id.htmlUrl);

            itemView.setOnClickListener(v -> {

@ -96,45 +83,25 @@ 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");

-                    Call<WatchInfo> call;
+                    WatchRepository watch = new WatchRepository();
+
+                    Call<WatchRepository> call;

                    call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);

-                    call.enqueue(new Callback<WatchInfo>() {
+                    call.enqueue(new Callback<WatchRepository>() {

                        @Override
-                        public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
+                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {

                            if(response.isSuccessful()) {

@ -147,7 +114,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB

                                if(response.code() != 404) {

-                                    Toasty.error(context, context.getString(R.string.genericApiStatusError));
+                                    Toasty.info(context, context.getString(R.string.genericApiStatusError));

                                }

@ -156,14 +123,13 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                        }

                        @Override
-                        public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
+                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {

                            tinyDb.putBoolean("repoWatch", false);
-                            Toasty.error(context, context.getString(R.string.genericApiStatusError));
+                            Toasty.info(context, context.getString(R.string.genericApiStatusError));

                        }
                    });
-
                }

                context.startActivity(intent);
@ -179,26 +145,13 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
                TextView repoStargazers = view.findViewById(R.id.repoStargazers);
                TextView repoWatchers = view.findViewById(R.id.repoWatchers);
-	            TextView repoForksList = view.findViewById(R.id.repoForksList);
-	            TextView repoCopyUrl = view.findViewById(R.id.repoCopyUrl);
                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);

-	            bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
+                bottomSheetHeader.setText(fullName.getText());
                BottomSheetDialog dialog = new BottomSheetDialog(context);
                dialog.setContentView(view);
                dialog.show();

-	            repoCopyUrl.setOnClickListener(openInBrowser -> {
-
-		            ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
-		            ClipData clip = ClipData.newPlainText("repoUrl", htmlUrl.getText().toString());
-		            assert clipboard != null;
-		            clipboard.setPrimaryClip(clip);
-
-		            Toasty.info(context, context.getString(R.string.copyIssueUrlToastMsg));
-		            dialog.dismiss();
-	            });
-
                repoOpenInBrowser.setOnClickListener(openInBrowser -> {

                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
@ -208,7 +161,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB

                });

-                repoStargazers.setOnClickListener(stargazers -> {
+                repoStargazers.setOnClickListener(openInBrowser -> {

                    Intent intent = new Intent(context, RepoStargazersActivity.class);
                    intent.putExtra("repoFullNameForStars", fullName.getText());
@ -217,7 +170,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB

                });

-                repoWatchers.setOnClickListener(watchers -> {
+                repoWatchers.setOnClickListener(openInBrowser -> {

                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
@ -226,15 +179,6 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB

                });

-	            repoForksList.setOnClickListener(forks -> {
-
-		            Intent intentW = new Intent(context, RepoForksActivity.class);
-		            intentW.putExtra("repoFullNameForForks", fullName.getText());
-		            context.startActivity(intentW);
-		            dialog.dismiss();
-
-	            });
-
            });

        }
@ -250,7 +194,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
    @NonNull
    @Override
    public RepositoriesByOrgAdapter.OrgReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories_by_org, parent, false);
        return new RepositoriesByOrgAdapter.OrgReposViewHolder(v);
    }

@ -259,8 +203,6 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB

        UserRepositories currentItem = reposList.get(position);
        holder.repoDescription.setVisibility(View.GONE);
-	    holder.repoBranch.setText(currentItem.getDefault_branch());
-	    holder.htmlUrl.setText(currentItem.getHtml_url());

        ColorGenerator generator = ColorGenerator.MATERIAL;
        int color = generator.getColor(currentItem.getName());
@ -294,11 +236,11 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
        }
        holder.fullName.setText(currentItem.getFullname());
        if(currentItem.getPrivateFlag()) {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
            holder.repoType.setText(R.string.strPrivate);
        }
        else {
-	        holder.repoPrivatePublic.setVisibility(View.GONE);
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
            holder.repoType.setText(R.string.strPublic);
        }
        holder.repoStars.setText(currentItem.getStars_count());
@ -310,13 +252,6 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
        }
        holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());

-	    if(currentItem.isArchived()) {
-		    holder.archiveRepo.setVisibility(View.VISIBLE);
-	    }
-	    else {
-		    holder.archiveRepo.setVisibility(View.GONE);
-	    }
-
    }

    @Override
--- a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
@ -1,8 +1,6 @@
 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.Typeface;
@ -13,10 +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;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
@ -25,19 +20,17 @@ import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
-import org.mian.gitnex.activities.RepoForksActivity;
 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.WatchInfo;
+import org.mian.gitnex.models.WatchRepository;
+import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -63,9 +56,6 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
        private TextView repoForks;
        private TextView repoOpenIssuesCount;
        private TextView repoType;
-	    private LinearLayout archiveRepo;
-	    private TextView repoBranch;
-	    private TextView htmlUrl;

        private StarredReposViewHolder(View itemView) {
            super(itemView);
@ -80,9 +70,6 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
            repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
            ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
            repoType = itemView.findViewById(R.id.repoType);
-	        archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
-	        repoBranch = itemView.findViewById(R.id.repoBranch);
-	        htmlUrl = itemView.findViewById(R.id.htmlUrl);

            itemView.setOnClickListener(v -> {

@ -96,47 +83,25 @@ 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");

-                    WatchInfo watch = new WatchInfo();
+                    WatchRepository watch = new WatchRepository();

-                    Call<WatchInfo> call;
+                    Call<WatchRepository> call;

                    call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);

-                    call.enqueue(new Callback<WatchInfo>() {
+                    call.enqueue(new Callback<WatchRepository>() {

                        @Override
-                        public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
+                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {

                            if(response.isSuccessful()) {

@ -158,14 +123,13 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                        }

                        @Override
-                        public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
+                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {

                            tinyDb.putBoolean("repoWatch", false);
                            Toasty.info(context, context.getString(R.string.genericApiStatusError));

                        }
                    });
-
                }

                context.startActivity(intent);
@ -182,26 +146,13 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
                TextView repoStargazers = view.findViewById(R.id.repoStargazers);
                TextView repoWatchers = view.findViewById(R.id.repoWatchers);
-	            TextView repoForksList = view.findViewById(R.id.repoForksList);
-	            TextView repoCopyUrl = view.findViewById(R.id.repoCopyUrl);
                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);

-	            bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
+                bottomSheetHeader.setText(fullName.getText());
                BottomSheetDialog dialog = new BottomSheetDialog(context);
                dialog.setContentView(view);
                dialog.show();

-	            repoCopyUrl.setOnClickListener(openInBrowser -> {
-
-		            ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
-		            ClipData clip = ClipData.newPlainText("repoUrl", htmlUrl.getText().toString());
-		            assert clipboard != null;
-		            clipboard.setPrimaryClip(clip);
-
-		            Toasty.info(context, context.getString(R.string.copyIssueUrlToastMsg));
-		            dialog.dismiss();
-	            });
-
                repoOpenInBrowser.setOnClickListener(openInBrowser -> {

                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
@ -229,15 +180,6 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi

                });

-	            repoForksList.setOnClickListener(forks -> {
-
-		            Intent intentW = new Intent(context, RepoForksActivity.class);
-		            intentW.putExtra("repoFullNameForForks", fullName.getText());
-		            context.startActivity(intentW);
-		            dialog.dismiss();
-
-	            });
-
            });

        }
@ -253,7 +195,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
    @NonNull
    @Override
    public StarredReposListAdapter.StarredReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_starred_repos, parent, false);
        return new StarredReposListAdapter.StarredReposViewHolder(v);
    }

@ -262,8 +204,6 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi

        UserRepositories currentItem = reposList.get(position);
        holder.repoDescription.setVisibility(View.GONE);
-	    holder.repoBranch.setText(currentItem.getDefault_branch());
-	    holder.htmlUrl.setText(currentItem.getHtml_url());

        ColorGenerator generator = ColorGenerator.MATERIAL;
        int color = generator.getColor(currentItem.getName());
@ -297,11 +237,11 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
        }
        holder.fullName.setText(currentItem.getFullname());
        if(currentItem.getPrivateFlag()) {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
            holder.repoType.setText(R.string.strPrivate);
        }
        else {
-	        holder.repoPrivatePublic.setVisibility(View.GONE);
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
            holder.repoType.setText(R.string.strPublic);
        }
        holder.repoStars.setText(currentItem.getStars_count());
@ -312,13 +252,6 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
        }
        holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());

-	    if(currentItem.isArchived()) {
-		    holder.archiveRepo.setVisibility(View.VISIBLE);
-	    }
-	    else {
-		    holder.archiveRepo.setVisibility(View.GONE);
-	    }
-
    }

    @Override
--- a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
@ -11,9 +11,10 @@ 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;

 /**
@ -110,5 +111,12 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
            viewHolder.memberName.setTypeface(myTypeface);
        }

+        if(tinyDb.getInt("themeId") == 1) { //light
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
+        }
+        else { // dark
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
+        }
+
    }
 }
--- a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java
@ -1,155 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-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.appcompat.app.AlertDialog;
-import androidx.recyclerview.widget.RecyclerView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.database.api.UserAccountsApi;
-import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.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;
-
-	class UserAccountsViewHolder extends RecyclerView.ViewHolder {
-
-		private TextView accountUrl;
-		private TextView userId;
-		private ImageView activeAccount;
-		private ImageView deleteAccount;
-		private ImageView repoAvatar;
-		private TextView accountId;
-		private TextView accountName;
-
-		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);
-			accountId = itemView.findViewById(R.id.accountId);
-			accountName = itemView.findViewById(R.id.accountName);
-
-			deleteAccount.setOnClickListener(itemDelete -> {
-
-				new AlertDialog.Builder(mCtx)
-					.setIcon(mCtx.getDrawable(R.drawable.ic_delete))
-					.setTitle(mCtx.getResources().getString(R.string.removeAccountPopupTitle))
-					.setMessage(mCtx.getResources().getString(R.string.removeAccountPopupMessage))
-					.setPositiveButton(mCtx.getResources().getString(R.string.removeButton), (dialog, which) -> {
-
-						updateLayoutByPosition(getAdapterPosition());
-						UserAccountsApi userAccountsApi = new UserAccountsApi(mCtx);
-						userAccountsApi.deleteAccount(Integer.parseInt(accountId.getText().toString()));
-					}).setNeutralButton(mCtx.getResources().getString(R.string.cancelButton), null)
-					.show();
-
-			});
-
-			itemView.setOnClickListener(itemEdit -> {
-
-				String accountNameSwitch = accountName.getText().toString();
-				UserAccountsApi userAccountsApi = new UserAccountsApi(mCtx);
-				UserAccount userAccount = userAccountsApi.getAccountData(accountNameSwitch);
-
-				if(tinyDB.getInt("currentActiveAccountId") != userAccount.getAccountId()) {
-
-					String url = UrlBuilder.fromString(userAccount.getInstanceUrl())
-						.withPath("/")
-						.toString();
-
-					tinyDB.putString("loginUid", userAccount.getUserName());
-					tinyDB.putString("userLogin", userAccount.getUserName());
-					tinyDB.putString(userAccount.getUserName() + "-token", userAccount.getToken());
-					tinyDB.putString("instanceUrl", userAccount.getInstanceUrl());
-					tinyDB.putInt("currentActiveAccountId", userAccount.getAccountId());
-
-					Toasty.success(mCtx,  mCtx.getResources().getString(R.string.switchAccountSuccess, userAccount.getUserName(), url));
-					((Activity) mCtx).recreate();
-				}
-
-			});
-
-		}
-
-	}
-
-	public UserAccountsAdapter(Context mCtx, List<UserAccount> userAccountsListMain) {
-
-		this.mCtx = mCtx;
-		this.userAccountsList = userAccountsListMain;
-	}
-
-	private void updateLayoutByPosition(int position) {
-
-		userAccountsList.remove(position);
-		notifyItemRemoved(position);
-		notifyItemRangeChanged(position, userAccountsList.size());
-		Toasty.success(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.accountId.setText(String.valueOf(currentItem.getAccountId()));
-		holder.accountName.setText(currentItem.getAccountName());
-		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.VISIBLE);
-		}
-
-	}
-
-	@Override
-	public int getItemCount() {
-		return userAccountsList.size();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsListDialogAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsListDialogAdapter.java
@ -1,72 +0,0 @@
-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.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TinyDB;
-import java.util.List;
-import io.mikael.urlbuilder.UrlBuilder;
-
-/**
- * Author M M Arif
- */
-
-public class UserAccountsListDialogAdapter extends ArrayAdapter<UserAccount> {
-
-	private final Context mCtx;
-	private final List<UserAccount> userAccountsList;
-
-	public UserAccountsListDialogAdapter(@NonNull Context mCtx, int resource, @NonNull List<UserAccount> objects) {
-
-		super(mCtx, resource, objects);
-		userAccountsList = objects;
-		this.mCtx = mCtx;
-	}
-
-	@SuppressLint("ViewHolder")
-	@NonNull
-	@Override
-	public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
-
-		LayoutInflater inflater = (LayoutInflater) mCtx.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-		assert inflater != null;
-		View rowView = inflater.inflate(R.layout.custom_user_accounts_list, parent, false);
-
-		TinyDB tinyDB = new TinyDB(mCtx);
-
-		ImageView profileImage = rowView.findViewById(R.id.profileImage);
-		TextView userName = rowView.findViewById(R.id.userName);
-		TextView accountUrl = rowView.findViewById(R.id.accountUrl);
-		ImageView activeAccount = rowView.findViewById(R.id.activeAccount);
-
-		UserAccount currentItem = userAccountsList.get(position);
-
-		String url = UrlBuilder.fromString(currentItem.getInstanceUrl())
-			.withPath("/")
-			.toString();
-
-		userName.setText(currentItem.getUserName());
-		accountUrl.setText(url);
-
-		if(tinyDB.getInt("currentActiveAccountId") == currentItem.getAccountId()) {
-			activeAccount.setVisibility(View.VISIBLE);
-		}
-
-		PicassoService
-			.getInstance(mCtx).get().load(url + "img/favicon.png").placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(profileImage);
-
-		return rowView;
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java
@ -1,147 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.recyclerview.widget.RecyclerView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.database.api.UserAccountsApi;
-import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.fragments.UserAccountsFragment;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
-import io.mikael.urlbuilder.UrlBuilder;
-
-/**
- * Author M M Arif
- */
-
-public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNavAdapter.UserAccountsViewHolder> {
-
-	private static DrawerLayout drawer;
-	private List<UserAccount> userAccountsList;
-	private Context mCtx;
-	private TextView toolbarTitle;
-
-	public UserAccountsNavAdapter(Context mCtx, List<UserAccount> userAccountsListMain, DrawerLayout drawerLayout, TextView toolbarTitle) {
-
-		this.mCtx = mCtx;
-		this.userAccountsList = userAccountsListMain;
-		drawer = drawerLayout;
-		this.toolbarTitle = toolbarTitle;
-	}
-
-	class UserAccountsViewHolder extends RecyclerView.ViewHolder {
-
-		private ImageView userAccountAvatar;
-
-		private UserAccountsViewHolder(View itemView) {
-
-			super(itemView);
-
-			userAccountAvatar = itemView.findViewById(R.id.userAccountAvatar);
-
-			itemView.setOnClickListener(item -> {
-
-				customDialogUserAccountsList(userAccountsList);
-				drawer.closeDrawers();
-			});
-
-		}
-
-	}
-
-	@NonNull
-	@Override
-	public UserAccountsNavAdapter.UserAccountsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.nav_user_accounts, parent, false);
-		return new UserAccountsViewHolder(v);
-	}
-
-	@SuppressLint("DefaultLocale")
-	@Override
-	public void onBindViewHolder(@NonNull UserAccountsNavAdapter.UserAccountsViewHolder holder, int position) {
-
-		UserAccount currentItem = userAccountsList.get(position);
-
-		String url = UrlBuilder.fromString(currentItem.getInstanceUrl())
-			.withPath("/")
-			.toString();
-
-		PicassoService
-			.getInstance(mCtx).get().load(url + "img/favicon.png").placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAccountAvatar);
-	}
-
-	@Override
-	public int getItemCount() {
-
-		return userAccountsList.size();
-	}
-
-	private void customDialogUserAccountsList(List<UserAccount> allAccountsList) {
-
-		TinyDB tinyDB = new TinyDB(mCtx);
-		Dialog dialog = new Dialog(mCtx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
-		dialog.setContentView(R.layout.custom_user_accounts_dialog);
-
-		ListView listView = dialog.findViewById(R.id.accountsList);
-		TextView manageAccounts = dialog.findViewById(R.id.manageAccounts);
-
-		if (dialog.getWindow() != null) {
-			dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-		}
-
-		manageAccounts.setOnClickListener(item -> {
-
-			toolbarTitle.setText(mCtx.getResources().getString(R.string.pageTitleUserAccounts));
-			AppCompatActivity activity = (AppCompatActivity) mCtx;
-			activity.getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new UserAccountsFragment()).commit();
-			dialog.dismiss();
-		});
-
-		UserAccountsListDialogAdapter arrayAdapter = new UserAccountsListDialogAdapter(mCtx, R.layout.custom_user_accounts_list, allAccountsList);
-		listView.setAdapter(arrayAdapter);
-
-		listView.setOnItemClickListener((adapterView, view, which, l) -> {
-
-			String accountNameSwitch = allAccountsList.get(which).getAccountName();
-			UserAccountsApi userAccountsApi = new UserAccountsApi(mCtx);
-			UserAccount userAccount = userAccountsApi.getAccountData(accountNameSwitch);
-
-			if(tinyDB.getInt("currentActiveAccountId") != userAccount.getAccountId()) {
-
-				String url = UrlBuilder.fromString(userAccount.getInstanceUrl())
-					.withPath("/")
-					.toString();
-
-				tinyDB.putString("loginUid", userAccount.getUserName());
-				tinyDB.putString("userLogin", userAccount.getUserName());
-				tinyDB.putString(userAccount.getUserName() + "-token", userAccount.getToken());
-				tinyDB.putString("instanceUrl", userAccount.getInstanceUrl());
-				tinyDB.putInt("currentActiveAccountId", userAccount.getAccountId());
-
-				Toasty.success(mCtx,  mCtx.getResources().getString(R.string.switchAccountSuccess, userAccount.getUserName(), url));
-				((Activity) mCtx).recreate();
-				dialog.dismiss();
-			}
-		});
-		dialog.show();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
@ -9,9 +9,6 @@ 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;
@ -19,10 +16,13 @@ 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;
--- a/app/src/main/java/org/mian/gitnex/adapters/UserSearchForTeamMemberAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserSearchForTeamMemberAdapter.java
@ -1,182 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.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();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/clients/IssuesService.java
+++ b/app/src/main/java/org/mian/gitnex/clients/IssuesService.java
@ -2,18 +2,20 @@ package org.mian.gitnex.clients;

 import android.content.Context;
 import android.util.Log;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.FilesData;
-import org.mian.gitnex.helpers.TinyDB;
+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;
@ -22,14 +24,13 @@ import retrofit2.converter.gson.GsonConverterFactory;
 * Author M M Arif
 */

-public class AppApiService {
+public class IssuesService {

 	public static <S> S createService(Class<S> serviceClass, String instanceURL, Context ctx) {

-		TinyDB tinyDb = new TinyDB(ctx);
-		final boolean connToInternet = AppUtil.hasNetworkConnection(ctx);
+		final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
 		File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
-		int cacheSize = FilesData.returnOnlyNumber(tinyDb.getString("cacheSizeStr")) * 1024 * 1024;
+		int cacheSize = 50 * 1024 * 1024; // 50MB
 		Cache cache = new Cache(httpCacheDirectory, cacheSize);

 		HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
@ -47,18 +48,22 @@ public class AppApiService {
 					//.addInterceptor(logging)
 					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
 					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()))
-					.addInterceptor(chain -> {
+					.addInterceptor(new Interceptor() {

-						Request request = chain.request();
-						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);
+				@NonNull
+				@Override
+				public Response intercept(@NonNull Chain chain) throws IOException {

-					}).build();
+					Request request = chain.request();
+					if(connToInternet) {
+						request = request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build();
+					}
+					else {
+						request = request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build();
+					}
+					return chain.proceed(request);
+				}
+			}).build();

 			Retrofit.Builder builder = new Retrofit.Builder()
 					.baseUrl(instanceURL)
--- a/app/src/main/java/org/mian/gitnex/clients/PicassoService.java
+++ b/app/src/main/java/org/mian/gitnex/clients/PicassoService.java
@ -14,18 +14,16 @@ import javax.net.ssl.X509TrustManager;
 import okhttp3.OkHttpClient;

 /**
- * Author opyale
+ * Author anonTree1417
 */

 public class PicassoService {

 	private static PicassoService picassoService;
-	private static File cachePath;
 	private Picasso picasso;

 	private PicassoService(Context context) {

-		cachePath = new File(context.getCacheDir() + "/picasso_cache/");
 		Picasso.Builder builder = new Picasso.Builder(context);

 		try {
@ -47,7 +45,11 @@ public class PicassoService {

 			});

-			picasso = builder.memoryCache(new PicassoCache(cachePath, context)).build();
+			File cachePath = new File(context.getCacheDir() + "/picasso_cache/");
+			//noinspection ResultOfMethodCallIgnored
+			cachePath.mkdirs();
+
+			picasso = builder.memoryCache(new PicassoCache(cachePath)).build();

 		}
 		catch(Exception e) {
@ -59,9 +61,7 @@ public class PicassoService {

 	public Picasso get() {

-		cachePath.mkdirs();
 		return picasso;
-
 	}

 	public static synchronized PicassoService getInstance(Context context) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
M M Arif	3ddf978bf0	Merge pull request 'prepare release 2.5' (#434 ) from prepare-release-2.5 into release-2.5 Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/434	2020-04-21 16:02:15 +00:00
M M Arif	bb8cc3ff6e	prepare release 2.5	2020-04-21 19:19:16 +05:00
6543	e9eef8fcbf	[Backport] Crowdin [2020-04-21] (#432 ) Merge branch 'release-2.5' into backport_431 Update from Crowdin Co-authored-by: 6543 <6543@obermui.de> Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/432 Reviewed-by: M M Arif <mmarif@swatian.com>	2020-04-21 13:54:07 +00:00
M M Arif	eba170f7e9	Shuffle tabs, add images (#430 ) update images workaround for #414 (shuffle tabs) Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/430 Reviewed-by: 6543 <6543@noreply.gitea.io>	2020-04-21 08:50:51 +00:00
M M Arif	c2b316446c	#427 Dismiss bottom sheet on subscribe/unsubscribe to issue & Fix (#429 ) Dismiss bottom sheet on subscribe/unsubscribe to issue: Does not really fix the issue as there is way to handle this without a proper call. And dismiss does not work properly either. But added few improvements and fixed close/reopen issue along the way. Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/429 Reviewed-by: 6543 <6543@noreply.gitea.io>	2020-04-18 14:21:48 +00:00
				`@ -1 +0,0 @@`
				!function(e){"use strict";function t(){"complete"===document.readyState?n():e.addEventListener("DOMContentLoaded",n)}function n(){try{var e=document.querySelectorAll("code.hljs");for(var t in e)e.hasOwnProperty(t)&&r(e[t])}catch(n){console.error("LineNumbers error: ",n)}}function r(e){if("object"==typeof e){var t=e.parentNode,n=o(t.textContent);if(n>1){for(var r="",c=0;n>c;c++)r+=c+1+"\n";var l=document.createElement("code");l.className="hljs hljs-line-numbers",l.style["float"]="left",l.textContent=r,t.insertBefore(l,e)}}}function o(e){if(0===e.length)return 0;var t=/\r\n\|\r\|\n/g,n=e.match(t);return n=n?n.length:0,e[e.length-1].match(t)\|\|(n+=1),n}"undefined"==typeof e.hljs?console.error("highlight.js not detected!"):(e.hljs.initLineNumbersOnLoad=t,e.hljs.lineNumbersBlock=r)}(window);