Prepare release 3.0.1 (#625)

Prepare release 3.0.1

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

.drone.yml

@@ -15,8 +15,8 @@ steps:
     image: zosiab/eclint:latest
     depends_on: [ clone ]
     commands:
-      - git pull origin main
+      - git pull origin master
-      - eclint check $(git diff --name-only origin/main)
+      - 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
@@ -54,7 +54,7 @@ trigger:
   event:
     - push
   branch:
-    - main
+    - master
 
 ---
 kind: pipeline
@@ -66,7 +66,7 @@ steps:
   - name: build
     image: nextcloudci/android:android-49
     commands:
-      - ./gradlew assembleFreeRelease
+      - ./gradlew build
 
   - name: sign
     image: nextcloudci/android:android-49
@@ -78,7 +78,7 @@ steps:
       KEY_PASS:
         from_secret: KEY_PASS
       OUTPUT: signed.apk
-      INSTANCE: https://codeberg.org
+      GITEA: https://gitea.com
       KS_FILE: ci_keystore.jks
       KS_REPO:
         from_secret: KS_REPO
@@ -101,4 +101,4 @@ trigger:
   event:
     - push
   branch:
-    - main
+    - master

.gitea/issue_template.md

@@ -0,0 +1,32 @@
+## # What do you want to address?
+(This step is required; examples are shown below)
+
+- [ ] Bug
+- [ ] Feature
+- [ ] Suggestion
+
+## # Describe your matter briefly
+(This step is required)
+
+
+##### What did you expect? (Useful when addressing bugs)
+---
+_(This step is optional)_
+
+
+##### Some additional details (Useful, when we are trying to reproduce a bug)
+---
+_(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): 
+
+
+##### We would appreciate some screenshots or stacktrace's, but this is also not required.
+---
+_(Screenshots and stacktrace's can go here)_
+
+#### Thank you for your time.

.gitea/issue_template/bug.md

@@ -1,37 +0,0 @@
----
-
-name: "Bug"
-about: "Something isn't working"
-labels:
-
-- Bug
-
----
-
-## # Describe your matter briefly
-<br><br>
-
-##### What did you expect?
----
-<br><br>
-
-##### Some additional details
----
-
-* The version of **Gitea** you are using: 
-* The version of **GitNex** you are using: 
-* Source of installation (Play Store, F-Droid, APK): 
-* Current android version and phone model/manufacturer: 
-* The type of certificate your instance is using (self-signed, signed): 
-* How you used to log in (via password or token): 
-<br>
-
-##### We would appreciate some screenshots or stacktrace's, but this is also not required.
----
-<!-- Screenshots and stacktrace's can go here. -->
-<br><br>
-
-- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/main/CONTRIBUTING.md).
-<br>
-
-<!-- Thank you for your time. -->

.gitea/issue_template/feature.md

@@ -1,17 +0,0 @@
----
-
-name: "Feature"
-about: "A new feature or an enhancement to an existing feature"
-labels:
-
-- Feature
-
----
-
-## # Describe your matter briefly
-<br><br>
-
-- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/main/CONTRIBUTING.md).
-<br>
-
-<!-- Thank you for your time. -->

.gitea/issue_template/suggestion.md

@@ -1,37 +0,0 @@
----
-
-name: "Suggestion"
-about: "A general suggestion"
-labels:
-
-- Suggestion
-
----
-
-## # Describe your matter briefly
-<br><br>
-
-##### What did you expect?
----
-<br><br>
-
-##### Some additional details
----
-
-* The version of **Gitea** you are using: 
-* The version of **GitNex** you are using: 
-* Source of installation (Play Store, F-Droid, APK): 
-* Current android version and phone model/manufacturer: 
-* The type of certificate your instance is using (self-signed, signed): 
-* How you used to log in (via password or token): 
-<br>
-
-##### We would appreciate some screenshots or stacktrace's, but this is also not required.
----
-<!-- Screenshots and stacktrace's can go here. -->
-<br><br>
-
-- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/main/CONTRIBUTING.md).
-<br>
-
-<!-- Thank you for your time. --> 

.gitea/pull_request_template.md

@@ -1,9 +1,8 @@
-### Describe what your pull request does and which issue you’re targeting
+Please check the following:
-<!-- Create a new issue, if it doesn't exist yet -->
-<br><br>
 
-<!-- Make sure you are targeting the "main" branch, pull requests on release branches are only allowed for bug fixes. -->
+1. Make sure you are targeting the `master` branch, pull requests on release branches are only allowed for bug fixes.
+2. Read contributing guidelines: [CONTRIBUTING.md](https://gitea.com/GitNex/GitNex/src/branch/master/CONTRIBUTING.md)
+3. Please follow the [Code-Standards](https://gitea.com/gitnex/GitNex/wiki/Code-Standards)
+4. Describe what your pull request does and which issue you’re targeting (create one if does not exist)
 
-- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/main/CONTRIBUTING.md).
+**You MUST delete the content above including this line before posting, otherwise your pull request will be invalid.**
-- [ ] I'm following the code standards as defined [here](https://codeberg.org/gitnex/GitNex/wiki/Code-Standards).
-- [ ] By submitting this pull request, I permit GitNex to license my work under the [GNU General Public License v3](https://codeberg.org/GitNex/GitNex/src/branch/main/LICENSE).

.gitignore

@@ -11,9 +11,6 @@
 # Release dir
 app/release/*
 
-# Pro dir
-app/pro/*
-
 # Files for the ART/Dalvik VM
 *.dex
 
@@ -195,6 +192,3 @@ crowdin.yml
 !/gradle/wrapper/gradle-wrapper.jar
 
 # End of https://www.gitignore.io/api/android,androidstudio
-
-# Crowdin Config
-crowdin.yml

.gitlab-ci.yml

@@ -1,43 +1,35 @@
 stages:
+  - test
   - build
   - sign
   - publish
 
-on_setup:
+test:
-  image: curlimages/curl:7.77.0
+  image: nextcloudci/android:android-49
-  stage: .pre
+  stage: test
-  only:
-    - main
-    - tags
-  variables:
-    INSTANCE: "https://codeberg.org"
-    MAIN_REPO: gitnex/GitNex
-    STATE: pending
   script:
-    - ./scripts/add-commit-status.sh
+    - ./gradlew test
 
 build:
-  image: nextcloudci/android8:android-61
+  image: nextcloudci/android:android-49
   stage: build
   only:
-    - main
+    - master
-    - tags
   script:
-    - ./gradlew assembleFreeRelease
+    - ./gradlew build
   artifacts:
     paths:
       - app/build/outputs/
     expire_in: 15 minutes
 
 sign:
-  image: nextcloudci/android8:android-61
+  image: nextcloudci/android:android-49
   stage: sign
   only:
-    - main
+    - master
-    - tags
   variables:
     OUTPUT: "signed.apk"
-    INSTANCE: "https://codeberg.org"
+    GITEA: "https://gitea.com"
     KS_FILE: "ci_keystore.jks"
   script:
     - ./scripts/sign-build.sh
@@ -47,11 +39,10 @@ sign:
     expire_in: 15 minutes
 
 latest:
-  image: curlimages/curl:7.77.0
+  image: tutum/curl
   stage: publish
   only:
-    - main
+    - master
-    - tags
   variables:
     WEBDAV_USERNAME: "GitNexBot"
     PLUGIN_FILE: "signed.apk"
@@ -60,7 +51,7 @@ latest:
     - curl -T "$PLUGIN_FILE" -u "$WEBDAV_USERNAME":"$WEBDAV_PASSWORD" "$PLUGIN_DESTINATION"
 
 release:
-  image: curlimages/curl:7.77.0
+  image: tutum/curl
   stage: publish
   only:
     - tags
@@ -70,31 +61,3 @@ release:
   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'
-
-on_success:
-  image: curlimages/curl:7.77.0
-  stage: .post
-  only:
-    - main
-    - tags
-  variables:
-    INSTANCE: "https://codeberg.org"
-    MAIN_REPO: gitnex/GitNex
-    STATE: success
-  script:
-    - ./scripts/add-commit-status.sh
-  when: on_success
-
-on_failure:
-  image: curlimages/curl:7.77.0
-  stage: .post
-  only:
-    - main
-    - tags
-  variables:
-    INSTANCE: "https://codeberg.org"
-    MAIN_REPO: gitnex/GitNex
-    STATE: failure
-  script:
-    - ./scripts/add-commit-status.sh
-  when: on_failure

.idea/codeStyles/Project.xml

@@ -16,24 +16,6 @@
         </value>
       </option>
     </JavaCodeStyleSettings>
-    <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
-    </JetCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="RIGHT_MARGIN" value="220" />
       <option name="KEEP_LINE_BREAKS" value="false" />
@@ -180,4 +162,4 @@
       </arrangement>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>

CONTRIBUTING.md

@@ -2,35 +2,26 @@
 
 Please take a few minutes to read this document to make the process of contribution more easy and healthy for all involved.
 
-### General
+## Pull Requests
-> **Be polite and gentle while commenting or creating new issues to maintain a healthy environment in which __everyone__ is able to feel comfortable.**
+Patches, enhancements, features are always welcome. The PR should focus on the scope of work and avoid many unnecessary commits. Please provide as much detail and context as possible to explain the work submitted.
-<br>
 
-### Issues and Reports
+Please ask if you are not sure about the scope of work to be submitted to avoid waste of time spent on the work.
-Before creating an issue please take a moment and search the repository issues(open/closed) to avoid duplicate issues either it's a bug or feature.
-In case you want to submit a bug report, please provide as much details as possible to better debug the problem. The important part is how to reproduce the bug and steps to reproduce are appreciated.<br><br>
-**Note:** Please contact the project directly via [email](mailto:gitnex@swatian.com) if have to share sensitive and security related details.
-<br>
 
-### Pull Requests
+**Code Standards**
-Patches, enhancements and features are always welcome.
-The PR should focus on the scope of work and avoid many unnecessary commits.
-Please provide as much detail and context as possible to explain the work submitted.
-
-**Please ask if you are not sure about the scope of work to be submitted to avoid waste of time spent on the work.** (Submit an issue, __before__ submitting a PR)
-
-**Code Standards**<br><br>
 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)
 
-**How to submit a PR (Pull Request)**  
+**How to submit a PR**  
-1. Fork this repository.
+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.
-2. Clone the forked repository from your namespace to your local machine.
-3. Create a new branch and work on your feature, enhancement or patch.
-4. Push your commits to your forked version.
-5. You can now create a PR using the web interface against **main** branch.
 
-For more information, click [here](http://makeapullrequest.com/).
+**IMPORTANT:** By submitting PR, you agree to allow GitNex to license your work under the same license as that used by GitNex.
 
-**IMPORTANT:** By submitting PR, you agree to allow GitNex to license your work under the same license as that used by GitNex.
+## Issues and Reports
+*1st of please be polite and gentle while commenting or creating new issue to maintain a healthy environment.*
+
+Before creating an issue please take a moment and search the repository issues(open/closed) to avoid duplicate issues either it's a bug or feature.
+
+In case you want to submit a bug report, please provide as much details as possible to better debug the problem. The important part is how to reproduce the bug and steps to reproduce are appreciated.
+
+**Note:** Please contact the project directly via email(gitnex@swatian.com) if have to share sensitive and security related details.

README.md

@@ -1,17 +1,17 @@
-[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Pipeline status](https://img.shields.io/gitlab/pipeline/mmarif4u/gitnex-ci/main)](https://gitlab.com/mmarif4u/gitnex-ci/-/pipelines) [![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://codeberg.org/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://codeberg.org/gitnex/GitNex/releases) [![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex) [![Join the Discord chat at https://discord.gg/FbSS4rf](https://img.shields.io/discord/632219664587685908.svg)](https://discord.gg/FbSS4rf)
 
-[<img alt="Become a Patreon" src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" height="40"/>](https://www.patreon.com/mmarif)
+[<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/paid, 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 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 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.pro)
+[<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='https://codeberg.org/gitnex/GitNex/raw/branch/main/assets/apk-badge.png' height="82"/>](https://cloud.swatian.com/s/DN7E5xxtaw4fRbE)
+[<img alt='Download builds and releases' src='assets/apk-badge.png' height="82"/>](https://cloud.swatian.com/s/DN7E5xxtaw4fRbE)
 
 ## Note about Gitea version
 Please make sure that you are on latest stable release or later for better app experience.
@@ -21,10 +21,10 @@ Check the versions [compatibility page](https://codeberg.org/gitnex/GitNex/wiki/
 ## Build from source
 Option 1 - Download the source code, open it in Android Studio and build it there.
 
-Option 2 - Open terminal(Linux) and cd to the project dir. Run `./gradlew assembleFree`.
+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
@@ -33,11 +33,10 @@ Option 2 - Open terminal(Linux) and cd to the project dir. Run `./gradlew assemb
 - Files diff for PRs
 - Notifications
 - Drafts
-- Repositories / issues / org list
 - [MANY MORE](https://codeberg.org/gitnex/GitNex/wiki/Features)
 
 ## Contributing
-[CONTRIBUTING](https://codeberg.org/gitnex/GitNex/src/branch/main/CONTRIBUTING.md)
+[CONTRIBUTING](https://codeberg.org/gitnex/GitNex/src/branch/master/CONTRIBUTING.md)
 
 ## Translation
 Help us translate GitNex to your native language.
@@ -48,50 +47,48 @@ We use [Crowdin](https://crowdin.com/project/gitnex) for translation. If your la
 
 ## Screenshots:
 
-<img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/001.png" alt="001.png" width="200"/>  | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/002.png" alt="002.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/003.png" alt="003.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/004.png" alt="004.png" width="200"/>
+<img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/001.png" alt="001.png" width="200"/>  | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/002.png" alt="002.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/003.png" alt="003.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/004.png" alt="004.png" width="200"/>
 ---|---|---|---
-<img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/005.png" alt="005.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/006.png" alt="006.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/007.png" alt="007.png" width="200"/>  | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/008.png" alt="008.png" width="200"/>
+<img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/005.png" alt="005.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/006.png" alt="006.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/007.png" alt="007.png" width="200"/>  | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/008.png" alt="008.png" width="200"/>
+
+
+## FAQ
+[Faq](https://codeberg.org/gitnex/GitNex/wiki/FAQ)
 
 ## Links
 [Website](https://gitnex.com)
 
 [Wiki](https://codeberg.org/gitnex/GitNex/wiki/Home)
 
+[Website Repository](https://gitlab.com/mmarif4u/gitnex-website)
+
 [Troubleshoot Guide](https://codeberg.org/gitnex/GitNex/wiki/Troubleshoot-Guide)
 
-[Faq](https://codeberg.org/gitnex/GitNex/wiki/FAQ)
-
-[Release Blog](https://gitnex.codeberg.page)
-
 ## Thanks
 Thanks to all the open source libraries, contributors and donators.
 
 #### Open source libraries
-- [square/retrofit](https://github.com/square/retrofit)
+- Retrofit
-- [google/gson](https://github.com/google/gson)
+- Gson
-- [square/okhttp](https://github.com/square/okhttp)
+- Okhttp
-- [square/picasso](https://github.com/square/picasso)
+- ViHtarb/tooltip
-- [wasabeef/picasso-transformations](https://github.com/wasabeef/picasso-transformations)
+- Picasso
-- [cats-oss/android-gpuimage](https://github.com/cats-oss/android-gpuimage)
+- Markwon
-- [noties/Markwon](https://github.com/noties/Markwon)
+- Prettytime
-- [noties/Prism4j](https://github.com/noties/Prism4j)
+- Amulyakhare/textdrawable
-- [ocpsoft/prettytime](https://github.com/ocpsoft/prettytime)
+- Vdurmont/emoji-java
-- [amulyakhare/TextDrawable](https://github.com/amulyakhare/TextDrawable)
+- Abumoallim/android-multi-select-dialog
-- [vdurmont/emoji-java](https://github.com/vdurmont/emoji-java)
+- Pes/materialcolorpicker
-- [Pes8/android-material-color-picker-dialog](https://github.com/Pes8/android-material-color-picker-dialog)
+- Hendraanggrian/socialview
-- [HamidrezaAmz/BreadcrumbsView](https://github.com/HamidrezaAmz/BreadcrumbsView)
+- HamidrezaAmz/BreadcrumbsView
-- [Baseflow/PhotoView](https://github.com/Baseflow/PhotoView)
+- Chrisbanes/PhotoView
-- [apache/commons](https://github.com/apache/commons-io)
+- Pddstudio/highlightjs-android
-- [ge0rg/MemorizingTrustManager](https://github.com/ge0rg/MemorizingTrustManager)
+- Apache/commons-io
-- [mikaelhg/urlbuilder](https://github.com/mikaelhg/urlbuilder)
+- Caverock/androidsvg
-- [ACRA/acra](https://github.com/ACRA/acra)
+- Droidsonroids.gif/android-gif-drawable
-- [chrisvest/stormpot](https://github.com/chrisvest/stormpot)
+- Barteksc/AndroidPdfViewer
-
+- Ge0rg/MemorizingTrustManager
-#### Icon sets
+- Dimezis/BlurView
-- [feathericons/feather](https://github.com/feathericons/feather)
+- mikaelhg/urlbuilder
-- [primer/octicons](https://github.com/primer/octicons)
-- [google/material-design-icons](https://github.com/google/material-design-icons)
 
 [Follow me on Fediverse - mastodon.social/@mmarif](https://mastodon.social/@mmarif)
-
-*All trademarks and logos are the properties of their respective owners.*

app/build.gradle

@@ -1,36 +1,23 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 29
     defaultConfig {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 29
-        versionCode 415
+        versionCode 301
-        versionName "4.2.0"
+        versionName "3.0.1"
-        multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
-    dexOptions {
-        javaMaxHeapSize "4g"
-    }
-    flavorDimensions "default"
-    productFlavors {
-        free {
-            applicationId "org.mian.gitnex"
-        }
-        pro {
-            applicationId "org.mian.gitnex.pro"
-        }
-    }
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
     buildTypes {
         release {
             minifyEnabled false
             shrinkResources false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
     lintOptions {
@@ -38,13 +25,8 @@ android {
         abortOnError false
     }
     compileOptions {
-        coreLibraryDesugaringEnabled true
+        targetCompatibility = "8"
-
+        sourceCompatibility = "8"
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    defaultConfig{
-        vectorDrawables.useSupportLibrary = true
     }
 }
 
@@ -54,32 +36,31 @@ configurations {
 }
 
 dependencies {
-    def lifecycle_version = '2.3.1'
+    def lifecycle_version = "2.3.0-alpha05"
-    def markwon_version = '4.6.2'
+    def markwon_version = "4.4.0"
-    def work_version = "2.7.0-alpha05"
+    def work_version = "2.4.0"
-    def acra = "5.7.0"
+    def acra = "5.5.0"
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.4.0-alpha03'
+    implementation "androidx.appcompat:appcompat:1.3.0-alpha01"
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation "com.google.android.material:material:1.3.0-alpha01"
-    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
+    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-    testImplementation 'junit:junit:4.13.2'
+    testImplementation "junit:junit:4.13"
-    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation "androidx.test:runner:1.2.0"
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
-    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.2'
+    implementation "com.github.vihtarb:tooltip:0.2.0"
+    implementation 'com.squareup.okhttp3:okhttp:4.8.0'
     implementation "com.google.code.gson:gson:2.8.6"
     implementation "com.squareup.picasso:picasso:2.71828"
-    implementation 'jp.wasabeef:picasso-transformations:2.4.0'
-    implementation 'jp.co.cyberagent.android:gpuimage:2.1.0'
     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:5.0.0-alpha.2'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.8.0'
-    implementation 'org.ocpsoft.prettytime:prettytime:5.0.0.Final'
+    implementation 'org.ocpsoft.prettytime:prettytime:4.0.5.Final'
+    implementation "com.vdurmont:emoji-java:5.1.1"
     implementation "com.pes.materialcolorpicker:library:1.2.5"
     implementation "io.noties.markwon:core:$markwon_version"
     implementation "io.noties.markwon:ext-latex:$markwon_version"
@@ -94,24 +75,22 @@ dependencies {
     implementation "io.noties.markwon:recycler-table:$markwon_version"
     implementation "io.noties.markwon:simple-ext:$markwon_version"
     implementation "io.noties.markwon:syntax-highlight:$markwon_version"
-    implementation "io.noties.markwon:image-picasso:$markwon_version"
+    implementation "com.caverock:androidsvg:1.4"
-    implementation "io.noties:prism4j:2.0.0"
+    implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.19"
-    annotationProcessor "io.noties:prism4j-bundler:2.0.0"
+    implementation "com.hendraanggrian.appcompat:socialview:0.2"
+    implementation "com.hendraanggrian.appcompat:socialview-commons:0.2"
     implementation "com.github.HamidrezaAmz:BreadcrumbsView:0.2.9"
     implementation "commons-io:commons-io:20030203.000550"
-    implementation 'org.apache.commons:commons-lang3:3.12.0'
+    implementation "org.apache.commons:commons-lang3:3.10"
     implementation "com.github.chrisbanes:PhotoView:2.3.0"
+    implementation "com.github.barteksc:android-pdf-viewer:3.2.0-beta.1"
     implementation "ch.acra:acra-mail:$acra"
     implementation "ch.acra:acra-limiter:$acra"
     implementation "ch.acra:acra-notification:$acra"
-    implementation 'androidx.room:room-runtime:2.3.0'
+    implementation "androidx.room:room-runtime:2.2.5"
-    annotationProcessor 'androidx.room:room-compiler:2.3.0'
+    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"
-    implementation "org.codeberg.gitnex-garage:emoji-java:v5.1.2"
-    implementation "org.codeberg.gitnex:tea4j:1.0.24"
-    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
-    implementation 'androidx.biometric:biometric:1.1.0'
-    implementation 'com.github.chrisvest:stormpot:2.4.2'
 
 }

app/proguard-rules.pro

@@ -19,5 +19,3 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--optimizationpasses 30
--allowaccessmodification

app/src/main/AndroidManifest.xml

@@ -6,90 +6,62 @@
     <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.CHANGE_NETWORK_STATE" />
 
     <application
-        android:name=".core.MainApplication"
         android:allowBackup="true"
         android:icon="@mipmap/app_logo"
-        android:label="@string/appName"
+        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
+        <activity android:name=".activities.MergePullRequestActivity" />
-            android:name=".activities.MergePullRequestActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
             android:name=".activities.FileViewActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.CreateFileActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.RepoWatchersActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.RepoStargazersActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:theme="@style/AppTheme.NoActionBar" />
+        <activity android:name=".activities.AdminGetUsersActivity" />
         <activity
-            android:name=".activities.AdminGetUsersActivity"
+            android:name=".activities.AddRemoveAssigneesActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+            android:theme="@style/Theme.AppCompat.Light.Dialog" />
+        <activity android:name=".activities.CreateReleaseActivity" />
+        <activity android:name=".activities.EditIssueActivity" />
+        <activity android:name=".activities.CreateNewUserActivity" />
         <activity
-            android:name=".activities.CreateReleaseActivity"
+            android:name=".activities.AddRemoveLabelsActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+            android:theme="@style/Theme.AppCompat.Light.Dialog" />
-        <activity
+        <activity android:name=".activities.ProfileEmailActivity" />
-            android:name=".activities.EditIssueActivity"
+        <activity android:name=".activities.AddCollaboratorToRepositoryActivity" />
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity android:name=".activities.CreateTeamByOrgActivity" />
-        <activity
+        <activity android:name=".activities.OrganizationTeamMembersActivity" />
-            android:name=".activities.CreateNewUserActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.MyProfileEmailActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.AddCollaboratorToRepositoryActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.CreateTeamByOrgActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.OrganizationTeamMembersActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
             android:name=".activities.OrganizationDetailActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
+            android:label="@string/title_activity_org_detail"
-            android:label="@string/titleActivityOrgDetail"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity
+        <activity android:name=".activities.SponsorsActivity" />
-            android:name=".activities.CreateLabelActivity"
+        <activity android:name=".activities.CreditsActivity" />
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity android:name=".activities.CreateLabelActivity" />
-        <activity
+        <activity android:name=".activities.CreateIssueActivity" />
-            android:name=".activities.CreateIssueActivity"
+        <activity android:name=".activities.CreateMilestoneActivity" />
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity android:name=".activities.ReplyToIssueActivity" />
-        <activity
-            android:name=".activities.CreateMilestoneActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
             android:name=".activities.IssueDetailActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:windowSoftInputMode="adjustNothing" />
         <activity
             android:name=".activities.RepoDetailActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
+            android:label="@string/title_activity_repo_detail"
-            android:label="@string/titleActivityRepoDetail"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity
+        <activity android:name=".activities.MainActivity" android:theme="@android:style/Theme.NoTitleBar" android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation">
-            android:name=".activities.MainActivity"
-            android:theme="@android:style/Theme.NoTitleBar"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
-            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -98,106 +70,26 @@
         </activity>
         <activity
             android:name=".activities.LoginActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
+            android:launchMode="singleTask" android:theme="@android:style/Theme.NoTitleBar"/>
-            android:launchMode="singleTask"
+        <activity android:name=".activities.CreateRepoActivity" />
-            android:theme="@android:style/Theme.NoTitleBar"/>
+        <activity android:name=".activities.CreateOrganizationActivity" />
-        <activity
+        <activity android:name=".activities.OpenRepoInBrowserActivity" />
-            android:name=".activities.CreateRepoActivity"
+        <activity android:name=".activities.FileDiffActivity" />
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity android:name=".activities.CommitsActivity" />
-        <activity
+        <activity android:name=".helpers.ssl.MemorizingActivity" android:theme="@android:style/Theme.Material.Dialog" />
-            android:name=".activities.CreateOrganizationActivity"
+        <activity android:name=".activities.SettingsAppearanceActivity" />
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity android:name=".activities.SettingsFileViewerActivity" />
-        <activity
+        <activity android:name=".activities.SettingsSecurityActivity" />
-            android:name=".activities.OpenRepoInBrowserActivity"
+        <activity android:name=".activities.SettingsTranslationActivity" />
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity android:name=".activities.SettingsReportsActivity" />
-        <activity
+        <activity android:name=".activities.AddNewTeamMemberActivity" />
-            android:name=".activities.FileDiffActivity"
+        <activity android:name=".activities.SettingsDraftsActivity" />
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.CommitsActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".helpers.ssl.MemorizingActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
-            android:theme="@android:style/Theme.Material.Dialog" />
-        <activity
-            android:name=".activities.SettingsAppearanceActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.ProfileActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.SettingsSecurityActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.SettingsTranslationActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.SettingsReportsActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.AddNewTeamMemberActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.SettingsDraftsActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.RepoForksActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.AddNewAccountActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.RepositorySettingsActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.CreatePullRequestActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.SettingsGeneralActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.SettingsNotificationsActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-
-        <activity
-            android:name=".activities.AdminCronTasksActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
 
         <!-- 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"/>
 
-        <!-- deep links -->
-        <activity
-            android:name=".activities.DeepLinksActivity"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:noHistory="true"
-            android:launchMode="singleTask"
-            android:exported="true">
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="codeberg.org" />
-                <data android:host="gitea.com" />
-                <data android:host="try.gitea.io" />
-                <data android:host="code.obermui.de" />
-                <data android:host="git.fsfe.org" />
-                <data android:host="opendev.org" />
-                <data android:host="git.shihaam.dev" />
-                <data android:host="git.athfan.com" />
-                <data android:host="git.athfan.dev" />
-
-            </intent-filter>
-
-        </activity>
-        <!-- deep links -->
-
     </application>
 
 </manifest>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,80 +0,0 @@
-package org.mian.gitnex.actions;
-
-import androidx.annotation.NonNull;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author opyale
- */
-
-public class ActionResult<R> {
-
-	public enum Status { SUCCESS, FAILED }
-
-	private final BlockingQueue<Boolean> blockingQueue;
-	private final List<OnFinishedListener<R>> onFinishedListeners;
-
-	private boolean invalidated = false;
-
-	public ActionResult() {
-
-		blockingQueue = new ArrayBlockingQueue<>(1);
-		onFinishedListeners = new ArrayList<>();
-
-	}
-
-	public void finish(@NonNull Status status) {
-
-		finish(status, null);
-	}
-
-	public void finish(@NonNull Status status, R result) {
-
-		try {
-			if(blockingQueue.poll(5, TimeUnit.SECONDS)) {
-
-				for(OnFinishedListener<R> onFinishedListener : onFinishedListeners)
-					onFinishedListener.onFinished(status, result);
-			}
-
-		} catch (InterruptedException ignored) {}
-
-	}
-
-	public void invalidate() {
-
-		if(invalidated) throw new IllegalStateException("Already invalidated");
-		this.invalidated = true;
-
-	}
-
-	@SafeVarargs
-	public synchronized final void accept(@NonNull OnFinishedListener<R>... onFinishedListeners) {
-
-		invalidate();
-
-		this.blockingQueue.add(true);
-		this.onFinishedListeners.addAll(Arrays.asList(onFinishedListeners));
-
-	}
-
-	public synchronized final void discard() {
-
-		invalidate();
-		this.blockingQueue.add(false);
-
-	}
-
-	public static class None {}
-
-	public interface OnFinishedListener<R> {
-
-		void onFinished(Status status, R result);
-	}
-
-}

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

@@ -1,118 +0,0 @@
-package org.mian.gitnex.actions;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.util.Log;
-import android.view.View;
-import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.Collaborators;
-import org.gitnex.tea4j.models.Issues;
-import org.mian.gitnex.R;
-import org.mian.gitnex.adapters.AssigneesListAdapter;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.CustomAssigneesSelectionDialogBinding;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class AssigneesActions {
-
-	public static void getCurrentIssueAssignees(Context ctx, String repoOwner, String repoName, int issueIndex, List<String> currentAssignees) {
-
-		Call<Issues> callSingleIssueLabels = RetrofitClient
-			.getApiInterface(ctx)
-			.getIssueByIndex(Authorization.get(ctx), repoOwner, repoName, issueIndex);
-
-		callSingleIssueLabels.enqueue(new Callback<Issues>() {
-
-			@Override
-			public void onResponse(@NonNull Call<Issues> call, @NonNull retrofit2.Response<Issues> response) {
-
-				if(response.code() == 200) {
-
-					Issues issueAssigneesList = response.body();
-					assert issueAssigneesList != null;
-
-					if (issueAssigneesList.getAssignees() != null) {
-
-						if(issueAssigneesList.getAssignees().size() > 0) {
-
-							for(int i = 0; i < issueAssigneesList.getAssignees().size(); i++) {
-
-								currentAssignees.add(issueAssigneesList.getAssignees().get(i).getLogin());
-							}
-						}
-					}
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-			}
-
-		});
-	}
-
-	public static void getRepositoryAssignees(Context ctx, String repoOwner, String repoName, List<Collaborators> assigneesList, Dialog dialogAssignees, AssigneesListAdapter assigneesAdapter, CustomAssigneesSelectionDialogBinding assigneesBinding) {
-
-		TinyDB tinyDB = TinyDB.getInstance(ctx);
-
-		Call<List<Collaborators>> call = RetrofitClient
-			.getApiInterface(ctx)
-			.getCollaborators(Authorization.get(ctx), repoOwner, repoName);
-
-		call.enqueue(new Callback<List<Collaborators>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull retrofit2.Response<List<Collaborators>> response) {
-
-				assigneesList.clear();
-				List<Collaborators> assigneesList_ = response.body();
-
-				assigneesBinding.progressBar.setVisibility(View.GONE);
-				assigneesBinding.dialogFrame.setVisibility(View.VISIBLE);
-
-				if (response.code() == 200) {
-
-					assert assigneesList_ != null;
-
-					if(assigneesList_.size() > 0) {
-
-						assigneesList.add(new Collaborators(tinyDB.getString("userFullname"), tinyDB.getString("loginUid"), tinyDB.getString("userAvatar")));
-						assigneesList.addAll(assigneesList_);
-					}
-					else {
-
-						dialogAssignees.dismiss();
-						Toasty.warning(ctx, ctx.getResources().getString(R.string.noAssigneesFound));
-					}
-
-					assigneesBinding.assigneesRecyclerView.setAdapter(assigneesAdapter);
-
-				}
-				else {
-
-					Toasty.error(ctx, ctx.getResources().getString(R.string.genericError));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
-
-	}
-
-}

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

@@ -3,8 +3,6 @@ package org.mian.gitnex.actions;
 import android.content.Context;
 import android.util.Log;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.Collaborators;
-import org.gitnex.tea4j.models.Permission;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.AddCollaboratorToRepositoryActivity;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -12,10 +10,10 @@ 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 java.util.List;
+import org.mian.gitnex.models.Collaborators;
+import org.mian.gitnex.models.Permission;
 import retrofit2.Call;
 import retrofit2.Callback;
-import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -25,16 +23,21 @@ public class CollaboratorActions {
 
     public static void deleteCollaborator(final Context context, final String searchKeyword, String userName) {
 
-        final TinyDB tinyDb = TinyDB.getInstance(context);
+        final TinyDB tinyDb = new TinyDB(context);
-
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
         final String repoName = parts[1];
 
-        Call<Collaborators> call = RetrofitClient
+        Call<Collaborators> call;
-                .getApiInterface(context)
+
-                .deleteCollaborator(Authorization.get(context), repoOwner, repoName, userName);
+        call = RetrofitClient
+                .getInstance(instanceUrl, context)
+                .getApiInterface()
+                .deleteCollaborator(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, userName);
 
         call.enqueue(new Callback<Collaborators>() {
 
@@ -44,12 +47,12 @@ 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);
                         //AddCollaboratorToRepositoryActivity usersSearchData = new AddCollaboratorToRepositoryActivity();
-                        //usersSearchData.loadUserSearchList(instanceToken, searchKeyword, context);
+                        //usersSearchData.loadUserSearchList(instanceUrl, instanceToken, searchKeyword, context);
 
                     }
                 }
@@ -63,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));
 
                 }
 
@@ -89,18 +92,22 @@ public class CollaboratorActions {
 
     public static void addCollaborator(final Context context, String permission, String userName) {
 
-        final TinyDB tinyDb = TinyDB.getInstance(context);
+        final TinyDB tinyDb = new TinyDB(context);
-
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
         final String repoName = parts[1];
 
         Permission permissionString = new Permission(permission);
+        Call<Permission> call;
 
-        Call<Permission> call = RetrofitClient
+        call = RetrofitClient
-                .getApiInterface(context)
+                .getInstance(instanceUrl, context)
-                .addCollaborator(Authorization.get(context), repoOwner, repoName, userName, permissionString);
+                .getApiInterface()
+                .addCollaborator(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, userName, permissionString);
 
         call.enqueue(new Callback<Permission>() {
 
@@ -110,10 +117,10 @@ 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(instanceToken, searchKeyword, context);
+                        //usersSearchData.loadUserSearchList(instanceUrl, instanceToken, searchKeyword, context);
 
                     }
                 }
@@ -127,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));
 
                 }
 
@@ -147,50 +154,8 @@ public class CollaboratorActions {
             public void onFailure(@NonNull Call<Permission> call, @NonNull Throwable t) {
                 Log.e("onFailure", t.toString());
             }
-
         });
 
     }
 
-	public static ActionResult<List<Collaborators>> getCollaborators(Context context) {
-
-		ActionResult<List<Collaborators>> actionResult = new ActionResult<>();
-		TinyDB tinyDb = TinyDB.getInstance(context);
-
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		String repoOwner = parts[0];
-		String repoName = parts[1];
-
-		Call<List<Collaborators>> call = RetrofitClient
-			.getApiInterface(context)
-			.getCollaborators(Authorization.get(context), repoOwner, repoName);
-
-		call.enqueue(new Callback<List<Collaborators>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
-
-				if (response.isSuccessful()) {
-
-					assert response.body() != null;
-					actionResult.finish(ActionResult.Status.SUCCESS, response.body());
-				}
-				else {
-
-					actionResult.finish(ActionResult.Status.FAILED);
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-
-				actionResult.finish(ActionResult.Status.FAILED);
-			}
-		});
-
-		return actionResult;
-
-	}
-
 }

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

@@ -1,20 +1,20 @@
 package org.mian.gitnex.actions;
 
 import android.content.Context;
+import android.util.Log;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.IssueComments;
-import org.gitnex.tea4j.models.Issues;
-import org.gitnex.tea4j.models.UpdateIssueState;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.ReplyToIssueActivity;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.IssueComments;
+import org.mian.gitnex.models.UpdateIssueState;
 import retrofit2.Call;
 import retrofit2.Callback;
-import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -22,72 +22,83 @@ import retrofit2.Response;
 
 public class IssueActions {
 
-	public static ActionResult<Response<?>> edit(Context context, String comment, int commentId) {
+	public static void editIssueComment(final Context ctx, final int commentId, final String commentBody) {
-
-		ActionResult<Response<?>> actionResult = new ActionResult<>();
-
-		TinyDB tinyDb = TinyDB.getInstance(context);
 
+		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];
 
-		String repoOwner = parts[0];
+		IssueComments commentBodyJson = new IssueComments(commentBody);
-		String repoName = parts[1];
+		Call<IssueComments> call;
 
-		Call<IssueComments> call = RetrofitClient
+		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().patchIssueComment(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, commentId, commentBodyJson);
-			.getApiInterface(context)
-			.patchIssueComment(Authorization.get(context), repoOwner, repoName, commentId, new IssueComments(comment));
 
 		call.enqueue(new Callback<IssueComments>() {
 
 			@Override
 			public void onResponse(@NonNull Call<IssueComments> call, @NonNull retrofit2.Response<IssueComments> response) {
 
-				switch(response.code()) {
+				if(response.isSuccessful()) {
+					if(response.code() == 200) {
 
-					case 200:
+						tinyDb.putBoolean("commentEdited", true);
-						actionResult.finish(ActionResult.Status.SUCCESS);
+						Toasty.info(ctx, ctx.getString(R.string.editCommentUpdatedText));
-						break;
+						((ReplyToIssueActivity) ctx).finish();
 
-					case 401:
+					}
-						actionResult.finish(ActionResult.Status.FAILED, response);
+				}
-						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() == 401) {
-						break;
 
-					default:
+					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));
-						actionResult.finish(ActionResult.Status.FAILED, response);
-						break;
 
 				}
+				else if(response.code() == 403) {
+
+					Toasty.info(ctx, ctx.getString(R.string.authorizeError));
+
+				}
+				else if(response.code() == 404) {
+
+					Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+
+				}
+				else {
+
+					Toasty.info(ctx, ctx.getString(R.string.genericError));
+
+				}
+
 			}
 
 			@Override
 			public void onFailure(@NonNull Call<IssueComments> call, @NonNull Throwable t) {
 
-				actionResult.finish(ActionResult.Status.FAILED);
+				Log.e("onFailure", t.toString());
 			}
 		});
 
-		return actionResult;
-
 	}
 
 	public static void closeReopenIssue(final Context ctx, final int issueIndex, final String issueState) {
 
-		final TinyDB tinyDb = TinyDB.getInstance(ctx);
+		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;
 
-		call = RetrofitClient
+		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().closeReopenIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueStatJson);
-			.getApiInterface(ctx)
-			.closeReopenIssue(Authorization.get(ctx), repoOwner, repoName, issueIndex, issueStatJson);
 
 		call.enqueue(new Callback<JsonElement>() {
 
@@ -102,13 +113,13 @@ public class IssueActions {
 
 						if(issueState.equals("closed")) {
 
-							Toasty.success(ctx, ctx.getString(R.string.issueStateClosed));
+							Toasty.info(ctx, ctx.getString(R.string.issueStateClosed));
 							tinyDb.putString("issueState", "closed");
 
 						}
 						else if(issueState.equals("open")) {
 
-							Toasty.success(ctx, ctx.getString(R.string.issueStateReopened));
+							Toasty.info(ctx, ctx.getString(R.string.issueStateReopened));
 							tinyDb.putString("issueState", "open");
 
 						}
@@ -122,17 +133,17 @@ public class IssueActions {
 				}
 				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, ctx.getString(R.string.genericError));
+					Toasty.info(ctx, ctx.getString(R.string.genericError));
 
 				}
 
@@ -141,7 +152,7 @@ public class IssueActions {
 			@Override
 			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
+				Log.e("onFailure", t.toString());
 			}
 		});
 
@@ -149,23 +160,20 @@ public class IssueActions {
 
 	public static void subscribe(final Context ctx) {
 
-		final TinyDB tinyDB = TinyDB.getInstance(ctx);
+		final TinyDB tinyDB = new TinyDB(ctx);
 
+		final String instanceUrl = tinyDB.getString("instanceUrl");
 		String[] repoFullName = tinyDB.getString("repoFullName").split("/");
-
 		if(repoFullName.length != 2) {
 			return;
 		}
-
 		final String userLogin = tinyDB.getString("userLogin");
 		final String token = "token " + tinyDB.getString(tinyDB.getString("loginUid") + "-token");
 		final int issueNr = Integer.parseInt(tinyDB.getString("issueNumber"));
 
 		Call<Void> call;
 
-		call = RetrofitClient
+		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().addIssueSubscriber(token, repoFullName[0], repoFullName[1], issueNr, userLogin);
-			.getApiInterface(ctx)
-			.addIssueSubscriber(token, repoFullName[0], repoFullName[1], issueNr, userLogin);
 
 		call.enqueue(new Callback<Void>() {
 
@@ -176,14 +184,14 @@ public class IssueActions {
 
 					if(response.code() == 201) {
 
-						Toasty.success(ctx, ctx.getString(R.string.subscribedSuccessfully));
+						Toasty.info(ctx, ctx.getString(R.string.subscribedSuccessfully));
 						tinyDB.putBoolean("issueSubscribed", true);
 
 					}
 					else if(response.code() == 200) {
 
 						tinyDB.putBoolean("issueSubscribed", true);
-						Toasty.success(ctx, ctx.getString(R.string.alreadySubscribed));
+						Toasty.info(ctx, ctx.getString(R.string.alreadySubscribed));
 
 					}
 
@@ -195,7 +203,7 @@ public class IssueActions {
 				}
 				else {
 
-					Toasty.error(ctx, ctx.getString(R.string.subscriptionError));
+					Toasty.info(ctx, ctx.getString(R.string.subscriptionError));
 
 				}
 
@@ -204,7 +212,7 @@ public class IssueActions {
 			@Override
 			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
+				Toasty.info(ctx, ctx.getString(R.string.unsubscribedSuccessfully));
 			}
 		});
 
@@ -212,8 +220,9 @@ public class IssueActions {
 
 	public static void unsubscribe(final Context ctx) {
 
-		final TinyDB tinyDB = TinyDB.getInstance(ctx);
+		final TinyDB tinyDB = new TinyDB(ctx);
 
+		final String instanceUrl = tinyDB.getString("instanceUrl");
 		String[] repoFullName = tinyDB.getString("repoFullName").split("/");
 		if(repoFullName.length != 2) {
 			return;
@@ -224,7 +233,7 @@ public class IssueActions {
 
 		Call<Void> call;
 
-		call = RetrofitClient.getApiInterface(ctx).delIssueSubscriber(token, repoFullName[0], repoFullName[1], issueNr, userLogin);
+		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().delIssueSubscriber(token, repoFullName[0], repoFullName[1], issueNr, userLogin);
 
 		call.enqueue(new Callback<Void>() {
 
@@ -235,14 +244,14 @@ public class IssueActions {
 
 					if(response.code() == 201) {
 
-						Toasty.success(ctx, ctx.getString(R.string.unsubscribedSuccessfully));
+						Toasty.info(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));
+						Toasty.info(ctx, ctx.getString(R.string.alreadyUnsubscribed));
 
 					}
 
@@ -254,7 +263,7 @@ public class IssueActions {
 				}
 				else {
 
-					Toasty.error(ctx, ctx.getString(R.string.unSubscriptionError));
+					Toasty.info(ctx, ctx.getString(R.string.unsubscriptionError));
 
 				}
 
@@ -263,65 +272,9 @@ public class IssueActions {
 			@Override
 			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
+				Toasty.info(ctx, ctx.getString(R.string.unsubscriptionError));
 			}
 		});
 	}
 
-	public static ActionResult<ActionResult.None> reply(Context context, String comment, int issueIndex) {
-
-		ActionResult<ActionResult.None> actionResult = new ActionResult<>();
-
-		TinyDB tinyDb = TinyDB.getInstance(context);
-
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		String repoOwner = parts[0];
-		String repoName = parts[1];
-
-		Issues issueComment = new Issues(comment);
-
-		Call<Issues> call = RetrofitClient
-			.getApiInterface(context)
-			.replyCommentToIssue(Authorization.get(context), 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) {
-
-					actionResult.finish(ActionResult.Status.SUCCESS);
-
-					tinyDb.putBoolean("commentPosted", true);
-					tinyDb.putBoolean("resumeIssues", true);
-					tinyDb.putBoolean("resumePullRequests", true);
-
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(context, context.getString(R.string.alertDialogTokenRevokedTitle),
-						context.getString(R.string.alertDialogTokenRevokedMessage),
-						context.getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-						context.getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
-				}
-				else {
-
-					actionResult.finish(ActionResult.Status.FAILED);
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
-
-				Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
-
-		return actionResult;
-
-	}
-
 }

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

@@ -1,131 +0,0 @@
-package org.mian.gitnex.actions;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.util.Log;
-import android.view.View;
-import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.Labels;
-import org.mian.gitnex.R;
-import org.mian.gitnex.adapters.LabelsListAdapter;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class LabelsActions {
-
-	public static void getCurrentIssueLabels(Context ctx, String repoOwner, String repoName, int issueIndex, List<Integer> currentLabelsIds) {
-
-		Call<List<Labels>> callSingleIssueLabels = RetrofitClient
-			.getApiInterface(ctx)
-			.getIssueLabels(Authorization.get(ctx), repoOwner, repoName, issueIndex);
-
-		callSingleIssueLabels.enqueue(new Callback<List<Labels>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Labels>> call, @NonNull retrofit2.Response<List<Labels>> response) {
-
-				if(response.code() == 200) {
-
-					List<Labels> issueLabelsList = response.body();
-
-					assert issueLabelsList != null;
-
-					if(issueLabelsList.size() > 0) {
-
-						for (int i = 0; i < issueLabelsList.size(); i++) {
-
-							currentLabelsIds.add(issueLabelsList.get(i).getId());
-						}
-					}
-
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Labels>> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-			}
-
-		});
-	}
-
-	public static void getRepositoryLabels(Context ctx, String repoOwner, String repoName, List<Labels> labelsList, Dialog dialogLabels, LabelsListAdapter labelsAdapter, CustomLabelsSelectionDialogBinding labelsBinding) {
-
-		Call<List<Labels>> call = RetrofitClient
-			.getApiInterface(ctx)
-			.getLabels(Authorization.get(ctx), repoOwner, repoName);
-
-		call.enqueue(new Callback<List<Labels>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Labels>> call, @NonNull retrofit2.Response<List<Labels>> response) {
-
-				labelsList.clear();
-
-				if (response.code() == 200) {
-
-					if(response.body() != null) {
-
-						labelsList.addAll(response.body());
-					}
-
-					// Load organization labels
-					Call<List<Labels>> callOrgLabels = RetrofitClient
-						.getApiInterface(ctx)
-						.getOrganizationLabels(Authorization.get(ctx), repoOwner);
-
-					callOrgLabels.enqueue(new Callback<List<Labels>>() {
-
-						@Override
-						public void onResponse(@NonNull Call<List<Labels>> call, @NonNull retrofit2.Response<List<Labels>> responseOrg) {
-
-							labelsBinding.progressBar.setVisibility(View.GONE);
-							labelsBinding.dialogFrame.setVisibility(View.VISIBLE);
-
-							if(responseOrg.body() != null) {
-
-								labelsList.addAll(responseOrg.body());
-							}
-
-							if(labelsList.isEmpty()) {
-
-								dialogLabels.dismiss();
-								Toasty.warning(ctx, ctx.getResources().getString(R.string.noLabelsFound));
-
-							}
-
-							labelsBinding.labelsRecyclerView.setAdapter(labelsAdapter);
-						}
-
-						@Override public void onFailure(@NonNull Call<List<Labels>> call, @NonNull Throwable t) {}
-
-					});
-
-				}
-				else {
-
-					Toasty.error(ctx, ctx.getResources().getString(R.string.genericError));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Labels>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
-
-	}
-
-}

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

@@ -4,12 +4,12 @@ import android.content.Context;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.Milestones;
 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.Toasty;
+import org.mian.gitnex.models.Milestones;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -23,8 +23,9 @@ public class MilestoneActions {
 
 	public static void closeMilestone(final Context ctx, int milestoneId_) {
 
-		final TinyDB tinyDB = TinyDB.getInstance(ctx);
+		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];
@@ -36,7 +37,8 @@ public class MilestoneActions {
 		Call<JsonElement> call;
 
 		call = RetrofitClient
-				.getApiInterface(ctx)
+				.getInstance(instanceUrl, ctx)
+				.getApiInterface()
 				.closeReopenMilestone(token, repoOwner, repoName, milestoneId_, milestoneStateJson);
 
 		call.enqueue(new Callback<JsonElement>() {
@@ -46,7 +48,7 @@ public class MilestoneActions {
 
 				if(response.isSuccessful()) {
 
-					Toasty.success(ctx, ctx.getString(R.string.milestoneStatusUpdate));
+					Toasty.info(ctx, ctx.getString(R.string.milestoneStatusUpdate));
 
 				}
 				else if(response.code() == 401) {
@@ -59,7 +61,7 @@ public class MilestoneActions {
 				}
 				else {
 
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
+					Toasty.info(ctx, ctx.getString(R.string.genericError));
 
 				}
 
@@ -79,8 +81,9 @@ public class MilestoneActions {
 
 	public static void openMilestone(final Context ctx, int milestoneId_) {
 
-		final TinyDB tinyDB = TinyDB.getInstance(ctx);
+		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];
@@ -92,7 +95,8 @@ public class MilestoneActions {
 		Call<JsonElement> call;
 
 		call = RetrofitClient
-				.getApiInterface(ctx)
+				.getInstance(instanceUrl, ctx)
+				.getApiInterface()
 				.closeReopenMilestone(token, repoOwner, repoName, milestoneId_, milestoneStateJson);
 
 		call.enqueue(new Callback<JsonElement>() {
@@ -102,7 +106,7 @@ public class MilestoneActions {
 
 				if(response.isSuccessful()) {
 
-					Toasty.success(ctx, ctx.getString(R.string.milestoneStatusUpdate));
+					Toasty.info(ctx, ctx.getString(R.string.milestoneStatusUpdate));
 
 				}
 				else if(response.code() == 401) {
@@ -115,7 +119,7 @@ public class MilestoneActions {
 				}
 				else {
 
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
+					Toasty.info(ctx, ctx.getString(R.string.genericError));
 
 				}
 

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

@@ -1,12 +1,13 @@
 package org.mian.gitnex.actions;
 
 import android.content.Context;
-import org.gitnex.tea4j.models.NotificationThread;
 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;
 
 /**
@@ -19,22 +20,24 @@ public class NotificationsActions {
 
 	private TinyDB tinyDB;
 	private Context context;
+	private String instanceUrl;
 	private String instanceToken;
 
 	public NotificationsActions(Context context) {
 
 		this.context = context;
-		this.tinyDB = TinyDB.getInstance(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<Void> call = RetrofitClient.getApiInterface(context)
+		Call<ResponseBody> call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface()
 			.markNotificationThreadAsRead(instanceToken, notificationThread.getId(), notificationStatus.name());
 
 		if(!call.execute().isSuccessful()) {
@@ -45,7 +48,7 @@ public class NotificationsActions {
 
 	public boolean setAllNotificationsRead(Date date) throws IOException {
 
-		Call<Void> call = RetrofitClient.getApiInterface(context)
+		Call<ResponseBody> call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface()
 			.markNotificationThreadsAsRead(instanceToken, AppUtil.getTimestampFromDate(context, date), true,
 				new String[]{"unread", "pinned"}, "read");
 

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

@@ -1,102 +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.clients.RetrofitClient;
-import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Toasty;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-/**
- * Author qwerty287
- */
-
-public class PullRequestActions {
-
-	public static void deleteHeadBranch(Context context, String repoOwner, String repoName, String headBranch, boolean showToasts) {
-		Call<JsonElement> call = RetrofitClient
-				.getApiInterface(context)
-				.deleteBranch(Authorization.get(context), repoOwner, repoName, headBranch);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				if(response.code() == 204) {
-
-					if(showToasts) Toasty.success(context, context.getString(R.string.deleteBranchSuccess));
-				}
-				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) {
-
-					if(showToasts) Toasty.error(context, context.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-
-					if(showToasts) Toasty.warning(context, context.getString(R.string.deleteBranchErrorNotFound));
-				}
-				else {
-
-					if(showToasts) Toasty.error(context, context.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				if(showToasts) Toasty.error(context, context.getString(R.string.deleteBranchError));
-			}
-
-		});
-	}
-
-	public static void updatePr(Context context, String repoOwner, String repoName, String index, Boolean rebase) {
-		String strategy;
-		if(rebase == null) {
-			strategy = null;
-		}
-		else if(!rebase) {
-			strategy = "merge";
-		}
-		else {
-			strategy = "rebase";
-		}
-		RetrofitClient.getApiInterface(context).updatePullRequest(Authorization.get(context), repoOwner, repoName, Integer.parseInt(index), strategy)
-			.enqueue(new Callback<Void>() {
-
-			@Override
-			public void onResponse(@NonNull Call call, @NonNull Response response) {
-				if(response.isSuccessful()) {
-					Toasty.success(context, context.getString(R.string.updatePrSuccess));
-				}
-				else {
-					if(response.code() == 403) {
-						Toasty.error(context, context.getString(R.string.authorizeError));
-					}
-					else if(response.code() == 409) {
-						Toasty.error(context, context.getString(R.string.updatePrConflict));
-					}
-					else {
-						Toasty.error(context, context.getString(R.string.genericError));
-					}
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call call, @NonNull Throwable t) {
-				Toasty.error(context, context.getString(R.string.genericError));
-			}
-		});
-	}
-
-}

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

@@ -21,8 +21,10 @@ public class RepositoryActions {
 
     public static void starRepository(final Context context) {
 
-        final TinyDB tinyDb = TinyDB.getInstance(context);
+        final TinyDB tinyDb = new TinyDB(context);
-
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
@@ -31,8 +33,9 @@ public class RepositoryActions {
         Call<JsonElement> call;
 
         call = RetrofitClient
-                .getApiInterface(context)
+                .getInstance(instanceUrl, context)
-                .starRepository(Authorization.get(context), repoOwner, repoName);
+                .getApiInterface()
+                .starRepository(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<JsonElement>() {
 
@@ -43,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));
 
                     }
                 }
@@ -57,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));
 
                 }
 
@@ -83,8 +86,10 @@ public class RepositoryActions {
 
     public static void unStarRepository(final Context context) {
 
-        final TinyDB tinyDb = TinyDB.getInstance(context);
+        final TinyDB tinyDb = new TinyDB(context);
-
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
@@ -93,8 +98,9 @@ public class RepositoryActions {
         Call<JsonElement> call;
 
         call = RetrofitClient
-                .getApiInterface(context)
+                .getInstance(instanceUrl, context)
-                .unStarRepository(Authorization.get(context), repoOwner, repoName);
+                .getApiInterface()
+                .unStarRepository(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<JsonElement>() {
 
@@ -105,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));
 
                     }
                 }
@@ -119,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));
 
                 }
 
@@ -145,8 +151,10 @@ public class RepositoryActions {
 
     public static void watchRepository(final Context context) {
 
-        final TinyDB tinyDb = TinyDB.getInstance(context);
+        final TinyDB tinyDb = new TinyDB(context);
-
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
@@ -155,8 +163,9 @@ public class RepositoryActions {
         Call<JsonElement> call;
 
         call = RetrofitClient
-                .getApiInterface(context)
+                .getInstance(instanceUrl, context)
-                .watchRepository(Authorization.get(context), repoOwner, repoName);
+                .getApiInterface()
+                .watchRepository(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<JsonElement>() {
 
@@ -167,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));
 
                     }
                 }
@@ -181,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));
 
                 }
 
@@ -207,8 +216,10 @@ public class RepositoryActions {
 
     public static void unWatchRepository(final Context context) {
 
-        final TinyDB tinyDb = TinyDB.getInstance(context);
+        final TinyDB tinyDb = new TinyDB(context);
-
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
@@ -217,8 +228,9 @@ public class RepositoryActions {
         Call<JsonElement> call;
 
         call = RetrofitClient
-                .getApiInterface(context)
+                .getInstance(instanceUrl, context)
-                .unWatchRepository(Authorization.get(context), repoOwner, repoName);
+                .getApiInterface()
+                .unWatchRepository(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<JsonElement>() {
 
@@ -228,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) {
@@ -241,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));
 
                 }
 

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

@@ -21,13 +21,17 @@ public class TeamActions {
 
 	public static void removeTeamMember(final Context context, String userName, int teamId) {
 
-		final TinyDB tinyDb = TinyDB.getInstance(context);
+		final TinyDB tinyDb = new TinyDB(context);
+		final String instanceUrl = tinyDb.getString("instanceUrl");
+		final String loginUid = tinyDb.getString("loginUid");
+		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
 		Call<JsonElement> call;
 
 		call = RetrofitClient
-				.getApiInterface(context)
+				.getInstance(instanceUrl, context)
-				.removeTeamMember(Authorization.get(context), teamId, userName);
+				.getApiInterface()
+				.removeTeamMember(Authorization.returnAuthentication(context, loginUid, instanceToken), teamId, userName);
 
 		call.enqueue(new Callback<JsonElement>() {
 
@@ -39,7 +43,7 @@ public class TeamActions {
 					if(response.code() == 204) {
 
 						tinyDb.putBoolean("teamActionFlag", true);
-						Toasty.success(context, context.getString(R.string.memberRemovedMessage));
+						Toasty.info(context, context.getString(R.string.memberRemovedMessage));
 						((AddNewTeamMemberActivity)context).finish();
 
 					}
@@ -55,17 +59,17 @@ public class TeamActions {
 				}
 				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));
 
 				}
 
@@ -83,11 +87,17 @@ public class TeamActions {
 
 	public static void addTeamMember(final Context context, String userName, int teamId) {
 
-		final TinyDB tinyDb = TinyDB.getInstance(context);
+		final TinyDB tinyDb = new TinyDB(context);
+		final String instanceUrl = tinyDb.getString("instanceUrl");
+		final String loginUid = tinyDb.getString("loginUid");
+		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-		Call<JsonElement> call = RetrofitClient
+		Call<JsonElement> call;
-				.getApiInterface(context)
+
-				.addTeamMember(Authorization.get(context), teamId, userName);
+		call = RetrofitClient
+				.getInstance(instanceUrl, context)
+				.getApiInterface()
+				.addTeamMember(Authorization.returnAuthentication(context, loginUid, instanceToken), teamId, userName);
 
 		call.enqueue(new Callback<JsonElement>() {
 
@@ -99,7 +109,7 @@ public class TeamActions {
 					if(response.code() == 204) {
 
 						tinyDb.putBoolean("teamActionFlag", true);
-						Toasty.success(context, context.getString(R.string.memberAddedMessage));
+						Toasty.info(context, context.getString(R.string.memberAddedMessage));
 						((AddNewTeamMemberActivity)context).finish();
 
 					}
@@ -115,17 +125,17 @@ public class TeamActions {
 				}
 				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));
 
 				}
 

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

@@ -13,12 +13,13 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.UserInfo;
+import org.mian.gitnex.R;
-import org.gitnex.tea4j.models.UserSearch;
 import org.mian.gitnex.adapters.UserSearchAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityAddCollaboratorToRepositoryBinding;
 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.List;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -31,27 +32,39 @@ import retrofit2.Response;
 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;
 
     private RecyclerView mRecyclerView;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_add_collaborator_to_repository;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-
+        appCtx = getApplicationContext();
-	    ActivityAddCollaboratorToRepositoryBinding activityAddCollaboratorToRepositoryBinding = ActivityAddCollaboratorToRepositoryBinding.inflate(getLayoutInflater());
-		setContentView(activityAddCollaboratorToRepositoryBinding.getRoot());
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        ImageView closeActivity = activityAddCollaboratorToRepositoryBinding.close;
+        TinyDB tinyDb = new TinyDB(appCtx);
-        addCollaboratorSearch = activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch;
+        final String instanceUrl = tinyDb.getString("instanceUrl");
-        mRecyclerView = activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch;
+        final String loginUid = tinyDb.getString("loginUid");
-        mProgressBar = activityAddCollaboratorToRepositoryBinding.progressBar;
+        String repoFullName = tinyDb.getString("repoFullName");
-        noData = activityAddCollaboratorToRepositoryBinding.noData;
+        String[] parts = repoFullName.split("/");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+        ImageView closeActivity = findViewById(R.id.close);
+        addCollaboratorSearch = findViewById(R.id.addCollaboratorSearch);
+        mRecyclerView = findViewById(R.id.recyclerViewUserSearch);
+        mProgressBar = findViewById(R.id.progress_bar);
+        noData = findViewById(R.id.noData);
 
         addCollaboratorSearch.requestFocus();
         assert imm != null;
@@ -63,11 +76,8 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
         addCollaboratorSearch.setOnEditorActionListener((v, actionId, event) -> {
 
             if (actionId == EditorInfo.IME_ACTION_SEND) {
-
                 if(!addCollaboratorSearch.getText().toString().equals("")) {
-
+                    loadUserSearchList(instanceUrl, instanceToken, addCollaboratorSearch.getText().toString(), loginUid);
-	                mProgressBar.setVisibility(View.VISIBLE);
-                    loadUserSearchList(addCollaboratorSearch.getText().toString());
                 }
             }
 
@@ -77,26 +87,22 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
 
     }
 
-    public void loadUserSearchList(String searchKeyword) {
+    public void loadUserSearchList(String instanceUrl, String token, String searchKeyword, String loginUid) {
 
         Call<UserSearch> call = RetrofitClient
-                .getApiInterface(appCtx)
+                .getInstance(instanceUrl, ctx)
-                .getUserBySearch(Authorization.get(ctx), searchKeyword, 10, 1);
+                .getApiInterface()
+                .getUserBySearch(Authorization.returnAuthentication(ctx, loginUid, token), searchKeyword, 10);
 
         call.enqueue(new Callback<UserSearch>() {
 
             @Override
             public void onResponse(@NonNull Call<UserSearch> call, @NonNull Response<UserSearch> response) {
 
-	            mProgressBar.setVisibility(View.GONE);
+                if (response.isSuccessful()) {
-
-                if (response.code() == 200) {
-
                     assert response.body() != null;
                     getUsersList(response.body().getData(), ctx);
-                }
+                } else {
-                else {
-
                     Log.i("onResponse", String.valueOf(response.code()));
                 }
 
@@ -123,20 +129,20 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
         mProgressBar.setVisibility(View.VISIBLE);
 
         if(adapter.getItemCount() > 0) {
-
             mRecyclerView.setAdapter(adapter);
             noData.setVisibility(View.GONE);
+            mProgressBar.setVisibility(View.GONE);
         }
         else {
-
             noData.setVisibility(View.VISIBLE);
+            mProgressBar.setVisibility(View.GONE);
         }
 
-	    mProgressBar.setVisibility(View.GONE);
     }
 
     private void initCloseListener() {
         onClickListener = view -> finish();
     }
 
+
 }

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

@@ -1,251 +0,0 @@
-package org.mian.gitnex.activities;
-
-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.gitnex.tea4j.models.GiteaVersion;
-import org.gitnex.tea4j.models.UserInfo;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
-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.Toasty;
-import org.mian.gitnex.helpers.UrlHelper;
-import org.mian.gitnex.helpers.Version;
-import java.net.URI;
-import io.mikael.urlbuilder.UrlBuilder;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class AddNewAccountActivity extends BaseActivity {
-
-	private View.OnClickListener onClickListener;
-	private ActivityAddNewAccountBinding viewBinding;
-
-	private enum Protocol {HTTPS, HTTP}
-	private String spinnerSelectedValue;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		viewBinding = ActivityAddNewAccountBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
-
-		getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
-
-		initCloseListener();
-		viewBinding.close.setOnClickListener(onClickListener);
-		viewBinding.instanceUrl.setText(getIntent().getStringExtra("instanceUrl"));
-
-		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(ctx, R.layout.list_spinner_items, Protocol.values());
-
-		viewBinding.protocolSpinner.setAdapter(adapterProtocols);
-		viewBinding.protocolSpinner.setOnItemClickListener((parent, view1, position, id) -> spinnerSelectedValue = String.valueOf(parent.getItemAtPosition(position)));
-		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 = String.valueOf(viewBinding.instanceUrl.getText());
-			String loginToken = String.valueOf(viewBinding.loginToken.getText());
-			String protocol = spinnerSelectedValue;
-
-			if(protocol == null) {
-
-				Toasty.error(ctx, getResources().getString(R.string.protocolEmptyError));
-				return;
-			}
-
-			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 instanceUrl = UrlBuilder.fromUri(rawInstanceUrl).withScheme(protocol.toLowerCase()).withPath(PathsHelper.join(rawInstanceUrl.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.getApiInterface(ctx, instanceUrl).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();
-
-					assert version != null;
-
-					if(!Version.valid(version.getVersion())) {
-
-						Toasty.error(ctx, getResources().getString(R.string.versionUnknown));
-						return;
-					}
-
-					tinyDB.putString("giteaVersion", version.getVersion());
-					Version giteaVersion = new Version(version.getVersion());
-
-					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.setNeutralButton(getString(R.string.cancelButton), (dialog, which) -> {
-
-							dialog.dismiss();
-						});
-
-						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.getApiInterface(ctx, instanceUrl).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 = BaseApi.getInstance(ctx, UserAccountsApi.class);
-						boolean userAccountExists = userAccountsApi.userAccountExists(accountName);
-
-						if(!userAccountExists) {
-
-							userAccountsApi.createNewAccount(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();
-	}
-
-}

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

@@ -14,12 +14,13 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.UserInfo;
+import org.mian.gitnex.R;
-import org.gitnex.tea4j.models.UserSearch;
 import org.mian.gitnex.adapters.UserSearchForTeamMemberAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityAddNewTeamMemberBinding;
 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;
@@ -27,13 +28,11 @@ 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;
@@ -44,21 +43,31 @@ public class AddNewTeamMemberActivity extends BaseActivity {
 
 	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();
-		ActivityAddNewTeamMemberBinding activityAddNewTeamMemberBinding = ActivityAddNewTeamMemberBinding.inflate(getLayoutInflater());
-		setContentView(activityAddNewTeamMemberBinding.getRoot());
 
 		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-		ImageView closeActivity = activityAddNewTeamMemberBinding.close;
+		TinyDB tinyDb = new TinyDB(appCtx);
-		addNewTeamMember = activityAddNewTeamMemberBinding.addNewTeamMember;
+		final String instanceUrl = tinyDb.getString("instanceUrl");
-		mRecyclerView = activityAddNewTeamMemberBinding.recyclerViewUserSearch;
+		final String loginUid = tinyDb.getString("loginUid");
-		mProgressBar = activityAddNewTeamMemberBinding.progressBar;
+		String repoFullName = tinyDb.getString("repoFullName");
-		noData = activityAddNewTeamMemberBinding.noData;
+		String[] parts = repoFullName.split("/");
+		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+		ImageView closeActivity = findViewById(R.id.close);
+		addNewTeamMember = findViewById(R.id.addNewTeamMeber);
+		mRecyclerView = findViewById(R.id.recyclerViewUserSearch);
+		mProgressBar = findViewById(R.id.progress_bar);
+		noData = findViewById(R.id.noData);
 
 		addNewTeamMember.requestFocus();
 		assert imm != null;
@@ -68,11 +77,9 @@ public class AddNewTeamMemberActivity extends BaseActivity {
 		closeActivity.setOnClickListener(onClickListener);
 
 		if(getIntent().getStringExtra("teamId") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamId")).equals("")) {
-
 			teamId = getIntent().getStringExtra("teamId");
 		}
 		else {
-
 			teamId = "0";
 		}
 
@@ -92,8 +99,10 @@ public class AddNewTeamMemberActivity extends BaseActivity {
 				if(!addNewTeamMember.getText().toString().equals("") && addNewTeamMember.getText().toString().length() > 1) {
 
 					adapter = new UserSearchForTeamMemberAdapter(dataList, ctx, Integer.parseInt(teamId));
-					loadUserSearchList(addNewTeamMember.getText().toString(), teamId);
+					loadUserSearchList(instanceUrl, instanceToken, addNewTeamMember.getText().toString(), loginUid, teamId);
+
 				}
+
 			}
 
 			@Override
@@ -108,11 +117,9 @@ public class AddNewTeamMemberActivity extends BaseActivity {
 
 	}
 
-	public void loadUserSearchList(String searchKeyword, String teamId) {
+	public void loadUserSearchList(String instanceUrl, String token, String searchKeyword, String loginUid, String teamId) {
 
-		Call<UserSearch> call = RetrofitClient.getApiInterface(ctx).getUserBySearch(Authorization.get(ctx), searchKeyword, 10, 1);
+		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>() {
 
@@ -128,13 +135,16 @@ public class AddNewTeamMemberActivity extends BaseActivity {
 						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);
+
 					}
 
-					mProgressBar.setVisibility(View.GONE);
 				}
 
 			}

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

@@ -0,0 +1,294 @@
+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 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 java.util.ArrayList;
+import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class AddRemoveAssigneesActivity extends BaseActivity {
+
+    private ArrayList<MultiSelectModel> listOfCollaborators = new ArrayList<>();
+    private ArrayList<Integer> issueAssigneesIds = new ArrayList<>();
+    private Boolean assigneesFlag = false;
+    private MultiSelectDialog multiSelectDialogAssignees;
+    final Context ctx = this;
+    private Context appCtx;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_add_remove_assignees;
+    }
+
+    @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);
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+
+        getAssignees(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
+
+    }
+
+    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);
+
+        Call<List<Collaborators>> call = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<List<Collaborators>>() {
+
+            @Override
+            public void onResponse(@NonNull final Call<List<Collaborators>> call, @NonNull final retrofit2.Response<List<Collaborators>> response) {
+
+                if(response.isSuccessful()) {
+                    if(response.code() == 200) {
+
+                        final List<Collaborators> collaboratorsList_ = response.body();
+
+                        assert collaboratorsList_ != null;
+                        if(collaboratorsList_.size() > 0) {
+                            for (int i = 0; i < collaboratorsList_.size(); i++) {
+
+                                listOfCollaborators.add(new MultiSelectModel(collaboratorsList_.get(i).getId(), collaboratorsList_.get(i).getUsername().trim()));
+
+                            }
+                        }
+
+                        // get current issue assignees
+                        Call<Issues> callSingleIssueAssignees = RetrofitClient
+                                .getInstance(instanceUrl, ctx)
+                                .getApiInterface()
+                                .getIssueByIndex(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
+
+                        callSingleIssueAssignees.enqueue(new Callback<Issues>() {
+
+                            @Override
+                            public void onResponse(@NonNull Call<Issues> call, @NonNull retrofit2.Response<Issues> response) {
+
+                                if(response.code() == 200) {
+
+                                    Issues issueAssigneesList = response.body();
+
+                                    assert issueAssigneesList != null;
+                                    if (issueAssigneesList.getAssignees() != null) {
+                                        if (issueAssigneesList.getAssignees().size() > 0) {
+                                            for (int i = 0; i < issueAssigneesList.getAssignees().size(); i++) {
+
+                                                issueAssigneesIds.add(issueAssigneesList.getAssignees().get(i).getId());
+
+                                                if(issueAssigneesList.getAssignees().get(i).getUsername().equals(loginUid)) {
+                                                    listOfCollaborators.add(new MultiSelectModel(issueAssigneesList.getAssignees().get(i).getId(), issueAssigneesList.getAssignees().get(i).getUsername().trim()));
+                                                }
+
+                                            }
+                                            assigneesFlag = true;
+                                        }
+                                    }
+                                    else {
+                                        listOfCollaborators.add(new MultiSelectModel(tinyDb.getInt("userId"), loginUid));
+                                    }
+
+                                    if(assigneesFlag) {
+
+                                        multiSelectDialogAssignees = new MultiSelectDialog()
+                                                .title(getResources().getString(R.string.newIssueSelectAssigneesListTitle))
+                                                .titleSize(25)
+                                                .positiveText(getResources().getString(R.string.saveButton))
+                                                .negativeText(getResources().getString(R.string.cancelButton))
+                                                .setMinSelectionLimit(0)
+                                                .preSelectIDsList(issueAssigneesIds)
+                                                .setMaxSelectionLimit(listOfCollaborators.size())
+                                                .multiSelectList(listOfCollaborators)
+                                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
+                                                    @Override
+                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
+
+                                                        Log.i("selectedNames", String.valueOf(selectedNames));
+
+                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
+                                                        tinyDb.putBoolean("singleIssueUpdate", true);
+                                                        CloseActivity();
+                                                    }
+
+                                                    @Override
+                                                    public void onCancel() {
+                                                        CloseActivity();
+                                                    }
+                                                });
+
+                                    }
+                                    else {
+
+                                        multiSelectDialogAssignees = new MultiSelectDialog()
+                                                .title(getResources().getString(R.string.newIssueSelectAssigneesListTitle))
+                                                .titleSize(25)
+                                                .positiveText(getResources().getString(R.string.saveButton))
+                                                .negativeText(getResources().getString(R.string.cancelButton))
+                                                .setMinSelectionLimit(0)
+                                                .setMaxSelectionLimit(listOfCollaborators.size())
+                                                .multiSelectList(listOfCollaborators)
+                                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
+                                                    @Override
+                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
+
+                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames);
+                                                        tinyDb.putBoolean("singleIssueUpdate", true);
+                                                        CloseActivity();
+
+                                                    }
+
+                                                    @Override
+                                                    public void onCancel() {
+                                                        CloseActivity();
+                                                    }
+                                                });
+
+                                    }
+
+                                    multiSelectDialogAssignees.show(getSupportFragmentManager(), "issueMultiSelectDialog");
+
+                                }
+                            }
+
+                            @Override
+                            public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
+                                Log.e("onFailure", t.toString());
+                            }
+
+                        });
+                        // get current issue assignees
+
+                    }
+                    else if(response.code() == 401) {
+
+                        AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                                getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                                getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                                getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                    }
+                    else if(response.code() == 403) {
+
+                        Toasty.info(ctx, ctx.getString(R.string.authorizeError));
+
+                    }
+                    else if(response.code() == 404) {
+
+                        Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+
+                    }
+                    else {
+
+                        Toasty.info(ctx, getString(R.string.genericError));
+
+                    }
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+    private void CloseActivity() {
+        this.finish();
+    }
+
+    private void updateIssueAssignees(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String loginUid, int issueIndex, List<String> issueAssigneesList) {
+
+        UpdateIssueAssignees updateAssigneeJson = new UpdateIssueAssignees(issueAssigneesList);
+
+        Call<JsonElement> call3;
+
+        call3 = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .patchIssueAssignees(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);
+
+        call3.enqueue(new Callback<JsonElement>() {
+
+            @Override
+            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response2) {
+
+                if(response2.code() == 201) {
+
+                    Toasty.info(ctx, ctx.getString(R.string.assigneesUpdated));
+
+                }
+                else if(response2.code() == 401) {
+
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else if(response2.code() == 403) {
+
+                    Toasty.info(ctx, ctx.getString(R.string.authorizeError));
+
+                }
+                else if(response2.code() == 404) {
+
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+
+                }
+                else {
+
+                    Toasty.info(ctx, getString(R.string.genericError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+}

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

@@ -0,0 +1,308 @@
+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 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 java.util.ArrayList;
+import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class AddRemoveLabelsActivity extends BaseActivity {
+
+    private ArrayList<MultiSelectModel> listOfLabels = new ArrayList<>();
+    private ArrayList<Integer> issueLabelIds = new ArrayList<>();
+    private Boolean labelsFlag = false;
+    private MultiSelectDialog multiSelectDialogLabels;
+    final Context ctx = this;
+    private Context appCtx;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_add_remove_labels;
+    }
+
+    @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);
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+
+        getLabels(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
+
+    }
+
+    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);
+
+        Call<List<Labels>> call = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .getlabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<List<Labels>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Labels>> call, @NonNull retrofit2.Response<List<Labels>> response) {
+
+                if(response.isSuccessful()) {
+                    if(response.code() == 200) {
+
+                        List<Labels> labelsList_ = response.body();
+
+                        assert labelsList_ != null;
+                        if(labelsList_.size() > 0) {
+                            for (int i = 0; i < labelsList_.size(); i++) {
+
+                                listOfLabels.add(new MultiSelectModel(labelsList_.get(i).getId(), labelsList_.get(i).getName().trim()));
+
+                            }
+                        }
+
+                        // get current issue labels
+                        Call<List<Labels>> callSingleIssueLabels = RetrofitClient
+                                .getInstance(instanceUrl, ctx)
+                                .getApiInterface()
+                                .getIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
+
+                        callSingleIssueLabels.enqueue(new Callback<List<Labels>>() {
+
+                            @Override
+                            public void onResponse(@NonNull Call<List<Labels>> call, @NonNull retrofit2.Response<List<Labels>> response) {
+
+                                if(response.code() == 200) {
+
+                                    List<Labels> issueLabelsList = response.body();
+
+                                    assert issueLabelsList != null;
+                                    if(issueLabelsList.size() > 0) {
+                                        for (int i = 0; i < issueLabelsList.size(); i++) {
+
+                                            issueLabelIds.add(issueLabelsList.get(i).getId());
+
+                                        }
+                                        labelsFlag = true;
+                                    }
+
+                                    if(labelsFlag) {
+
+                                        multiSelectDialogLabels = new MultiSelectDialog()
+                                                .title(getResources().getString(R.string.newIssueSelectLabelsListTitle))
+                                                .titleSize(25)
+                                                .positiveText(getResources().getString(R.string.saveButton))
+                                                .negativeText(getResources().getString(R.string.cancelButton))
+                                                .setMinSelectionLimit(0)
+                                                .preSelectIDsList(issueLabelIds)
+                                                .setMaxSelectionLimit(listOfLabels.size())
+                                                .multiSelectList(listOfLabels)
+                                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
+                                                    @Override
+                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
+
+                                                        String labelIds = selectedIds.toString();
+                                                        int[] integers;
+                                                        if (selectedIds.size() > 0) {
+
+                                                            String[] items = labelIds.replaceAll("\\[", "").replaceAll("\\]", "").replaceAll("\\s", "").split(",");
+                                                            integers = new int[items.length];
+                                                            for (int i = 0; i < integers.length; i++) {
+                                                                integers[i] = Integer.parseInt(items[i]);
+                                                            }
+
+                                                        }
+                                                        else {
+                                                            integers = new int[0];
+                                                        }
+
+                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
+                                                        tinyDb.putBoolean("singleIssueUpdate", true);
+                                                        CloseActivity();
+                                                    }
+
+                                                    @Override
+                                                    public void onCancel() {
+                                                        CloseActivity();
+                                                    }
+                                                });
+
+                                    }
+                                    else {
+
+                                        multiSelectDialogLabels = new MultiSelectDialog()
+                                                .title(getResources().getString(R.string.newIssueSelectLabelsListTitle))
+                                                .titleSize(25)
+                                                .positiveText(getResources().getString(R.string.saveButton))
+                                                .negativeText(getResources().getString(R.string.cancelButton))
+                                                .setMinSelectionLimit(0)
+                                                .setMaxSelectionLimit(listOfLabels.size())
+                                                .multiSelectList(listOfLabels)
+                                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
+                                                    @Override
+                                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
+
+                                                        String labelIds = selectedIds.toString();
+                                                        int[] integers;
+                                                        if (selectedIds.size() > 0) {
+
+                                                            String[] items = labelIds.replaceAll("\\[", "").replaceAll("\\]", "").replaceAll("\\s", "").split(",");
+                                                            integers = new int[items.length];
+                                                            for (int i = 0; i < integers.length; i++) {
+                                                                integers[i] = Integer.parseInt(items[i]);
+                                                            }
+
+                                                        }
+                                                        else {
+                                                            integers = new int[0];
+                                                        }
+
+                                                        updateIssueLabels(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid);
+                                                        tinyDb.putBoolean("singleIssueUpdate", true);
+                                                        CloseActivity();
+
+                                                    }
+
+                                                    @Override
+                                                    public void onCancel() {
+                                                        CloseActivity();
+                                                    }
+                                                });
+
+                                    }
+
+                                    multiSelectDialogLabels.show(getSupportFragmentManager(), "issueMultiSelectDialog");
+
+                                }
+                            }
+
+                            @Override
+                            public void onFailure(@NonNull Call<List<Labels>> call, @NonNull Throwable t) {
+                                Log.e("onFailure", t.toString());
+                            }
+
+                        });
+                        // get current issue labels
+
+                    }
+                    else if(response.code() == 401) {
+
+                        AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                                getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                                getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                                getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                    }
+                    else if(response.code() == 403) {
+
+                        Toasty.info(ctx, ctx.getString(R.string.authorizeError));
+
+                    }
+                    else if(response.code() == 404) {
+
+                        Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+
+                    }
+                    else {
+
+                        Toasty.info(ctx, getString(R.string.genericError));
+
+                    }
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Labels>> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+    private void updateIssueLabels(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, int issueIndex, int[] issueLabels, String loginUid) {
+
+        Labels patchIssueLabels = new Labels(issueLabels);
+
+        Call<JsonElement> call = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .updateIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, patchIssueLabels);
+
+        call.enqueue(new Callback<JsonElement>() {
+
+            @Override
+            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+                if(response.code() == 200) {
+
+                    Toasty.info(ctx, ctx.getString(R.string.labelsUpdated));
+
+                }
+                else if(response.code() == 401) {
+
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else if(response.code() == 403) {
+
+                    Toasty.info(ctx, ctx.getString(R.string.authorizeError));
+
+                }
+                else if(response.code() == 404) {
+
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+
+                }
+                else {
+
+                    Toasty.info(ctx, getString(R.string.genericError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+    private void CloseActivity() {
+        this.finish();
+    }
+}

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

@@ -1,89 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.view.View;
-import androidx.appcompat.widget.Toolbar;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import org.mian.gitnex.adapters.AdminCronTasksAdapter;
-import org.mian.gitnex.databinding.ActivityAdminCronTasksBinding;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.viewmodels.AdminCronTasksViewModel;
-
-/**
- * Author M M Arif
- */
-
-public class AdminCronTasksActivity extends BaseActivity {
-
-	private View.OnClickListener onClickListener;
-	private AdminCronTasksAdapter adapter;
-
-	private ActivityAdminCronTasksBinding activityAdminCronTasksBinding;
-
-	public static final int PAGE = 1;
-	public static final int LIMIT = 50;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		activityAdminCronTasksBinding = ActivityAdminCronTasksBinding.inflate(getLayoutInflater());
-		setContentView(activityAdminCronTasksBinding.getRoot());
-
-		initCloseListener();
-		activityAdminCronTasksBinding.close.setOnClickListener(onClickListener);
-
-		Toolbar toolbar = activityAdminCronTasksBinding.toolbar;
-		setSupportActionBar(toolbar);
-
-		activityAdminCronTasksBinding.recyclerView.setHasFixedSize(true);
-		activityAdminCronTasksBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
-
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(activityAdminCronTasksBinding.recyclerView.getContext(),
-			DividerItemDecoration.VERTICAL);
-		activityAdminCronTasksBinding.recyclerView.addItemDecoration(dividerItemDecoration);
-
-		activityAdminCronTasksBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			activityAdminCronTasksBinding.pullToRefresh.setRefreshing(false);
-			AdminCronTasksViewModel.loadCronTasksList(ctx, Authorization.get(ctx), PAGE, LIMIT);
-
-		}, 500));
-
-		fetchDataAsync(ctx, Authorization.get(ctx));
-	}
-
-	private void fetchDataAsync(Context ctx, String instanceToken) {
-
-		AdminCronTasksViewModel cronTasksViewModel = new ViewModelProvider(this).get(AdminCronTasksViewModel.class);
-
-		cronTasksViewModel.getCronTasksList(ctx, instanceToken, PAGE, LIMIT).observe(this, cronTasksListMain -> {
-
-			adapter = new AdminCronTasksAdapter(ctx, cronTasksListMain);
-
-			if(adapter.getItemCount() > 0) {
-
-				activityAdminCronTasksBinding.recyclerView.setVisibility(View.VISIBLE);
-				activityAdminCronTasksBinding.recyclerView.setAdapter(adapter);
-				activityAdminCronTasksBinding.noData.setVisibility(View.GONE);
-			}
-			else {
-
-				activityAdminCronTasksBinding.recyclerView.setVisibility(View.GONE);
-				activityAdminCronTasksBinding.noData.setVisibility(View.VISIBLE);
-			}
-
-		});
-
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> finish();
-	}
-}

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

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.Looper;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -21,10 +20,10 @@ 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.databinding.ActivityAdminGetUsersBinding;
 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.viewmodels.AdminGetUsersViewModel;
 
 /**
@@ -34,26 +33,36 @@ import org.mian.gitnex.viewmodels.AdminGetUsersViewModel;
 public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAdminUsersFragment.BottomSheetListener {
 
     private View.OnClickListener onClickListener;
+    final Context ctx = this;
+    private Context appCtx;
     private AdminGetUsersAdapter adapter;
     private RecyclerView mRecyclerView;
     private TextView noDataUsers;
     private Boolean searchFilter = false;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_admin_get_users;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
 
-	    ActivityAdminGetUsersBinding activityAdminGetUsersBinding = ActivityAdminGetUsersBinding.inflate(getLayoutInflater());
+        TinyDB tinyDb = new TinyDB(appCtx);
-	    setContentView(activityAdminGetUsersBinding.getRoot());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        ImageView closeActivity = activityAdminGetUsersBinding.close;
+        ImageView closeActivity = findViewById(R.id.close);
-        noDataUsers = activityAdminGetUsersBinding.noDataUsers;
+        noDataUsers = findViewById(R.id.noDataUsers);
-        mRecyclerView = activityAdminGetUsersBinding.recyclerView;
+        mRecyclerView = findViewById(R.id.recyclerView);
 
-        final SwipeRefreshLayout swipeRefresh = activityAdminGetUsersBinding.pullToRefresh;
+        final SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);
 
-        Toolbar toolbar = activityAdminGetUsersBinding.toolbar;
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
         initCloseListener();
@@ -66,33 +75,33 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
                 DividerItemDecoration.VERTICAL);
         mRecyclerView.addItemDecoration(dividerItemDecoration);
 
-        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+        swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
 
             swipeRefresh.setRefreshing(false);
-            AdminGetUsersViewModel.loadUsersList(ctx, Authorization.get(ctx));
+            AdminGetUsersViewModel.loadUsersList(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken));
 
         }, 500));
 
-        fetchDataAsync(ctx, Authorization.get(ctx));
+        fetchDataAsync(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken));
 
     }
 
-    private void fetchDataAsync(Context ctx, String instanceToken) {
+    private void fetchDataAsync(Context ctx, String instanceUrl, String instanceToken) {
 
         AdminGetUsersViewModel usersModel = new ViewModelProvider(this).get(AdminGetUsersViewModel.class);
 
-        usersModel.getUsersList(ctx, instanceToken).observe(this, usersListMain -> {
+        usersModel.getUsersList(ctx, instanceUrl, instanceToken).observe(this, usersListMain -> {
 
             adapter = new AdminGetUsersAdapter(ctx, usersListMain);
             if(adapter.getItemCount() > 0) {
-
                 mRecyclerView.setVisibility(View.VISIBLE);
                 mRecyclerView.setAdapter(adapter);
                 noDataUsers.setVisibility(View.GONE);
                 searchFilter = true;
             }
             else {
-
+                //adapter.notifyDataSetChanged();
+                //mRecyclerView.setAdapter(adapter);
                 mRecyclerView.setVisibility(View.GONE);
                 noDataUsers.setVisibility(View.VISIBLE);
             }
@@ -107,7 +116,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
         final MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
 
-        new Handler(Looper.getMainLooper()).postDelayed(() -> {
+        new Handler().postDelayed(() -> {
 
             if(searchFilter) {
 
@@ -130,7 +139,6 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
 
                     @Override
                     public boolean onQueryTextChange(String newText) {
-
                         adapter.getFilter().filter(newText);
                         return false;
                     }
@@ -148,21 +156,18 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
 
         int id = item.getItemId();
 
-        if(id == android.R.id.home) {
+        switch (id) {
-
+            case android.R.id.home:
-	        finish();
+                finish();
-	        return true;
+                return true;
+            case R.id.genericMenu:
+                BottomSheetAdminUsersFragment bottomSheet = new BottomSheetAdminUsersFragment();
+                bottomSheet.show(getSupportFragmentManager(), "usersBottomSheet");
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
         }
-        else if(id == R.id.genericMenu) {
 
-	        BottomSheetAdminUsersFragment bottomSheet = new BottomSheetAdminUsersFragment();
-	        bottomSheet.show(getSupportFragmentManager(), "usersBottomSheet");
-	        return true;
-        }
-        else {
-
-	        return super.onOptionsItemSelected(item);
-        }
     }
 
     @Override

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

@@ -2,135 +2,143 @@ package org.mian.gitnex.activities;
 
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.biometric.BiometricPrompt;
+import org.acra.ACRA;
-import androidx.core.content.ContextCompat;
+import org.acra.BuildConfig;
+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.Notifications;
+import org.mian.gitnex.notifications.NotificationsMaster;
-import java.util.Locale;
-import java.util.concurrent.Executor;
 
 /**
  * Author M M Arif
  */
 
+@AcraNotification(resIcon = R.drawable.gitnex_transparent,
+		resTitle = R.string.crashTitle,
+		resChannelName = R.string.setCrashReports,
+		resText = R.string.crashMessage)
+
 public abstract class BaseActivity extends AppCompatActivity {
 
-	protected TinyDB tinyDB;
+	private Context appCtx;
-
-	protected Context ctx = this;
-	protected Context appCtx;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
-		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
+		final TinyDB tinyDb = new TinyDB(appCtx);
 
-		this.appCtx = getApplicationContext();
+		switch(tinyDb.getInt("themeId")) {
-		this.tinyDB = TinyDB.getInstance(appCtx);
-
-		switch(tinyDB.getInt("themeId")) {
 
 			case 1:
-
-				tinyDB.putString("currentTheme", "light");
 				setTheme(R.style.AppThemeLight);
 				break;
+
 			case 2:
-
+				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
-				if(TimeHelper.timeBetweenHours(tinyDB.getInt("darkThemeTimeHour"), tinyDB.getInt("lightThemeTimeHour"), tinyDB.getInt("darkThemeTimeMinute"), tinyDB.getInt("lightThemeTimeMinute"))) {
-
-					tinyDB.putString("currentTheme", "dark");
 					setTheme(R.style.AppTheme);
 				}
 				else {
-
-					tinyDB.putString("currentTheme", "light");
 					setTheme(R.style.AppThemeLight);
 				}
 				break;
-			case 3:
 
-				tinyDB.putString("currentTheme", "light");
-				setTheme(R.style.AppThemeRetro);
-				break;
-			case 4:
-				if(TimeHelper.timeBetweenHours(tinyDB.getInt("darkThemeTimeHour"), tinyDB.getInt("lightThemeTimeHour"), tinyDB.getInt("darkThemeTimeMinute"), tinyDB.getInt("lightThemeTimeMinute"))) {
-
-					tinyDB.putString("currentTheme", "dark");
-					setTheme(R.style.AppTheme);
-				}
-				else {
-
-					tinyDB.putString("currentTheme", "light");
-					setTheme(R.style.AppThemeRetro);
-				}
-				break;
-			case 5:
-
-				tinyDB.putString("currentTheme", "dark");
-				setTheme(R.style.AppThemePitchBlack);
-				break;
 			default:
-
-				tinyDB.putString("currentTheme", "dark");
 				setTheme(R.style.AppTheme);
+				break;
 
 		}
 
-		String locale = tinyDB.getString("locale");
+		String appLocale = tinyDb.getString("locale");
-		if (locale.isEmpty()) {
+		AppUtil.setAppLocale(getResources(), appLocale);
-			AppUtil.setAppLocale(getResources(), Locale.getDefault().getLanguage());
+
-		}
+		super.onCreate(savedInstanceState);
-		else {
+		setContentView(getLayoutResourceId());
-			AppUtil.setAppLocale(getResources(), locale);
+
+		switch(tinyDb.getInt("customFontId", -1)) {
+
+			case 0:
+				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf");
+				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf");
+				FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf");
+				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf");
+				break;
+
+			case 2:
+				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/sourcecodeproregular.ttf");
+				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/sourcecodeproregular.ttf");
+				FontsOverride.setDefaultFont(this, "SERIF", "fonts/sourcecodeproregular.ttf");
+				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/sourcecodeproregular.ttf");
+				break;
+
+			default:
+				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/manroperegular.ttf");
+				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/manroperegular.ttf");
+				FontsOverride.setDefaultFont(this, "SERIF", "fonts/manroperegular.ttf");
+				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/manroperegular.ttf");
+				break;
+
+		}
+
+        if(tinyDb.getInt("pollingDelayMinutes") == 0) {
+            tinyDb.putInt("pollingDelayMinutes", 15);
+        }
+
+        NotificationsMaster.hireWorker(appCtx);
+
+        // enabling counter badges by default
+        if(tinyDb.getString("enableCounterBadgesInit").isEmpty()) {
+            tinyDb.putBoolean("enableCounterBadges", true);
+            tinyDb.putString("enableCounterBadgesInit", "yes");
+        }
+
+		// enable crash reports by default
+		if(tinyDb.getString("crashReportingEnabledInit").isEmpty()) {
+			tinyDb.putBoolean("crashReportingEnabled", true);
+			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);
+			ACRABuilder.setBuildConfigClass(BuildConfig.class).setReportFormat(StringFormat.KEY_VALUE_LIST);
+			ACRABuilder.getPluginConfigurationBuilder(MailSenderConfigurationBuilder.class).setReportAsFile(true).setMailTo(getResources().getString(R.string.appEmail)).setSubject(getResources().getString(R.string.crashReportEmailSubject, AppUtil.getAppBuildNo(getApplicationContext()))).setEnabled(true);
+			ACRABuilder.getPluginConfigurationBuilder(LimiterConfigurationBuilder.class).setEnabled(true);
+			ACRA.init(getApplication(), ACRABuilder);
+
 		}
 
-		Notifications.startWorker(appCtx);
 	}
 
-	public void onResume() {
+	protected abstract int getLayoutResourceId();
-		super.onResume();
 
-		if(tinyDB.getBoolean("biometricStatus") && !tinyDB.getBoolean("biometricLifeCycle")) {
-
-			Executor executor = ContextCompat.getMainExecutor(this);
-
-			BiometricPrompt biometricPrompt = new BiometricPrompt(this, executor, new BiometricPrompt.AuthenticationCallback() {
-
-				@Override
-				public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
-
-					super.onAuthenticationError(errorCode, errString);
-
-					// Authentication error, close the app
-					if(errorCode == BiometricPrompt.ERROR_USER_CANCELED ||
-						errorCode == BiometricPrompt.ERROR_NEGATIVE_BUTTON) {
-						finish();
-					}
-				}
-
-				// Authentication succeeded, continue to app
-				@Override public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) { super.onAuthenticationSucceeded(result); tinyDB.putBoolean("biometricLifeCycle", true); }
-
-				// Authentication failed, close the app
-				@Override public void onAuthenticationFailed() { super.onAuthenticationFailed(); }
-
-			});
-
-			BiometricPrompt.PromptInfo biometricPromptBuilder = new BiometricPrompt.PromptInfo.Builder()
-				.setTitle(getString(R.string.biometricAuthTitle))
-				.setSubtitle(getString(R.string.biometricAuthSubTitle))
-				.setNegativeButtonText(getString(R.string.cancelButton)).build();
-
-			biometricPrompt.authenticate(biometricPromptBuilder);
-
-		}
-	}
 }
 
 

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

@@ -1,8 +1,8 @@
 package org.mian.gitnex.activities;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.Looper;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
 import android.view.Menu;
@@ -18,15 +18,15 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import org.gitnex.tea4j.models.Commits;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.CommitsAdapter;
-import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.clients.AppApiService;
-import org.mian.gitnex.databinding.ActivityCommitsBinding;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Constants;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
-import org.mian.gitnex.helpers.Toasty;
+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 java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;
@@ -39,63 +39,71 @@ import retrofit2.Response;
 
 public class CommitsActivity extends BaseActivity {
 
+	final Context ctx = this;
+	private Context appCtx;
 	private View.OnClickListener onClickListener;
 	private TextView noData;
 	private ProgressBar progressBar;
 	private String TAG = "CommitsActivity";
-	private int resultLimit = Constants.resultLimitOldGiteaInstances;
+	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 	private int pageSize = 1;
 
 	private RecyclerView recyclerView;
 	private List<Commits> commitsList;
 	private CommitsAdapter adapter;
-	private ProgressBar progressLoadMore;
+	private ApiInterface api;
+
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_commits;
+	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
-
+		appCtx = getApplicationContext();
-		ActivityCommitsBinding activityCommitsBinding = ActivityCommitsBinding.inflate(getLayoutInflater());
+		Toolbar toolbar = findViewById(R.id.toolbar);
-		setContentView(activityCommitsBinding.getRoot());
-
-		Toolbar toolbar = activityCommitsBinding.toolbar;
 		setSupportActionBar(toolbar);
 
-		String repoFullName = tinyDB.getString("repoFullName");
+		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");
 
-		TextView toolbar_title = activityCommitsBinding.toolbarTitle;
+		TextView toolbar_title = findViewById(R.id.toolbar_title);
 		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
 		toolbar_title.setText(branchName);
 
-		ImageView closeActivity = activityCommitsBinding.close;
+		ImageView closeActivity = findViewById(R.id.close);
-		noData = activityCommitsBinding.noDataCommits;
+		noData = findViewById(R.id.noDataCommits);
-		progressLoadMore = activityCommitsBinding.progressLoadMore;
+		progressBar = findViewById(R.id.progress_bar);
-		progressBar = activityCommitsBinding.progressBar;
+		SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);
-		SwipeRefreshLayout swipeRefresh = activityCommitsBinding.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")) {
+		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12")) {
-
+			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
-			resultLimit = Constants.resultLimitNewGiteaInstances;
 		}
 
-		recyclerView = activityCommitsBinding.recyclerView;
+		recyclerView = findViewById(R.id.recyclerView);
 		commitsList = new ArrayList<>();
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
 
 			swipeRefresh.setRefreshing(false);
-			loadInitial(Authorization.get(ctx), repoOwner, repoName, branchName, resultLimit);
+			loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName, resultLimit);
 			adapter.notifyDataChanged();
+
 		}, 200));
 
 		adapter = new CommitsAdapter(ctx, commitsList);
@@ -104,70 +112,24 @@ public class CommitsActivity extends BaseActivity {
 			if(commitsList.size() == resultLimit || pageSize == resultLimit) {
 
 				int page = (commitsList.size() + resultLimit) / resultLimit;
-				loadMore(Authorization.get(ctx), repoOwner, repoName, page, branchName, resultLimit);
+				loadMore(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, page, branchName, resultLimit);
+
 			}
+
 		}));
 
 		recyclerView.setHasFixedSize(true);
 		recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
 		recyclerView.setAdapter(adapter);
 
-		loadInitial(Authorization.get(ctx), repoOwner, repoName, branchName, resultLimit);
+		api = AppApiService.createService(ApiInterface.class, instanceUrl, ctx);
+		loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName, resultLimit);
+
 	}
 
 	private void loadInitial(String token, String repoOwner, String repoName, String branchName, int resultLimit) {
 
-		Call<List<Commits>> call = RetrofitClient.getApiInterface(ctx).getRepositoryCommits(token, repoOwner, repoName, 1, branchName, resultLimit);
+		Call<List<Commits>> call = api.getRepositoryCommits(token, repoOwner, repoName, 1, branchName, resultLimit);
-
-		call.enqueue(new Callback<List<Commits>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {
-
-				if(response.code() == 200) {
-
-					assert response.body() != null;
-					if(response.body().size() > 0) {
-
-						commitsList.clear();
-						commitsList.addAll(response.body());
-						adapter.notifyDataChanged();
-						noData.setVisibility(View.GONE);
-					}
-					else {
-
-						commitsList.clear();
-						adapter.notifyDataChanged();
-						noData.setVisibility(View.VISIBLE);
-					}
-				}
-				if(response.code() == 409) {
-
-					noData.setVisibility(View.VISIBLE);
-				}
-				else {
-
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-
-				progressBar.setVisibility(View.GONE);
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getResources().getString(R.string.errorOnLogin));
-			}
-
-		});
-
-	}
-
-	private void loadMore(String token, String repoOwner, String repoName, final int page, String branchName, int resultLimit) {
-
-		progressLoadMore.setVisibility(View.VISIBLE);
-
-		Call<List<Commits>> call = RetrofitClient.getApiInterface(ctx).getRepositoryCommits(token, repoOwner, repoName, page, branchName, resultLimit);
 
 		call.enqueue(new Callback<List<Commits>>() {
 
@@ -176,33 +138,91 @@ public class CommitsActivity extends BaseActivity {
 
 				if(response.isSuccessful()) {
 
-					List<Commits> result = response.body();
+					assert response.body() != null;
-					assert result != null;
+					if(response.body().size() > 0) {
 
-					if(result.size() > 0) {
+						commitsList.clear();
+						commitsList.addAll(response.body());
+						adapter.notifyDataChanged();
+						noData.setVisibility(View.GONE);
 
-						pageSize = result.size();
-						commitsList.addAll(result);
 					}
 					else {
-
+						commitsList.clear();
-						adapter.setMoreDataAvailable(false);
+						adapter.notifyDataChanged();
+						noData.setVisibility(View.VISIBLE);
 					}
 
-					adapter.notifyDataChanged();
+					progressBar.setVisibility(View.GONE);
+
 				}
 				else {
 
 					Log.e(TAG, String.valueOf(response.code()));
+
 				}
 
-				progressLoadMore.setVisibility(View.GONE);
 			}
 
 			@Override
 			public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, getResources().getString(R.string.errorOnLogin));
+				Log.e(TAG, t.toString());
+			}
+
+		});
+
+	}
+
+	private void loadMore(String token, String repoOwner, String repoName, final int page, String branchName, int resultLimit) {
+
+		//add loading progress view
+		commitsList.add(new Commits("load"));
+		adapter.notifyItemInserted((commitsList.size() - 1));
+
+		Call<List<Commits>> call = api.getRepositoryCommits(token, repoOwner, repoName, page, branchName, resultLimit);
+
+		call.enqueue(new Callback<List<Commits>>() {
+
+			@Override
+			public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {
+
+				if(response.isSuccessful()) {
+
+					//remove loading view
+					commitsList.remove(commitsList.size() - 1);
+
+					List<Commits> result = response.body();
+
+					assert result != null;
+					if(result.size() > 0) {
+
+						pageSize = result.size();
+						commitsList.addAll(result);
+
+					}
+					else {
+
+						adapter.setMoreDataAvailable(false);
+
+					}
+
+					adapter.notifyDataChanged();
+
+				}
+				else {
+
+					Log.e(TAG, String.valueOf(response.code()));
+
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
+
+				Log.e(TAG, t.toString());
+
 			}
 
 		});
@@ -237,6 +257,7 @@ public class CommitsActivity extends BaseActivity {
 		});
 
 		return super.onCreateOptionsMenu(menu);
+
 	}
 
 	private void filter(String text) {
@@ -244,9 +265,7 @@ public class CommitsActivity extends BaseActivity {
 		List<Commits> arr = new ArrayList<>();
 
 		for(Commits d : commitsList) {
-
 			if(d.getCommit().getMessage().toLowerCase().contains(text) || d.getSha().toLowerCase().contains(text)) {
-
 				arr.add(d);
 			}
 		}
@@ -257,7 +276,6 @@ public class CommitsActivity extends BaseActivity {
 	private void initCloseListener() {
 
 		onClickListener = view -> {
-
 			getIntent().removeExtra("branchName");
 			finish();
 		};

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

@@ -1,28 +1,30 @@
 package org.mian.gitnex.activities;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.MotionEvent;
 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 org.gitnex.tea4j.models.Branches;
-import org.gitnex.tea4j.models.DeleteFile;
-import org.gitnex.tea4j.models.EditFile;
-import org.gitnex.tea4j.models.NewFile;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateFileBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.NetworkStatusObserver;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.models.NewFile;
 import java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;
@@ -34,355 +36,311 @@ import retrofit2.Callback;
 
 public class CreateFileActivity extends BaseActivity {
 
-	private ActivityCreateFileBinding binding;
+    public ImageView closeActivity;
+    private View.OnClickListener onClickListener;
+    private Button newFileCreate;
 
-	public static final int FILE_ACTION_CREATE = 0;
+    private EditText newFileName;
-	public static final int FILE_ACTION_DELETE = 1;
+    private EditText newFileContent;
-	public static final int FILE_ACTION_EDIT = 2;
+    private EditText newFileBranchName;
+    private EditText newFileCommitMessage;
+    private Spinner newFileBranchesSpinner;
+    final Context ctx = this;
+    private Context appCtx;
 
-	private int fileAction = FILE_ACTION_CREATE;
+    List<Branches> branchesList = new ArrayList<>();
 
-	private String filePath;
+    @Override
-	private String fileSha;
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_file;
+    }
 
-    private final List<String> branches = new ArrayList<>();
-
-	private String repoOwner;
-	private String repoName;
-
-    @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
 
-        binding = ActivityCreateFileBinding.inflate(getLayoutInflater());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-	    setContentView(binding.getRoot());
 
-        String repoFullName = tinyDB.getString("repoFullName");
+        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("/");
-        repoOwner = parts[0];
+        final String repoOwner = parts[0];
-        repoName = parts[1];
+        final String repoName = parts[1];
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-	    TextView toolbarTitle = binding.toolbarTitle;
+        closeActivity = findViewById(R.id.close);
+        newFileName = findViewById(R.id.newFileName);
+        newFileContent = findViewById(R.id.newFileContent);
+        newFileBranchName = findViewById(R.id.newFileBranchName);
+        newFileCommitMessage = findViewById(R.id.newFileCommitMessage);
+        TextView branchNameId = findViewById(R.id.branchNameId);
+        TextView branchNameHintText = findViewById(R.id.branchNameHintText);
 
-        binding.newFileName.requestFocus();
+        newFileName.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(newFileName, InputMethodManager.SHOW_IMPLICIT);
 
-	    InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        initCloseListener();
-        assert inputMethodManager != null;
+        closeActivity.setOnClickListener(onClickListener);
-        inputMethodManager.showSoftInput(binding.newFileName, InputMethodManager.SHOW_IMPLICIT);
 
-	    binding.close.setOnClickListener(view -> finish());
+        newFileCreate = findViewById(R.id.newFileCreate);
-	    binding.newFileContent.setOnTouchListener((touchView, motionEvent) -> {
 
-		    touchView.getParent().requestDisallowInterceptTouchEvent(true);
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
 
-		    if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 &&
+        newFileBranchesSpinner = findViewById(R.id.newFileBranchesSpinner);
-			    (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
+        newFileBranchesSpinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+        getBranches(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
 
-			    touchView.getParent().requestDisallowInterceptTouchEvent(false);
+        newFileBranchesSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
-		    }
+        {
+            public void onItemSelected(AdapterView<?> arg0,
+                                       View arg1, int arg2, long arg3)
+            {
+                Branches bModelValue = (Branches) newFileBranchesSpinner.getSelectedItem();
 
-		    return false;
+                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("");
+                }
 
-	    });
+            }
 
-	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", FILE_ACTION_DELETE) == FILE_ACTION_DELETE) {
+            public void onNothingSelected(AdapterView<?> arg0) {}
-
+        });
-		    fileAction = getIntent().getIntExtra("fileAction", FILE_ACTION_DELETE);
-		    filePath = getIntent().getStringExtra("filePath");
-		    fileSha = getIntent().getStringExtra("fileSha");
-
-		    toolbarTitle.setText(getString(R.string.deleteFileText, filePath));
-
-		    binding.newFileCreate.setText(R.string.deleteFile);
-
-		    binding.newFileNameLayout.setVisibility(View.GONE);
-		    binding.newFileContentLayout.setVisibility(View.GONE);
-
-	    }
-
-	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", FILE_ACTION_EDIT) == FILE_ACTION_EDIT) {
-
-		    fileAction = getIntent().getIntExtra("fileAction", FILE_ACTION_EDIT);
-		    filePath = getIntent().getStringExtra("filePath");
-		    fileSha = getIntent().getStringExtra("fileSha");
-
-		    toolbarTitle.setText(getString(R.string.editFileText, filePath));
-
-		    binding.newFileCreate.setText(R.string.editFile);
-		    binding.newFileName.setText(filePath);
-		    binding.newFileName.setEnabled(false);
-		    binding.newFileName.setFocusable(false);
-
-		    binding.newFileContent.setText(getIntent().getStringExtra("fileContents"));
-
-	    }
-
-        getBranches(repoOwner, repoName);
 
         disableProcessButton();
 
-	    NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.getInstance(ctx);
+        if(!connToInternet) {
-	    networkStatusObserver.registerNetworkStatusListener(binding.newFileCreate::setEnabled);
 
-	    binding.newFileCreate.setOnClickListener(v -> processNewFile());
+            newFileCreate.setEnabled(false);
+            GradientDrawable shape =  new GradientDrawable();
+            shape.setCornerRadius( 8 );
+            shape.setColor(getResources().getColor(R.color.hintColor));
+            newFileCreate.setBackground(shape);
+
+        } else {
+
+            newFileCreate.setOnClickListener(createFileListener);
+
+        }
 
     }
 
+    private View.OnClickListener createFileListener = v -> processNewFile();
+
     private void processNewFile() {
 
-        String newFileName = binding.newFileName.getText() != null ? binding.newFileName.getText().toString() : "";
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-        String newFileContent = binding.newFileContent.getText() != null ? binding.newFileContent.getText().toString() : "";
+        AppUtil appUtil = new AppUtil();
-        String newFileBranchName = binding.newFileBranches.getText() != null ? binding.newFileBranches.getText().toString() : "";
+        TinyDB tinyDb = new TinyDB(appCtx);
-        String newFileCommitMessage = binding.newFileCommitMessage.getText() != null ? binding.newFileCommitMessage.getText().toString() : "";
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
 
-        if(!AppUtil.hasNetworkConnection(appCtx)) {
+        String newFileName_ = newFileName.getText().toString();
-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+        String newFileContent_ = newFileContent.getText().toString();
+        String newFileBranchName_ = newFileBranchName.getText().toString();
+        String newFileCommitMessage_ = newFileCommitMessage.getText().toString();
+
+        Branches currentBranch = (Branches) newFileBranchesSpinner.getSelectedItem();
+
+        if(!connToInternet) {
+
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
+
         }
 
-        if(((newFileName.isEmpty() || newFileContent.isEmpty()) && fileAction != FILE_ACTION_DELETE) || newFileCommitMessage.isEmpty()) {
+        if(newFileName_.equals("") || newFileContent_.equals("") || newFileCommitMessage_.equals("")) {
-            Toasty.error(ctx, getString(R.string.newFileRequiredFields));
+
+            Toasty.info(ctx, getString(R.string.newFileRequiredFields));
             return;
-        }
-
-	    if(!AppUtil.checkStringsWithDash(newFileBranchName)) {
-		    Toasty.error(ctx, getString(R.string.newFileInvalidBranchName));
-		    return;
-	    }
-
-        if(newFileCommitMessage.length() > 255) {
-            Toasty.warning(ctx, getString(R.string.newFileCommitMessageError));
-            return;
-        }
-
-        disableProcessButton();
-
-        switch(fileAction) {
-
-            case FILE_ACTION_CREATE:
-	            createNewFile(repoOwner, repoName, newFileName, AppUtil.encodeBase64(newFileContent), newFileCommitMessage, newFileBranchName);
-	            break;
-
-            case FILE_ACTION_DELETE:
-	            deleteFile(repoOwner, repoName, filePath, newFileCommitMessage, newFileBranchName, fileSha);
-	            break;
-
-            case FILE_ACTION_EDIT:
-	            editFile(repoOwner, repoName, filePath, AppUtil.encodeBase64(newFileContent), newFileCommitMessage, newFileBranchName, fileSha);
-                break;
 
         }
+
+        if(currentBranch.toString().equals("No branch")) {
+
+            if(newFileBranchName_.equals("")) {
+                Toasty.info(ctx, getString(R.string.newFileRequiredFieldNewBranchName));
+                return;
+            }
+            else {
+                if(!appUtil.checkStringsWithDash(newFileBranchName_)) {
+
+                    Toasty.info(ctx, getString(R.string.newFileInvalidBranchName));
+                    return;
+
+                }
+            }
+
+        }
+
+        if(appUtil.charactersLength(newFileCommitMessage_) > 255) {
+
+            Toasty.info(ctx, getString(R.string.newFileCommitMessageError));
+
+        }
+        else {
+
+            disableProcessButton();
+            createNewFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newFileName_, appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString());
+
+        }
+
     }
 
-    private void createNewFile(String repoOwner, String repoName, String fileName, String fileContent, String fileCommitMessage, String branchName) {
+    private void createNewFile(final String instanceUrl, final String token, String repoOwner, String repoName, String fileName, String fileContent, String fileBranchName, String fileCommitMessage, String currentBranch) {
 
-        NewFile createNewFileJsonStr = branches.contains(branchName) ?
+        NewFile createNewFileJsonStr;
-	        new NewFile(branchName, fileContent, fileCommitMessage, "") :
+        if(currentBranch.equals("No branch")) {
-	        new NewFile("", fileContent, fileCommitMessage, branchName);
+            createNewFileJsonStr = new NewFile("", fileContent, fileCommitMessage, fileBranchName);
+        }
+        else {
+            createNewFileJsonStr = new NewFile(currentBranch, fileContent, fileCommitMessage, "");
+        }
 
         Call<JsonElement> call = RetrofitClient
-                .getApiInterface(ctx)
+                .getInstance(instanceUrl, ctx)
-                .createNewFile(Authorization.get(ctx), repoOwner, repoName, fileName, createNewFileJsonStr);
+                .getApiInterface()
+                .createNewFile(token, repoOwner, repoName, fileName, createNewFileJsonStr);
 
         call.enqueue(new Callback<JsonElement>() {
 
             @Override
             public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
 
-            	switch(response.code()) {
+                if(response.code() == 201) {
 
-		            case 201:
+                    enableProcessButton();
-			            enableProcessButton();
+                    Toasty.info(ctx, getString(R.string.newFileSuccessMessage));
-			            Toasty.success(ctx, getString(R.string.newFileSuccessMessage));
+                    finish();
-			            finish();
-		            	break;
 
-		            case 401:
+                }
-			            enableProcessButton();
+                else if(response.code() == 401) {
-			            AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-				            getResources().getString(R.string.alertDialogTokenRevokedMessage),
-				            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-				            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-		            	break;
 
-		            case 404:
+                    enableProcessButton();
-			            enableProcessButton();
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-			            Toasty.warning(ctx, getString(R.string.apiNotFound));
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
-		            	break;
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 
-		            default:
+                }
-			            enableProcessButton();
+                else {
-			            Toasty.error(ctx, getString(R.string.orgCreatedError));
+
-		            	break;
+                    if(response.code() == 404) {
+                        enableProcessButton();
+                        Toasty.info(ctx, getString(R.string.apiNotFound));
+                    }
+                    else {
+                        enableProcessButton();
+                        Toasty.info(ctx, getString(R.string.orgCreatedError));
+                    }
+
+                }
 
-	            }
             }
 
             @Override
             public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
-
             }
         });
 
     }
 
-	private void deleteFile(String repoOwner, String repoName, String fileName, String fileCommitMessage, String branchName, String fileSha) {
+    private void getBranches(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
-
-    	DeleteFile deleteFileJsonStr = branches.contains(branchName) ?
-		    new DeleteFile(branchName, fileCommitMessage, "", fileSha) :
-		    new DeleteFile("", fileCommitMessage, branchName, fileSha);
-
-		Call<JsonElement> call = RetrofitClient
-			.getApiInterface(ctx)
-			.deleteFile(Authorization.get(ctx), repoOwner, repoName, fileName, deleteFileJsonStr);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				switch(response.code()) {
-
-					case 200:
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.deleteFileMessage, tinyDB.getString("repoBranch")));
-						getIntent().removeExtra("filePath");
-						getIntent().removeExtra("fileSha");
-						getIntent().removeExtra("fileContents");
-						finish();
-						break;
-
-					case 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));
-						break;
-
-					case 404:
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.apiNotFound));
-						break;
-
-					default:
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.genericError));
-						break;
-
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-		});
-
-	}
-
-	private void editFile(String repoOwner, String repoName, String fileName, String fileContent, String fileCommitMessage, String branchName, String fileSha) {
-
-		EditFile editFileJsonStr = branches.contains(branchName) ?
-			new EditFile(branchName, fileCommitMessage, "", fileSha, fileContent) :
-			new EditFile("", fileCommitMessage, branchName, fileSha, fileContent);
-
-		Call<JsonElement> call = RetrofitClient
-			.getApiInterface(ctx)
-			.editFile(Authorization.get(ctx), repoOwner, repoName, fileName, editFileJsonStr);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				switch(response.code()) {
-
-					case 200:
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.editFileMessage, branchName));
-						getIntent().removeExtra("filePath");
-						getIntent().removeExtra("fileSha");
-						getIntent().removeExtra("fileContents");
-						tinyDB.putBoolean("fileModified", true);
-						finish();
-						break;
-
-					case 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));
-						break;
-
-					case 404:
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.apiNotFound));
-						break;
-
-					default:
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.genericError));
-						break;
-
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-
-			}
-		});
-
-	}
-
-    private void getBranches(String repoOwner, String repoName) {
 
         Call<List<Branches>> call = RetrofitClient
-                .getApiInterface(ctx)
+                .getInstance(instanceUrl, ctx)
-                .getBranches(Authorization.get(ctx), repoOwner, repoName);
+                .getApiInterface()
+                .getBranches(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
 
         call.enqueue(new Callback<List<Branches>>() {
 
             @Override
             public void onResponse(@NonNull Call<List<Branches>> call, @NonNull retrofit2.Response<List<Branches>> response) {
 
-                if(response.code() == 200) {
+                if(response.isSuccessful()) {
+                    if(response.code() == 200) {
 
-                	assert response.body() != null;
+                        List<Branches> branchesList_ = response.body();
-                    for(Branches branch : response.body()) branches.add(branch.getName());
 
-                    ArrayAdapter<String> adapter = new ArrayAdapter<>(CreateFileActivity.this, R.layout.list_spinner_items, branches);
+                        branchesList.add(new Branches("No branch"));
+                        assert branchesList_ != null;
+                        if(branchesList_.size() > 0) {
+                            for (int i = 0; i < branchesList_.size(); i++) {
 
-	                binding.newFileBranches.setAdapter(adapter);
+                                Branches data = new Branches(
-	                binding.newFileBranches.setText(tinyDB.getString("repoBranch"), false);
+                                        branchesList_.get(i).getName()
+                                );
+                                branchesList.add(data);
 
-	                enableProcessButton();
+                            }
+                        }
 
+                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreateFileActivity.this,
+                                R.layout.spinner_item, branchesList);
+
+                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
+                        newFileBranchesSpinner.setAdapter(adapter);
+                        enableProcessButton();
+
+                    }
                 }
+
             }
 
             @Override
             public void onFailure(@NonNull Call<List<Branches>> call, @NonNull Throwable t) {
-
                 Log.e("onFailure", t.toString());
             }
         });
 
     }
 
-    private void disableProcessButton() { binding.newFileCreate.setEnabled(false); }
+    private void initCloseListener() {
-    private void enableProcessButton() { binding.newFileCreate.setEnabled(true); }
+        onClickListener = 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);
+
+    }
 
 }

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

@@ -1,262 +1,310 @@
 package org.mian.gitnex.activities;
 
-import android.annotation.SuppressLint;
 import android.app.DatePickerDialog;
-import android.app.Dialog;
 import android.content.Context;
-import android.graphics.Color;
+import android.graphics.PorterDuff;
-import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
-import android.view.LayoutInflater;
+import android.util.Log;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.DatePicker;
+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.gitnex.tea4j.models.Collaborators;
+import com.hendraanggrian.appcompat.socialview.Mention;
-import org.gitnex.tea4j.models.CreateIssue;
+import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
-import org.gitnex.tea4j.models.Labels;
+import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
-import org.gitnex.tea4j.models.Milestones;
 import org.mian.gitnex.R;
-import org.mian.gitnex.actions.AssigneesActions;
-import org.mian.gitnex.actions.LabelsActions;
-import org.mian.gitnex.adapters.AssigneesListAdapter;
-import org.mian.gitnex.adapters.LabelsListAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateIssueBinding;
-import org.mian.gitnex.databinding.CustomAssigneesSelectionDialogBinding;
-import org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Constants;
+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 java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
+import retrofit2.Response;
 
 /**
  * Author M M Arif
  */
 
-public class CreateIssueActivity extends BaseActivity implements View.OnClickListener, LabelsListAdapter.LabelsListAdapterListener, AssigneesListAdapter.AssigneesListAdapterListener {
+public class CreateIssueActivity extends BaseActivity implements View.OnClickListener {
 
-	private ActivityCreateIssueBinding viewBinding;
-	private CustomLabelsSelectionDialogBinding labelsBinding;
-	private CustomAssigneesSelectionDialogBinding assigneesBinding;
     private View.OnClickListener onClickListener;
-    private int resultLimit = Constants.resultLimitOldGiteaInstances;
+    MultiSelectDialog multiSelectDialog;
-	private Dialog dialogLabels;
+    MultiSelectDialog multiSelectDialogLabels;
-	private Dialog dialogAssignees;
+    private TextView assigneesList;
-	private String labelsSetter;
+    private TextView newIssueLabels;
-	private String assigneesSetter;
+    private TextView newIssueDueDate;
-	private int milestoneId;
+    private Spinner newIssueMilestoneSpinner;
+    private EditText newIssueTitle;
+    private SocialAutoCompleteTextView newIssueDescription;
+    private Button createNewIssueButton;
+    private TextView labelsIdHolder;
+    private boolean assigneesFlag;
+    private boolean labelsFlag;
+    final Context ctx = this;
+    private Context appCtx;
+    private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 
-	private String loginUid;
+    List<Milestones> milestonesList = new ArrayList<>();
-	private String repoOwner;
+    ArrayList<MultiSelectModel> listOfAssignees = new ArrayList<>();
-	private String repoName;
+    ArrayList<MultiSelectModel> listOfLabels= new ArrayList<>();
+    private ArrayAdapter<Mention> defaultMentionAdapter;
 
-	private LabelsListAdapter labelsAdapter;
+    @Override
-	private AssigneesListAdapter assigneesAdapter;
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_issue;
+    }
 
-	private List<Integer> labelsIds = new ArrayList<>();
-	private List<Labels> labelsList = new ArrayList<>();
-	private List<Milestones> milestonesList = new ArrayList<>();
-	private List<Collaborators> assigneesList = new ArrayList<>();
-	private List<String> assigneesListData = new ArrayList<>();
-
-    @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-
+        appCtx = getApplicationContext();
-	    viewBinding = ActivityCreateIssueBinding.inflate(getLayoutInflater());
-	    setContentView(viewBinding.getRoot());
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        loginUid = tinyDB.getString("loginUid");
+        TinyDB tinyDb = new TinyDB(appCtx);
-        String repoFullName = tinyDB.getString("repoFullName");
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String loginFullName = tinyDb.getString("userFullname");
+        String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
-        repoOwner = parts[0];
+        final String repoOwner = parts[0];
-        repoName = parts[1];
+        final String repoName = parts[1];
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        // require gitea 1.12 or higher
+        // if gitea is 1.12 or higher use the new limit
-        if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+        if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
-
+            resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
-            resultLimit = Constants.resultLimitNewGiteaInstances;
         }
 
-	    viewBinding.newIssueTitle.requestFocus();
+        ImageView closeActivity = findViewById(R.id.close);
+        assigneesList = findViewById(R.id.newIssueAssigneesList);
+        newIssueLabels = findViewById(R.id.newIssueLabels);
+        newIssueDueDate = findViewById(R.id.newIssueDueDate);
+        createNewIssueButton = findViewById(R.id.createNewIssueButton);
+        newIssueTitle = findViewById(R.id.newIssueTitle);
+        newIssueDescription = findViewById(R.id.newIssueDescription);
+        labelsIdHolder = findViewById(R.id.labelsIdHolder);
+
+        newIssueTitle.requestFocus();
         assert imm != null;
-        imm.showSoftInput(viewBinding.newIssueTitle, InputMethodManager.SHOW_IMPLICIT);
+        imm.showSoftInput(newIssueTitle, InputMethodManager.SHOW_IMPLICIT);
 
-	    viewBinding.newIssueDescription.setOnTouchListener((touchView, motionEvent) -> {
+        defaultMentionAdapter = new MentionArrayAdapter<>(this);
+        loadCollaboratorsList();
 
-		    touchView.getParent().requestDisallowInterceptTouchEvent(true);
+        newIssueDescription.setMentionAdapter(defaultMentionAdapter);
-
-		    if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
-
-			    touchView.getParent().requestDisallowInterceptTouchEvent(false);
-		    }
-		    return false;
-	    });
-
-	    labelsAdapter = new LabelsListAdapter(labelsList, CreateIssueActivity.this, labelsIds);
-	    assigneesAdapter = new AssigneesListAdapter(ctx, assigneesList, CreateIssueActivity.this, assigneesListData);
 
         initCloseListener();
-	    viewBinding.close.setOnClickListener(onClickListener);
+        closeActivity.setOnClickListener(onClickListener);
 
-	    viewBinding.newIssueAssigneesList.setOnClickListener(this);
+        assigneesList.setOnClickListener(this);
-	    viewBinding.newIssueLabels.setOnClickListener(this);
+        newIssueLabels.setOnClickListener(this);
-	    viewBinding.newIssueDueDate.setOnClickListener(this);
+        newIssueDueDate.setOnClickListener(this);
 
-        getMilestones(repoOwner, repoName, resultLimit);
+        newIssueMilestoneSpinner = findViewById(R.id.newIssueMilestoneSpinner);
+        newIssueMilestoneSpinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+        getMilestones(instanceUrl, instanceToken, repoOwner, repoName, loginUid, resultLimit);
+
+        getLabels(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
+        getCollaborators(instanceUrl, instanceToken, repoOwner, repoName, loginUid, loginFullName);
 
         disableProcessButton();
 
-	    viewBinding.newIssueLabels.setOnClickListener(newIssueLabels -> showLabels());
-
-	    viewBinding.newIssueAssigneesList.setOnClickListener(newIssueAssigneesList -> showAssignees());
-
         if(!connToInternet) {
 
-	        viewBinding.createNewIssueButton.setEnabled(false);
+            createNewIssueButton.setEnabled(false);
-        }
+            GradientDrawable shape =  new GradientDrawable();
-        else {
+            shape.setCornerRadius( 8 );
+            shape.setColor(getResources().getColor(R.color.hintColor));
+            createNewIssueButton.setBackground(shape);
+
+        } else {
+
+            createNewIssueButton.setOnClickListener(this);
 
-	        viewBinding.createNewIssueButton.setOnClickListener(this);
         }
 
     }
 
-	@Override
-	public void assigneesInterface(List<String> data) {
-
-		assigneesSetter = String.valueOf(data);
-		viewBinding.newIssueAssigneesList.setText(assigneesSetter.replace("]", "").replace("[", ""));
-		assigneesListData = data;
-	}
-
-	@Override
-	public void labelsInterface(List<String> data) {
-
-		labelsSetter = String.valueOf(data);
-		viewBinding.newIssueLabels.setText(labelsSetter.replace("]", "").replace("[", ""));
-	}
-
-	@Override
-	public void labelsIdsInterface(List<Integer> data) {
-
-		labelsIds = data;
-	}
-
-	private void showAssignees() {
-
-		dialogAssignees = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
-
-		if (dialogAssignees.getWindow() != null) {
-
-			dialogAssignees.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-		}
-
-		assigneesBinding = CustomAssigneesSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
-
-		View view = assigneesBinding.getRoot();
-		dialogAssignees.setContentView(view);
-
-		assigneesBinding.cancel.setOnClickListener(assigneesBinding_ -> dialogAssignees.dismiss());
-
-		dialogAssignees.show();
-		AssigneesActions.getRepositoryAssignees(ctx, repoOwner, repoName, assigneesList, dialogAssignees, assigneesAdapter, assigneesBinding);
-	}
-
-	private void showLabels() {
-
-		dialogLabels = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
-
-		if (dialogLabels.getWindow() != null) {
-
-			dialogLabels.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-		}
-
-		labelsBinding = CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
-
-		View view = labelsBinding.getRoot();
-		dialogLabels.setContentView(view);
-
-		labelsBinding.cancel.setOnClickListener(labelsBinding_ -> dialogLabels.dismiss());
-
-		dialogLabels.show();
-		LabelsActions.getRepositoryLabels(ctx, repoOwner, repoName, labelsList, dialogLabels, labelsAdapter, labelsBinding);
-	}
-
     private void processNewIssue() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        TinyDB tinyDb = new TinyDB(appCtx);
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        String newIssueTitleForm = Objects.requireNonNull(viewBinding.newIssueTitle.getText()).toString();
+        Milestones mModel = (Milestones) newIssueMilestoneSpinner.getSelectedItem();
-        String newIssueDescriptionForm = Objects.requireNonNull(viewBinding.newIssueDescription.getText()).toString();
+
-        String newIssueDueDateForm = Objects.requireNonNull(viewBinding.newIssueDueDate.getText()).toString();
+        int newIssueMilestoneIdForm = mModel.getId();
+        String newIssueTitleForm = newIssueTitle.getText().toString();
+        String newIssueDescriptionForm = newIssueDescription.getText().toString();
+        String newIssueAssigneesListForm = assigneesList.getText().toString();
+        //String newIssueLabelsForm = newIssueLabels.getText().toString();
+        String newIssueDueDateForm = newIssueDueDate.getText().toString();
+        String newIssueLabelsIdHolderForm = labelsIdHolder.getText().toString();
 
         if(!connToInternet) {
 
-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
+
         }
 
         if (newIssueTitleForm.equals("")) {
 
-            Toasty.error(ctx, getString(R.string.issueTitleEmpty));
+            Toasty.info(ctx, getString(R.string.issueTitleEmpty));
             return;
+
         }
 
+        /*if (newIssueDescriptionForm.equals("")) {
+
+            Toasty.info(ctx, getString(R.string.issueDescriptionEmpty));
+            return;
+
+        }*/
+
         if (newIssueDueDateForm.equals("")) {
-
             newIssueDueDateForm = null;
-        }
+        } else {
-        else {
-
             newIssueDueDateForm = (AppUtil.customDateCombine(AppUtil.customDateFormat(newIssueDueDateForm)));
         }
 
+        List<String> newIssueAssigneesListForm_ = new ArrayList<>(Arrays.asList(newIssueAssigneesListForm.split(",")));
+
+        for (int i = 0; i < newIssueAssigneesListForm_.size(); i++) {
+            newIssueAssigneesListForm_.set(i, newIssueAssigneesListForm_.get(i).trim());
+        }
+
+        int[] integers;
+        if (!newIssueLabelsIdHolderForm.equals("")) {
+
+            String[] items = newIssueLabelsIdHolderForm.replaceAll("\\[", "").replaceAll("\\]", "").replaceAll("\\s", "").split(",");
+            integers = new int[items.length];
+            for (int i = 0; i < integers.length; i++) {
+                integers[i] = Integer.parseInt(items[i]);
+            }
+
+        }
+        else {
+            integers = new int[0];
+        }
+
+        //Log.i("FormData", String.valueOf(newIssueLabelsForm));
         disableProcessButton();
-        createNewIssueFunc(repoOwner, repoName, loginUid, newIssueDescriptionForm, newIssueDueDateForm, milestoneId, newIssueTitleForm);
+        createNewIssueFunc(instanceUrl, instanceToken, repoOwner, repoName, loginUid, newIssueDescriptionForm, newIssueDueDateForm, newIssueMilestoneIdForm, newIssueTitleForm, newIssueAssigneesListForm_, integers);
+
     }
 
-    private void createNewIssueFunc(String repoOwner, String repoName, String loginUid, String newIssueDescriptionForm, String newIssueDueDateForm, int newIssueMilestoneIdForm, String newIssueTitleForm) {
+    public void loadCollaboratorsList() {
 
-        CreateIssue createNewIssueJson = new CreateIssue(loginUid, newIssueDescriptionForm, false, newIssueDueDateForm, newIssueMilestoneIdForm, newIssueTitleForm, assigneesListData, labelsIds);
+        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];
+
+        Call<List<Collaborators>> call = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<List<Collaborators>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
+
+                if (response.isSuccessful()) {
+
+                    assert response.body() != null;
+                    String fullName = "";
+                    for (int i = 0; i < response.body().size(); i++) {
+                        if(!response.body().get(i).getFull_name().equals("")) {
+                            fullName = response.body().get(i).getFull_name();
+                        }
+                        defaultMentionAdapter.add(
+                                new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
+                    }
+
+                } else {
+
+                    Log.i("onResponse", String.valueOf(response.code()));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
+                Log.i("onFailure", t.toString());
+            }
+
+        });
+    }
+
+    private void createNewIssueFunc(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String loginUid, String newIssueDescriptionForm, String newIssueDueDateForm, int newIssueMilestoneIdForm, String newIssueTitleForm, List<String> newIssueAssigneesListForm, int[] newIssueLabelsForm) {
+
+        CreateIssue createNewIssueJson = new CreateIssue(loginUid, newIssueDescriptionForm, false, newIssueDueDateForm, newIssueMilestoneIdForm, newIssueTitleForm, newIssueAssigneesListForm, newIssueLabelsForm);
 
         Call<JsonElement> call3;
 
         call3 = RetrofitClient
-                .getApiInterface(ctx)
+                .getInstance(instanceUrl, ctx)
-                .createNewIssue(Authorization.get(ctx), repoOwner, repoName, createNewIssueJson);
+                .getApiInterface()
+                .createNewIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, createNewIssueJson);
 
         call3.enqueue(new Callback<JsonElement>() {
 
             @Override
             public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response2) {
 
-				if(response2.code() == 201) {
+                if(response2.isSuccessful()) {
+                    if(response2.code() == 201) {
 
-                    TinyDB tinyDb = TinyDB.getInstance(appCtx);
+                        //Log.i("isSuccessful1", String.valueOf(response2.body()));
-                    tinyDb.putBoolean("resumeIssues", true);
+                        TinyDB tinyDb = new TinyDB(appCtx);
+                        tinyDb.putBoolean("resumeIssues", true);
+
+                        Toasty.info(ctx, getString(R.string.issueCreated));
+                        enableProcessButton();
+                        finish();
+
+                    }
 
-                    Toasty.success(ctx, getString(R.string.issueCreated));
-                    enableProcessButton();
-                    finish();
                 }
                 else if(response2.code() == 401) {
 
@@ -265,19 +313,21 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
                 }
                 else {
 
-                    Toasty.error(ctx, getString(R.string.issueCreatedError));
+                    Toasty.info(ctx, getString(R.string.issueCreatedError));
                     enableProcessButton();
+                    //Log.i("isSuccessful2", String.valueOf(response2.body()));
+
                 }
 
             }
 
             @Override
             public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
+                Log.e("onFailure", t.toString());
-	            Toasty.error(ctx, getString(R.string.genericServerResponseError));
                 enableProcessButton();
             }
         });
@@ -285,16 +335,21 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
     }
 
     private void initCloseListener() {
-
+        onClickListener = new View.OnClickListener() {
-        onClickListener = view -> finish();
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
     }
 
-    private void getMilestones(String repoOwner, String repoName, int resultLimit) {
+    private void getMilestones(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid, int resultLimit) {
 
         String msState = "open";
         Call<List<Milestones>> call = RetrofitClient
-                .getApiInterface(ctx)
+                .getInstance(instanceUrl, ctx)
-                .getMilestones(Authorization.get(ctx), repoOwner, repoName, 1, resultLimit, msState);
+                .getApiInterface()
+                .getMilestones(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, 1, resultLimit, msState);
 
         call.enqueue(new Callback<List<Milestones>>() {
 
@@ -302,16 +357,13 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
             public void onResponse(@NonNull Call<List<Milestones>> call, @NonNull retrofit2.Response<List<Milestones>> response) {
 
                 if(response.isSuccessful()) {
-
                     if(response.code() == 200) {
 
                         List<Milestones> milestonesList_ = response.body();
 
                         milestonesList.add(new Milestones(0,getString(R.string.issueCreatedNoMilestone)));
                         assert milestonesList_ != null;
-
                         if(milestonesList_.size() > 0) {
-
                             for (int i = 0; i < milestonesList_.size(); i++) {
 
                                 //Don't translate "open" is a enum
@@ -322,20 +374,17 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                                     );
                                     milestonesList.add(data);
                                 }
+
                             }
                         }
 
                         ArrayAdapter<Milestones> adapter = new ArrayAdapter<>(CreateIssueActivity.this,
-                                R.layout.list_spinner_items, milestonesList);
+                                R.layout.spinner_item, milestonesList);
 
-	                    viewBinding.newIssueMilestoneSpinner.setAdapter(adapter);
+                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
+                        newIssueMilestoneSpinner.setAdapter(adapter);
                         enableProcessButton();
 
-	                    viewBinding.newIssueMilestoneSpinner.setOnItemClickListener ((parent, view, position, id) ->
-
-		                    milestoneId = milestonesList.get(position).getId()
-	                    );
-
                     }
                 }
 
@@ -343,8 +392,143 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
             @Override
             public void onFailure(@NonNull Call<List<Milestones>> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
 
-	            Toasty.error(ctx, getString(R.string.genericServerResponseError));
+    }
+
+    private void getCollaborators(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid, String loginFullName) {
+
+        Call<List<Collaborators>> call = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+
+        listOfAssignees.add(new MultiSelectModel(-1, loginFullName));
+
+        call.enqueue(new Callback<List<Collaborators>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull retrofit2.Response<List<Collaborators>> response) {
+
+                if(response.isSuccessful()) {
+                    if(response.code() == 200) {
+
+                        List<Collaborators> assigneesList_ = response.body();
+
+                        assert assigneesList_ != null;
+                        if(assigneesList_.size() > 0) {
+                            for (int i = 0; i < assigneesList_.size(); i++) {
+
+                                /*String assigneesCopy;
+                                if(!assigneesList_.get(i).getFull_name().equals("")) {
+                                    assigneesCopy = getString(R.string.dialogAssignessText, assigneesList_.get(i).getFull_name(), assigneesList_.get(i).getLogin());
+                                }
+                                else {
+                                    assigneesCopy = assigneesList_.get(i).getLogin();
+                                }*/
+                                listOfAssignees.add(new MultiSelectModel(assigneesList_.get(i).getId(), assigneesList_.get(i).getLogin().trim()));
+
+                            }
+                            assigneesFlag = true;
+                        }
+
+                        multiSelectDialog = new MultiSelectDialog()
+                                .title(getResources().getString(R.string.newIssueSelectAssigneesListTitle))
+                                .titleSize(25)
+                                .positiveText(getResources().getString(R.string.okButton))
+                                .negativeText(getResources().getString(R.string.cancelButton))
+                                .setMinSelectionLimit(0)
+                                .setMaxSelectionLimit(listOfAssignees.size())
+                                .multiSelectList(listOfAssignees)
+                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
+                                    @Override
+                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
+
+                                        assigneesList.setText(dataString);
+
+                                    }
+
+                                    @Override
+                                    public void onCancel() {
+                                        //Log.d("multiSelect","Dialog cancelled");
+
+                                    }
+                                });
+
+                    }
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+    private void getLabels(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
+
+        Call<List<Labels>> call = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .getlabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<List<Labels>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Labels>> call, @NonNull retrofit2.Response<List<Labels>> response) {
+
+                if(response.isSuccessful()) {
+                    if(response.code() == 200) {
+
+                        List<Labels> labelsList_ = response.body();
+
+                        assert labelsList_ != null;
+                        if(labelsList_.size() > 0) {
+                            for (int i = 0; i < labelsList_.size(); i++) {
+
+                                listOfLabels.add(new MultiSelectModel(labelsList_.get(i).getId(), labelsList_.get(i).getName().trim()));
+
+                            }
+                            labelsFlag = true;
+                        }
+
+                        multiSelectDialogLabels = new MultiSelectDialog()
+                                .title(getResources().getString(R.string.newIssueSelectLabelsListTitle))
+                                .titleSize(25)
+                                .positiveText(getResources().getString(R.string.okButton))
+                                .negativeText(getResources().getString(R.string.cancelButton))
+                                .setMinSelectionLimit(0)
+                                .setMaxSelectionLimit(listOfLabels.size())
+                                .multiSelectList(listOfLabels)
+                                .onSubmit(new MultiSelectDialog.SubmitCallbackListener() {
+                                    @Override
+                                    public void onSelected(List<Integer> selectedIds, List<String> selectedNames, String dataString) {
+
+                                        newIssueLabels.setText(dataString.trim());
+                                        labelsIdHolder.setText(selectedIds.toString());
+
+                                    }
+
+                                    @Override
+                                    public void onCancel() {
+                                        //Log.d("multiSelect","Dialog cancelled");
+
+                                    }
+                                });
+
+                    }
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Labels>> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
             }
         });
 
@@ -352,8 +536,23 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void onClick(View v) {
-
+        if (v == assigneesList) {
-        if (v == viewBinding.newIssueDueDate) {
+            if(assigneesFlag) {
+                multiSelectDialog.show(getSupportFragmentManager(), "multiSelectDialog");
+            }
+            else {
+                Toasty.info(ctx, getResources().getString(R.string.noAssigneesFound));
+            }
+        }
+        else if (v == newIssueLabels) {
+            if(labelsFlag) {
+                multiSelectDialogLabels.show(getSupportFragmentManager(), "multiSelectDialogLabels");
+            }
+            else {
+                Toasty.info(ctx, getResources().getString(R.string.noLabelsFound));
+            }
+        }
+        else if (v == newIssueDueDate) {
 
             final Calendar c = Calendar.getInstance();
             int mYear = c.get(Calendar.YEAR);
@@ -361,22 +560,41 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
             final int mDay = c.get(Calendar.DAY_OF_MONTH);
 
             DatePickerDialog datePickerDialog = new DatePickerDialog(this,
-	            (view, year, monthOfYear, dayOfMonth) -> viewBinding.newIssueDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth)), mYear, mMonth, mDay);
+                    new DatePickerDialog.OnDateSetListener() {
+
+                        @Override
+                        public void onDateSet(DatePicker view, int year,
+                                              int monthOfYear, int dayOfMonth) {
+
+                            newIssueDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth));
+
+                        }
+                    }, mYear, mMonth, mDay);
             datePickerDialog.show();
         }
-        else if(v == viewBinding.createNewIssueButton) {
+        else if(v == createNewIssueButton) {
-
             processNewIssue();
         }
+
     }
 
     private void disableProcessButton() {
 
-	    viewBinding.createNewIssueButton.setEnabled(false);
+        createNewIssueButton.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        createNewIssueButton.setBackground(shape);
+
     }
 
     private void enableProcessButton() {
 
-	    viewBinding.createNewIssueButton.setEnabled(true);
+        createNewIssueButton.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        createNewIssueButton.setBackground(shape);
+
     }
 }

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

@@ -2,6 +2,7 @@ package org.mian.gitnex.activities;
 
 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,21 +11,21 @@ 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 org.gitnex.tea4j.models.CreateLabel;
+import com.pes.androidmaterialcolorpickerdialog.ColorPickerCallback;
-import org.gitnex.tea4j.models.Labels;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateLabelBinding;
 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.viewmodels.LabelsViewModel;
-import org.mian.gitnex.viewmodels.OrganizationLabelsViewModel;
 import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -39,37 +40,45 @@ public class CreateLabelActivity extends BaseActivity {
     private TextView colorPicker;
     private EditText labelName;
     private Button createLabelButton;
-    private TinyDB tinyDB;
+    final Context ctx = this;
+    private Context appCtx;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_label;
+    }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-
+        appCtx = getApplicationContext();
-	    ActivityCreateLabelBinding activityCreateLabelBinding = ActivityCreateLabelBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateLabelBinding.getRoot());
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        tinyDB = TinyDB.getInstance(appCtx);
+        final TinyDB tinyDb = new TinyDB(appCtx);
-        String repoFullName = tinyDB.getString("repoFullName");
+        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");
 
         if(getIntent().getStringExtra("labelAction") != null && Objects.requireNonNull(getIntent().getStringExtra("labelAction")).equals("delete")) {
 
-            deleteLabel(repoOwner, repoName, Integer.parseInt(Objects.requireNonNull(getIntent().getStringExtra("labelId"))));
+            deleteLabel(instanceUrl, instanceToken, repoOwner, repoName, Integer.parseInt(Objects.requireNonNull(getIntent().getStringExtra("labelId"))), loginUid);
             finish();
             return;
+
         }
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-        ImageView closeActivity = activityCreateLabelBinding.close;
+        ImageView closeActivity = findViewById(R.id.close);
-        colorPicker = activityCreateLabelBinding.colorPicker;
+        colorPicker = findViewById(R.id.colorPicker);
-        labelName = activityCreateLabelBinding.labelName;
+        labelName = findViewById(R.id.labelName);
-        createLabelButton = activityCreateLabelBinding.createLabelButton;
+        createLabelButton = findViewById(R.id.createLabelButton);
 
         labelName.requestFocus();
         assert imm != null;
@@ -79,14 +88,22 @@ public class CreateLabelActivity extends BaseActivity {
 
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
-        colorPicker.setOnClickListener(v -> cp.show());
+        colorPicker.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                cp.show();
+            }
+        });
 
-        cp.setCallback(color -> {
+        cp.setCallback(new ColorPickerCallback() {
+            @Override
+            public void onColorChosen(@ColorInt int color) {
 
-            //Log.i("#Hex no alpha", String.format("#%06X", (0xFFFFFF & color)));
+                //Log.i("#Hex no alpha", String.format("#%06X", (0xFFFFFF & color)));
-            colorPicker.setBackgroundColor(color);
+                colorPicker.setBackgroundColor(color);
-	        tinyDB.putString("labelColor", String.format("#%06X", (0xFFFFFF & color)));
+                tinyDb.putString("labelColor", String.format("#%06X", (0xFFFFFF & color)));
-            cp.dismiss();
+                cp.dismiss();
+
+            }
         });
 
         if(getIntent().getStringExtra("labelAction") != null && Objects.requireNonNull(getIntent().getStringExtra("labelAction")).equals("edit")) {
@@ -94,133 +111,154 @@ public class CreateLabelActivity extends BaseActivity {
             labelName.setText(getIntent().getStringExtra("labelTitle"));
             int labelColor_ = Color.parseColor("#" + getIntent().getStringExtra("labelColor"));
             colorPicker.setBackgroundColor(labelColor_);
-	        tinyDB.putString("labelColorDefault", "#" + getIntent().getStringExtra("labelColor"));
+            tinyDb.putString("labelColorDefault", "#" + getIntent().getStringExtra("labelColor"));
 
-            TextView toolbar_title = activityCreateLabelBinding.toolbarTitle;
+            TextView toolbar_title = findViewById(R.id.toolbar_title);
             toolbar_title.setText(getResources().getString(R.string.pageTitleLabelUpdate));
             createLabelButton.setText(getResources().getString(R.string.newUpdateButtonCopy));
 
             createLabelButton.setOnClickListener(updateLabelListener);
+
             return;
+
         }
 
         if(!connToInternet) {
 
             createLabelButton.setEnabled(false);
-        }
+            GradientDrawable shape =  new GradientDrawable();
-        else {
+            shape.setCornerRadius( 8 );
+            shape.setColor(getResources().getColor(R.color.hintColor));
+            createLabelButton.setBackground(shape);
+
+        } else {
 
             createLabelButton.setOnClickListener(createLabelListener);
+
         }
 
     }
 
-    private final View.OnClickListener createLabelListener = v -> processCreateLabel();
+    private View.OnClickListener createLabelListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processCreateLabel();
+        }
+    };
 
-    private final 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);
-
+        AppUtil appUtil = new AppUtil();
-        String repoFullName = tinyDB.getString("repoFullName");
+        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");
 
         String updateLabelName = labelName.getText().toString();
 
         String updateLabelColor;
-        if(tinyDB.getString("labelColor").isEmpty()) {
+        if(tinyDb.getString("labelColor").isEmpty()) {
-
+            updateLabelColor = tinyDb.getString("labelColorDefault");
-            updateLabelColor = tinyDB.getString("labelColorDefault");
         }
         else {
-
+            updateLabelColor = tinyDb.getString("labelColor");
-            updateLabelColor = tinyDB.getString("labelColor");
         }
 
         if(!connToInternet) {
 
-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
+
         }
 
         if(updateLabelName.equals("")) {
 
-            Toasty.error(ctx, getString(R.string.labelEmptyError));
+            Toasty.info(ctx, getString(R.string.labelEmptyError));
             return;
+
         }
 
-        if(!AppUtil.checkStrings(updateLabelName)) {
+        if(!appUtil.checkStrings(updateLabelName)) {
 
-            Toasty.error(ctx, getString(R.string.labelNameError));
+            Toasty.info(ctx, getString(R.string.labelNameError));
             return;
+
         }
 
         disableProcessButton();
-        patchLabel(repoOwner, repoName, updateLabelName, updateLabelColor, Integer.parseInt(
+        patchLabel(instanceUrl, instanceToken, repoOwner, repoName, updateLabelName, updateLabelColor, Integer.valueOf(getIntent().getStringExtra("labelId")), loginUid);
-	        Objects.requireNonNull(getIntent().getStringExtra("labelId"))));
 
     }
 
     private void processCreateLabel() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
+        AppUtil appUtil = new AppUtil();
-        String repoFullName = tinyDB.getString("repoFullName");
+        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 instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         String newLabelName = labelName.getText().toString();
         String newLabelColor;
-
+        if(tinyDb.getString("labelColor").isEmpty()) {
-        if(tinyDB.getString("labelColor").isEmpty()) {
-
             newLabelColor = String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(ctx, R.color.releasePre)));
         }
         else {
-
+            newLabelColor = tinyDb.getString("labelColor");
-            newLabelColor = tinyDB.getString("labelColor");
         }
 
         if(!connToInternet) {
 
-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
+
         }
 
         if(newLabelName.equals("")) {
 
-            Toasty.error(ctx, getString(R.string.labelEmptyError));
+            Toasty.info(ctx, getString(R.string.labelEmptyError));
             return;
+
         }
 
-        if(!AppUtil.checkStrings(newLabelName)) {
+        if(!appUtil.checkStrings(newLabelName)) {
 
-            Toasty.error(ctx, getString(R.string.labelNameError));
+            Toasty.info(ctx, getString(R.string.labelNameError));
             return;
+
         }
 
         disableProcessButton();
-        createNewLabel(repoOwner, repoName, newLabelName, newLabelColor);
+        createNewLabel(instanceUrl, instanceToken, repoOwner, repoName, newLabelName, newLabelColor, loginUid);
+
     }
 
-    private void createNewLabel(String repoOwner, String repoName, String newLabelName, String newLabelColor) {
+    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);
 
         Call<CreateLabel> call;
 
-	    if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
+        call = RetrofitClient
-
+                .getInstance(instanceUrl, ctx)
-	    	call = RetrofitClient.getApiInterface(ctx).createOrganizationLabel(Authorization.get(ctx), getIntent().getStringExtra("orgName"), createLabelFunc);
+                .getApiInterface()
-	    }
+                .createLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, createLabelFunc);
-	    else {
-
-		    call = RetrofitClient.getApiInterface(ctx).createLabel(Authorization.get(ctx), repoOwner, repoName, createLabelFunc);
-	    }
 
         call.enqueue(new Callback<CreateLabel>() {
 
@@ -229,10 +267,11 @@ public class CreateLabelActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    Toasty.success(ctx, getString(R.string.labelCreated));
+                    Toasty.info(ctx, getString(R.string.labelCreated));
-	                tinyDB.putString("labelColor", "");
+                    tinyDb.putString("labelColor", "");
-	                tinyDB.putBoolean("labelsRefresh", true);
+                    tinyDb.putBoolean("labelsRefresh", true);
                     finish();
+
                 }
                 else if(response.code() == 401) {
 
@@ -241,19 +280,21 @@ public class CreateLabelActivity extends BaseActivity {
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
                 }
                 else {
 
                     enableProcessButton();
-	                tinyDB.putString("labelColor", "");
+                    tinyDb.putString("labelColor", "");
-                    Toasty.error(ctx, getString(R.string.labelGeneralError));
+                    Toasty.info(ctx, getString(R.string.labelGeneralError));
+
                 }
+
             }
 
             @Override
             public void onFailure(@NonNull Call<CreateLabel> call, @NonNull Throwable t) {
-
+                tinyDb.putString("labelColor", "");
-	            tinyDB.putString("labelColor", "");
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -261,20 +302,17 @@ public class CreateLabelActivity extends BaseActivity {
 
     }
 
-    private void patchLabel(String repoOwner, String repoName, String updateLabelName, String updateLabelColor, int labelId) {
+    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);
 
         Call<CreateLabel> call;
 
-	    if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
+        call = RetrofitClient
-
+                .getInstance(instanceUrl, ctx)
-		    call = RetrofitClient.getApiInterface(ctx).patchOrganizationLabel(Authorization.get(ctx), getIntent().getStringExtra("orgName"), labelId, createLabelFunc);
+                .getApiInterface()
-	    }
+                .patchLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, labelId, createLabelFunc);
-	    else {
-
-		    call = RetrofitClient.getApiInterface(appCtx).patchLabel(Authorization.get(ctx), repoOwner, repoName, labelId, createLabelFunc);
-	    }
 
         call.enqueue(new Callback<CreateLabel>() {
 
@@ -282,19 +320,18 @@ public class CreateLabelActivity extends BaseActivity {
             public void onResponse(@NonNull Call<CreateLabel> call, @NonNull retrofit2.Response<CreateLabel> response) {
 
                 if(response.isSuccessful()) {
-
                     if(response.code() == 200) {
 
-                        Toasty.success(ctx, getString(R.string.labelUpdated));
+                        Toasty.info(ctx, getString(R.string.labelUpdated));
-	                    tinyDB.putString("labelColor", "");
+                        tinyDb.putString("labelColor", "");
-	                    tinyDB.putBoolean("labelsRefresh", true);
+                        tinyDb.putBoolean("labelsRefresh", true);
-	                    tinyDB.putString("labelColorDefault", "");
+                        tinyDb.putString("labelColorDefault", "");
                         getIntent().removeExtra("labelAction");
                         getIntent().removeExtra("labelId");
                         getIntent().removeExtra("labelTitle");
                         getIntent().removeExtra("labelColor");
-	                    getIntent().removeExtra("type");
                         finish();
+
                     }
                 }
                 else if(response.code() == 401) {
@@ -304,21 +341,23 @@ public class CreateLabelActivity extends BaseActivity {
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
                 }
                 else {
 
                     enableProcessButton();
-	                tinyDB.putString("labelColor", "");
+                    tinyDb.putString("labelColor", "");
-	                tinyDB.putString("labelColorDefault", "");
+                    tinyDb.putString("labelColorDefault", "");
-                    Toasty.error(ctx, getString(R.string.labelGeneralError));
+                    Toasty.info(ctx, getString(R.string.labelGeneralError));
+
                 }
+
             }
 
             @Override
             public void onFailure(@NonNull Call<CreateLabel> call, @NonNull Throwable t) {
-
+                tinyDb.putString("labelColor", "");
-	            tinyDB.putString("labelColor", "");
+                tinyDb.putString("labelColorDefault", "");
-	            tinyDB.putString("labelColorDefault", "");
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -327,30 +366,26 @@ public class CreateLabelActivity extends BaseActivity {
     }
 
     private void initCloseListener() {
-
+        onClickListener = new View.OnClickListener() {
-        onClickListener = view -> {
+            @Override
-
+            public void onClick(View view) {
-            getIntent().removeExtra("labelAction");
+                getIntent().removeExtra("labelAction");
-            getIntent().removeExtra("labelId");
+                getIntent().removeExtra("labelId");
-            getIntent().removeExtra("labelTitle");
+                getIntent().removeExtra("labelTitle");
-            getIntent().removeExtra("labelColor");
+                getIntent().removeExtra("labelColor");
-	        getIntent().removeExtra("type");
+                finish();
-            finish();
+            }
         };
     }
 
-    private void deleteLabel(final String repoOwner, final String repoName, int labelId) {
+    private void deleteLabel(final String instanceUrl, final String instanceToken, final String repoOwner, final String repoName, int labelId, String loginUid) {
 
         Call<Labels> call;
 
-	    if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
+        call = RetrofitClient
-
+                .getInstance(instanceUrl, ctx)
-		    call = RetrofitClient.getApiInterface(appCtx).deleteOrganizationLabel(Authorization.get(ctx), getIntent().getStringExtra("orgName"), labelId);
+                .getApiInterface()
-	    }
+                .deleteLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, labelId);
-	    else {
-
-		    call = RetrofitClient.getApiInterface(appCtx).deleteLabel(Authorization.get(ctx), repoOwner, repoName, labelId);
-	    }
 
         call.enqueue(new Callback<Labels>() {
 
@@ -358,21 +393,13 @@ public class CreateLabelActivity extends BaseActivity {
             public void onResponse(@NonNull Call<Labels> call, @NonNull retrofit2.Response<Labels> response) {
 
                 if(response.isSuccessful()) {
-
                     if(response.code() == 204) {
 
-                        Toasty.success(ctx, getString(R.string.labelDeleteText));
+                        Toasty.info(ctx, getString(R.string.labelDeleteText));
-	                    if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
+                        LabelsViewModel.loadLabelsList(instanceUrl, instanceToken, repoOwner, repoName, ctx);
-
-	                    	OrganizationLabelsViewModel.loadOrgLabelsList(Authorization.get(ctx), getIntent().getStringExtra("orgName"), ctx, null, null);
-	                    }
-	                    else {
-
-		                    LabelsViewModel.loadLabelsList(Authorization.get(ctx), repoOwner, repoName, ctx);
-	                    }
                         getIntent().removeExtra("labelAction");
                         getIntent().removeExtra("labelId");
-	                    getIntent().removeExtra("type");
+
                     }
                 }
                 else if(response.code() == 401) {
@@ -381,11 +408,14 @@ public class CreateLabelActivity extends BaseActivity {
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
                 }
                 else {
 
-                    Toasty.error(ctx, getString(R.string.labelDeleteErrorText));
+                    Toasty.info(ctx, getString(R.string.labelDeleteErrorText));
+
                 }
+
             }
 
             @Override
@@ -399,11 +429,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);
+
     }
 
 }

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

@@ -1,27 +1,26 @@
 package org.mian.gitnex.activities;
 
-import android.annotation.SuppressLint;
 import android.app.DatePickerDialog;
 import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
+import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.Milestones;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateMilestoneBinding;
 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.models.Milestones;
 import java.util.Calendar;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -37,41 +36,34 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
     private EditText milestoneTitle;
     private EditText milestoneDescription;
     private Button createNewMilestoneButton;
+    final Context ctx = this;
+    private Context appCtx;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_milestone;
+    }
 
-    @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-
+        appCtx = getApplicationContext();
-	    ActivityCreateMilestoneBinding activityCreateMilestoneBinding = ActivityCreateMilestoneBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateMilestoneBinding.getRoot());
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        milestoneDueDate = activityCreateMilestoneBinding.milestoneDueDate;
+        milestoneDueDate = findViewById(R.id.milestoneDueDate);
-        ImageView closeActivity = activityCreateMilestoneBinding.close;
+        ImageView closeActivity = findViewById(R.id.close);
-        createNewMilestoneButton = activityCreateMilestoneBinding.createNewMilestoneButton;
+        createNewMilestoneButton = findViewById(R.id.createNewMilestoneButton);
-        milestoneTitle = activityCreateMilestoneBinding.milestoneTitle;
+        milestoneTitle = findViewById(R.id.milestoneTitle);
-        milestoneDescription = activityCreateMilestoneBinding.milestoneDescription;
+        milestoneDescription = findViewById(R.id.milestoneDescription);
 
         milestoneTitle.requestFocus();
         assert imm != null;
         imm.showSoftInput(milestoneTitle, InputMethodManager.SHOW_IMPLICIT);
 
-	    milestoneDescription.setOnTouchListener((touchView, motionEvent) -> {
-
-		    touchView.getParent().requestDisallowInterceptTouchEvent(true);
-
-		    if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
-
-			    touchView.getParent().requestDisallowInterceptTouchEvent(false);
-		    }
-		    return false;
-	    });
-
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
         milestoneDueDate.setOnClickListener(this);
@@ -79,25 +71,38 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
         if(!connToInternet) {
 
             createNewMilestoneButton.setEnabled(false);
-        }
+            GradientDrawable shape =  new GradientDrawable();
-        else {
+            shape.setCornerRadius( 8 );
+            shape.setColor(getResources().getColor(R.color.hintColor));
+            createNewMilestoneButton.setBackground(shape);
+
+        } else {
 
             createNewMilestoneButton.setOnClickListener(createMilestoneListener);
+
         }
 
     }
 
-    private final 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);
-
+        AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = TinyDB.getInstance(appCtx);
+        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 instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        //String appLocale = tinyDb.getString("locale");
 
         String newMilestoneTitle = milestoneTitle.getText().toString();
         String newMilestoneDescription = milestoneDescription.getText().toString();
@@ -105,50 +110,50 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
         if(!connToInternet) {
 
-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
+
         }
 
         if(newMilestoneTitle.equals("")) {
 
-            Toasty.error(ctx, getString(R.string.milestoneNameErrorEmpty));
+            Toasty.info(ctx, getString(R.string.milestoneNameErrorEmpty));
             return;
+
         }
 
         if(!newMilestoneDescription.equals("")) {
+            if (appUtil.charactersLength(newMilestoneDescription) > 255) {
 
-            if (newMilestoneDescription.length() > 255) {
+                Toasty.info(ctx, getString(R.string.milestoneDescError));
-
-                Toasty.warning(ctx, getString(R.string.milestoneDescError));
                 return;
+
             }
         }
 
         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 (new Version(tinyDb.getString("giteaVersion")).less("1.10.0")) {
-
             // if Gitea version is less than 1.10.0 DueDate is required
-            Toasty.warning(ctx, getString(R.string.milestoneDateEmpty));
+            Toasty.info(ctx, getString(R.string.milestoneDateEmpty));
             return;
         }
 
         disableProcessButton();
-        createNewMilestone(Authorization.get(ctx), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate);
+        createNewMilestone(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate);
+
     }
 
-    private void createNewMilestone(final String token, String repoOwner, String repoName, String newMilestoneTitle, String newMilestoneDescription, String newMilestoneDueDate) {
+    private void createNewMilestone(final String instanceUrl, final String token, String repoOwner, String repoName, String newMilestoneTitle, String newMilestoneDescription, String newMilestoneDueDate) {
 
         Milestones createMilestone = new Milestones(newMilestoneDescription, newMilestoneTitle, newMilestoneDueDate);
 
         Call<Milestones> call;
 
         call = RetrofitClient
-                .getApiInterface(appCtx)
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
                 .createMilestone(token, repoOwner, repoName, createMilestone);
 
         call.enqueue(new Callback<Milestones>() {
@@ -157,14 +162,14 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
             public void onResponse(@NonNull Call<Milestones> call, @NonNull retrofit2.Response<Milestones> response) {
 
                 if(response.isSuccessful()) {
-
                     if(response.code() == 201) {
 
-                        TinyDB tinyDb = TinyDB.getInstance(appCtx);
+                        TinyDB tinyDb = new TinyDB(appCtx);
                         tinyDb.putBoolean("milestoneCreated", true);
-                        Toasty.success(ctx, getString(R.string.milestoneCreated));
+                        Toasty.info(ctx, getString(R.string.milestoneCreated));
                         enableProcessButton();
                         finish();
+
                     }
                 }
                 else if(response.code() == 401) {
@@ -174,17 +179,19 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
                 }
                 else {
 
                     enableProcessButton();
-                    Toasty.error(ctx, getString(R.string.milestoneCreatedError));
+                    Toasty.info(ctx, getString(R.string.milestoneCreatedError));
+
                 }
+
             }
 
             @Override
             public void onFailure(@NonNull Call<Milestones> call, @NonNull Throwable t) {
-
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -203,25 +210,48 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
             final int mDay = c.get(Calendar.DAY_OF_MONTH);
 
             DatePickerDialog datePickerDialog = new DatePickerDialog(this,
-	            (view, year, monthOfYear, dayOfMonth) -> milestoneDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth)), mYear, mMonth, mDay);
+                    new DatePickerDialog.OnDateSetListener() {
+
+                        @Override
+                        public void onDateSet(DatePicker view, int year,
+                                              int monthOfYear, int dayOfMonth) {
+
+                            milestoneDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth));
+
+                        }
+                    }, mYear, mMonth, mDay);
             datePickerDialog.show();
         }
 
     }
 
     private void initCloseListener() {
-
+        onClickListener = new View.OnClickListener() {
-        onClickListener = view -> finish();
+            @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);
+
     }
 
 }

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.util.Patterns;
@@ -10,14 +11,14 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateNewUserBinding;
 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;
 
@@ -33,25 +34,30 @@ public class CreateNewUserActivity extends BaseActivity {
     private EditText userEmail;
     private EditText userPassword;
     private Button createUserButton;
+    final Context ctx = this;
+    private Context appCtx;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_new_user;
+    }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-
+        appCtx = getApplicationContext();
-	    ActivityCreateNewUserBinding activityCreateNewUserBinding = ActivityCreateNewUserBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateNewUserBinding.getRoot());
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        ImageView closeActivity = activityCreateNewUserBinding.close;
+        ImageView closeActivity = findViewById(R.id.close);
-        createUserButton = activityCreateNewUserBinding.createUserButton;
+        createUserButton = findViewById(R.id.createUserButton);
-        fullName = activityCreateNewUserBinding.fullName;
+        fullName = findViewById(R.id.fullName);
-        userUserName = activityCreateNewUserBinding.userUserName;
+        userUserName = findViewById(R.id.userUserName);
-        userEmail = activityCreateNewUserBinding.userEmail;
+        userEmail = findViewById(R.id.userEmail);
-        userPassword = activityCreateNewUserBinding.userPassword;
+        userPassword = findViewById(R.id.userPassword);
 
         fullName.requestFocus();
         assert imm != null;
@@ -63,16 +69,23 @@ public class CreateNewUserActivity extends BaseActivity {
         if(!connToInternet) {
 
             disableProcessButton();
-        }
+
-        else {
+        } else {
 
             createUserButton.setOnClickListener(createNewUserListener);
+
         }
+
     }
 
     private void processCreateNewUser() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        AppUtil appUtil = new AppUtil();
+        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 newFullName = fullName.getText().toString().trim();
         String newUserName = userUserName.getText().toString().trim();
@@ -81,46 +94,53 @@ public class CreateNewUserActivity extends BaseActivity {
 
         if(!connToInternet) {
 
-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
+
         }
 
         if(newFullName.equals("") || newUserName.equals("") | newUserEmail.equals("") || newUserPassword.equals("")) {
 
-            Toasty.error(ctx, getString(R.string.emptyFields));
+            Toasty.info(ctx, getString(R.string.emptyFields));
             return;
+
         }
 
-        if(!AppUtil.checkStrings(newFullName)) {
+        if(!appUtil.checkStrings(newFullName)) {
 
-            Toasty.error(ctx, getString(R.string.userInvalidFullName));
+            Toasty.info(ctx, getString(R.string.userInvalidFullName));
             return;
+
         }
 
-        if(!AppUtil.checkStringsWithAlphaNumeric(newUserName)) {
+        if(!appUtil.checkStringsWithAlphaNumeric(newUserName)) {
 
-            Toasty.error(ctx, getString(R.string.userInvalidUserName));
+            Toasty.info(ctx, getString(R.string.userInvalidUserName));
             return;
+
         }
 
         if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {
 
-            Toasty.error(ctx, getString(R.string.userInvalidEmail));
+            Toasty.info(ctx, getString(R.string.userInvalidEmail));
             return;
+
         }
 
         disableProcessButton();
-        createNewUser(Authorization.get(ctx), newFullName, newUserName, newUserEmail, newUserPassword);
+        createNewUser(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newFullName, newUserName, newUserEmail, newUserPassword);
+
     }
 
-    private void createNewUser(final String instanceToken, String newFullName, String newUserName, String newUserEmail, String newUserPassword) {
+    private void createNewUser(final String instanceUrl, final String instanceToken, String newFullName, String newUserName, String newUserEmail, String newUserPassword) {
 
         UserInfo createUser = new UserInfo(newUserEmail, newFullName, newUserName, newUserPassword, newUserName, 0, true);
 
         Call<UserInfo> call;
 
         call = RetrofitClient
-                .getApiInterface(appCtx)
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
                 .createNewUser(instanceToken, createUser);
 
         call.enqueue(new Callback<UserInfo>() {
@@ -130,9 +150,10 @@ public class CreateNewUserActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    Toasty.success(ctx, getString(R.string.userCreatedText));
+                    Toasty.info(ctx, getString(R.string.userCreatedText));
                     enableProcessButton();
                     finish();
+
                 }
                 else if(response.code() == 401) {
 
@@ -141,32 +162,37 @@ public class CreateNewUserActivity extends BaseActivity {
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
                 }
                 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(ctx, getString(R.string.genericError));
+
                 }
+
             }
 
             @Override
             public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
-
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -174,21 +200,39 @@ public class CreateNewUserActivity extends BaseActivity {
 
     }
 
-    private final View.OnClickListener createNewUserListener = v -> processCreateNewUser();
+    private View.OnClickListener createNewUserListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processCreateNewUser();
+        }
+    };
 
     private void initCloseListener() {
-
+        onClickListener = new View.OnClickListener() {
-        onClickListener = view -> finish();
+            @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);
+
     }
 
 }

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

@@ -1,25 +1,23 @@
 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.MotionEvent;
 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.gitnex.tea4j.models.UserOrganizations;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateOrganizationBinding;
 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 retrofit2.Call;
 import retrofit2.Callback;
 
@@ -35,106 +33,122 @@ public class CreateOrganizationActivity extends BaseActivity {
 
     private EditText orgName;
     private EditText orgDesc;
+    final Context ctx = this;
+    private Context appCtx;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_organization;
+    }
 
-    @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-
+        appCtx = getApplicationContext();
-	    ActivityCreateOrganizationBinding activityCreateOrganizationBinding = ActivityCreateOrganizationBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateOrganizationBinding.getRoot());
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        closeActivity = activityCreateOrganizationBinding.close;
+        closeActivity = findViewById(R.id.close);
-        orgName = activityCreateOrganizationBinding.newOrganizationName;
+        orgName = findViewById(R.id.newOrganizationName);
-        orgDesc = activityCreateOrganizationBinding.newOrganizationDescription;
+        orgDesc = findViewById(R.id.newOrganizationDescription);
 
         orgName.requestFocus();
         assert imm != null;
         imm.showSoftInput(orgName, InputMethodManager.SHOW_IMPLICIT);
 
-	    orgDesc.setOnTouchListener((touchView, motionEvent) -> {
-
-		    touchView.getParent().requestDisallowInterceptTouchEvent(true);
-
-		    if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
-
-			    touchView.getParent().requestDisallowInterceptTouchEvent(false);
-		    }
-		    return false;
-	    });
-
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
-        createOrganizationButton = activityCreateOrganizationBinding.createNewOrganizationButton;
+        createOrganizationButton = findViewById(R.id.createNewOrganizationButton);
 
         if(!connToInternet) {
 
             createOrganizationButton.setEnabled(false);
-        }
+            GradientDrawable shape =  new GradientDrawable();
-        else {
+            shape.setCornerRadius( 8 );
+            shape.setColor(getResources().getColor(R.color.hintColor));
+            createOrganizationButton.setBackground(shape);
+
+        } else {
 
             createOrganizationButton.setOnClickListener(createOrgListener);
+
         }
 
     }
 
     private void initCloseListener() {
-
+        onClickListener = new View.OnClickListener() {
-        onClickListener = view -> finish();
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
     }
 
-    private final View.OnClickListener createOrgListener = v -> processNewOrganization();
+    private View.OnClickListener createOrgListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processNewOrganization();
+        }
+    };
 
     private void processNewOrganization() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        AppUtil appUtil = new AppUtil();
+        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 newOrgName = orgName.getText().toString();
         String newOrgDesc = orgDesc.getText().toString();
 
         if(!connToInternet) {
 
-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
+
         }
 
         if(!newOrgDesc.equals("")) {
+            if (appUtil.charactersLength(newOrgDesc) > 255) {
 
-            if (newOrgDesc.length() > 255) {
+                Toasty.info(ctx, getString(R.string.orgDescError));
-
-                Toasty.warning(ctx, getString(R.string.orgDescError));
                 return;
+
             }
         }
 
         if(newOrgName.equals("")) {
 
-            Toasty.error(ctx, getString(R.string.orgNameErrorEmpty));
+            Toasty.info(ctx, getString(R.string.orgNameErrorEmpty));
-        }
+
-        else if(!AppUtil.checkStrings(newOrgName)) {
+        }
+        else if(!appUtil.checkStrings(newOrgName)) {
+
+            Toasty.info(ctx, getString(R.string.orgNameErrorInvalid));
 
-            Toasty.warning(ctx, getString(R.string.orgNameErrorInvalid));
         }
         else {
 
             disableProcessButton();
-            createNewOrganization(Authorization.get(ctx), newOrgName, newOrgDesc);
+            createNewOrganization(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newOrgName, newOrgDesc);
+
         }
 
     }
 
-    private void createNewOrganization(final String token, String orgName, String orgDesc) {
+    private void createNewOrganization(final String instanceUrl, final String token, String orgName, String orgDesc) {
 
         UserOrganizations createOrganization = new UserOrganizations(orgName, null, orgDesc, null, null);
 
         Call<UserOrganizations> call = RetrofitClient
-            .getApiInterface(appCtx)
+            .getInstance(instanceUrl, ctx)
+            .getApiInterface()
             .createNewOrganization(token, createOrganization);
 
         call.enqueue(new Callback<UserOrganizations>() {
@@ -144,11 +158,12 @@ public class CreateOrganizationActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    TinyDB tinyDb = TinyDB.getInstance(appCtx);
+                    TinyDB tinyDb = new TinyDB(appCtx);
                     tinyDb.putBoolean("orgCreated", true);
                     enableProcessButton();
-                    Toasty.success(ctx, getString(R.string.orgCreated));
+                    Toasty.info(ctx, getString(R.string.orgCreated));
                     finish();
+
                 }
                 else if(response.code() == 401) {
 
@@ -157,35 +172,37 @@ public class CreateOrganizationActivity 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.orgExistsError));
+                    Toasty.info(ctx, getString(R.string.orgExistsError));
+
                 }
                 else if(response.code() == 422) {
 
                     enableProcessButton();
-                    Toasty.warning(ctx, getString(R.string.orgExistsError));
+                    Toasty.info(ctx, getString(R.string.orgExistsError));
+
                 }
                 else {
 
                     if(response.code() == 404) {
-
                         enableProcessButton();
-                        Toasty.warning(ctx, getString(R.string.apiNotFound));
+                        Toasty.info(ctx, getString(R.string.apiNotFound));
                     }
                     else {
-
                         enableProcessButton();
-                        Toasty.error(ctx, getString(R.string.orgCreatedError));
+                        Toasty.info(ctx, getString(R.string.orgCreatedError));
                     }
+
                 }
+
             }
 
             @Override
             public void onFailure(@NonNull Call<UserOrganizations> call, @NonNull Throwable t) {
-
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -196,11 +213,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);
+
     }
 
 }

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

@@ -1,373 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.annotation.SuppressLint;
-import android.app.DatePickerDialog;
-import android.app.Dialog;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.Branches;
-import org.gitnex.tea4j.models.CreatePullRequest;
-import org.gitnex.tea4j.models.Labels;
-import org.gitnex.tea4j.models.Milestones;
-import org.mian.gitnex.R;
-import org.mian.gitnex.actions.LabelsActions;
-import org.mian.gitnex.adapters.LabelsListAdapter;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreatePrBinding;
-import org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Constants;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.Version;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class CreatePullRequestActivity extends BaseActivity implements LabelsListAdapter.LabelsListAdapterListener {
-
-	private View.OnClickListener onClickListener;
-	private ActivityCreatePrBinding viewBinding;
-	private CustomLabelsSelectionDialogBinding labelsBinding;
-	private int resultLimit = Constants.resultLimitOldGiteaInstances;
-	private Dialog dialogLabels;
-	private String labelsSetter;
-	private List<Integer> labelsIds = new ArrayList<>();
-	private List<String> assignees = new ArrayList<>();
-	private int milestoneId;
-
-	private String loginUid;
-	private String instanceToken;
-	private String repoOwner;
-	private String repoName;
-
-	private LabelsListAdapter labelsAdapter;
-
-	List<Milestones> milestonesList = new ArrayList<>();
-	List<Branches> branchesList = new ArrayList<>();
-	List<Labels> labelsList = new ArrayList<>();
-
-	@SuppressLint("ClickableViewAccessibility")
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		viewBinding = ActivityCreatePrBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
-
-		loginUid = tinyDB.getString("loginUid");
-		String repoFullName = tinyDB.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		repoOwner = parts[0];
-		repoName = parts[1];
-		instanceToken = "token " + tinyDB.getString(loginUid + "-token");
-
-		// require gitea 1.12 or higher
-		if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.0")) {
-
-			resultLimit = Constants.resultLimitNewGiteaInstances;
-		}
-
-		viewBinding.prBody.setOnTouchListener((touchView, motionEvent) -> {
-
-			touchView.getParent().requestDisallowInterceptTouchEvent(true);
-
-			if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
-
-				touchView.getParent().requestDisallowInterceptTouchEvent(false);
-			}
-			return false;
-		});
-
-		labelsAdapter =  new LabelsListAdapter(labelsList, CreatePullRequestActivity.this, labelsIds);
-
-		ImageView closeActivity = findViewById(R.id.close);
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		viewBinding.prDueDate.setOnClickListener(dueDate ->
-			setDueDate()
-		);
-
-		disableProcessButton();
-
-		getMilestones(repoOwner, repoName, resultLimit);
-		getBranches(repoOwner, repoName);
-
-		viewBinding.prLabels.setOnClickListener(prLabels -> showLabels());
-
-		viewBinding.createPr.setOnClickListener(createPr -> processPullRequest());
-	}
-
-	private void processPullRequest() {
-
-		String prTitle = String.valueOf(viewBinding.prTitle.getText());
-		String prDescription = String.valueOf(viewBinding.prBody.getText());
-		String mergeInto = viewBinding.mergeIntoBranchSpinner.getText().toString();
-		String pullFrom = viewBinding.pullFromBranchSpinner.getText().toString();
-		String dueDate = String.valueOf(viewBinding.prDueDate.getText());
-
-		assignees.add("");
-
-		if (labelsIds.size() == 0) {
-
-			labelsIds.add(0);
-		}
-
-		if (dueDate.matches("")) {
-
-			dueDate = null;
-		}
-		else {
-
-			dueDate = AppUtil.customDateCombine(AppUtil.customDateFormat(dueDate));
-		}
-
-		if(prTitle.matches("")) {
-
-			Toasty.error(ctx, getString(R.string.titleError));
-		}
-		else if(mergeInto.matches("")) {
-
-			Toasty.error(ctx, getString(R.string.mergeIntoError));
-		}
-		else if(pullFrom.matches("")) {
-
-			Toasty.error(ctx, getString(R.string.pullFromError));
-		}
-		else if(pullFrom.equals(mergeInto)) {
-
-			Toasty.error(ctx, getString(R.string.sameBranchesError));
-		}
-		else {
-
-			createPullRequest(prTitle, prDescription, mergeInto, pullFrom, milestoneId, dueDate, assignees);
-		}
-	}
-
-	private void createPullRequest(String prTitle, String prDescription, String mergeInto, String pullFrom, int milestoneId, String dueDate, List<String> assignees) {
-
-		CreatePullRequest createPullRequest = new CreatePullRequest(prTitle, prDescription, loginUid, mergeInto, pullFrom, milestoneId, dueDate, assignees, labelsIds);
-
-		Call<Void> transferCall = RetrofitClient
-			.getApiInterface(appCtx)
-			.createPullRequest(instanceToken, repoOwner, repoName, createPullRequest);
-
-		transferCall.enqueue(new Callback<Void>() {
-
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
-
-				disableProcessButton();
-
-				if (response.code() == 201) {
-
-					Toasty.success(ctx, getString(R.string.prCreateSuccess));
-					finish();
-				}
-				else if (response.code() == 409 && response.message().equals("Conflict")) {
-
-					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.prAlreadyExists));
-				}
-				else if (response.code() == 404) {
-
-					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.apiNotFound));
-				}
-				else {
-
-					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				enableProcessButton();
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
-	}
-
-	@Override
-	public void labelsInterface(List<String> data) {
-
-		labelsSetter = String.valueOf(data);
-		viewBinding.prLabels.setText(labelsSetter.replace("]", "").replace("[", ""));
-	}
-
-	@Override
-	public void labelsIdsInterface(List<Integer> data) {
-
-		labelsIds = data;
-	}
-
-	private void showLabels() {
-
-		dialogLabels = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
-
-		if (dialogLabels.getWindow() != null) {
-
-			dialogLabels.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-		}
-
-		labelsBinding = CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
-
-		View view = labelsBinding.getRoot();
-		dialogLabels.setContentView(view);
-
-		labelsBinding.cancel.setOnClickListener(editProperties -> dialogLabels.dismiss());
-
-		dialogLabels.show();
-		LabelsActions.getRepositoryLabels(ctx, repoOwner, repoName, labelsList, dialogLabels, labelsAdapter, labelsBinding);
-	}
-
-	private void getBranches(String repoOwner, String repoName) {
-
-		Call<List<Branches>> call = RetrofitClient
-			.getApiInterface(ctx)
-			.getBranches(Authorization.get(ctx), repoOwner, repoName);
-
-		call.enqueue(new Callback<List<Branches>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Branches>> call, @NonNull retrofit2.Response<List<Branches>> response) {
-
-				if(response.isSuccessful()) {
-
-					if(response.code() == 200) {
-
-						List<Branches> branchesList_ = response.body();
-						assert branchesList_ != null;
-
-						if(branchesList_.size() > 0) {
-
-							for (int i = 0; i < branchesList_.size(); i++) {
-
-								Branches data = new Branches(branchesList_.get(i).getName());
-								branchesList.add(data);
-							}
-						}
-
-						ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreatePullRequestActivity.this,
-							R.layout.list_spinner_items, branchesList);
-
-						viewBinding.mergeIntoBranchSpinner.setAdapter(adapter);
-						viewBinding.pullFromBranchSpinner.setAdapter(adapter);
-						enableProcessButton();
-
-					}
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Branches>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
-
-	}
-
-	private void getMilestones(String repoOwner, String repoName, int resultLimit) {
-
-		String msState = "open";
-		Call<List<Milestones>> call = RetrofitClient
-			.getApiInterface(appCtx)
-			.getMilestones(Authorization.get(ctx), repoOwner, repoName, 1, resultLimit, msState);
-
-		call.enqueue(new Callback<List<Milestones>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Milestones>> call, @NonNull retrofit2.Response<List<Milestones>> response) {
-
-				if(response.code() == 200) {
-
-					List<Milestones> milestonesList_ = response.body();
-
-					milestonesList.add(new Milestones(0,getString(R.string.issueCreatedNoMilestone)));
-					assert milestonesList_ != null;
-
-					if(milestonesList_.size() > 0) {
-
-						for (int i = 0; i < milestonesList_.size(); i++) {
-
-							//Don't translate "open" is a enum
-							if(milestonesList_.get(i).getState().equals("open")) {
-								Milestones data = new Milestones(
-									milestonesList_.get(i).getId(),
-									milestonesList_.get(i).getTitle()
-								);
-								milestonesList.add(data);
-							}
-						}
-					}
-
-					ArrayAdapter<Milestones> adapter = new ArrayAdapter<>(CreatePullRequestActivity.this,
-						R.layout.list_spinner_items, milestonesList);
-
-					viewBinding.milestonesSpinner.setAdapter(adapter);
-					enableProcessButton();
-
-					viewBinding.milestonesSpinner.setOnItemClickListener ((parent, view, position, id) ->
-
-						milestoneId = milestonesList.get(position).getId()
-					);
-
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Milestones>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
-
-	}
-
-	private void setDueDate() {
-
-		final Calendar c = Calendar.getInstance();
-		int mYear = c.get(Calendar.YEAR);
-		final int mMonth = c.get(Calendar.MONTH);
-		final int mDay = c.get(Calendar.DAY_OF_MONTH);
-
-		DatePickerDialog datePickerDialog = new DatePickerDialog(this,
-			(view, year, monthOfYear, dayOfMonth) -> viewBinding.prDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth)), mYear, mMonth, mDay);
-		datePickerDialog.show();
-	}
-
-	private void initCloseListener() {
-
-		onClickListener = view -> finish();
-	}
-
-	private void disableProcessButton() {
-
-		viewBinding.createPr.setEnabled(false);
-	}
-
-	private void enableProcessButton() {
-
-		viewBinding.createPr.setEnabled(true);
-	}
-}

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

@@ -1,28 +1,29 @@
 package org.mian.gitnex.activities;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.Spinner;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.Branches;
-import org.gitnex.tea4j.models.Releases;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateReleaseBinding;
 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 java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;
@@ -37,128 +38,146 @@ public class CreateReleaseActivity extends BaseActivity {
     private View.OnClickListener onClickListener;
     public ImageView closeActivity;
     private EditText releaseTagName;
-    private AutoCompleteTextView releaseBranch;
+    private Spinner releaseBranch;
     private EditText releaseTitle;
     private EditText releaseContent;
     private CheckBox releaseType;
     private CheckBox releaseDraft;
     private Button createNewRelease;
-    private String selectedBranch;
+    final Context ctx = this;
-
+    private Context appCtx;
-	private String repoOwner;
-	private String repoName;
 
     List<Branches> branchesList = new ArrayList<>();
 
-    @SuppressLint("ClickableViewAccessibility")
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_release;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-
+        appCtx = getApplicationContext();
-	    ActivityCreateReleaseBinding activityCreateReleaseBinding = ActivityCreateReleaseBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateReleaseBinding.getRoot());
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        String repoFullName = tinyDB.getString("repoFullName");
+        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("/");
-        repoOwner = parts[0];
+        final String repoOwner = parts[0];
-        repoName = parts[1];
+        final String repoName = parts[1];
 
-        closeActivity = activityCreateReleaseBinding.close;
+        closeActivity = findViewById(R.id.close);
-        releaseTagName = activityCreateReleaseBinding.releaseTagName;
+        releaseTagName = findViewById(R.id.releaseTagName);
-        releaseTitle = activityCreateReleaseBinding.releaseTitle;
+        releaseTitle = findViewById(R.id.releaseTitle);
-        releaseContent = activityCreateReleaseBinding.releaseContent;
+        releaseContent = findViewById(R.id.releaseContent);
-        releaseType = activityCreateReleaseBinding.releaseType;
+        releaseType = findViewById(R.id.releaseType);
-        releaseDraft = activityCreateReleaseBinding.releaseDraft;
+        releaseDraft = findViewById(R.id.releaseDraft);
 
-	    releaseTitle.requestFocus();
+        releaseTagName.requestFocus();
         assert imm != null;
-        imm.showSoftInput(releaseTitle, InputMethodManager.SHOW_IMPLICIT);
+        imm.showSoftInput(releaseTagName, InputMethodManager.SHOW_IMPLICIT);
-
-	    releaseContent.setOnTouchListener((touchView, motionEvent) -> {
-
-		    touchView.getParent().requestDisallowInterceptTouchEvent(true);
-
-		    if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
-
-			    touchView.getParent().requestDisallowInterceptTouchEvent(false);
-		    }
-		    return false;
-	    });
 
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
-        releaseBranch = activityCreateReleaseBinding.releaseBranch;
+        releaseBranch = findViewById(R.id.releaseBranch);
-        getBranches(Authorization.get(ctx), repoOwner, repoName);
+        releaseBranch.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+        getBranches(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+        releaseBranch.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                Branches branch = (Branches) parent.getSelectedItem();
+            }
 
-        createNewRelease = activityCreateReleaseBinding.createNewRelease;
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+
+        createNewRelease = findViewById(R.id.createNewRelease);
         disableProcessButton();
 
         if(!connToInternet) {
 
             disableProcessButton();
-        }
+
-        else {
+        } else {
 
             createNewRelease.setOnClickListener(createReleaseListener);
+
         }
 
     }
 
-    private final 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);
 
+        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 newReleaseTagName = releaseTagName.getText().toString();
         String newReleaseTitle = releaseTitle.getText().toString();
         String newReleaseContent = releaseContent.getText().toString();
-	    String checkBranch = selectedBranch;
+        String newReleaseBranch = releaseBranch.getSelectedItem().toString();
         boolean newReleaseType = releaseType.isChecked();
         boolean newReleaseDraft = releaseDraft.isChecked();
 
         if(!connToInternet) {
 
-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
+
         }
 
-	    if(newReleaseTitle.equals("")) {
-
-		    Toasty.error(ctx, getString(R.string.titleErrorEmpty));
-		    return;
-	    }
-
         if(newReleaseTagName.equals("")) {
 
-            Toasty.error(ctx, getString(R.string.tagNameErrorEmpty));
+            Toasty.info(ctx, getString(R.string.tagNameErrorEmpty));
             return;
+
         }
 
-	    if(checkBranch == null) {
+        if(newReleaseTitle.equals("")) {
 
-	    	Toasty.error(ctx, getString(R.string.selectBranchError));
+            Toasty.info(ctx, getString(R.string.titleErrorEmpty));
-		    return;
+            return;
-	    }
+
+        }
 
         disableProcessButton();
-        createNewReleaseFunc(Authorization.get(ctx), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, selectedBranch, newReleaseType, newReleaseDraft);
+        createNewReleaseFunc(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, newReleaseBranch, newReleaseType, newReleaseDraft);
+
     }
 
-    private void createNewReleaseFunc(final String token, String repoOwner, String repoName, String newReleaseTagName, String newReleaseTitle, String newReleaseContent, String selectedBranch, boolean newReleaseType, boolean newReleaseDraft) {
+    private void createNewReleaseFunc(final String instanceUrl, final String token, String repoOwner, String repoName, String newReleaseTagName, String newReleaseTitle, String newReleaseContent, String newReleaseBranch, boolean newReleaseType, boolean newReleaseDraft) {
 
-        Releases createReleaseJson = new Releases(newReleaseContent, newReleaseDraft, newReleaseTitle, newReleaseType, newReleaseTagName, selectedBranch);
+        Releases createReleaseJson = new Releases(newReleaseContent, newReleaseDraft, newReleaseTitle, newReleaseType, newReleaseTagName, newReleaseBranch);
 
         Call<Releases> call;
 
         call = RetrofitClient
-                .getApiInterface(ctx)
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
                 .createNewRelease(token, repoOwner, repoName, createReleaseJson);
 
         call.enqueue(new Callback<Releases>() {
@@ -168,10 +187,12 @@ public class CreateReleaseActivity extends BaseActivity {
 
                 if (response.code() == 201) {
 
-                    tinyDB.putBoolean("updateReleases", true);
+                    TinyDB tinyDb = new TinyDB(appCtx);
-                    Toasty.success(ctx, getString(R.string.releaseCreatedText));
+                    tinyDb.putBoolean("updateReleases", true);
+                    Toasty.info(ctx, getString(R.string.releaseCreatedText));
                     enableProcessButton();
                     finish();
+
                 }
                 else if(response.code() == 401) {
 
@@ -180,27 +201,31 @@ public class CreateReleaseActivity extends BaseActivity {
                              ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
                              ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                              ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
                 }
                 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));
+
                 }
+
             }
 
             @Override
             public void onFailure(@NonNull Call<Releases> call, @NonNull Throwable t) {
-
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -208,10 +233,11 @@ public class CreateReleaseActivity extends BaseActivity {
 
     }
 
-    private void getBranches(String instanceToken, final String repoOwner, final String repoName) {
+    private void getBranches(String instanceUrl, String instanceToken, final String repoOwner, final String repoName) {
 
         Call<List<Branches>> call = RetrofitClient
-                .getApiInterface(ctx)
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
                 .getBranches(instanceToken, repoOwner, repoName);
 
         call.enqueue(new Callback<List<Branches>>() {
@@ -220,27 +246,29 @@ public class CreateReleaseActivity extends BaseActivity {
             public void onResponse(@NonNull Call<List<Branches>> call, @NonNull retrofit2.Response<List<Branches>> response) {
 
                 if(response.isSuccessful()) {
-
                     if(response.code() == 200) {
 
                         List<Branches> branchesList_ = response.body();
 
                         assert branchesList_ != null;
                         if(branchesList_.size() > 0) {
+                            for (int i = 0; i < branchesList_.size(); i++) {
 
-	                        branchesList.addAll(branchesList_);
+                                Branches data = new Branches(
+                                        branchesList_.get(i).getName()
+                                );
+                                branchesList.add(data);
+
+                            }
                         }
 
-	                    ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreateReleaseActivity.this,
+                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreateReleaseActivity.this,
-		                    R.layout.list_spinner_items, branchesList);
+                                R.layout.spinner_item, branchesList);
 
+                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
                         releaseBranch.setAdapter(adapter);
                         enableProcessButton();
 
-	                    releaseBranch.setOnItemClickListener ((parent, view, position, id) ->
-
-		                    selectedBranch = branchesList.get(position).getName()
-	                    );
                     }
                 }
                 else if(response.code() == 401) {
@@ -249,13 +277,13 @@ public class CreateReleaseActivity extends BaseActivity {
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
                 }
 
             }
 
             @Override
             public void onFailure(@NonNull Call<List<Branches>> call, @NonNull Throwable t) {
-
                 Log.e("onFailure", t.toString());
             }
         });
@@ -263,18 +291,32 @@ public class CreateReleaseActivity extends BaseActivity {
     }
 
     private void initCloseListener() {
-
+        onClickListener = new View.OnClickListener() {
-        onClickListener = view -> finish();
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
     }
 
     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);
+
     }
 
 }

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

@@ -1,29 +1,29 @@
 package org.mian.gitnex.activities;
 
 import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.Spinner;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.OrgOwner;
-import org.gitnex.tea4j.models.OrganizationRepository;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateRepoBinding;
 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 java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -39,42 +39,45 @@ public class CreateRepoActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
-    private AutoCompleteTextView spinner;
+    private Spinner spinner;
     private Button createRepo;
     private EditText repoName;
     private EditText repoDesc;
     private CheckBox repoAccess;
+    final Context ctx = this;
+    private Context appCtx;
 
-	private String loginUid;
+    List<OrgOwner> organizationsList = new ArrayList<>();
-	private String userLogin;
-
-	private String selectedOwner;
-
-	List<OrgOwner> organizationsList = new ArrayList<>();
 
     //https://github.com/go-gitea/gitea/blob/52cfd2743c0e85b36081cf80a850e6a5901f1865/models/repo.go#L964-L967
     final List<String> reservedRepoNames = Arrays.asList(".", "..");
     final Pattern reservedRepoPatterns = Pattern.compile("\\.(git|wiki)$");
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_repo;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-
+        appCtx = getApplicationContext();
-	    ActivityCreateRepoBinding activityCreateRepoBinding = ActivityCreateRepoBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateRepoBinding.getRoot());
 
         boolean connToInternet = AppUtil.hasNetworkConnection(ctx);
 
-        loginUid = tinyDB.getString("loginUid");
+        TinyDB tinyDb = new TinyDB(appCtx);
-        userLogin = tinyDB.getString("userLogin");
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String userLogin = tinyDb.getString("userLogin");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        closeActivity = activityCreateRepoBinding.close;
+        closeActivity = findViewById(R.id.close);
-        repoName = activityCreateRepoBinding.newRepoName;
+        repoName = findViewById(R.id.newRepoName);
-        repoDesc = activityCreateRepoBinding.newRepoDescription;
+        repoDesc = findViewById(R.id.newRepoDescription);
-        repoAccess = activityCreateRepoBinding.newRepoPrivate;
+        repoAccess = findViewById(R.id.newRepoPrivate);
 
         repoName.requestFocus();
         assert imm != null;
@@ -83,90 +86,120 @@ public class CreateRepoActivity extends BaseActivity {
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
-        spinner = activityCreateRepoBinding.ownerSpinner;
+        spinner = findViewById(R.id.ownerSpinner);
-        getOrganizations(Authorization.get(ctx), userLogin);
+        spinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+        getOrganizations(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), userLogin);
+        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                OrgOwner user = (OrgOwner) parent.getSelectedItem();
+            }
 
-        createRepo = activityCreateRepoBinding.createNewRepoButton;
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+
+        createRepo = findViewById(R.id.createNewRepoButton);
         disableProcessButton();
 
         if(!connToInternet) {
 
             disableProcessButton();
+
         }
         else {
 
             createRepo.setOnClickListener(createRepoListener);
+
         }
     }
 
-    private final View.OnClickListener createRepoListener = v -> processNewRepo();
+    private View.OnClickListener createRepoListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processNewRepo();
+        }
+    };
 
     private void processNewRepo() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        AppUtil appUtil = new AppUtil();
+        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 newRepoName = repoName.getText().toString();
         String newRepoDesc = repoDesc.getText().toString();
+        String repoOwner = spinner.getSelectedItem().toString();
         boolean newRepoAccess = repoAccess.isChecked();
 
         if(!connToInternet) {
 
-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
+
         }
 
         if(!newRepoDesc.equals("")) {
+            if (appUtil.charactersLength(newRepoDesc) > 255) {
 
-            if (newRepoDesc.length() > 255) {
+                Toasty.info(ctx, getString(R.string.repoDescError));
-
-                Toasty.warning(ctx, getString(R.string.repoDescError));
                 return;
+
             }
         }
 
         if(newRepoName.equals("")) {
 
-            Toasty.error(ctx, getString(R.string.repoNameErrorEmpty));
+            Toasty.info(ctx, getString(R.string.repoNameErrorEmpty));
-        }
+
-        else if(!AppUtil.checkStrings(newRepoName)) {
+        }
+        else if(!appUtil.checkStrings(newRepoName)) {
+
+            Toasty.info(ctx, getString(R.string.repoNameErrorInvalid));
 
-            Toasty.warning(ctx, getString(R.string.repoNameErrorInvalid));
         }
         else if (reservedRepoNames.contains(newRepoName)) {
 
-            Toasty.warning(ctx, getString(R.string.repoNameErrorReservedName));
+            Toasty.info(ctx, getString(R.string.repoNameErrorReservedName));
+
         }
         else if (reservedRepoPatterns.matcher(newRepoName).find()) {
 
-            Toasty.warning(ctx, getString(R.string.repoNameErrorReservedPatterns));
+            Toasty.info(ctx, getString(R.string.repoNameErrorReservedPatterns));
-        }
-	    else if(selectedOwner == null) {
 
-		    Toasty.error(ctx, getString(R.string.repoOwnerError));
         }
         else {
 
             disableProcessButton();
-            createNewRepository(Authorization.get(ctx), loginUid, newRepoName, newRepoDesc, selectedOwner, newRepoAccess);
+            createNewRepository(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, repoOwner, newRepoAccess);
+
         }
     }
 
-    private void createNewRepository(final String token, String loginUid, String repoName, String repoDesc, String selectedOwner, boolean isPrivate) {
+    private void createNewRepository(final String instanceUrl, final String token, String loginUid, String repoName, String repoDesc, String repoOwner, boolean isPrivate) {
 
         OrganizationRepository createRepository = new OrganizationRepository(true, repoDesc, null, null, repoName, isPrivate, "Default");
 
         Call<OrganizationRepository> call;
-        if(selectedOwner.equals(loginUid)) {
+        if(repoOwner.equals(loginUid)) {
 
             call = RetrofitClient
-                    .getApiInterface(ctx)
+                    .getInstance(instanceUrl, ctx)
+                    .getApiInterface()
                     .createNewUserRepository(token, createRepository);
+
         }
         else {
 
             call = RetrofitClient
-                    .getApiInterface(ctx)
+                    .getInstance(instanceUrl, ctx)
-                    .createNewUserOrgRepository(token, selectedOwner, createRepository);
+                    .getApiInterface()
+                    .createNewUserOrgRepository(token, repoOwner, createRepository);
+
         }
 
         call.enqueue(new Callback<OrganizationRepository>() {
@@ -176,9 +209,9 @@ public class CreateRepoActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    TinyDB tinyDb = TinyDB.getInstance(appCtx);
+                    TinyDB tinyDb = new TinyDB(appCtx);
                     tinyDb.putBoolean("repoCreated", true);
-                    Toasty.success(ctx, getString(R.string.repoCreated));
+                    Toasty.info(ctx, getString(R.string.repoCreated));
                     enableProcessButton();
                     finish();
                 }
@@ -189,96 +222,99 @@ 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(ctx, getString(R.string.repoExistsError));
+
                 }
                 else {
 
                     enableProcessButton();
-                    Toasty.error(ctx, getString(R.string.repoCreatedError));
+                    Toasty.info(ctx, getString(R.string.repoCreatedError));
+
                 }
+
             }
 
             @Override
             public void onFailure(@NonNull Call<OrganizationRepository> call, @NonNull Throwable t) {
-
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
         });
     }
 
-    private void getOrganizations(String instanceToken, final String userLogin) {
+    private void getOrganizations(String instanceUrl, String instanceToken, final String userLogin) {
+
+        TinyDB tinyDb = new TinyDB(appCtx);
 
         Call<List<OrgOwner>> call = RetrofitClient
-                .getApiInterface(ctx)
+                .getInstance(instanceUrl, ctx)
-                .getOrgOwners(instanceToken, 1, 50);
+                .getApiInterface()
+                .getOrgOwners(instanceToken);
 
         call.enqueue(new Callback<List<OrgOwner>>() {
 
             @Override
             public void onResponse(@NonNull Call<List<OrgOwner>> call, @NonNull retrofit2.Response<List<OrgOwner>> response) {
 
-	            if(response.code() == 200) {
+                if(response.isSuccessful()) {
+                    if(response.code() == 200) {
 
-		            int organizationId = 0;
+                        int organizationId = 0;
 
-		            List<OrgOwner> organizationsList_ = response.body();
+                        List<OrgOwner> organizationsList_ = response.body();
 
-		            organizationsList.add(new OrgOwner(userLogin));
+                        organizationsList.add(new OrgOwner(userLogin));
-		            assert organizationsList_ != null;
+                        assert organizationsList_ != null;
+                        if(organizationsList_.size() > 0) {
+                            for (int i = 0; i < organizationsList_.size(); i++) {
 
-		            if(organizationsList_.size() > 0) {
+                                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()
+                                );
+                                organizationsList.add(data);
 
-			            for(int i = 0; i < organizationsList_.size(); i++) {
+                            }
+                        }
 
-				            if(!tinyDB.getString("organizationId").isEmpty()) {
+                        ArrayAdapter<OrgOwner> adapter = new ArrayAdapter<>(CreateRepoActivity.this,
+                                R.layout.spinner_item, organizationsList);
 
-					            if(Integer.parseInt(tinyDB.getString("organizationId")) == organizationsList_.get(i).getId()) {
+                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
-						            organizationId = i + 1;
+                        spinner.setAdapter(adapter);
-					            }
-				            }
 
-				            OrgOwner data = new OrgOwner(organizationsList_.get(i).getUsername());
+                        if (tinyDb.getBoolean("organizationAction") & organizationId != 0) {
-				            organizationsList.add(data);
+                            spinner.setSelection(organizationId);
-			            }
+                            tinyDb.putBoolean("organizationAction", false);
-		            }
+                        }
 
-		            ArrayAdapter<OrgOwner> adapter = new ArrayAdapter<>(CreateRepoActivity.this, R.layout.list_spinner_items, organizationsList);
+                        enableProcessButton();
 
-		            spinner.setAdapter(adapter);
+                    }
+                }
+                else if(response.code() == 401) {
 
-		            spinner.setOnItemClickListener ((parent, view, position, id) -> selectedOwner = organizationsList.get(position).getUsername());
+                    enableProcessButton();
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 
-		            if(tinyDB.getBoolean("organizationAction") & organizationId != 0) {
+                }
 
-			            int selectOwnerById = organizationId;
-			            new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-				            spinner.setText(organizationsList.get(selectOwnerById).getUsername(), false);
-				            selectedOwner = organizationsList.get(selectOwnerById).getUsername();
-			            }, 500);
-
-			            tinyDB.putBoolean("organizationAction", false);
-		            }
-
-		            enableProcessButton();
-	            }
-
-	            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));
-	            }
             }
 
             @Override
             public void onFailure(@NonNull Call<List<OrgOwner>> call, @NonNull Throwable t) {
-
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -286,18 +322,32 @@ public class CreateRepoActivity extends BaseActivity {
     }
 
     private void initCloseListener() {
-
+        onClickListener = new View.OnClickListener() {
-        onClickListener = view -> finish();
+            @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);
+
     }
 
 }

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import android.content.Context;
+import android.content.DialogInterface;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
@@ -11,16 +12,14 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.res.ResourcesCompat;
-import org.gitnex.tea4j.models.Teams;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateTeamByOrgBinding;
 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 java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -33,6 +32,8 @@ 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;
@@ -41,10 +42,15 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
     private TextView teamAccessControls;
     private TextView teamAccessControlsArray;
     private Button createTeamButton;
-    private final String[] permissionList = {"Read", "Write", "Admin"};
+    private String[] permissionList = {"Read", "Write", "Admin"};
     public int permissionSelectedChoice = -1;
 
-    private final String[] accessControlsList = new String[] {
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_team_by_org;
+    }
+
+    private String[] accessControlsList = new String[] {
             "Code",
             "Issues",
             "Pull Request",
@@ -56,7 +62,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
     private List<String> pushAccessList;
 
-    private final boolean[] selectedAccessControlsTrueFalse = new boolean[]{
+    private boolean[] selectedAccessControlsTrueFalse = new boolean[]{
             false,
             false,
             false,
@@ -70,22 +76,20 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-
+        appCtx = getApplicationContext();
-	    ActivityCreateTeamByOrgBinding activityCreateTeamByOrgBinding = ActivityCreateTeamByOrgBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateTeamByOrgBinding.getRoot());
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        ImageView closeActivity = activityCreateTeamByOrgBinding.close;
+        ImageView closeActivity = findViewById(R.id.close);
-        teamName = activityCreateTeamByOrgBinding.teamName;
+        teamName = findViewById(R.id.teamName);
-        teamDesc = activityCreateTeamByOrgBinding.teamDesc;
+        teamDesc = findViewById(R.id.teamDesc);
-        teamPermission = activityCreateTeamByOrgBinding.teamPermission;
+        teamPermission = findViewById(R.id.teamPermission);
-        teamPermissionDetail = activityCreateTeamByOrgBinding.teamPermissionDetail;
+        teamPermissionDetail = findViewById(R.id.teamPermissionDetail);
-        teamAccessControls = activityCreateTeamByOrgBinding.teamAccessControls;
+        teamAccessControls = findViewById(R.id.teamAccessControls);
-        teamAccessControlsArray = activityCreateTeamByOrgBinding.teamAccessControlsArray;
+        teamAccessControlsArray = findViewById(R.id.teamAccessControlsArray);
-        createTeamButton = activityCreateTeamByOrgBinding.createTeamButton;
+        createTeamButton = findViewById(R.id.createTeamButton);
 
         teamName.requestFocus();
         assert imm != null;
@@ -94,115 +98,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);
+                pBuilder.setTitle(R.string.newTeamPermission);
-	        pBuilder.setCancelable(permissionSelectedChoice != -1);
+                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) {
 
-            pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, (dialogInterface, i) -> {
+                        permissionSelectedChoice = i;
+                        teamPermission.setText(permissionList[i]);
 
-                permissionSelectedChoice = i;
+                        if(permissionList[i].equals("Read")) {
-                teamPermission.setText(permissionList[i]);
+                            teamPermissionDetail.setVisibility(View.VISIBLE);
-
+                            teamPermissionDetail.setText(R.string.newTeamPermissionRead);
-	            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.setText("");
-            teamAccessControlsArray.setText("");
-            pushAccessList = Arrays.asList(accessControlsList);
-
-            AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx);
-
-            aDialogBuilder.setMultiChoiceItems(accessControlsList, selectedAccessControlsTrueFalse, (dialog, which, isChecked) -> {
-
-            })
-                .setCancelable(false)
-                .setTitle(R.string.newTeamAccessControls)
-                .setPositiveButton(R.string.okButton, (dialog, which) -> {
-
-                    int selectedVal = 0;
-                    while(selectedVal < selectedAccessControlsTrueFalse.length)
-                    {
-                        boolean value = selectedAccessControlsTrueFalse[selectedVal];
-
-                        String repoCode = "";
-                        if(selectedVal == 0) {
-                            repoCode = "repo.code";
                         }
-                        if(selectedVal == 1) {
+                        else if(permissionList[i].equals("Write")) {
-                            repoCode = "repo.issues";
+                            teamPermissionDetail.setVisibility(View.VISIBLE);
+                            teamPermissionDetail.setText(R.string.newTeamPermissionWrite);
                         }
-                        if(selectedVal == 2) {
+                        else if(permissionList[i].equals("Admin")) {
-                            repoCode = "repo.pulls";
+                            teamPermissionDetail.setVisibility(View.VISIBLE);
+                            teamPermissionDetail.setText(R.string.newTeamPermissionAdmin);
                         }
-                        if(selectedVal == 3) {
+                        else {
-                            repoCode = "repo.releases";
+                            teamPermissionDetail.setVisibility(View.GONE);
-                        }
-                        if(selectedVal == 4) {
-                            repoCode = "repo.wiki";
-                        }
-                        if(selectedVal == 5) {
-                            repoCode = "repo.ext_wiki";
-                        }
-                        if(selectedVal == 6) {
-                            repoCode = "repo.ext_issues";
                         }
 
-                        if(value){
+                        dialogInterface.dismiss();
 
-                            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));
                     }
                 });
 
-            AlertDialog aDialog = aDialogBuilder.create();
+                AlertDialog pDialog = pBuilder.create();
-            aDialog.show();
+                pDialog.show();
+
+            }
+        });
+
+
+        teamAccessControls.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                teamAccessControls.setText("");
+                teamAccessControlsArray.setText("");
+                pushAccessList = Arrays.asList(accessControlsList);
+
+                AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx);
+
+                aDialogBuilder.setMultiChoiceItems(accessControlsList, selectedAccessControlsTrueFalse, new DialogInterface.OnMultiChoiceClickListener() {
+
+                        @Override
+                        public void onClick(DialogInterface dialog, int which, boolean isChecked) {
+
+                        }
+
+                    })
+                    .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()));
+
+                        }
+
+
+                    });
+
+                AlertDialog aDialog = aDialogBuilder.create();
+                aDialog.show();
+            }
         });
 
         createTeamButton.setEnabled(false);
@@ -210,21 +233,25 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
         if(!connToInternet) {
 
             createTeamButton.setEnabled(false);
-            GradientDrawable shape = new GradientDrawable();
+            GradientDrawable shape =  new GradientDrawable();
-            shape.setCornerRadius(8);
+            shape.setCornerRadius( 8 );
-            shape.setColor(ResourcesCompat.getColor(getResources(), R.color.hintColor, null));
+            shape.setColor(getResources().getColor(R.color.hintColor));
             createTeamButton.setBackground(shape);
-        }
+
-        else {
+        } else {
 
             createTeamButton.setEnabled(true);
             createTeamButton.setOnClickListener(this);
+
         }
+
     }
 
     private void processCreateTeam() {
 
-        final TinyDB tinyDb = TinyDB.getInstance(appCtx);
+        AppUtil appUtil = new AppUtil();
+        final TinyDB tinyDb = new TinyDB(appCtx);
+        final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         final String orgName = tinyDb.getString("orgName");;
@@ -237,62 +264,66 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
         if(!connToInternet) {
 
-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
+
         }
 
         if (newTeamName.equals("")) {
 
-            Toasty.error(ctx, getString(R.string.teamNameEmpty));
+            Toasty.info(ctx, getString(R.string.teamNameEmpty));
             return;
+
         }
 
-        if(!AppUtil.checkStringsWithAlphaNumericDashDotUnderscore(newTeamName)) {
+        if(!appUtil.checkStringsWithAlphaNumericDashDotUnderscore(newTeamName)) {
 
-            Toasty.warning(ctx, getString(R.string.teamNameError));
+            Toasty.info(ctx, getString(R.string.teamNameError));
             return;
+
         }
 
         if(!newTeamDesc.equals("")) {
 
-            if(!AppUtil.checkStrings(newTeamDesc)) {
+            if(!appUtil.checkStrings(newTeamDesc)) {
-
+                Toasty.info(ctx, getString(R.string.teamDescError));
-                Toasty.warning(ctx, getString(R.string.teamDescError));
                 return;
             }
 
             if(newTeamDesc.length() > 100) {
-
+                Toasty.info(ctx, getString(R.string.teamDescLimit));
-                Toasty.warning(ctx, getString(R.string.teamDescLimit));
                 return;
             }
+
         }
 
         if (newTeamPermission.equals("")) {
 
-            Toasty.error(ctx, getString(R.string.teamPermissionEmpty));
+            Toasty.info(ctx, getString(R.string.teamPermissionEmpty));
             return;
+
         }
 
         List<String> newTeamAccessControls_ = new ArrayList<>(Arrays.asList(newTeamAccessControls.split(",")));
 
         for (int i = 0; i < newTeamAccessControls_.size(); i++) {
-
             newTeamAccessControls_.set(i, newTeamAccessControls_.get(i).trim());
         }
 
-        createNewTeamCall(instanceToken, orgName, newTeamName, newTeamDesc, newTeamPermission, newTeamAccessControls_, loginUid);
+        createNewTeamCall(instanceUrl, instanceToken, orgName, newTeamName, newTeamDesc, newTeamPermission, newTeamAccessControls_, loginUid);
+
     }
 
-    private void createNewTeamCall(final String instanceToken, String orgName, String newTeamName, String newTeamDesc, String newTeamPermission, List<String> newTeamAccessControls, String loginUid) {
+    private void createNewTeamCall(final String instanceUrl, final String instanceToken, String orgName, String newTeamName, String newTeamDesc, String newTeamPermission, List<String> newTeamAccessControls, String loginUid) {
 
         Teams createNewTeamJson = new Teams(newTeamName, newTeamDesc, newTeamPermission, newTeamAccessControls);
 
         Call<Teams> call3;
 
         call3 = RetrofitClient
-                .getApiInterface(ctx)
+                .getInstance(instanceUrl, ctx)
-                .createTeamsByOrg(Authorization.get(ctx), orgName, createNewTeamJson);
+                .getApiInterface()
+                .createTeamsByOrg(Authorization.returnAuthentication(ctx, loginUid, instanceToken), orgName, createNewTeamJson);
 
         call3.enqueue(new Callback<Teams>() {
 
@@ -300,19 +331,21 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
             public void onResponse(@NonNull Call<Teams> call, @NonNull retrofit2.Response<Teams> response2) {
 
                 if(response2.isSuccessful()) {
-
                     if(response2.code() == 201) {
 
-                        TinyDB tinyDb = TinyDB.getInstance(appCtx);
+                        TinyDB tinyDb = new TinyDB(appCtx);
                         tinyDb.putBoolean("resumeTeams", true);
 
-                        Toasty.success(ctx, getString(R.string.teamCreated));
+                        Toasty.info(ctx, getString(R.string.teamCreated));
                         finish();
+
                     }
+
                 }
                 else if(response2.code() == 404) {
 
-                    Toasty.warning(ctx, getString(R.string.apiNotFound));
+                    Toasty.info(ctx, getString(R.string.apiNotFound));
+
                 }
                 else if(response2.code() == 401) {
 
@@ -320,11 +353,14 @@ 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(ctx, getString(R.string.teamCreatedError));
+
                 }
+
             }
 
             @Override
@@ -337,16 +373,19 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
     @Override
     public void onClick(View v) {
-
         if(v == createTeamButton) {
-
             processCreateTeam();
         }
+
     }
 
     private void initCloseListener() {
-
+        onClickListener = new View.OnClickListener() {
-        onClickListener = view -> finish();
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
     }
 
 }

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

@@ -0,0 +1,68 @@
+package org.mian.gitnex.activities;
+
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.View;
+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;
+    final Context ctx = this;
+
+    @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(ctx));
+
+        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();
+            }
+        };
+    }
+}

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

@@ -1,699 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Log;
-import android.view.View;
-import androidx.annotation.NonNull;
-import org.apache.commons.lang3.StringUtils;
-import org.gitnex.tea4j.models.Files;
-import org.gitnex.tea4j.models.Organization;
-import org.gitnex.tea4j.models.PullRequests;
-import org.gitnex.tea4j.models.UserInfo;
-import org.gitnex.tea4j.models.UserRepositories;
-import org.jetbrains.annotations.NotNull;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
-import org.mian.gitnex.database.api.RepositoriesApi;
-import org.mian.gitnex.database.api.UserAccountsApi;
-import org.mian.gitnex.database.models.Repository;
-import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.databinding.ActivityDeeplinksBinding;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.UrlHelper;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import io.mikael.urlbuilder.UrlBuilder;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-/**
- * Author M M Arif
- */
-
-public class DeepLinksActivity extends BaseActivity {
-
-	private ActivityDeeplinksBinding viewBinding;
-	private String currentInstance;
-	private String instanceToken;
-	private boolean accountFound = false;
-
-	private Intent mainIntent;
-	private Intent issueIntent;
-	private Intent repoIntent;
-	private Intent orgIntent;
-	private Intent userIntent;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		viewBinding = ActivityDeeplinksBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
-
-		mainIntent = new Intent(ctx, MainActivity.class);
-		issueIntent = new Intent(ctx, IssueDetailActivity.class);
-		repoIntent = new Intent(ctx, RepoDetailActivity.class);
-		orgIntent = new Intent(ctx, OrganizationDetailActivity.class);
-		userIntent = new Intent(ctx, ProfileActivity.class);
-
-		Intent intent = getIntent();
-		Uri data = intent.getData();
-		assert data != null;
-
-		// check for login
-		if(!tinyDB.getBoolean("loggedInMode")) {
-			Intent loginIntent = new Intent(ctx, LoginActivity.class);
-			loginIntent.putExtra("instanceUrl", data.getHost());
-			ctx.startActivity(loginIntent);
-			finish();
-		}
-
-		// check for the links(URI) to be in the db
-		UserAccountsApi userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
-		List<UserAccount> userAccounts = userAccountsApi.usersAccounts();
-
-		for(UserAccount userAccount : userAccounts) {
-
-			String hostUri = userAccount.getInstanceUrl();
-
-			currentInstance = userAccount.getInstanceUrl();
-			instanceToken = userAccount.getToken();
-
-			if(hostUri.toLowerCase().contains(Objects.requireNonNull(data.getHost().toLowerCase()))) {
-
-				accountFound = true;
-
-				AppUtil.switchToAccount(ctx, userAccount);
-				break;
-
-			}
-		}
-
-		if(accountFound) {
-
-			// redirect to proper fragment/activity, if no action is there, show options where user to want to go like repos, profile, notifications etc
-			if(data.getPathSegments().size() == 1) {
-				if(data.getLastPathSegment().equals("notifications")) { // notifications
-					mainIntent.putExtra("launchFragmentByLinkHandler", "notification");
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-				else if(data.getLastPathSegment().equals("explore")) { // explore
-					mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-				else if(data.getLastPathSegment().equals(tinyDB.getString("userLogin"))) { // your user profile
-					mainIntent.putExtra("launchFragmentByLinkHandler", "profile");
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-				else if(data.getLastPathSegment().equals("admin")) {
-					mainIntent.putExtra("launchFragmentByLinkHandler", "admin");
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-				else {
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						getUserOrOrg(currentInstance, instanceToken, data.getLastPathSegment()), 500);
-				}
-			}
-			else if(data.getPathSegments().size() == 2) {
-				if(data.getPathSegments().get(0).equals("explore")) { // specific explore tab
-					if(data.getPathSegments().get(1).equals("organizations")) { // orgs
-						mainIntent.putExtra("exploreOrgs", true);
-					}
-					mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-				else if(data.getPathSegments().get(0).equals("user") && data.getPathSegments().get(1).equals("login")) { // open login
-					Intent loginIntent = new Intent(ctx, AddNewAccountActivity.class);
-					loginIntent.putExtra("instanceUrl", data.getHost());
-					loginIntent.putExtra("instanceProtocol", data.getScheme());
-					ctx.startActivity(loginIntent);
-					finish();
-				}
-				else if(data.getPathSegments().get(0).equals("admin")) {
-					mainIntent.putExtra("launchFragmentByLinkHandler", "admin");
-					mainIntent.putExtra("giteaAdminAction", data.getLastPathSegment());
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-				else if(!data.getPathSegments().get(0).equals("") & !data.getLastPathSegment().equals("")) { // go to repo
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getLastPathSegment(), "repo"), 500);
-				}
-				else { // no action, show options
-					showNoActionButtons();
-				}
-			}
-			else if(data.getPathSegments().size() >= 3) {
-				if(data.getPathSegments().get(2).equals("issues")) { // issue
-
-					if(!Objects.requireNonNull(data.getLastPathSegment()).contains("issues") & StringUtils.isNumeric(data.getLastPathSegment())) {
-
-						issueIntent.putExtra("issueNumber", data.getLastPathSegment());
-						issueIntent.putExtra("openedFromLink", "true");
-
-						String[] urlSplitted = data.toString().split("#");
-						if (urlSplitted.length == 2) {
-							issueIntent.putExtra("issueComment", urlSplitted[1]);
-						}
-
-						tinyDB.putString("issueNumber", data.getLastPathSegment());
-						tinyDB.putString("issueType", "Issue");
-
-						tinyDB.putString("repoFullName", data.getPathSegments().get(0) + "/" + data.getPathSegments().get(1));
-
-						final String repoOwner = data.getPathSegments().get(0);
-						final String repoName = data.getPathSegments().get(1);
-
-						int currentActiveAccountId = tinyDB.getInt("currentActiveAccountId");
-						RepositoriesApi repositoryData = BaseApi.getInstance(ctx, RepositoriesApi.class);
-
-						Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
-
-						if(count == 0) {
-
-							long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
-							tinyDB.putLong("repositoryId", id);
-						}
-						else {
-
-							Repository dataRepo = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
-							tinyDB.putLong("repositoryId", dataRepo.getRepositoryId());
-						}
-
-						ctx.startActivity(issueIntent);
-						finish();
-					}
-					else if(Objects.requireNonNull(data.getLastPathSegment()).contains("issues")) {
-						new Handler(Looper.getMainLooper()).postDelayed(() ->
-							goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "issue"), 500);
-					}
-					else if(data.getLastPathSegment().equals("new")) {
-						new Handler(Looper.getMainLooper()).postDelayed(() ->
-							goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "issueNew"), 500);
-					}
-					else {
-						ctx.startActivity(mainIntent);
-						finish();
-					}
-				}
-				else if(data.getPathSegments().get(2).equals("pulls")) { // pr
-
-					if(!Objects.requireNonNull(data.getLastPathSegment()).contains("pulls") & StringUtils.isNumeric(data.getLastPathSegment())) {
-
-						new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-							String[] urlSplitted = data.toString().split("#");
-							if (urlSplitted.length == 2) {
-								issueIntent.putExtra("issueComment", urlSplitted[1]);
-							}
-
-							getPullRequest(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), Integer.parseInt(data.getLastPathSegment()));
-						}, 500);
-
-					}
-					else if(Objects.requireNonNull(data.getLastPathSegment()).contains("pulls")) {
-						new Handler(Looper.getMainLooper()).postDelayed(() ->
-							goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "pull"), 500);
-					}
-					else if(data.getLastPathSegment().equals("files")) { // pr diff
-						new Handler(Looper.getMainLooper()).postDelayed(() -> {
-							issueIntent.putExtra("openPrDiff", "true");
-							getPullRequest(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), Integer.parseInt(data.getPathSegments().get(3)));
-						}, 500);
-					}
-					else {
-						ctx.startActivity(mainIntent);
-						finish();
-					}
-				}
-
-				else if(data.getPathSegments().get(2).equals("compare")) { // new pull request
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "pullNew"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("commit")) { // commits (no API yet to properly implement)
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "pull"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("commits")) { // commits list
-					String branch = data.getLastPathSegment();
-					repoIntent.putExtra("branchName", branch);
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "commitsList"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("milestones") && data.getLastPathSegment().equals("new")) { // new milestone
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "milestonesNew"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("milestones")) { // milestones
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "milestones"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("milestone")) { // milestone
-					repoIntent.putExtra("milestoneId", data.getLastPathSegment());
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "milestones"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("releases") && data.getLastPathSegment().equals("new")) { // new release
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "newRelease"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("releases")) { // releases
-					if(data.getPathSegments().size() == 5) {
-						if(data.getPathSegments().get(2).equals("releases") && data.getPathSegments().get(3).equals("tag")) {
-							repoIntent.putExtra("releaseTagName", data.getLastPathSegment());
-						}
-					}
-					new Handler(Looper.getMainLooper()).postDelayed(
-						() -> goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1),
-							"releases"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("labels")) { // labels
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "labels"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("settings")) { // repo settings
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "settings"), 500);
-				}
-				else if(data.getLastPathSegment().equals("branches")) { // branches list
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "branchesList"), 500);
-				}
-				else if(data.getPathSegments().size() == 5 && data.getPathSegments().get(2).equals("src") && data.getPathSegments().get(3).equals("branch")) { // branch
-					repoIntent.putExtra("selectedBranch", data.getLastPathSegment());
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "branch"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("src") && data.getPathSegments().get(3).equals("branch")) { // file/dir
-					StringBuilder filePath = new StringBuilder();
-					ArrayList<String> segments = new ArrayList<>(data.getPathSegments());
-					segments.subList(0, 5).clear();
-					for (String item : segments) {
-						filePath.append(item);
-						filePath.append("/");
-					}
-					filePath.deleteCharAt(filePath.toString().length() - 1);
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						getFile(currentInstance, instanceToken, data.getPathSegments().get(0),
-							data.getPathSegments().get(1), filePath.toString(), data.getPathSegments().get(4)), 500);
-				}
-				else { // no action, show options
-					showNoActionButtons();
-				}
-			}
-			else {
-
-				startActivity(mainIntent);
-				finish();
-			}
-		}
-		else {
-
-			viewBinding.progressBar.setVisibility(View.GONE);
-			viewBinding.addNewAccountFrame.setVisibility(View.VISIBLE);
-			viewBinding.noActionFrame.setVisibility(View.GONE);
-			viewBinding.addAccountText.setText(String.format(getResources().getString(R.string.accountDoesNotExist), data.getHost()));
-
-			viewBinding.addNewAccount.setOnClickListener(addNewAccount -> {
-
-				Intent accountIntent = new Intent(ctx, AddNewAccountActivity.class);
-				accountIntent.putExtra("instanceUrl", data.getHost());
-				startActivity(accountIntent);
-				finish();
-			});
-
-			viewBinding.openInBrowser.setOnClickListener(addNewAccount -> {
-
-				Integer port = data.getPort() >= 0 ? data.getPort() : null;
-
-				URI host = UrlBuilder.fromString(UrlHelper.fixScheme(data.getHost(), "https"))
-					.withPort(port)
-					.toUri();
-
-				Intent intentBrowser = new Intent();
-
-				intentBrowser.setAction(Intent.ACTION_VIEW);
-				intentBrowser.addCategory(Intent.CATEGORY_BROWSABLE);
-				intentBrowser.setData(Uri.parse(String.valueOf(host)));
-
-				startActivity(intentBrowser);
-				finish();
-
-			});
-
-			viewBinding.launchApp.setOnClickListener(launchApp -> {
-
-				startActivity(mainIntent);
-				finish();
-			});
-		}
-	}
-
-	private void getPullRequest(String url, String token, String repoOwner, String repoName, int index) {
-
-		Call<PullRequests> call = RetrofitClient
-			.getApiInterface(ctx, url)
-			.getPullRequestByIndex(token, repoOwner, repoName, index);
-
-		call.enqueue(new Callback<PullRequests>() {
-
-			@Override
-			public void onResponse(@NonNull Call<PullRequests> call, @NonNull retrofit2.Response<PullRequests> response) {
-
-				PullRequests prInfo = response.body();
-
-				if (response.code() == 200) {
-
-					assert prInfo != null;
-
-					issueIntent.putExtra("issueNumber", index);
-					issueIntent.putExtra("prMergeable", prInfo.isMergeable());
-					issueIntent.putExtra("openedFromLink", "true");
-
-					if(prInfo.getHead() != null) {
-
-						issueIntent.putExtra("prHeadBranch", prInfo.getHead().getRef());
-						tinyDB.putString("prHeadBranch", prInfo.getHead().getRef());
-
-						if(prInfo.getHead().getRepo() != null) {
-
-							tinyDB.putString("prIsFork", String.valueOf(prInfo.getHead().getRepo().isFork()));
-							tinyDB.putString("prForkFullName", prInfo.getHead().getRepo().getFull_name());
-						}
-						else {
-
-							// pull was done from a deleted fork
-							tinyDB.putString("prIsFork", "true");
-							tinyDB.putString("prForkFullName", ctx.getString(R.string.prDeletedFork));
-						}
-					}
-
-					tinyDB.putString("issueNumber", String.valueOf(index));
-					tinyDB.putString("prMergeable", String.valueOf(prInfo.isMergeable()));
-					tinyDB.putString("issueType", "Pull");
-
-					tinyDB.putString("repoFullName", repoOwner + "/" + repoName);
-
-					int currentActiveAccountId = tinyDB.getInt("currentActiveAccountId");
-					RepositoriesApi repositoryData = BaseApi.getInstance(ctx, RepositoriesApi.class);
-
-					Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
-
-					if(count == 0) {
-
-						long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
-						tinyDB.putLong("repositoryId", id);
-					}
-					else {
-
-						Repository dataRepo = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
-						tinyDB.putLong("repositoryId", dataRepo.getRepositoryId());
-					}
-
-					ctx.startActivity(issueIntent);
-					finish();
-				}
-
-				else {
-
-					ctx.startActivity(issueIntent);
-					finish();
-					Log.e("onFailure-links-pr", String.valueOf(response.code()));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<PullRequests> call, @NonNull Throwable t) {
-
-				ctx.startActivity(issueIntent);
-				finish();
-				Log.e("onFailure-links-pr", t.toString());
-			}
-		});
-	}
-
-	private void goToRepoSection(String url, String token, String repoOwner, String repoName, String type) {
-
-		Call<UserRepositories> call = RetrofitClient
-			.getApiInterface(ctx, url)
-			.getUserRepository(token, repoOwner, repoName);
-
-		call.enqueue(new Callback<UserRepositories>() {
-
-			@Override
-			public void onResponse(@NonNull Call<UserRepositories> call, @NonNull retrofit2.Response<UserRepositories> response) {
-
-				UserRepositories repoInfo = response.body();
-
-				if (response.code() == 200) {
-
-					assert repoInfo != null;
-
-					repoIntent.putExtra("repoFullName", repoInfo.getFullName());
-					repoIntent.putExtra("goToSection", "yes");
-					repoIntent.putExtra("goToSectionType", type);
-
-					tinyDB.putString("repoFullName", repoInfo.getFullName());
-					if(repoInfo.getPrivateFlag()) {
-
-						tinyDB.putString("repoType", getResources().getString(R.string.strPrivate));
-					}
-					else {
-
-						tinyDB.putString("repoType", getResources().getString(R.string.strPublic));
-					}
-					tinyDB.putBoolean("isRepoAdmin", repoInfo.getPermissions().isAdmin());
-					tinyDB.putString("repoBranch", repoInfo.getDefault_branch());
-
-					int currentActiveAccountId = tinyDB.getInt("currentActiveAccountId");
-					RepositoriesApi repositoryData = BaseApi.getInstance(ctx, RepositoriesApi.class);
-
-					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());
-					}
-
-					ctx.startActivity(repoIntent);
-					finish();
-				}
-
-				else {
-
-					ctx.startActivity(mainIntent);
-					finish();
-					Log.e("onFailure-goToRepo", String.valueOf(response.code()));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<UserRepositories> call, @NonNull Throwable t) {
-
-				ctx.startActivity(mainIntent);
-				finish();
-				Log.e("onFailure-goToRepo", t.toString());
-			}
-		});
-	}
-
-	private void getUserOrOrg(String url, String instanceToken, String userOrgName) {
-		Call<Organization> call = RetrofitClient.getApiInterface(ctx, url).getOrganization(instanceToken, userOrgName);
-
-		call.enqueue(new Callback<Organization>() {
-
-			@Override
-			public void onResponse(@NotNull Call<Organization> call, @NotNull Response<Organization> response) {
-				if(response.code() == 404) { // org doesn't exist or it's a user user
-					Log.d("getUserOrOrg-404", String.valueOf(response.code()));
-					getUser(url, instanceToken, userOrgName);
-				}
-				else if(response.code() == 200) { // org
-					assert response.body() != null;
-					orgIntent.putExtra("orgName", response.body().getUsername());
-
-
-					TinyDB tinyDb = TinyDB.getInstance(ctx);
-					tinyDb.putString("orgName", response.body().getUsername());
-					tinyDb.putString("organizationId", String.valueOf(response.body().getId()));
-					tinyDb.putBoolean("organizationAction", true);
-					ctx.startActivity(orgIntent);
-					finish();
-				}
-				else {
-					Log.e("getUserOrOrg-code", String.valueOf(response.code()));
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-			}
-
-			@Override
-			public void onFailure(@NotNull Call<Organization> call, @NotNull Throwable t) {
-				Log.e("onFailure-getUserOrOrg", t.toString());
-			}
-		});
-	}
-
-	private void getUser(String url, String instanceToken, String userName) {
-		Call<UserInfo> call = RetrofitClient.getApiInterface(ctx, url).getUserProfile(instanceToken, userName);
-
-		call.enqueue(new Callback<UserInfo>() {
-
-			@Override
-			public void onResponse(@NotNull Call<UserInfo> call, @NotNull Response<UserInfo> response) {
-				if(response.code() == 200) {
-					assert response.body() != null;
-					userIntent.putExtra("username", response.body().getLogin());
-					ctx.startActivity(userIntent);
-				}
-				else {
-					Log.e("getUser-code", String.valueOf(response.code()));
-					ctx.startActivity(mainIntent);
-				}
-				finish();
-			}
-
-			@Override
-			public void onFailure(@NotNull Call<UserInfo> call, @NotNull Throwable t) {
-				Log.e("onFailure-getUser", t.toString());
-				ctx.startActivity(mainIntent);
-				finish();
-			}
-		});
-	}
-
-	private void getFile(String url, String instanceToken, String owner, String repo, String filePath, String branch) {
-		Call<Files> call = RetrofitClient.getApiInterface(ctx, url).getSingleFileContents(instanceToken, owner, repo, filePath, branch);
-
-		call.enqueue(new Callback<Files>() {
-
-			@Override
-			public void onResponse(@NotNull Call<Files> call, @NotNull Response<Files> response) {
-				if(response.code() == 200) {
-					// check if file and open file/dir
-					Files file = response.body();
-					assert file != null;
-					if(file.getType().equals("file")) {
-						repoIntent.putExtra("file", file);
-						repoIntent.putExtra("branch", branch);
-						goToRepoSection(url, instanceToken, owner, repo, "file");
-					}
-				}
-				else {
-					Log.e("getFile-onFailure", String.valueOf(response.code()));
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-			}
-
-			@Override
-			public void onFailure(@NotNull Call<Files> call, @NotNull Throwable t) {
-				Log.e("getFile-onFailure", t.toString());
-				// maybe it's a directory
-				getDir(url, instanceToken, owner, repo, filePath, branch);
-			}
-		});
-	}
-
-	private void getDir(String url, String instanceToken, String owner, String repo, String filePath, String branch) {
-		repoIntent.putExtra("branch", branch);
-		repoIntent.putExtra("dir", filePath);
-		goToRepoSection(url, instanceToken, owner, repo, "dir");
-	}
-
-	private void showNoActionButtons()  {
-		viewBinding.progressBar.setVisibility(View.GONE);
-
-		if(tinyDB.getInt("defaultScreenId") == 1) { // repos
-
-			mainIntent.putExtra("launchFragmentByLinkHandler", "repos");
-			ctx.startActivity(mainIntent);
-			finish();
-		}
-		else if(tinyDB.getInt("defaultScreenId") == 2) { // org
-
-			mainIntent.putExtra("launchFragmentByLinkHandler", "org");
-			ctx.startActivity(mainIntent);
-			finish();
-		}
-		else if(tinyDB.getInt("defaultScreenId") == 3) { // notifications
-
-			mainIntent.putExtra("launchFragmentByLinkHandler", "notification");
-			ctx.startActivity(mainIntent);
-			finish();
-		}
-		else if(tinyDB.getInt("defaultScreenId") == 4) { // explore
-
-			mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
-			ctx.startActivity(mainIntent);
-			finish();
-		}
-		else if(tinyDB.getInt("defaultScreenId") == 0) { // show options
-
-			viewBinding.noActionFrame.setVisibility(View.VISIBLE);
-			viewBinding.addNewAccountFrame.setVisibility(View.GONE);
-
-			viewBinding.repository.setOnClickListener(repository -> {
-
-				tinyDB.putInt("defaultScreenId", 1);
-				mainIntent.putExtra("launchFragmentByLinkHandler", "repos");
-				ctx.startActivity(mainIntent);
-				finish();
-			});
-
-			viewBinding.organization.setOnClickListener(organization -> {
-
-				tinyDB.putInt("defaultScreenId", 2);
-				mainIntent.putExtra("launchFragmentByLinkHandler", "org");
-				ctx.startActivity(mainIntent);
-				finish();
-			});
-
-			viewBinding.notification.setOnClickListener(notification -> {
-
-				tinyDB.putInt("defaultScreenId", 3);
-				mainIntent.putExtra("launchFragmentByLinkHandler", "notification");
-				ctx.startActivity(mainIntent);
-				finish();
-			});
-
-			viewBinding.explore.setOnClickListener(explore -> {
-
-				tinyDB.putInt("defaultScreenId", 4);
-				mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
-				ctx.startActivity(mainIntent);
-				finish();
-			});
-
-			viewBinding.launchApp2.setOnClickListener(launchApp2 -> {
-
-				tinyDB.putInt("defaultScreenId", 0);
-				ctx.startActivity(mainIntent);
-				finish();
-			});
-		}
-	}
-}

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

@@ -3,33 +3,37 @@ package org.mian.gitnex.activities;
 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.os.Handler;
-import android.os.Looper;
 import android.util.Log;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
 import android.widget.Button;
+import android.widget.DatePicker;
 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.gitnex.tea4j.models.CreateIssue;
+import com.hendraanggrian.appcompat.socialview.Mention;
-import org.gitnex.tea4j.models.Issues;
+import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
-import org.gitnex.tea4j.models.Milestones;
+import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityEditIssueBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Constants;
+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 java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -37,6 +41,7 @@ import java.util.Calendar;
 import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
+import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -44,74 +49,69 @@ import retrofit2.Callback;
 
 public class EditIssueActivity extends BaseActivity implements View.OnClickListener {
 
+    final Context ctx = this;
+    private Context appCtx;
     private View.OnClickListener onClickListener;
-    private int resultLimit = Constants.resultLimitOldGiteaInstances;
+    private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 
     private EditText editIssueTitle;
-    private EditText editIssueDescription;
+    private SocialAutoCompleteTextView editIssueDescription;
     private TextView editIssueDueDate;
     private Button editIssueButton;
-    private AutoCompleteTextView editIssueMilestoneSpinner;
+    private Spinner editIssueMilestoneSpinner;
 
     private String msState = "open";
-    private int milestoneId;
 
     List<Milestones> milestonesList = new ArrayList<>();
+    private ArrayAdapter<Mention> defaultMentionAdapter;
 
-	private String loginUid;
+    @Override
-	private String instanceToken;
+    protected int getLayoutResourceId(){
-	private String repoOwner;
+        return R.layout.activity_edit_issue;
-	private String repoName;
+    }
-	private int issueIndex;
 
-    @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-
+        appCtx = getApplicationContext();
-	    ActivityEditIssueBinding activityEditIssueBinding = ActivityEditIssueBinding.inflate(getLayoutInflater());
-	    setContentView(activityEditIssueBinding.getRoot());
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        loginUid = tinyDB.getString("loginUid");
+        final TinyDB tinyDb = new TinyDB(appCtx);
-        instanceToken = "token " + tinyDB.getString(loginUid + "-token");
-        String repoFullName = tinyDB.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        repoOwner = parts[0];
-        repoName = parts[1];
-        issueIndex = Integer.parseInt(tinyDB.getString("issueNumber"));
 
-        ImageView closeActivity = activityEditIssueBinding.close;
+        final String instanceUrl = tinyDb.getString("instanceUrl");
-        editIssueButton = activityEditIssueBinding.editIssueButton;
+        final String loginUid = tinyDb.getString("loginUid");
-        TextView toolbar_title = activityEditIssueBinding.toolbarTitle;
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        editIssueTitle = activityEditIssueBinding.editIssueTitle;
+        String repoFullName = tinyDb.getString("repoFullName");
-        editIssueDescription = activityEditIssueBinding.editIssueDescription;
+        String[] parts = repoFullName.split("/");
-        editIssueDueDate = activityEditIssueBinding.editIssueDueDate;
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+
+        ImageView closeActivity = findViewById(R.id.close);
+        editIssueButton = findViewById(R.id.editIssueButton);
+        TextView toolbar_title = findViewById(R.id.toolbar_title);
+        editIssueTitle = findViewById(R.id.editIssueTitle);
+        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")) {
+        if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
-
+            resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
-            resultLimit = Constants.resultLimitNewGiteaInstances;
         }
 
         editIssueTitle.requestFocus();
         assert imm != null;
         imm.showSoftInput(editIssueTitle, InputMethodManager.SHOW_IMPLICIT);
 
-	    editIssueDescription.setOnTouchListener((touchView, motionEvent) -> {
+        defaultMentionAdapter = new MentionArrayAdapter<>(this);
-
+        loadCollaboratorsList();
-		    touchView.getParent().requestDisallowInterceptTouchEvent(true);
-
-		    if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
-
-			    touchView.getParent().requestDisallowInterceptTouchEvent(false);
-		    }
-		    return false;
-	    });
 
         editIssueMilestoneSpinner = findViewById(R.id.editIssueMilestoneSpinner);
+        editIssueMilestoneSpinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+
+        editIssueDescription.setMentionAdapter(defaultMentionAdapter);
 
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
@@ -119,30 +119,97 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
         editIssueDueDate.setOnClickListener(this);
         editIssueButton.setOnClickListener(this);
 
-        if(!tinyDB.getString("issueNumber").isEmpty()) {
+        if(!tinyDb.getString("issueNumber").isEmpty()) {
-
-            if(tinyDB.getString("issueType").equalsIgnoreCase("Pull")) {
 
+            if(tinyDb.getString("issueType").equalsIgnoreCase("Pull")) {
                 toolbar_title.setText(getString(R.string.editPrNavHeader, String.valueOf(issueIndex)));
             }
             else {
-
                 toolbar_title.setText(getString(R.string.editIssueNavHeader, String.valueOf(issueIndex)));
             }
         }
 
         disableProcessButton();
-        getIssue(instanceToken, loginUid, repoOwner, repoName, issueIndex, resultLimit);
+        getIssue(instanceUrl, instanceToken, loginUid, repoOwner, repoName, issueIndex, resultLimit);
+
+
+    }
+
+    public void loadCollaboratorsList() {
+
+        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];
+
+        Call<List<Collaborators>> call = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<List<Collaborators>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
+
+                if (response.isSuccessful()) {
+
+                    assert response.body() != null;
+                    String fullName = "";
+                    for (int i = 0; i < response.body().size(); i++) {
+                        if(!response.body().get(i).getFull_name().equals("")) {
+                            fullName = response.body().get(i).getFull_name();
+                        }
+                        defaultMentionAdapter.add(
+                                new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
+                    }
+
+                } else {
+
+                    Log.i("onResponse", String.valueOf(response.code()));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
+                Log.i("onFailure", t.toString());
+            }
+
+        });
     }
 
     private void initCloseListener() {
-
+        onClickListener = new View.OnClickListener() {
-        onClickListener = view -> finish();
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
     }
 
     private void processEditIssue() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        TinyDB tinyDb = new TinyDB(appCtx);
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+
+        Milestones mModel = (Milestones) editIssueMilestoneSpinner.getSelectedItem();
+
+        int editIssueMilestoneId = mModel.getId();
 
         String editIssueTitleForm = editIssueTitle.getText().toString();
         String editIssueDescriptionForm = editIssueDescription.getText().toString();
@@ -150,36 +217,47 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
         if(!connToInternet) {
 
-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
+
         }
 
         if (editIssueTitleForm.equals("")) {
 
-            Toasty.error(ctx, getString(R.string.issueTitleEmpty));
+            Toasty.info(ctx, getString(R.string.issueTitleEmpty));
             return;
+
         }
 
+        /*if (editIssueDescriptionForm.equals("")) {
+
+            Toasty.info(ctx, getString(R.string.issueDescriptionEmpty));
+            return;
+
+        }*/
+
         if (editIssueDueDateForm.equals("")) {
-
             editIssueDueDateForm = null;
-        }
+        } else {
-        else {
-
             editIssueDueDateForm = (AppUtil.customDateCombine(AppUtil.customDateFormat(editIssueDueDateForm)));
         }
 
+        //Log.i("editIssueDueDateForm", String.valueOf(editIssueDueDateForm));
         disableProcessButton();
-        editIssue(instanceToken, repoOwner, repoName, issueIndex, loginUid, editIssueTitleForm, editIssueDescriptionForm, editIssueDueDateForm, milestoneId);
+        editIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid, editIssueTitleForm, editIssueDescriptionForm, editIssueDueDateForm, editIssueMilestoneId);
+
     }
 
-    private void editIssue(String instanceToken, String repoOwner, String repoName, int issueIndex, String loginUid, String title, String description, String dueDate, int milestoneId) {
+    private void editIssue(String instanceUrl, String instanceToken, String repoOwner, String repoName, int issueIndex, String loginUid, String title, String description, String dueDate, int editIssueMilestoneId) {
 
-        CreateIssue issueData = new CreateIssue(title, description, dueDate, milestoneId);
+        final TinyDB tinyDb = new TinyDB(appCtx);
+
+        CreateIssue issueData = new CreateIssue(title, description, dueDate, editIssueMilestoneId);
 
         Call<JsonElement> call = RetrofitClient
-                .getApiInterface(ctx)
+                .getInstance(instanceUrl, ctx)
-                .patchIssue(Authorization.get(ctx), repoOwner, repoName, issueIndex, issueData);
+                .getApiInterface()
+                .patchIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueData);
 
         call.enqueue(new Callback<JsonElement>() {
 
@@ -188,18 +266,17 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
                 if(response.code() == 201) {
 
-                    if(tinyDB.getString("issueType").equalsIgnoreCase("Pull")) {
+                    if(tinyDb.getString("issueType").equalsIgnoreCase("Pull")) {
-
+                        Toasty.info(ctx, getString(R.string.editPrSuccessMessage));
-                        Toasty.success(ctx, getString(R.string.editPrSuccessMessage));
                     }
                     else {
-
+                        Toasty.info(ctx, getString(R.string.editIssueSuccessMessage));
-                        Toasty.success(ctx, getString(R.string.editIssueSuccessMessage));
                     }
 
-                    tinyDB.putBoolean("issueEdited", true);
+                    tinyDb.putBoolean("issueEdited", true);
-                    tinyDB.putBoolean("resumeIssues", true);
+                    tinyDb.putBoolean("resumeIssues", true);
                     finish();
+
                 }
                 else if(response.code() == 401) {
 
@@ -208,17 +285,19 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
                 }
                 else {
 
                     enableProcessButton();
-                    Toasty.error(ctx, getString(R.string.genericError));
+                    Toasty.info(ctx, getString(R.string.genericError));
+
                 }
+
             }
 
             @Override
             public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -226,6 +305,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
     }
 
+
     @Override
     public void onClick(View v) {
 
@@ -237,21 +317,31 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
             final int mDay = c.get(Calendar.DAY_OF_MONTH);
 
             DatePickerDialog datePickerDialog = new DatePickerDialog(this,
-	            (view, year, monthOfYear, dayOfMonth) -> editIssueDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth)), mYear, mMonth, mDay);
+                    new DatePickerDialog.OnDateSetListener() {
+
+                        @Override
+                        public void onDateSet(DatePicker view, int year,
+                                              int monthOfYear, int dayOfMonth) {
+
+                            editIssueDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth));
+
+                        }
+                    }, mYear, mMonth, mDay);
             datePickerDialog.show();
+
         }
         else if(v == editIssueButton) {
-
             processEditIssue();
         }
 
     }
 
-    private void getIssue(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, int resultLimit) {
 
         Call<Issues> call = RetrofitClient
-                .getApiInterface(ctx)
+                .getInstance(instanceUrl, ctx)
-                .getIssueByIndex(Authorization.get(ctx), repoOwner, repoName, issueIndex);
+                .getApiInterface()
+                .getIssueByIndex(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex);
 
         call.enqueue(new Callback<Issues>() {
 
@@ -264,27 +354,27 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                     editIssueTitle.setText(response.body().getTitle());
                     editIssueDescription.setText(response.body().getBody());
 
-                    int currentMilestoneId = 0;
+                    int msId = 0;
                     if(response.body().getMilestone() != null) {
-
+                        msId = response.body().getMilestone().getId();
-	                    currentMilestoneId = response.body().getMilestone().getId();
                     }
 
                     // get milestones list
                     if(response.body().getId() > 0) {
 
                         Call<List<Milestones>> call_ = RetrofitClient
-                                .getApiInterface(ctx)
+                                .getInstance(instanceUrl, ctx)
-                                .getMilestones(Authorization.get(ctx), repoOwner, repoName, 1, resultLimit, msState);
+                                .getApiInterface()
+                                .getMilestones(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, 1, resultLimit, msState);
 
-	                    int checkMilestoneId = currentMilestoneId;
+                        final int finalMsId = msId;
 
-	                    call_.enqueue(new Callback<List<Milestones>>() {
+                        call_.enqueue(new Callback<List<Milestones>>() {
 
                             @Override
                             public void onResponse(@NonNull Call<List<Milestones>> call, @NonNull retrofit2.Response<List<Milestones>> response_) {
 
-                                int getSelectedMilestoneId = 0;
+                                int finalMsId1 = 0;
 
                                 if (response_.code() == 200) {
 
@@ -292,40 +382,39 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
                                     milestonesList.add(new Milestones(0, "No milestone"));
                                     assert milestonesList_ != null;
-
                                     if (milestonesList_.size() > 0) {
-
-	                                    milestonesList.addAll(milestonesList_);
-
                                         for (int i = 0; i < milestonesList_.size(); i++) {
 
-                                            if(checkMilestoneId == milestonesList_.get(i).getId()) {
+                                            Milestones data = new Milestones(
-	                                            getSelectedMilestoneId = i + 1;
+                                                    milestonesList_.get(i).getId(),
+                                                    milestonesList_.get(i).getTitle()
+                                            );
+                                            milestonesList.add(data);
+
+                                            if(finalMsId == milestonesList_.get(i).getId()) {
+                                                finalMsId1 = i + 1;
                                             }
+
                                         }
                                     }
 
-                                    ArrayAdapter<Milestones> adapter = new ArrayAdapter<>(EditIssueActivity.this,
+                                    ArrayAdapter<Milestones> adapter_ = new ArrayAdapter<>(EditIssueActivity.this,
-                                            R.layout.list_spinner_items, milestonesList);
+                                            R.layout.spinner_item, milestonesList);
 
-                                    editIssueMilestoneSpinner.setAdapter(adapter);
+                                    adapter_.setDropDownViewResource(R.layout.spinner_dropdown_item);
-
+                                    editIssueMilestoneSpinner.setAdapter(adapter_);
-	                                editIssueMilestoneSpinner.setOnItemClickListener ((parent, view, position, id) -> milestoneId = milestonesList.get(position).getId());
-
-	                                int finalMsId = getSelectedMilestoneId;
-	                                new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-		                                editIssueMilestoneSpinner.setText(milestonesList.get(finalMsId).getTitle(),false);
-		                                milestoneId = milestonesList.get(finalMsId).getId();
-	                                }, 500);
 
+                                    if(milestonesList_.size() > 0) {
+                                        editIssueMilestoneSpinner.setSelection(finalMsId1);
+                                    }
                                     enableProcessButton();
+
                                 }
+
                             }
 
                             @Override
                             public void onFailure(@NonNull Call<List<Milestones>> call, @NonNull Throwable t) {
-
                                 Log.e("onFailure", t.toString());
                             }
                         });
@@ -338,6 +427,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();
 
@@ -348,16 +438,18 @@ 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(ctx, getString(R.string.genericError));
+
                 }
+
             }
 
             @Override
             public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
-
                 Log.e("onFailure", t.toString());
             }
         });
@@ -367,11 +459,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);
+
     }
 
 }

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

@@ -1,28 +1,30 @@
 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 org.gitnex.tea4j.models.FileDiffView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.FilesDiffAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityFileDiffBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.Authorization;
+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 java.io.IOException;
 import java.util.List;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
-import retrofit2.Response;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -34,28 +36,36 @@ public class FileDiffActivity extends BaseActivity {
 	private TextView toolbarTitle;
 	private ListView mListView;
 	private ProgressBar mProgressBar;
+	final Context ctx = this;
+	private Context appCtx;
+
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_file_diff;
+	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
 
-		ActivityFileDiffBinding activityFileDiffBinding = ActivityFileDiffBinding.inflate(getLayoutInflater());
+		Toolbar toolbar = findViewById(R.id.toolbar);
-		setContentView(activityFileDiffBinding.getRoot());
-
-		Toolbar toolbar = activityFileDiffBinding.toolbar;
 		setSupportActionBar(toolbar);
 
-		final TinyDB tinyDb = TinyDB.getInstance(appCtx);
+		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");
 
-		ImageView closeActivity = activityFileDiffBinding.close;
+		ImageView closeActivity = findViewById(R.id.close);
-		toolbarTitle = activityFileDiffBinding.toolbarTitle;
+		toolbarTitle = findViewById(R.id.toolbar_title);
-		mListView = activityFileDiffBinding.listView;
+		mListView = findViewById(R.id.listView);
-		mProgressBar = activityFileDiffBinding.progressBar;
+		mProgressBar = findViewById(R.id.progress_bar);
 
 		mListView.setDivider(null);
 
@@ -67,80 +77,105 @@ public class FileDiffActivity extends BaseActivity {
 
 		String pullIndex = tinyDb.getString("issueNumber");
 
-		boolean apiCall = !new Version(tinyDb.getString("giteaVersion")).less("1.13.0");
+		boolean apiCall = true;
-		getPullDiffContent(repoOwner, repoName, pullIndex, apiCall);
+		String instanceUrl = tinyDb.getString("instanceUrl");
+
+		// fallback for old gitea instances
+		if(new Version(tinyDb.getString("giteaVersion")).less("1.13.0")) {
+			apiCall = false;
+			instanceUrl = tinyDb.getString("instanceUrlWithProtocol");
+		}
+
+		getPullDiffContent(instanceUrl, repoOwner, repoName, pullIndex, instanceToken, apiCall);
 
 	}
 
-	private void getPullDiffContent(String owner, String repo, String pullIndex, boolean apiCall) {
+	private void getPullDiffContent(String instanceUrl, String owner, String repo, String pullIndex, String token, boolean apiCall) {
 
-		Thread thread = new Thread(() -> {
+		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);
+		}
 
-			Call<ResponseBody> call = apiCall ?
+		call.enqueue(new Callback<ResponseBody>() {
-				RetrofitClient.getApiInterface(ctx).getPullDiffContent(Authorization.get(ctx), owner, repo, pullIndex) :
-				RetrofitClient.getWebInterface(ctx).getPullDiffContent(Authorization.getWeb(ctx), owner, repo, pullIndex);
 
-			try {
+			@Override
+			public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
 
-				Response<ResponseBody> response = call.execute();
+				if(response.code() == 200) {
-				assert response.body() != null;
 
-				switch(response.code()) {
+					try {
+						assert response.body() != null;
 
-					case 200:
+						AppUtil appUtil = new AppUtil();
-						List<FileDiffView> fileDiffViews = ParseDiff.getFileDiffViewArray(response.body().string());
+						List<FileDiffView> fileContentsArray = ParseDiff.getFileDiffViewArray(response.body().string());
 
-						int filesCount = fileDiffViews.size();
+						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 toolbarTitleText = (filesCount > 1) ?
+						FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, fileContentsArray);
-							getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)) :
+						mListView.setAdapter(adapter);
-							getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount));
 
-						FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, getSupportFragmentManager(), fileDiffViews);
+						mProgressBar.setVisibility(View.GONE);
 
-						runOnUiThread(() -> {
+					}
-							toolbarTitle.setText(toolbarTitleText);
+					catch(IOException e) {
-							mListView.setAdapter(adapter);
+						e.printStackTrace();
-							mProgressBar.setVisibility(View.GONE);
+					}
-						});
-						break;
-
-					case 401:
-						runOnUiThread(() -> AlertDialogs.authorizationTokenRevokedDialog(ctx,
-							getString(R.string.alertDialogTokenRevokedTitle),
-							getString(R.string.alertDialogTokenRevokedMessage),
-							getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-							getString(R.string.alertDialogTokenRevokedCopyPositiveButton)));
-						break;
-
-					case 403:
-						runOnUiThread(() -> Toasty.error(ctx, ctx.getString(R.string.authorizeError)));
-						break;
-
-					case 404:
-						runOnUiThread(() -> Toasty.warning(ctx, ctx.getString(R.string.apiNotFound)));
-						break;
-
-					default:
-						runOnUiThread(() -> Toasty.error(ctx, getString(R.string.labelGeneralError)));
 
 				}
-			} catch(IOException ignored) {}
+				else if(response.code() == 401) {
 
+					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+				}
+				else if(response.code() == 403) {
+
+					Toasty.info(ctx, ctx.getString(R.string.authorizeError));
+
+				}
+				else if(response.code() == 404) {
+
+					Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+
+				}
+				else {
+
+					Toasty.info(ctx, getString(R.string.labelGeneralError));
+
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", t.toString());
+			}
 		});
 
-		thread.start();
-
 	}
 
 	private void initCloseListener() {
 
-		onClickListener = view -> {
+		onClickListener = new View.OnClickListener() {
 
-			getIntent().removeExtra("singleFileName");
+			@Override
-			finish();
+			public void onClick(View view) {
 
+				getIntent().removeExtra("singleFileName");
+				finish();
+			}
 		};
 	}
 
+
 }

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

@@ -1,41 +1,50 @@
 package org.mian.gitnex.activities;
 
-import android.app.Activity;
-import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
+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.Bundle;
 import android.text.method.ScrollingMovementMethod;
+import android.util.Base64;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import androidx.activity.result.ActivityResultLauncher;
+import android.widget.ImageView;
-import androidx.activity.result.contract.ActivityResultContracts;
+import android.widget.LinearLayout;
-import androidx.core.app.NotificationCompat;
+import android.widget.ProgressBar;
-import com.vdurmont.emoji.EmojiParser;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import com.github.barteksc.pdfviewer.PDFView;
+import com.github.barteksc.pdfviewer.util.FitPolicy;
+import com.github.chrisbanes.photoview.PhotoView;
 import org.apache.commons.io.FileUtils;
-import org.gitnex.tea4j.models.Files;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityFileViewBinding;
 import org.mian.gitnex.fragments.BottomSheetFileViewerFragment;
 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.Constants;
-import org.mian.gitnex.helpers.Images;
-import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.notifications.Notifications;
+import org.mian.gitnex.helpers.highlightjs.HighlightJsView;
+import org.mian.gitnex.helpers.highlightjs.models.Theme;
+import org.mian.gitnex.models.Files;
+import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Arrays;
+import java.io.UnsupportedEncodingException;
-import okhttp3.ResponseBody;
+import java.net.URLDecoder;
+import java.util.Objects;
 import retrofit2.Call;
-import retrofit2.Response;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -43,180 +52,224 @@ import retrofit2.Response;
 
 public class FileViewActivity extends BaseActivity implements BottomSheetFileViewerFragment.BottomSheetListener {
 
-	private ActivityFileViewBinding binding;
+	private View.OnClickListener onClickListener;
-	private Files file;
+	private TextView singleFileContents;
+	private LinearLayout singleFileContentsFrame;
+	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;
+
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_file_view;
+	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
 
-		binding = ActivityFileViewBinding.inflate(getLayoutInflater());
+		Toolbar toolbar = findViewById(R.id.toolbar);
+		setSupportActionBar(toolbar);
 
-		setContentView(binding.getRoot());
+		final TinyDB tinyDb = new TinyDB(appCtx);
-		setSupportActionBar(binding.toolbar);
+		String repoFullName = tinyDb.getString("repoFullName");
-
+		String repoBranch = tinyDb.getString("repoBranch");
-		tinyDB.putBoolean("enableMarkdownInFileView", false);
-
-		file = (Files) getIntent().getSerializableExtra("file");
-
-		binding.close.setOnClickListener(view -> finish());
-
-		binding.toolbarTitle.setMovementMethod(new ScrollingMovementMethod());
-		binding.toolbarTitle.setText(file.getPath());
-
-		String repoFullName = tinyDB.getString("repoFullName");
-		String repoBranch = tinyDB.getString("repoBranch");
 		String[] parts = repoFullName.split("/");
-		String repoOwner = parts[0];
+		final String repoOwner = parts[0];
-		String repoName = parts[1];
+		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");
 
-		getSingleFileContents(repoOwner, repoName, file.getPath(), repoBranch);
+		ImageView closeActivity = findViewById(R.id.close);
+		singleFileContents = findViewById(R.id.singleFileContents);
+		singleCodeContents = findViewById(R.id.singleCodeContents);
+		imageView = findViewById(R.id.imageView);
+		mProgressBar = findViewById(R.id.progress_bar);
+		pdfView = findViewById(R.id.pdfView);
+		pdfViewFrame = findViewById(R.id.pdfViewFrame);
+		singleFileContentsFrame = findViewById(R.id.singleFileContentsFrame);
 
-	}
+		String singleFileName = getIntent().getStringExtra("singleFileName");
 
-	@Override
+		TextView toolbar_title = findViewById(R.id.toolbar_title);
-	public void onResume() {
+		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
 
-		super.onResume();
+		initCloseListener();
+		closeActivity.setOnClickListener(onClickListener);
 
-		if(tinyDB.getBoolean("fileModified")) {
+		tinyDb.putString("downloadFileContents", "");
-			String repoFullName = tinyDB.getString("repoFullName");
+
-			String repoBranch = tinyDB.getString("repoBranch");
+		try {
-			String[] parts = repoFullName.split("/");
+
-			String repoOwner = parts[0];
+			singleFileName = URLDecoder.decode(singleFileName, "UTF-8");
-			String repoName = parts[1];
+			singleFileName = singleFileName.replaceAll("//", "/");
+			singleFileName = singleFileName.startsWith("/") ? singleFileName.substring(1) : singleFileName;
 
-			getSingleFileContents(repoOwner, repoName, file.getPath(), repoBranch);
-			tinyDB.putBoolean("fileModified", false);
 		}
+		catch(UnsupportedEncodingException e) {
+
+			assert singleFileName != null;
+			Log.i("singleFileName", singleFileName);
+
+		}
+
+		toolbar_title.setText(singleFileName);
+
+		getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName, repoBranch);
+
 	}
 
-	private void getSingleFileContents(final String owner, String repo, final String filename, String ref) {
+	private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename, String ref) {
 
-		Thread thread = new Thread(() -> {
+		final TinyDB tinyDb = new TinyDB(appCtx);
 
-			Call<ResponseBody> call = RetrofitClient
+		Call<Files> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getSingleFileContents(token, owner, repo, filename, ref);
-				.getWebInterface(ctx)
-				.getFileContents(Authorization.getWeb(ctx), owner, repo, ref, filename);
 
-			try {
+		call.enqueue(new Callback<Files>() {
 
-				Response<ResponseBody> response = call.execute();
+			@Override
+			public void onResponse(@NonNull Call<Files> call, @NonNull retrofit2.Response<Files> response) {
 
 				if(response.code() == 200) {
 
-					ResponseBody responseBody = response.body();
+					AppUtil appUtil = new AppUtil();
+					assert response.body() != null;
 
-					if(responseBody != null) {
+					if(!response.body().getContent().equals("")) {
 
-						runOnUiThread(() -> binding.progressBar.setVisibility(View.GONE));
 						String fileExtension = FileUtils.getExtension(filename);
+						mProgressBar.setVisibility(View.GONE);
 
-						boolean processable = false;
+						// download file meta
+						tinyDb.putString("downloadFileName", filename);
+						tinyDb.putString("downloadFileContents", response.body().getContent());
 
-						switch(AppUtil.getFileType(fileExtension)) {
+						if(appUtil.imageExtension(fileExtension)) { // file is image
 
-							case IMAGE:
+							singleFileContentsFrame.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							imageView.setVisibility(View.VISIBLE);
 
-								// See https://developer.android.com/guide/topics/media/media-formats#core
+							imageData = Base64.decode(response.body().getContent(), Base64.DEFAULT);
-								if(Arrays.asList("bmp", "gif", "jpg", "jpeg", "png", "webp", "heic", "heif").contains(fileExtension.toLowerCase())) {
+							Drawable imageDrawable = new BitmapDrawable(getResources(), BitmapFactory.decodeByteArray(imageData, 0, imageData.length));
+							imageView.setImageDrawable(imageDrawable);
 
-									processable = true;
+						}
+						else if(appUtil.sourceCodeExtension(fileExtension)) { // file is sourcecode
 
-									byte[] pictureBytes = responseBody.bytes();
+							imageView.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.VISIBLE);
 
-									runOnUiThread(() -> {
+							switch(tinyDb.getInt("fileviewerSourceCodeThemeId")) {
-										binding.contents.setVisibility(View.GONE);
+								case 1:
-										binding.markdownFrame.setVisibility(View.GONE);
+									singleCodeContents.setTheme(Theme.ARDUINO_LIGHT);
-
-										binding.photoView.setVisibility(View.VISIBLE);
-										binding.photoView.setImageBitmap(Images.scaleImage(pictureBytes, 1920));
-									});
-								}
-								break;
-
-							case UNKNOWN:
-							case TEXT:
-
-								if(file.getSize() > Constants.maximumFileViewerSize) {
 									break;
-								}
+								case 2:
+									singleCodeContents.setTheme(Theme.GITHUB);
+									break;
+								case 3:
+									singleCodeContents.setTheme(Theme.FAR);
+									break;
+								case 4:
+									singleCodeContents.setTheme(Theme.IR_BLACK);
+									break;
+								case 5:
+									singleCodeContents.setTheme(Theme.ANDROID_STUDIO);
+									break;
+								default:
+									singleCodeContents.setTheme(Theme.MONOKAI_SUBLIME);
+							}
 
-								processable = true;
+							singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));
-								String text = responseBody.string();
 
-								runOnUiThread(() -> {
+						}
-									binding.photoView.setVisibility(View.GONE);
+						else if(appUtil.pdfExtension(fileExtension)) { // file is pdf
 
-									binding.contents.setContent(text, fileExtension);
+							imageView.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.VISIBLE);
 
-									if(tinyDB.getBoolean("enableMarkdownInFileView")) {
+							pdfNightMode = tinyDb.getBoolean("enablePdfMode");
-										Markdown.render(ctx, EmojiParser.parseToUnicode(text), binding.markdown);
 
-										binding.contents.setVisibility(View.GONE);
+							decodedPdf = Base64.decode(response.body().getContent(), Base64.DEFAULT);
-										binding.markdownFrame.setVisibility(View.VISIBLE);
+							pdfView.fromBytes(decodedPdf).enableSwipe(true).swipeHorizontal(false).enableDoubletap(true).defaultPage(0).enableAnnotationRendering(false).password(null).scrollHandle(null).enableAntialiasing(true).spacing(0).autoSpacing(true).pageFitPolicy(FitPolicy.WIDTH).fitEachPage(true).pageSnap(false).pageFling(true).nightMode(pdfNightMode).load();
-									} else {
+
-										binding.markdownFrame.setVisibility(View.GONE);
+						}
-										binding.contents.setVisibility(View.VISIBLE);
+						else if(appUtil.excludeFilesInFileViewerExtension(fileExtension)) { // files need to be excluded
-									}
+
-								});
+							imageView.setVisibility(View.GONE);
-								break;
+							singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.VISIBLE);
+
+							singleFileContents.setText(getResources().getString(R.string.excludeFilesInFileviewer));
+							singleFileContents.setGravity(Gravity.CENTER);
+							singleFileContents.setTypeface(null, Typeface.BOLD);
+
+						}
+						else { // file type not known - plain text view
+
+							imageView.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.VISIBLE);
+
+							singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));
 
 						}
 
-						if(!processable) { // While the file could still be non-binary,
-							// it's better we don't show it (to prevent any crashes and/or unwanted behavior) and let the user download it instead.
-							responseBody.close();
-
-							runOnUiThread(() -> {
-								binding.photoView.setVisibility(View.GONE);
-								binding.contents.setVisibility(View.GONE);
-
-								binding.markdownFrame.setVisibility(View.VISIBLE);
-								binding.markdown.setText(getString(R.string.excludeFilesInFileViewer));
-								binding.markdown.setGravity(Gravity.CENTER);
-								binding.markdown.setTypeface(null, Typeface.BOLD);
-							});
-						}
-					} else {
-
-						runOnUiThread(() -> {
-							binding.markdown.setText("");
-							binding.progressBar.setVisibility(View.GONE);
-						});
 					}
-				} else {
+					else {
-
+						singleFileContents.setText("");
-					switch(response.code()) {
+						mProgressBar.setVisibility(View.GONE);
-
-						case 401:
-							runOnUiThread(() -> AlertDialogs.authorizationTokenRevokedDialog(ctx,
-								getResources().getString(R.string.alertDialogTokenRevokedTitle),
-								getResources().getString(R.string.alertDialogTokenRevokedMessage),
-								getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-								getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton)));
-							break;
-
-						case 403:
-							runOnUiThread(() -> Toasty.error(ctx, ctx.getString(R.string.authorizeError)));
-							break;
-
-						case 404:
-							runOnUiThread(() -> Toasty.warning(ctx, ctx.getString(R.string.apiNotFound)));
-							break;
-
-						default:
-							runOnUiThread(() -> Toasty.error(ctx, getString(R.string.labelGeneralError)));
-
 					}
+
 				}
-			} catch(IOException ignored) {}
+				else if(response.code() == 401) {
 
+					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+				}
+				else if(response.code() == 403) {
+
+					Toasty.info(ctx, ctx.getString(R.string.authorizeError));
+
+				}
+				else if(response.code() == 404) {
+
+					Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+
+				}
+				else {
+
+					Toasty.info(ctx, getString(R.string.labelGeneralError));
+
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<Files> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", t.toString());
+			}
 		});
 
-		thread.start();
-
 	}
 
 	@Override
@@ -224,15 +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);
-
-		if(!FileUtils.getExtension(file.getName())
-			.equalsIgnoreCase("md")) {
-
-			menu.getItem(0)
-				.setVisible(false);
-		}
-
 		return true;
 	}
 
@@ -241,158 +285,98 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 		int id = item.getItemId();
 
-		if(id == android.R.id.home) {
+		switch(id) {
-
+			case android.R.id.home:
-			finish();
+				finish();
-			return true;
+				return true;
-
+			case R.id.genericMenu:
-		} else if(id == R.id.genericMenu) {
+				BottomSheetFileViewerFragment bottomSheet = new BottomSheetFileViewerFragment();
-
+				bottomSheet.show(getSupportFragmentManager(), "fileViewerBottomSheet");
-			BottomSheetFileViewerFragment bottomSheet = new BottomSheetFileViewerFragment();
+				return true;
-			bottomSheet.show(getSupportFragmentManager(), "fileViewerBottomSheet");
+			default:
-			return true;
+				return super.onOptionsItemSelected(item);
-
-		} else if(id == R.id.markdown) {
-
-			if(!tinyDB.getBoolean("enableMarkdownInFileView")) {
-				Markdown.render(ctx, EmojiParser.parseToUnicode(binding.contents.getContent()), binding.markdown);
-
-				binding.contents.setVisibility(View.GONE);
-				binding.markdownFrame.setVisibility(View.VISIBLE);
-
-				tinyDB.putBoolean("enableMarkdownInFileView", true);
-			} else {
-				binding.markdownFrame.setVisibility(View.GONE);
-				binding.contents.setVisibility(View.VISIBLE);
-
-				tinyDB.putBoolean("enableMarkdownInFileView", false);
-			}
-
-			return true;
-
-		} else {
-			return super.onOptionsItemSelected(item);
 		}
+
 	}
 
 	@Override
 	public void onButtonClicked(String text) {
 
 		if("downloadFile".equals(text)) {
+
 			requestFileDownload();
+
 		}
 
-		if("deleteFile".equals(text)) {
-			Intent intent = new Intent(ctx, CreateFileActivity.class);
-			intent.putExtra("fileAction", CreateFileActivity.FILE_ACTION_DELETE);
-			intent.putExtra("filePath", file.getPath());
-			intent.putExtra("fileSha", file.getSha());
-
-			ctx.startActivity(intent);
-		}
-
-		if("editFile".equals(text)) {
-
-			if(binding.contents.getContent() != null &&
-				!binding.contents.getContent().isEmpty()) {
-
-				Intent intent = new Intent(ctx, CreateFileActivity.class);
-
-				intent.putExtra("fileAction", CreateFileActivity.FILE_ACTION_EDIT);
-				intent.putExtra("filePath", file.getPath());
-				intent.putExtra("fileSha", file.getSha());
-				intent.putExtra("fileContents", binding.contents.getContent());
-
-				ctx.startActivity(intent);
-
-			} else {
-				Toasty.error(ctx, getString(R.string.fileTypeCannotBeEdited));
-			}
-		}
 	}
 
 	private void requestFileDownload() {
 
-		Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+		final TinyDB tinyDb = new TinyDB(appCtx);
 
-		intent.addCategory(Intent.CATEGORY_OPENABLE);
+		if(!tinyDb.getString("downloadFileContents").isEmpty()) {
-		intent.putExtra(Intent.EXTRA_TITLE, file.getName());
-		intent.setType("*/*");
 
-		activityResultLauncher.launch(intent);
+			int CREATE_REQUEST_CODE = 40;
+
+			File outputFileName = new File(tinyDb.getString("downloadFileName"));
+
+			Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+
+			intent.addCategory(Intent.CATEGORY_OPENABLE);
+			intent.setType("*/*");
+			intent.putExtra(Intent.EXTRA_TITLE, outputFileName.getName());
+
+			startActivityForResult(intent, CREATE_REQUEST_CODE);
+
+		}
+		else {
+			Toasty.error(ctx, getString(R.string.waitLoadingDownloadFile));
+		}
 
 	}
 
-	ActivityResultLauncher<Intent> activityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
 
-		if (result.getResultCode() == Activity.RESULT_OK) {
+		super.onActivityResult(requestCode, resultCode, data);
 
-			assert result.getData() != null;
+		final TinyDB tinyDb = new TinyDB(appCtx);
+
+		if (requestCode == 40 && resultCode == RESULT_OK) {
 
 			try {
 
-				OutputStream outputStream = getContentResolver().openOutputStream(result.getData().getData());
+				assert data != null;
+				Uri uri = data.getData();
 
-				NotificationCompat.Builder builder = new NotificationCompat.Builder(ctx, ctx.getPackageName())
+				assert uri != null;
-					.setContentTitle(getString(R.string.fileViewerNotificationTitleStarted))
+				OutputStream outputStream = getContentResolver().openOutputStream(uri);
-					.setContentText(getString(R.string.fileViewerNotificationDescriptionStarted, file.getName()))
-					.setSmallIcon(R.drawable.gitnex_transparent)
-					.setPriority(NotificationCompat.PRIORITY_LOW)
-					.setChannelId(Constants.downloadNotificationChannelId)
-					.setProgress(100, 0, false)
-					.setOngoing(true);
 
-				int notificationId = Notifications.uniqueNotificationId(ctx);
+				byte[] dataAsBytes = Base64.decode(tinyDb.getString("downloadFileContents"), 0);
 
-				NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);;
+				assert outputStream != null;
-				notificationManager.notify(notificationId, builder.build());
+				outputStream.write(dataAsBytes);
+				outputStream.close();
 
-				String repoFullName = tinyDB.getString("repoFullName");
+				Toasty.info(ctx, getString(R.string.downloadFileSaved));
-				String repoBranch = tinyDB.getString("repoBranch");
-				String[] parts = repoFullName.split("/");
-				String repoOwner = parts[0];
-				String repoName = parts[1];
 
-				Thread thread = new Thread(() -> {
+			}
+			catch (IOException e) {
+				Log.e("errorFileDownloading", Objects.requireNonNull(e.getMessage()));
+			}
 
-					try {
-
-						Call<ResponseBody> call = RetrofitClient
-							.getWebInterface(ctx)
-							.getFileContents(Authorization.getWeb(ctx), repoOwner, repoName, repoBranch, file.getPath());
-
-						Response<ResponseBody> response = call.execute();
-
-						assert response.body() != null;
-
-						AppUtil.copyProgress(response.body().byteStream(), outputStream, file.getSize(), progress -> {
-							builder.setProgress(100, progress, false);
-							notificationManager.notify(notificationId, builder.build());
-						});
-
-						builder.setContentTitle(getString(R.string.fileViewerNotificationTitleFinished))
-							.setContentText(getString(R.string.fileViewerNotificationDescriptionFinished, file.getName()));
-
-					} catch(IOException ignored) {
-
-						builder.setContentTitle(getString(R.string.fileViewerNotificationTitleFailed))
-							.setContentText(getString(R.string.fileViewerNotificationDescriptionFailed, file.getName()));
-
-					} finally {
-
-						builder.setProgress(0,0,false)
-							.setOngoing(false);
-
-						notificationManager.notify(notificationId, builder.build());
-
-					}
-				});
-
-				thread.start();
-
-			} catch(IOException ignored) {}
 		}
 
-	});
+	}
+
+	private void initCloseListener() {
+
+		onClickListener = view -> {
+
+			getIntent().removeExtra("singleFileName");
+			finish();
+
+		};
+	}
 
 }

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

@@ -1,33 +1,37 @@
 package org.mian.gitnex.activities;
 
+import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
-import android.os.Handler;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.RadioGroup;
+import android.widget.ScrollView;
+import android.widget.Spinner;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import org.gitnex.tea4j.models.GiteaVersion;
+import com.tooltip.Tooltip;
-import org.gitnex.tea4j.models.UserInfo;
-import org.gitnex.tea4j.models.UserTokens;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.UserAccountsApi;
-import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.databinding.ActivityLoginBinding;
 import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.NetworkStatusObserver;
+import org.mian.gitnex.helpers.NetworkObserver;
 import org.mian.gitnex.helpers.PathsHelper;
+import org.mian.gitnex.helpers.SnackBar;
 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 org.mian.gitnex.models.UserTokens;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -47,93 +51,100 @@ public class LoginActivity extends BaseActivity {
 
 	private enum LoginType {BASIC, TOKEN}
 
+	private Context appCtx;
+	private Context ctx = this;
+	private TinyDB tinyDB;
+
 	private Button loginButton;
 	private EditText instanceUrlET, loginUidET, loginPassword, otpCode, loginTokenCode;
-	private AutoCompleteTextView protocolSpinner;
+	private Spinner protocolSpinner;
+	private TextView otpInfo;
 	private RadioGroup loginMethod;
 	private String device_id = "token";
-	private String selectedProtocol;
+	private ScrollView layoutView;
+
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_login;
+	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
 
-		ActivityLoginBinding activityLoginBinding = ActivityLoginBinding.inflate(getLayoutInflater());
+		tinyDB = new TinyDB(appCtx);
-		setContentView(activityLoginBinding.getRoot());
+		NetworkObserver networkMonitor = new NetworkObserver(ctx);
 
-		NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.getInstance(ctx);
+		loginButton = findViewById(R.id.login_button);
+		instanceUrlET = findViewById(R.id.instance_url);
+		loginUidET = findViewById(R.id.login_uid);
+		loginPassword = findViewById(R.id.login_passwd);
+		otpCode = findViewById(R.id.otpCode);
+		otpInfo = findViewById(R.id.otpInfo);
+		ImageView info_button = findViewById(R.id.info);
+		protocolSpinner = findViewById(R.id.httpsSpinner);
+		loginMethod = findViewById(R.id.loginMethod);
+		loginTokenCode = findViewById(R.id.loginTokenCode);
+		layoutView = findViewById(R.id.loginForm);
 
-		loginButton = activityLoginBinding.loginButton;
+		((TextView) findViewById(R.id.appVersion)).setText(AppUtil.getAppVersion(appCtx));
-		instanceUrlET = activityLoginBinding.instanceUrl;
-		loginUidET = activityLoginBinding.loginUid;
-		loginPassword = activityLoginBinding.loginPasswd;
-		otpCode = activityLoginBinding.otpCode;
-		protocolSpinner = activityLoginBinding.httpsSpinner;
-		loginMethod = activityLoginBinding.loginMethod;
-		loginTokenCode = activityLoginBinding.loginTokenCode;
 
-		activityLoginBinding.appVersion.setText(AppUtil.getAppVersion(appCtx));
+		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(LoginActivity.this, R.layout.spinner_item, Protocol.values());
-
+		adapterProtocols.setDropDownViewResource(R.layout.spinner_dropdown_item);
-		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(LoginActivity.this, R.layout.list_spinner_items, Protocol.values());
-
-		instanceUrlET.setText(getIntent().getStringExtra("instanceUrl"));
 
 		protocolSpinner.setAdapter(adapterProtocols);
-		protocolSpinner.setSelection(0);
+		protocolSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-		protocolSpinner.setOnItemClickListener((parent, view, position, id) -> {
 
-			selectedProtocol = String.valueOf(parent.getItemAtPosition(position));
+			public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
 
-			if(selectedProtocol.equals(String.valueOf(Protocol.HTTP))) {
+				if(protocolSpinner.getSelectedItem() == Protocol.HTTP) {
-
+					SnackBar.warning(ctx, layoutView, getResources().getString(R.string.protocolError));
-				Toasty.warning(ctx, getResources().getString(R.string.protocolError));
+				}
 			}
+
+			public void onNothingSelected(AdapterView<?> parent) {
+
+			}
+
 		});
 
-		if(R.id.loginToken == loginMethod.getCheckedRadioButtonId()) {
+		info_button.setOnClickListener(
-
+			view -> new Tooltip.Builder(view).setText(R.string.urlInfoTooltip).setTextColor(getResources().getColor(R.color.white))
-			AppUtil.setMultiVisibility(View.GONE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
+				.setBackgroundColor(getResources().getColor(R.color.tooltipBackground)).setCancelable(true).setDismissOnClick(true).setPadding(30)
-			findViewById(R.id.loginTokenCodeLayout).setVisibility(View.VISIBLE);
+				.setCornerRadius(R.dimen.tooltipCornor).setGravity(Gravity.BOTTOM).show());
-		}
-		else {
-
-			AppUtil.setMultiVisibility(View.VISIBLE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
-			findViewById(R.id.loginTokenCodeLayout).setVisibility(View.GONE);
-		}
 
 		loginMethod.setOnCheckedChangeListener((group, checkedId) -> {
 
 			if(checkedId == R.id.loginToken) {
 
-				AppUtil.setMultiVisibility(View.GONE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
+				AppUtil.setMultiVisibility(View.GONE, loginUidET, loginPassword, otpCode, otpInfo);
-				findViewById(R.id.loginTokenCodeLayout).setVisibility(View.VISIBLE);
+				loginTokenCode.setVisibility(View.VISIBLE);
+
 			}
 			else {
 
-				AppUtil.setMultiVisibility(View.VISIBLE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
+				AppUtil.setMultiVisibility(View.VISIBLE, loginUidET, loginPassword, otpCode, otpInfo);
-				findViewById(R.id.loginTokenCodeLayout).setVisibility(View.GONE);
+				loginTokenCode.setVisibility(View.GONE);
+
 			}
 		});
 
-		Handler handler = new Handler(getMainLooper());
+		networkMonitor.onInternetStateListener(isAvailable -> {
 
-		networkStatusObserver.registerNetworkStatusListener(hasNetworkConnection -> {
+			if(isAvailable) {
 
-			handler.post(() -> {
+				enableProcessButton();
+				SnackBar.success(ctx, layoutView, getResources().getString(R.string.netConnectionIsBack));
+			}
+			else {
 
-				if(hasNetworkConnection) {
+				disableProcessButton();
-
+				loginButton.setText(getResources().getString(R.string.btnLogin));
-					enableProcessButton();
+				SnackBar.error(ctx, layoutView, getResources().getString(R.string.checkNetConnection));
-				}
+			}
-				else {
-
-					disableProcessButton();
-					loginButton.setText(getResources().getString(R.string.btnLogin));
-					Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
-				}
-
-			});
 		});
 
 		loadDefaults();
@@ -142,114 +153,131 @@ public class LoginActivity extends BaseActivity {
 
 			disableProcessButton();
 			login();
+
 		});
+
 	}
 
 	private void login() {
 
 		try {
 
-			if(selectedProtocol == null) {
-
-				Toasty.error(ctx, getResources().getString(R.string.protocolEmptyError));
-				enableProcessButton();
-				return;
-			}
-
 			String loginUid = loginUidET.getText().toString();
 			String loginPass = loginPassword.getText().toString();
 			String loginToken = loginTokenCode.getText().toString().trim();
 
+			Protocol protocol = (Protocol) protocolSpinner.getSelectedItem();
 			LoginType loginType = (loginMethod.getCheckedRadioButtonId() == R.id.loginUsernamePassword) ? LoginType.BASIC : LoginType.TOKEN;
 
 			URI rawInstanceUrl = UrlBuilder.fromString(UrlHelper.fixScheme(instanceUrlET.getText().toString(), "http")).toUri();
 
-			URI instanceUrl = UrlBuilder.fromUri(rawInstanceUrl).withScheme(selectedProtocol.toLowerCase()).withPath(PathsHelper.join(rawInstanceUrl.getPath(), "/api/v1/"))
+			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();
 
 			tinyDB.putString("loginType", loginType.name().toLowerCase());
 			tinyDB.putString("instanceUrlRaw", instanceUrlET.getText().toString());
 			tinyDB.putString("instanceUrl", instanceUrl.toString());
+			tinyDB.putString("instanceUrlWithProtocol", instanceUrlWithProtocol.toString());
 
 			if(instanceUrlET.getText().toString().equals("")) {
 
-				Toasty.error(ctx, getResources().getString(R.string.emptyFieldURL));
+				SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldURL));
 				enableProcessButton();
 				return;
+
 			}
 
 			if(loginType == LoginType.BASIC) {
 
 				if(otpCode.length() != 0 && otpCode.length() != 6) {
 
-					Toasty.warning(ctx, getResources().getString(R.string.loginOTPTypeError));
+					SnackBar.warning(ctx, layoutView, getResources().getString(R.string.loginOTPTypeError));
 					enableProcessButton();
 					return;
+
 				}
 
 				if(rawInstanceUrl.getUserInfo() != null) {
 
 					tinyDB.putString("basicAuthPassword", loginPass);
 					tinyDB.putBoolean("basicAuthFlag", true);
+
 				}
 
 				if(loginUid.equals("")) {
 
-					Toasty.error(ctx, getResources().getString(R.string.emptyFieldUsername));
+					SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldUsername));
 					enableProcessButton();
 					return;
+
+				}
+
+				if(loginUid.contains("@")) {
+
+					SnackBar.warning(ctx, layoutView, getResources().getString(R.string.userInvalidUserName));
+					enableProcessButton();
+					return;
+
 				}
 
 				if(loginPass.equals("")) {
 
-					Toasty.error(ctx, getResources().getString(R.string.emptyFieldPassword));
+					SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldPassword));
 					enableProcessButton();
 					return;
+
 				}
 
 				int loginOTP = (otpCode.length() > 0) ? Integer.parseInt(otpCode.getText().toString().trim()) : 0;
 				tinyDB.putString("loginUid", loginUid);
 
-				versionCheck(loginUid, loginPass, loginOTP, loginToken, loginType);
+				versionCheck(instanceUrl.toString(), loginUid, loginPass, loginOTP, loginToken, loginType);
 
 			}
 			else {
 
 				if(loginToken.equals("")) {
 
-					Toasty.error(ctx, getResources().getString(R.string.loginTokenError));
+					SnackBar.warning(ctx, layoutView, getResources().getString(R.string.loginTokenError));
 					enableProcessButton();
 					return;
+
 				}
 
-				versionCheck(loginUid, loginPass, 123, loginToken, loginType);
+				versionCheck(instanceUrl.toString(), loginUid, loginPass, 123, loginToken, loginType);
+
 			}
 
 		}
 		catch(Exception e) {
 
 			Log.e("onFailure-login", e.toString());
-			Toasty.error(ctx, getResources().getString(R.string.malformedUrl));
+			SnackBar.error(ctx, layoutView, getResources().getString(R.string.malformedUrl));
 			enableProcessButton();
+
 		}
 	}
 
-	private void versionCheck(final String loginUid, final String loginPass, final int loginOTP, final String loginToken,
+	private void versionCheck(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP, final String loginToken,
 		final LoginType loginType) {
 
 		Call<GiteaVersion> callVersion;
 
 		if(!loginToken.equals("")) {
 
-			callVersion = RetrofitClient.getApiInterface(appCtx).getGiteaVersionWithToken("token " + loginToken);
+			callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken(loginToken);
 		}
 		else {
 
 			String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
 
 			callVersion =
-				(loginOTP != 0) ? RetrofitClient.getApiInterface(appCtx).getGiteaVersionWithOTP(credential, loginOTP) :
+				(loginOTP != 0) ? RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithOTP(credential, loginOTP) :
-					RetrofitClient.getApiInterface(appCtx).getGiteaVersionWithBasic(credential);
+					RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithBasic(credential);
+
 		}
 
 		callVersion.enqueue(new Callback<GiteaVersion>() {
@@ -260,27 +288,27 @@ public class LoginActivity extends BaseActivity {
 				if(responseVersion.code() == 200) {
 
 					GiteaVersion version = responseVersion.body();
+					Version gitea_version;
+
 					assert version != null;
 
-					if(!Version.valid(version.getVersion())) {
+					try {
+						gitea_version = new Version(version.getVersion());
+					}
+					catch(Exception e) {
 
-						Toasty.error(ctx, getResources().getString(R.string.versionUnknown));
+						SnackBar.error(ctx, layoutView, getResources().getString(R.string.versionUnknown));
 						enableProcessButton();
 						return;
 					}
 
-					tinyDB.putString("giteaVersion", version.getVersion());
-					Version gitea_version = new Version(version.getVersion());
-
 					if(gitea_version.less(getString(R.string.versionLow))) {
 
-						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx)
+						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx).setTitle(getString(R.string.versionAlertDialogHeader))
-							.setTitle(getString(R.string.versionAlertDialogHeader))
+							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setIcon(R.drawable.ic_warning)
-							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion()))
-							.setIcon(R.drawable.ic_warning)
 							.setCancelable(true);
 
-						alertDialogBuilder.setNeutralButton(getString(R.string.cancelButton), (dialog, which) -> {
+						alertDialogBuilder.setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> {
 
 							dialog.dismiss();
 							enableProcessButton();
@@ -289,7 +317,7 @@ public class LoginActivity extends BaseActivity {
 						alertDialogBuilder.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
 
 							dialog.dismiss();
-							login(loginType, loginUid, loginPass, loginOTP, loginToken);
+							login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken);
 						});
 
 						alertDialogBuilder.create().show();
@@ -297,34 +325,32 @@ public class LoginActivity extends BaseActivity {
 					}
 					else if(gitea_version.lessOrEqual(getString(R.string.versionHigh))) {
 
-						login(loginType, loginUid, loginPass, loginOTP, loginToken);
+						login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken);
 					}
 					else {
 
-						Toasty.warning(ctx, getResources().getString(R.string.versionUnsupportedNew));
+						SnackBar.info(ctx, layoutView, getResources().getString(R.string.versionUnsupportedNew));
-						login(loginType, loginUid, loginPass, loginOTP, loginToken);
+						login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken);
 
 					}
 
 				}
 				else if(responseVersion.code() == 403) {
 
-					login(loginType, loginUid, loginPass, loginOTP, loginToken);
+					login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken);
 				}
 			}
 
-			private void login(LoginType loginType, String loginUid, String loginPass, int loginOTP, String loginToken) {
+			private void login(LoginType loginType, String instanceUrl, String loginUid, String loginPass, int loginOTP, String loginToken) {
 
 				// ToDo: before store/create token: get UserInfo to check DB/AccountManager if there already exist a token
 				// the setup methods then can better handle all different cases
 
 				if(loginType == LoginType.BASIC) {
-
+					setup(instanceUrl, loginUid, loginPass, loginOTP);
-					setup(loginUid, loginPass, loginOTP);
 				}
 				else if(loginType == LoginType.TOKEN) { // Token
-
+					setupUsingExistingToken(instanceUrl, loginToken);
-					setupUsingExistingToken(loginToken);
 				}
 			}
 
@@ -332,15 +358,15 @@ public class LoginActivity extends BaseActivity {
 			public void onFailure(@NonNull Call<GiteaVersion> callVersion, @NonNull Throwable t) {
 
 				Log.e("onFailure-versionCheck", t.toString());
-				Toasty.error(ctx, getResources().getString(R.string.errorOnLogin));
+				SnackBar.error(ctx, layoutView, getResources().getString(R.string.errorOnLogin));
 				enableProcessButton();
 			}
 		});
 	}
 
-	private void setupUsingExistingToken(final String loginToken) {
+	private void setupUsingExistingToken(String instanceUrl, final String loginToken) {
 
-		Call<UserInfo> call = RetrofitClient.getApiInterface(appCtx).getUserInfo("token " + loginToken);
+		Call<UserInfo> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserInfo("token " + loginToken);
 
 		call.enqueue(new Callback<UserInfo>() {
 
@@ -352,7 +378,6 @@ public class LoginActivity extends BaseActivity {
 				switch(response.code()) {
 
 					case 200:
-
 						assert userDetails != null;
 						tinyDB.putBoolean("loggedInMode", true);
 						tinyDB.putString(userDetails.getLogin() + "-token", loginToken);
@@ -360,51 +385,45 @@ public class LoginActivity extends BaseActivity {
 						tinyDB.putString("userLogin", userDetails.getUsername());
 
 						// insert new account to db if does not exist
-						String accountName = userDetails.getUsername() + "@" + TinyDB.getInstance(ctx).getString("instanceUrl");
+						String accountName = userDetails.getUsername() + "@" + instanceUrl;
-						UserAccountsApi userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
+						UserAccountsApi userAccountsApi = new UserAccountsApi(ctx);
-						boolean userAccountExists = userAccountsApi.userAccountExists(accountName);
+						int checkAccount = userAccountsApi.getCount(accountName);
-						long accountId;
 
-						if(!userAccountExists) {
+						if(checkAccount == 0) {
-
+							userAccountsApi.insertNewAccount(accountName, instanceUrl, userDetails.getUsername(), loginToken, "");
-							accountId = userAccountsApi.createNewAccount(accountName, TinyDB.getInstance(ctx).getString("instanceUrl"), userDetails.getUsername(), loginToken, "");
-							tinyDB.putInt("currentActiveAccountId", (int) accountId);
-						}
-						else {
-
-							userAccountsApi.updateTokenByAccountName(accountName, loginToken);
-							UserAccount data = userAccountsApi.getAccountByName(accountName);
-							tinyDB.putInt("currentActiveAccountId", data.getAccountId());
 						}
 
 						enableProcessButton();
 						startActivity(new Intent(LoginActivity.this, MainActivity.class));
 						finish();
 						break;
-					case 401:
 
-						Toasty.error(ctx, getResources().getString(R.string.unauthorizedApiError));
+					case 401:
+						SnackBar.error(ctx, layoutView, getResources().getString(R.string.unauthorizedApiError));
 						enableProcessButton();
 						break;
-					default:
 
-						Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + response.code());
+					default:
+						SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code());
 						enableProcessButton();
+
 				}
+
 			}
 
 			@Override
 			public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
 
 				Log.e("onFailure", t.toString());
-				Toasty.error(ctx, getResources().getString(R.string.genericError));
+				SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericError));
 				enableProcessButton();
+
 			}
 		});
 
 	}
 
-	private void setup(final String loginUid, final String loginPass, final int loginOTP) {
+	private void setup(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP) {
 
 		final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
 		final String tokenName = "gitnex-app-" + device_id;
@@ -412,11 +431,11 @@ public class LoginActivity extends BaseActivity {
 		Call<List<UserTokens>> call;
 		if(loginOTP != 0) {
 
-			call = RetrofitClient.getApiInterface(appCtx).getUserTokensWithOTP(credential, loginOTP, loginUid);
+			call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserTokensWithOTP(credential, loginOTP, loginUid);
 		}
 		else {
 
-			call = RetrofitClient.getApiInterface(appCtx).getUserTokens(credential, loginUid);
+			call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserTokens(credential, loginUid);
 		}
 
 		call.enqueue(new Callback<List<UserTokens>>() {
@@ -429,9 +448,7 @@ public class LoginActivity extends BaseActivity {
 				if(response.code() == 200) {
 
 					assert userTokens != null;
-
 					for(UserTokens t : userTokens) {
-
 						if(t.getName().equals(tokenName)) {
 
 							// this app had created an token on this instance before
@@ -440,14 +457,13 @@ public class LoginActivity extends BaseActivity {
 							Call<Void> delcall;
 							if(loginOTP != 0) {
 
-								delcall = RetrofitClient.getApiInterface(ctx)
+								delcall = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface()
 									.deleteTokenWithOTP(credential, loginOTP, loginUid, t.getId());
 							}
 							else {
 
-								delcall = RetrofitClient.getApiInterface(ctx).deleteToken(credential, loginUid, t.getId());
+								delcall = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().deleteToken(credential, loginUid, t.getId());
 							}
-
 							delcall.enqueue(new Callback<Void>() {
 
 								@Override
@@ -455,12 +471,13 @@ public class LoginActivity extends BaseActivity {
 
 									if(response.code() == 204) {
 
-										setupToken(loginUid, loginPass, loginOTP, tokenName);
+										setupToken(instanceUrl, loginUid, loginPass, loginOTP, tokenName);
 									}
 									else {
 
-										Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + response.code());
+										SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code());
 										enableProcessButton();
+
 									}
 								}
 
@@ -468,20 +485,22 @@ public class LoginActivity extends BaseActivity {
 								public void onFailure(@NonNull Call<Void> delcall, @NonNull Throwable t) {
 
 									Log.e("onFailure-login", t.toString());
-									Toasty.error(ctx, getResources().getString(R.string.malformedJson));
+									SnackBar.error(ctx, layoutView, getResources().getString(R.string.malformedJson));
 									enableProcessButton();
+
 								}
 							});
 							return;
 						}
 					}
 
-					setupToken(loginUid, loginPass, loginOTP, tokenName);
+					setupToken(instanceUrl, loginUid, loginPass, loginOTP, tokenName);
 				}
 				else {
 
-					Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + response.code());
+					SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code());
 					enableProcessButton();
+
 				}
 			}
 
@@ -489,14 +508,15 @@ public class LoginActivity extends BaseActivity {
 			public void onFailure(@NonNull Call<List<UserTokens>> call, @NonNull Throwable t) {
 
 				Log.e("onFailure-login", t.toString());
-				Toasty.error(ctx, getResources().getString(R.string.malformedJson));
+				SnackBar.error(ctx, layoutView, getResources().getString(R.string.malformedJson));
 				enableProcessButton();
+
 			}
 		});
 
 	}
 
-	private void setupToken(final String loginUid, final String loginPass, final int loginOTP, final String tokenName) {
+	private void setupToken(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP, final String tokenName) {
 
 		final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
 
@@ -505,13 +525,12 @@ public class LoginActivity extends BaseActivity {
 
 		if(loginOTP != 0) {
 
-			callCreateToken = RetrofitClient.getApiInterface(ctx)
+			callCreateToken = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface()
 				.createNewTokenWithOTP(credential, loginOTP, loginUid, createUserToken);
 		}
 		else {
 
-			callCreateToken = RetrofitClient.getApiInterface(ctx)
+			callCreateToken = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().createNewToken(credential, loginUid, createUserToken);
-				.createNewToken(credential, loginUid, createUserToken);
 		}
 
 		callCreateToken.enqueue(new Callback<UserTokens>() {
@@ -526,7 +545,7 @@ public class LoginActivity extends BaseActivity {
 
 					if(!newToken.getSha1().equals("")) {
 
-						Call<UserInfo> call = RetrofitClient.getApiInterface(ctx)
+						Call<UserInfo> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface()
 							.getUserInfo("token " + newToken.getSha1());
 
 						call.enqueue(new Callback<UserInfo>() {
@@ -539,7 +558,6 @@ public class LoginActivity extends BaseActivity {
 								switch(response.code()) {
 
 									case 200:
-
 										assert userDetails != null;
 										tinyDB.remove("loginPass");
 										tinyDB.putBoolean("loggedInMode", true);
@@ -548,53 +566,48 @@ public class LoginActivity extends BaseActivity {
 										tinyDB.putString(loginUid + "-token-last-eight", newToken.getToken_last_eight());
 
 										// insert new account to db if does not exist
-										String accountName = userDetails.getUsername() + "@" + TinyDB.getInstance(ctx).getString("instanceUrl");
+										String accountName = userDetails.getUsername() + "@" + instanceUrl;
-										UserAccountsApi userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
+										UserAccountsApi userAccountsApi = new UserAccountsApi(ctx);
-										boolean userAccountExists = userAccountsApi.userAccountExists(accountName);
+										int checkAccount = userAccountsApi.getCount(accountName);
-										long accountId;
 
-										if(!userAccountExists) {
+										if(checkAccount == 0) {
-
+											userAccountsApi
-											accountId = userAccountsApi
+												.insertNewAccount(accountName, instanceUrl, userDetails.getUsername(), newToken.getSha1(), "");
-												.createNewAccount(accountName, TinyDB.getInstance(ctx).getString("instanceUrl"), userDetails.getUsername(), newToken.getSha1(), "");
-											tinyDB.putInt("currentActiveAccountId", (int) accountId);
-										}
-										else {
-
-											userAccountsApi.updateTokenByAccountName(accountName, newToken.getSha1());
-											UserAccount data = userAccountsApi.getAccountByName(accountName);
-											tinyDB.putInt("currentActiveAccountId", data.getAccountId());
 										}
 
 										startActivity(new Intent(LoginActivity.this, MainActivity.class));
 										finish();
 										break;
-									case 401:
 
-										Toasty.error(ctx, getResources().getString(R.string.unauthorizedApiError));
+									case 401:
+										SnackBar.error(ctx, layoutView, getResources().getString(R.string.unauthorizedApiError));
 										enableProcessButton();
 										break;
-									default:
 
-										Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + response.code());
+									default:
+										SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code());
 										enableProcessButton();
+
 								}
+
 							}
 
 							@Override
 							public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
 
 								Log.e("onFailure", t.toString());
-								Toasty.error(ctx, getResources().getString(R.string.genericError));
+								SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericError));
 								enableProcessButton();
+
 							}
 						});
 					}
 				}
 				else if(responseCreate.code() == 500) {
 
-					Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + responseCreate.code());
+					SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + responseCreate.code());
 					enableProcessButton();
+
 				}
 			}
 
@@ -610,21 +623,17 @@ public class LoginActivity extends BaseActivity {
 	private void loadDefaults() {
 
 		if(tinyDB.getString("loginType").equals(LoginType.BASIC.name().toLowerCase())) {
-
 			loginMethod.check(R.id.loginUsernamePassword);
 		}
 		else {
-
 			loginMethod.check(R.id.loginToken);
 		}
 
 		if(!tinyDB.getString("instanceUrlRaw").equals("")) {
-
 			instanceUrlET.setText(tinyDB.getString("instanceUrlRaw"));
 		}
 
 		if(!tinyDB.getString("loginUid").equals("")) {
-
 			loginUidET.setText(tinyDB.getString("loginUid"));
 		}
 
@@ -635,11 +644,9 @@ public class LoginActivity extends BaseActivity {
 		}
 
 		if(!tinyDB.getString("uniqueAppId").isEmpty()) {
-
 			device_id = tinyDB.getString("uniqueAppId");
 		}
 		else {
-
 			device_id = UUID.randomUUID().toString();
 			tinyDB.putString("uniqueAppId", device_id);
 		}
@@ -647,14 +654,26 @@ public class LoginActivity extends BaseActivity {
 
 	private void disableProcessButton() {
 
+		GradientDrawable shape = new GradientDrawable();
+		shape.setCornerRadius(8);
+		shape.setColor(getResources().getColor(R.color.hintColor));
+
 		loginButton.setText(R.string.processingText);
+		loginButton.setBackground(shape);
 		loginButton.setEnabled(false);
+
 	}
 
 	private void enableProcessButton() {
 
+		GradientDrawable shape = new GradientDrawable();
+		shape.setCornerRadius(8);
+		shape.setColor(getResources().getColor(R.color.btnBackground));
+
 		loginButton.setText(R.string.btnLogin);
+		loginButton.setBackground(shape);
 		loginButton.setEnabled(true);
+
 	}
 
 }

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

@@ -1,48 +1,43 @@
 package org.mian.gitnex.activities;
 
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.graphics.Typeface;
+import android.net.Uri;
 import android.os.Bundle;
-import android.text.Html;
 import android.util.Log;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.cardview.widget.CardView;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.navigation.NavigationView;
-import org.gitnex.tea4j.models.GiteaVersion;
-import org.gitnex.tea4j.models.NotificationCount;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
-import org.mian.gitnex.adapters.UserAccountsNavAdapter;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.databinding.ActivityMainBinding;
+import org.mian.gitnex.fragments.AboutFragment;
 import org.mian.gitnex.fragments.AdministrationFragment;
 import org.mian.gitnex.fragments.BottomSheetDraftsFragment;
 import org.mian.gitnex.fragments.DraftsFragment;
-import org.mian.gitnex.fragments.ExploreFragment;
+import org.mian.gitnex.fragments.ExploreRepositoriesFragment;
 import org.mian.gitnex.fragments.MyRepositoriesFragment;
 import org.mian.gitnex.fragments.NotificationsFragment;
 import org.mian.gitnex.fragments.OrganizationsFragment;
-import org.mian.gitnex.fragments.MyProfileFragment;
+import org.mian.gitnex.fragments.ProfileFragment;
 import org.mian.gitnex.fragments.RepositoriesFragment;
 import org.mian.gitnex.fragments.SettingsFragment;
 import org.mian.gitnex.fragments.StarredRepositoriesFragment;
@@ -56,9 +51,11 @@ import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
-import java.util.ArrayList;
+import org.mian.gitnex.models.GiteaVersion;
-import java.util.List;
+import org.mian.gitnex.models.UserInfo;
-import jp.wasabeef.picasso.transformations.BlurTransformation;
+import java.util.Objects;
+import eightbitlab.com.blurview.BlurView;
+import eightbitlab.com.blurview.RenderScriptBlur;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -69,61 +66,70 @@ import retrofit2.Callback;
 public class MainActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener, BottomSheetDraftsFragment.BottomSheetListener {
 
 	private DrawerLayout drawer;
+	private BlurView blurView;
+	private TextView userFullName;
+	private TextView userEmail;
+	private ImageView userAvatar;
+	private ImageView userAvatarBackground;
+	private ViewGroup navHeaderFrame;
 	private TextView toolbarTitle;
+	final Context ctx = this;
+	private Context appCtx;
 	private Typeface myTypeface;
 
-	private String loginUid;
+	@Override
-	private String instanceToken;
+	protected int getLayoutResourceId() {
 
-	private View hView;
+		return R.layout.activity_main;
-	private MenuItem navNotifications;
+	}
-	private TextView notificationCounter;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
 
-		ActivityMainBinding activityMainBinding = ActivityMainBinding.inflate(getLayoutInflater());
+		final TinyDB tinyDb = new TinyDB(appCtx);
-		setContentView(activityMainBinding.getRoot());
+		tinyDb.putBoolean("noConnection", false);
 
 		Intent mainIntent = getIntent();
+		String launchFragment = mainIntent.getStringExtra("launchFragment");
 
-		// DO NOT MOVE
+		final String instanceUrl = tinyDb.getString("instanceUrl");
-		if(mainIntent.hasExtra("switchAccountId") &&
+		final String loginUid = tinyDb.getString("loginUid");
-			AppUtil.switchToAccount(ctx, BaseApi.getInstance(ctx, UserAccountsApi.class)
+		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-				.getAccountById(mainIntent.getIntExtra("switchAccountId", 0)))) {
-
-			mainIntent.removeExtra("switchAccountId");
-			recreate();
-			return;
 
+		if(tinyDb.getString("dateFormat").isEmpty()) {
+			tinyDb.putString("dateFormat", "pretty");
 		}
-		// DO NOT MOVE
 
-		tinyDB.putBoolean("noConnection", false);
+		if(tinyDb.getString("codeBlockStr").isEmpty()) {
+			tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorLightGreen));
+			tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
+		}
 
-		loginUid = tinyDB.getString("loginUid");
+		if(tinyDb.getString("enableCounterIssueBadgeInit").isEmpty()) {
-		instanceToken = "token " + tinyDB.getString(loginUid + "-token");
+			tinyDb.putBoolean("enableCounterIssueBadge", true);
+		}
+
+		if(tinyDb.getString("homeScreenStr").isEmpty()) {
+			tinyDb.putInt("homeScreenId", 0);
+		}
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-		if(!tinyDB.getBoolean("loggedInMode")) {
+		if(!tinyDb.getBoolean("loggedInMode")) {
-
 			logout(this, ctx);
 			return;
 		}
 
-		if(tinyDB.getInt("currentActiveAccountId", -1) <= 0) {
+		String accountName = loginUid + "@" + instanceUrl;
-			AlertDialogs.forceLogoutDialog(ctx,
+		getAccountData(accountName);
-				getResources().getString(R.string.forceLogoutDialogHeader),
-				getResources().getString(R.string.forceLogoutDialogDescription), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-		}
 
-		Toolbar toolbar = activityMainBinding.toolbar;
+		Toolbar toolbar = findViewById(R.id.toolbar);
-		toolbarTitle = activityMainBinding.toolbarTitle;
+		toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
 
-		switch(tinyDB.getInt("customFontId", -1)) {
+		switch(tinyDb.getInt("customFontId", -1)) {
 
 			case 0:
 				myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf");
@@ -157,15 +163,18 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		else if(fragmentById instanceof OrganizationsFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
 		}
-		else if(fragmentById instanceof ExploreFragment) {
+		else if(fragmentById instanceof ExploreRepositoriesFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
 		}
 		else if(fragmentById instanceof NotificationsFragment) {
 			toolbarTitle.setText(R.string.pageTitleNotifications);
 		}
-		else if(fragmentById instanceof MyProfileFragment) {
+		else if(fragmentById instanceof ProfileFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
 		}
+		else if(fragmentById instanceof AboutFragment) {
+			toolbarTitle.setText(getResources().getString(R.string.pageTitleAbout));
+		}
 		else if(fragmentById instanceof DraftsFragment) {
 			toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
 		}
@@ -176,17 +185,12 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleUserAccounts));
 		}
 
-		getNotificationsCount(instanceToken);
+		drawer = findViewById(R.id.drawer_layout);
-
+		NavigationView navigationView = findViewById(R.id.nav_view);
-		drawer = activityMainBinding.drawerLayout;
-		NavigationView navigationView = activityMainBinding.navView;
 		navigationView.setNavigationItemSelectedListener(this);
-		hView = navigationView.getHeaderView(0);
+		final View hView = navigationView.getHeaderView(0);
 
-		Menu menu = navigationView.getMenu();
+		ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-		navNotifications = menu.findItem(R.id.nav_notifications);
-
-		ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigationDrawerOpen, R.string.navigationDrawerClose);
 
 		drawer.addDrawerListener(toggle);
 		drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
@@ -194,97 +198,84 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			@Override
 			public void onDrawerOpened(@NonNull View drawerView) {
 
-				if(tinyDB.getBoolean("noConnection")) {
+				if(tinyDb.getBoolean("noConnection")) {
-
+					Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
-					Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+					tinyDb.putBoolean("noConnection", false);
-					tinyDB.putBoolean("noConnection", false);
 				}
 
-				String userEmailNav = tinyDB.getString("userEmail");
+				String userEmailNav = tinyDb.getString("userEmail");
-				String userFullNameNav = tinyDB.getString("userFullname");
+				String userFullNameNav = tinyDb.getString("userFullname");
-				String userAvatarNav = tinyDB.getString("userAvatar");
+				String userAvatarNav = tinyDb.getString("userAvatar");
 
-				TextView userEmail = hView.findViewById(R.id.userEmail);
+				blurView = hView.findViewById(R.id.blurView);
-				TextView userFullName = hView.findViewById(R.id.userFullname);
+				userEmail = hView.findViewById(R.id.userEmail);
-				ImageView userAvatar = hView.findViewById(R.id.userAvatar);
+				userFullName = hView.findViewById(R.id.userFullname);
-				ImageView userAvatarBackground = hView.findViewById(R.id.userAvatarBackground);
+				userAvatar = hView.findViewById(R.id.userAvatar);
-				CardView navRecyclerViewFrame = hView.findViewById(R.id.userAccountsFrame);
+				userAvatarBackground = hView.findViewById(R.id.userAvatarBackground);
-
+				navHeaderFrame = hView.findViewById(R.id.navHeaderFrame);
-				List<UserAccount> userAccountsList = new ArrayList<>();
-				UserAccountsApi userAccountsApi;
-				userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
-
-				RecyclerView navRecyclerViewUserAccounts = hView.findViewById(R.id.userAccounts);
-				UserAccountsNavAdapter adapterUserAccounts;
-
-				adapterUserAccounts = new UserAccountsNavAdapter(ctx, userAccountsList, drawer, toolbarTitle);
-
-				userAccountsApi.getAllAccounts().observe((AppCompatActivity) ctx, userAccounts -> {
-					if(userAccounts.size() > 0) {
-						userAccountsList.addAll(userAccounts);
-						navRecyclerViewUserAccounts.setAdapter(adapterUserAccounts);
-						navRecyclerViewFrame.setVisibility(View.VISIBLE);
-					}
-				});
 
 				userEmail.setTypeface(myTypeface);
 				userFullName.setTypeface(myTypeface);
 
+				String currentVersion = tinyDb.getString("giteaVersion");
+
+				navigationView.getMenu().findItem(R.id.nav_administration).setVisible(tinyDb.getBoolean("userIsAdmin"));
+				navigationView.getMenu().findItem(R.id.nav_notifications).setVisible(new Version(currentVersion).higherOrEqual("1.12.3"));
+
 				if(!userEmailNav.equals("")) {
 					userEmail.setText(userEmailNav);
 				}
 
 				if(!userFullNameNav.equals("")) {
-					userFullName.setText(Html.fromHtml(userFullNameNav));
+					userFullName.setText(userFullNameNav);
 				}
 
 				if(!userAvatarNav.equals("")) {
 
-					int avatarRadius = AppUtil.getPixelsFromDensity(ctx, 3);
-
 					PicassoService.getInstance(ctx).get()
 						.load(userAvatarNav)
 						.placeholder(R.drawable.loader_animated)
-						.transform(new RoundedTransformation(avatarRadius, 0))
+						.transform(new RoundedTransformation(8, 0))
 						.resize(160, 160)
 						.centerCrop().into(userAvatar);
 
 					PicassoService.getInstance(ctx).get()
 						.load(userAvatarNav)
-						.transform(new BlurTransformation(ctx))
 						.into(userAvatarBackground, new com.squareup.picasso.Callback() {
 
 							@Override
 							public void onSuccess() {
+
 								int textColor = new ColorInverter().getImageViewContrastColor(userAvatarBackground);
 
 								userFullName.setTextColor(textColor);
 								userEmail.setTextColor(textColor);
+
+								blurView.setupWith(navHeaderFrame)
+									.setBlurAlgorithm(new RenderScriptBlur(ctx))
+									.setBlurRadius(5)
+									.setHasFixedTransformationMatrix(false);
+
 							}
 
-							@Override public void onError(Exception e) {}
+							@Override
+							public void onError(Exception e) {}
+
 						});
+
 				}
 
 				userAvatar.setOnClickListener(v -> {
 
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
-					navigationView.setCheckedItem(R.id.nav_profile);
 					drawer.closeDrawers();
-
 				});
 
-				getNotificationsCount(instanceToken);
 			}
 
 			@Override
-			public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
+			public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {}
-
-				navigationView.getMenu().findItem(R.id.nav_administration).setVisible(tinyDB.getBoolean("userIsAdmin"));
-				navigationView.getMenu().findItem(R.id.nav_notifications).setVisible(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.3"));
-
-			}
 
 			@Override
 			public void onDrawerClosed(@NonNull View drawerView) {}
@@ -294,11 +285,17 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 		});
 
+		ImageView userAccounts = hView.findViewById(R.id.userAccounts);
+		userAccounts.setOnClickListener(v -> {
+
+			toolbarTitle.setText(getResources().getString(R.string.pageTitleUserAccounts));
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new UserAccountsFragment()).commit();
+			drawer.closeDrawers();
+		});
+
 		toggle.syncState();
 		toolbar.setNavigationIcon(R.drawable.ic_menu);
 
-		String launchFragment = mainIntent.getStringExtra("launchFragment");
-
 		if(launchFragment != null) {
 
 			mainIntent.removeExtra("launchFragment");
@@ -316,60 +313,13 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_notifications);
 					return;
-			}
-		}
-
-		String launchFragmentByHandler = mainIntent.getStringExtra("launchFragmentByLinkHandler");
-
-		if(launchFragmentByHandler != null) {
-
-			mainIntent.removeExtra("launchFragmentByLinkHandler");
-
-			switch(launchFragmentByHandler) {
-
-				case "repos":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
-					navigationView.setCheckedItem(R.id.nav_repositories);
-					return;
-
-				case "org":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
-					navigationView.setCheckedItem(R.id.nav_organizations);
-					return;
-
-				case "notification":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
-					navigationView.setCheckedItem(R.id.nav_notifications);
-					setActionBarTitle(getResources().getString(R.string.pageTitleNotifications));
-					return;
-
-				case "explore":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
-					navigationView.setCheckedItem(R.id.nav_explore);
-					return;
-
-				case "profile":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
-					navigationView.setCheckedItem(R.id.nav_profile);
-					return;
-
-				case "admin":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AdministrationFragment()).commit();
-					navigationView.setCheckedItem(R.id.nav_administration);
-					return;
 
 			}
 		}
 
 		if(savedInstanceState == null) {
 
-			if(!new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.3")) {
+			switch(tinyDb.getInt("homeScreenId")) {
-				if(tinyDB.getInt("homeScreenId") == 7) {
-					tinyDB.putInt("homeScreenId", 0);
-				}
-			}
-
-			switch(tinyDB.getInt("homeScreenId")) {
 
 				case 1:
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
@@ -391,13 +341,13 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 				case 4:
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_profile);
 					break;
 
 				case 5:
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreRepositoriesFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_explore);
 					break;
 
@@ -407,58 +357,59 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 					navigationView.setCheckedItem(R.id.nav_comments_draft);
 					break;
 
-				case 7:
-					toolbarTitle.setText(getResources().getString(R.string.pageTitleNotifications));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
-					navigationView.setCheckedItem(R.id.nav_notifications);
-					break;
-
 				default:
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_home);
 					break;
+
 			}
 		}
 
 		if(!connToInternet) {
 
-			if(!tinyDB.getBoolean("noConnection")) {
+			if(!tinyDb.getBoolean("noConnection")) {
-
+				Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
-				Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			}
 
-			tinyDB.putBoolean("noConnection", true);
+			tinyDb.putBoolean("noConnection", true);
+
 		}
 		else {
 
-			loadUserInfo(instanceToken, loginUid);
+			loadUserInfo(instanceUrl, instanceToken, loginUid);
-			giteaVersion();
+			giteaVersion(instanceUrl);
-			tinyDB.putBoolean("noConnection", false);
+			tinyDb.putBoolean("noConnection", false);
+
 		}
 
 		// Changelog popup
-		int versionCode = AppUtil.getAppBuildNo(appCtx);
+		int versionCode = 0;
 
-		if(versionCode > tinyDB.getInt("versionCode")) {
+		try {
 
-			tinyDB.putInt("versionCode", versionCode);
+			PackageInfo packageInfo = appCtx.getPackageManager().getPackageInfo(appCtx.getPackageName(), 0);
-			tinyDB.putBoolean("versionFlag", true);
+			versionCode = packageInfo.versionCode;
+		}
+		catch(PackageManager.NameNotFoundException e) {
+
+			Log.e("changelogDialog", Objects.requireNonNull(e.getMessage()));
+		}
+
+		if(versionCode > tinyDb.getInt("versionCode")) {
+
+			tinyDb.putInt("versionCode", versionCode);
+			tinyDb.putBoolean("versionFlag", true);
 
 			ChangeLog changelogDialog = new ChangeLog(this);
 			changelogDialog.showDialog();
 		}
 	}
 
-	public void setActionBarTitle(String title) {
-
-		toolbarTitle.setText(title);
-	}
-
 	@Override
 	public void onButtonClicked(String text) {
 
-		TinyDB tinyDb = TinyDB.getInstance(ctx);
+		TinyDB tinyDb = new TinyDB(ctx);
 		int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
 
 		if("deleteDrafts".equals(text)) {
@@ -470,27 +421,20 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 				if(frag != null) {
 
-					new AlertDialog.Builder(ctx)
+					new AlertDialog.Builder(ctx).setTitle(R.string.deleteAllDrafts).setIcon(R.drawable.ic_delete).setCancelable(false).setMessage(R.string.deleteAllDraftsDialogMessage).setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
-						.setTitle(R.string.deleteAllDrafts)
-						.setIcon(R.drawable.ic_delete)
-						.setCancelable(false)
-						.setMessage(R.string.deleteAllDraftsDialogMessage)
-						.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
 
-							frag.deleteAllDrafts(currentActiveAccountId);
+						frag.deleteAllDrafts(currentActiveAccountId);
-							dialog.dismiss();
+						dialog.dismiss();
+
+					}).setNegativeButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss()).show();
 
-						})
-						.setNeutralButton(R.string.cancelButton, null).show();
 				}
 				else {
-
 					Toasty.error(ctx, getResources().getString(R.string.genericError));
 				}
 
 			}
 			else {
-
 				Toasty.error(ctx, getResources().getString(R.string.genericError));
 			}
 
@@ -498,94 +442,127 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 	}
 
+	public void getAccountData(String accountName) {
+
+		UserAccountsApi accountData = new UserAccountsApi(ctx);
+		UserAccount data = accountData.getAccountData(accountName);
+
+		if(data != null) {
+			TinyDB tinyDb = new TinyDB(ctx.getApplicationContext());
+			tinyDb.putInt("currentActiveAccountId", data.getAccountId());
+		}
+		else {
+			AlertDialogs.forceLogoutDialog(ctx, getResources().getString(R.string.forceLogoutDialogHeader), getResources().getString(R.string.forceLogoutDialogDescription), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+		}
+	}
+
 	@Override
 	public void onBackPressed() {
 
 		if(drawer.isDrawerOpen(GravityCompat.START)) {
-
 			drawer.closeDrawer(GravityCompat.START);
 		}
 		else {
-
 			super.onBackPressed();
 		}
+
 	}
 
 	@Override
 	public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
 
-		int id = menuItem.getItemId();
+		switch(menuItem.getItemId()) {
 
-		if(id == R.id.nav_home) {
+			case R.id.nav_home:
+				toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
+				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
+				break;
 
-			toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
+			case R.id.nav_organizations:
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
+				toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
-		}
+				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
-		else if(id == R.id.nav_organizations) {
+				break;
 
-			toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
+			case R.id.nav_profile:
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
+				toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
-		}
+				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
-		else if(id == R.id.nav_profile) {
+				break;
 
-			toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
+			case R.id.nav_repositories:
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
+				toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
-		}
+				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
-		else if(id == R.id.nav_repositories) {
+				break;
 
-			toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
+			case R.id.nav_settings:
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
+				toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
-		}
+				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new SettingsFragment()).commit();
-		else if(id == R.id.nav_settings) {
+				break;
 
-			toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
+			case R.id.nav_logout:
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new SettingsFragment()).commit();
+				logout(this, ctx);
-		}
+				overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
-		else if(id == R.id.nav_logout) {
+				break;
 
-			logout(this, ctx);
+			case R.id.nav_about:
-			overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+				toolbarTitle.setText(getResources().getString(R.string.pageTitleAbout));
-		}
+				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AboutFragment()).commit();
-		else if(id == R.id.nav_starred_repos) {
+				break;
 
-			toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
+			case R.id.nav_rate_app:
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new StarredRepositoriesFragment()).commit();
+				rateThisApp();
-		}
+				break;
-		else if(id == R.id.nav_explore) {
 
-			toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
+			case R.id.nav_starred_repos:
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
+				toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
-		}
+				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new StarredRepositoriesFragment()).commit();
-		else if(id == R.id.nav_notifications) {
+				break;
 
-			toolbarTitle.setText(R.string.pageTitleNotifications);
+			case R.id.nav_explore:
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
+				toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
-		}
+				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreRepositoriesFragment()).commit();
-		else if(id == R.id.nav_comments_draft) {
+				break;
 
-			toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
+			case R.id.nav_notifications:
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new DraftsFragment()).commit();
+				toolbarTitle.setText(R.string.pageTitleNotifications);
-		}
+				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
-		else if(id == R.id.nav_administration) {
+				break;
+
+			case R.id.nav_comments_draft:
+				toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
+				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new DraftsFragment()).commit();
+				break;
+
+			case R.id.nav_administration:
+				toolbarTitle.setText(getResources().getString(R.string.pageTitleAdministration));
+				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AdministrationFragment()).commit();
+				break;
 
-			toolbarTitle.setText(getResources().getString(R.string.pageTitleAdministration));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AdministrationFragment()).commit();
 		}
 
 		drawer.closeDrawer(GravityCompat.START);
 		return true;
 	}
 
+	public void rateThisApp() {
+
+		try {
+			startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + getPackageName())));
+		}
+		catch(ActivityNotFoundException e) {
+			startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + getPackageName())));
+		}
+	}
+
 	public static void logout(Activity activity, Context ctx) {
 
-		TinyDB tinyDB = TinyDB.getInstance(ctx);
+		TinyDB tinyDb = new TinyDB(ctx.getApplicationContext());
-
+		tinyDb.putBoolean("loggedInMode", false);
-		tinyDB.putBoolean("loggedInMode", false);
+		tinyDb.remove("basicAuthPassword");
-		tinyDB.remove("basicAuthPassword");
+		tinyDb.putBoolean("basicAuthFlag", false);
-		tinyDB.putBoolean("basicAuthFlag", false);
 		//tinyDb.clear();
 		activity.finish();
 		ctx.startActivity(new Intent(ctx, LoginActivity.class));
+
 	}
 
 	@Override
@@ -594,43 +571,53 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		int id = item.getItemId();
 
 		if(id == R.id.genericMenu) {
-
 			BottomSheetDraftsFragment bottomSheet = new BottomSheetDraftsFragment();
 			bottomSheet.show(getSupportFragmentManager(), "draftsBottomSheet");
 			return true;
 		}
 
 		return super.onOptionsItemSelected(item);
+
 	}
 
-	private void giteaVersion() {
+	private void giteaVersion(final String instanceUrl) {
+
+		final TinyDB tinyDb = new TinyDB(appCtx);
+
+		final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
+
+		Call<GiteaVersion> callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken(token);
 
-		Call<GiteaVersion> callVersion = RetrofitClient.getApiInterface(ctx).getGiteaVersionWithToken(Authorization.get(ctx));
 		callVersion.enqueue(new Callback<GiteaVersion>() {
 
 			@Override
 			public void onResponse(@NonNull final Call<GiteaVersion> callVersion, @NonNull retrofit2.Response<GiteaVersion> responseVersion) {
 
-				if(responseVersion.code() == 200 && responseVersion.body() != null) {
+				if(responseVersion.code() == 200) {
-					String version = responseVersion.body().getVersion();
+
+					GiteaVersion version = responseVersion.body();
+					assert version != null;
+
+					tinyDb.putString("giteaVersion", version.getVersion());
 
-					tinyDB.putString("giteaVersion", version);
-					BaseApi.getInstance(ctx, UserAccountsApi.class).updateServerVersion(version, tinyDB.getInt("currentActiveAccountId"));
 				}
 			}
 
 			@Override
 			public void onFailure(@NonNull Call<GiteaVersion> callVersion, @NonNull Throwable t) {
+
 				Log.e("onFailure-version", t.toString());
 			}
+
 		});
+
 	}
 
-	private void loadUserInfo(String token, String loginUid) {
+	private void loadUserInfo(String instanceUrl, String token, String loginUid) {
 
-		final TinyDB tinyDb = TinyDB.getInstance(appCtx);
+		final TinyDB tinyDb = new TinyDB(appCtx);
 
-		Call<UserInfo> call = RetrofitClient.getApiInterface(ctx).getUserInfo(Authorization.get(ctx));
+		Call<UserInfo> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserInfo(Authorization.returnAuthentication(ctx, loginUid, token));
 
 		call.enqueue(new Callback<UserInfo>() {
 
@@ -646,7 +633,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 						assert userDetails != null;
 
 						if(userDetails.getIs_admin() != null) {
-
 							tinyDb.putBoolean("userIsAdmin", userDetails.getIs_admin());
 						}
 
@@ -654,11 +640,9 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 						tinyDb.putInt("userId", userDetails.getId());
 
 						if(!userDetails.getFullname().equals("")) {
-
 							tinyDb.putString("userFullname", userDetails.getFullname());
 						}
 						else {
-
 							tinyDb.putString("userFullname", userDetails.getLogin());
 						}
 
@@ -666,11 +650,9 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 						tinyDb.putString("userAvatar", userDetails.getAvatar());
 
 						if(userDetails.getLang() != null) {
-
 							tinyDb.putString("userLang", userDetails.getLang());
 						}
 						else {
-
 							tinyDb.putString("userLang", "");
 						}
 					}
@@ -678,12 +660,15 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 				else if(response.code() == 401) {
 
 					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
 				}
 				else {
 
 					String toastError = getResources().getString(R.string.genericApiStatusError) + response.code();
-					Toasty.error(ctx, toastError);
+					Toasty.info(ctx, toastError);
+
 				}
+
 			}
 
 			@Override
@@ -695,31 +680,4 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 	}
 
-	private void getNotificationsCount(String token) {
-
-		Call<NotificationCount> call = RetrofitClient.getApiInterface(ctx).checkUnreadNotifications(token);
-
-		call.enqueue(new Callback<NotificationCount>() {
-
-			@Override
-			public void onResponse(@NonNull Call<NotificationCount> call, @NonNull retrofit2.Response<NotificationCount> response) {
-
-				NotificationCount notificationCount = response.body();
-
-				if(response.code() == 200) {
-
-					assert notificationCount != null;
-					notificationCounter = navNotifications.getActionView().findViewById(R.id.counterBadgeNotification);
-					notificationCounter.setText(String.valueOf(notificationCount.getCounter()));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<NotificationCount> call, @NonNull Throwable t) {
-
-				Log.e("onFailure-notification", t.toString());
-			}
-		});
-	}
-
 }

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

@@ -6,24 +6,30 @@ 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 androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.MergePullRequest;
+import com.hendraanggrian.appcompat.socialview.Mention;
-import org.gitnex.tea4j.models.MergePullRequestSpinner;
+import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
 import org.mian.gitnex.R;
-import org.mian.gitnex.actions.PullRequestActions;
 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.models.Collaborators;
+import org.mian.gitnex.models.MergePullRequest;
+import org.mian.gitnex.models.MergePullRequestSpinner;
 import java.util.ArrayList;
-import java.util.Objects;
+import java.util.List;
+import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Callback;
+import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -32,31 +38,32 @@ import retrofit2.Callback;
 public class MergePullRequestActivity extends BaseActivity {
 
 	private View.OnClickListener onClickListener;
-
+	final Context ctx = this;
-	private String repoOwner;
+	private Context appCtx;
-	private String repoName;
-	private int prIndex;
-
 	private ActivityMergePullRequestBinding viewBinding;
 
+	private ArrayAdapter<Mention> defaultMentionAdapter;
 	private String Do;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_merge_pull_request;
+	}
+
 	@SuppressLint("SetTextI18n")
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
 
 		viewBinding = ActivityMergePullRequestBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
-
+		setContentView(view);
-		String repoFullName = tinyDB.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		repoOwner = parts[0];
-		repoName = parts[1];
-		prIndex = Integer.parseInt(tinyDB.getString("issueNumber"));
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+		TinyDB tinyDb = new TinyDB(appCtx);
 
 		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -66,72 +73,135 @@ public class MergePullRequestActivity extends BaseActivity {
 
 		setMergeAdapter();
 
-		if(!tinyDB.getString("issueTitle").isEmpty()) {
+		viewBinding.mergeSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
 
-			viewBinding.toolbarTitle.setText(tinyDB.getString("issueTitle"));
+			@Override
-			viewBinding.mergeTitle.setText(tinyDB.getString("issueTitle") + " (#" + tinyDB.getString("issueNumber") + ")");
+			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+
+				MergePullRequestSpinner mergeId = (MergePullRequestSpinner) parent.getSelectedItem();
+				Do = mergeId.getId();
+
+			}
+
+			@Override
+			public void onNothingSelected(AdapterView<?> parent) {
+
+			}
+
+		});
+
+		defaultMentionAdapter = new MentionArrayAdapter<>(this);
+		loadCollaboratorsList();
+
+		viewBinding.mergeDescription.setMentionAdapter(defaultMentionAdapter);
+
+		if(!tinyDb.getString("issueTitle").isEmpty()) {
+			viewBinding.toolbarTitle.setText(tinyDb.getString("issueTitle"));
+			viewBinding.mergeTitle.setText(tinyDb.getString("issueTitle") + " (#" + tinyDb.getString("issueNumber") + ")");
 		}
 
 		initCloseListener();
 		viewBinding.close.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")) {
+		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
-
 			viewBinding.deleteBranch.setVisibility(View.VISIBLE);
 		}
 
-		if(tinyDB.getString("prMergeable").equals("false")) {
+		if(tinyDb.getString("prMergeable").equals("false")) {
-
 			disableProcessButton();
 			viewBinding.mergeInfoDisabledMessage.setVisibility(View.VISIBLE);
 		}
 		else {
-
 			viewBinding.mergeInfoDisabledMessage.setVisibility(View.GONE);
 		}
 
-		if(tinyDB.getString("prIsFork").equals("true")) {
+		if(tinyDb.getString("prIsFork").equals("true")) {
-
 			viewBinding.deleteBranchForkInfo.setVisibility(View.VISIBLE);
 		}
 		else {
-
 			viewBinding.deleteBranchForkInfo.setVisibility(View.GONE);
 		}
 
 		if(!connToInternet) {
 
 			disableProcessButton();
+
 		}
 		else {
 
 			viewBinding.mergeButton.setOnClickListener(mergePullRequest);
+
 		}
 
 	}
 
 	private void setMergeAdapter() {
 
+		TinyDB tinyDb = new TinyDB(appCtx);
+
 		ArrayList<MergePullRequestSpinner> mergeList = new ArrayList<>();
 
 		mergeList.add(new MergePullRequestSpinner("merge", getResources().getString(R.string.mergeOptionMerge)));
 		mergeList.add(new MergePullRequestSpinner("rebase", getResources().getString(R.string.mergeOptionRebase)));
 		mergeList.add(new MergePullRequestSpinner("rebase-merge", getResources().getString(R.string.mergeOptionRebaseCommit)));
 		// squash merge works only on gitea > v1.11.4 due to a bug
-		if(new Version(tinyDB.getString("giteaVersion")).higher("1.11.4")) {
+		if(new Version(tinyDb.getString("giteaVersion")).higher("1.11.4")) {
-
 			mergeList.add(new MergePullRequestSpinner("squash", getResources().getString(R.string.mergeOptionSquash)));
 		}
 
-		ArrayAdapter<MergePullRequestSpinner> adapter = new ArrayAdapter<>(MergePullRequestActivity.this, R.layout.list_spinner_items, mergeList);
+		ArrayAdapter<MergePullRequestSpinner> adapter = new ArrayAdapter<>(MergePullRequestActivity.this, R.layout.spinner_item, mergeList);
+		adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
 		viewBinding.mergeSpinner.setAdapter(adapter);
 
-		viewBinding.mergeSpinner.setOnItemClickListener ((parent, view, position, id) -> {
+	}
+
+	public void loadCollaboratorsList() {
+
+		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];
+
+		Call<List<Collaborators>> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+
+		call.enqueue(new Callback<List<Collaborators>>() {
+
+			@Override
+			public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
+
+				if(response.isSuccessful()) {
+
+					assert response.body() != null;
+					String fullName = "";
+					for(int i = 0; i < response.body().size(); i++) {
+						if(!response.body().get(i).getFull_name().equals("")) {
+							fullName = response.body().get(i).getFull_name();
+						}
+						defaultMentionAdapter.add(new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
+					}
+
+				}
+				else {
+
+					Log.i("onResponse", String.valueOf(response.code()));
+
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
+
+				Log.i("onFailure", t.toString());
+			}
 
-			Do = mergeList.get(position).getId();
 		});
-
 	}
 
 	private void initCloseListener() {
@@ -139,84 +209,93 @@ public class MergePullRequestActivity extends BaseActivity {
 		onClickListener = view -> finish();
 	}
 
-	private final View.OnClickListener mergePullRequest = v -> processMergePullRequest();
+	private View.OnClickListener mergePullRequest = v -> processMergePullRequest();
 
 	private void processMergePullRequest() {
 
-		String mergePRDesc = Objects.requireNonNull(viewBinding.mergeDescription.getText()).toString();
+		String mergePRDesc = viewBinding.mergeDescription.getText().toString();
-		String mergePRTitle = Objects.requireNonNull(viewBinding.mergeTitle.getText()).toString();
+		String mergePRTitle = viewBinding.mergeTitle.getText().toString();
 		boolean deleteBranch = viewBinding.deleteBranch.isChecked();
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
 		if(!connToInternet) {
 
-			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+			Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
+
 		}
 
-		if(Do == null) {
+		disableProcessButton();
+		mergeFunction(Do, mergePRDesc, mergePRTitle, deleteBranch);
 
-			Toasty.error(ctx, getResources().getString(R.string.selectMergeStrategy));
-		}
-		else {
-
-			disableProcessButton();
-			mergeFunction(Do, mergePRDesc, mergePRTitle, deleteBranch);
-		}
 	}
 
 	private void mergeFunction(String Do, String mergePRDT, String mergeTitle, boolean deleteBranch) {
 
+		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 prIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+
 		MergePullRequest mergePR = new MergePullRequest(Do, mergePRDT, mergeTitle);
 
-		Call<Void> call = RetrofitClient.getApiInterface(ctx).mergePullRequest(Authorization.get(ctx), repoOwner, repoName, prIndex, mergePR);
+		Call<ResponseBody> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().mergePullRequest(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, prIndex, mergePR);
 
-		call.enqueue(new Callback<Void>() {
+		call.enqueue(new Callback<ResponseBody>() {
 
 			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+			public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
 
 				if(response.code() == 200) {
 
 					if(deleteBranch) {
 
-						if(tinyDB.getString("prIsFork").equals("true")) {
+						if(tinyDb.getString("prIsFork").equals("true")) {
 
-							String repoFullName = tinyDB.getString("prForkFullName");
+							String repoFullName = tinyDb.getString("prForkFullName");
 							String[] parts = repoFullName.split("/");
 							final String repoOwner = parts[0];
 							final String repoName = parts[1];
 
-							PullRequestActions.deleteHeadBranch(ctx, repoOwner, repoName, tinyDB.getString("prHeadBranch"), false);
+							deleteBranchFunction(repoOwner, repoName);
 
-							Toasty.success(ctx, getString(R.string.mergePRSuccessMsg));
+							Toasty.info(ctx, getString(R.string.mergePRSuccessMsg));
-							tinyDB.putBoolean("prMerged", true);
+							tinyDb.putBoolean("prMerged", true);
-							tinyDB.putBoolean("resumePullRequests", true);
+							tinyDb.putBoolean("resumePullRequests", true);
 							finish();
+
 						}
 						else {
 
-							String repoFullName = tinyDB.getString("repoFullName");
+							String repoFullName = tinyDb.getString("repoFullName");
 							String[] parts = repoFullName.split("/");
 							final String repoOwner = parts[0];
 							final String repoName = parts[1];
 
-							PullRequestActions.deleteHeadBranch(ctx, repoOwner, repoName, tinyDB.getString("prHeadBranch"), false);
+							deleteBranchFunction(repoOwner, repoName);
 
-							Toasty.success(ctx, getString(R.string.mergePRSuccessMsg));
+							Toasty.info(ctx, getString(R.string.mergePRSuccessMsg));
-							tinyDB.putBoolean("prMerged", true);
+							tinyDb.putBoolean("prMerged", true);
-							tinyDB.putBoolean("resumePullRequests", true);
+							tinyDb.putBoolean("resumePullRequests", true);
 							finish();
+
 						}
 
 					}
 					else {
 
-						Toasty.success(ctx, getString(R.string.mergePRSuccessMsg));
+						Toasty.info(ctx, getString(R.string.mergePRSuccessMsg));
-						tinyDB.putBoolean("prMerged", true);
+						tinyDb.putBoolean("prMerged", true);
-						tinyDB.putBoolean("resumePullRequests", true);
+						tinyDb.putBoolean("resumePullRequests", true);
 						finish();
+
 					}
 
 				}
@@ -224,27 +303,25 @@ public class MergePullRequestActivity extends BaseActivity {
 
 					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.warning(ctx, getString(R.string.mergePR404ErrorMsg));
+					Toasty.info(ctx, getString(R.string.mergePR404ErrorMsg));
-				}
-				else if(response.code() == 405) {
 
-					enableProcessButton();
-					Toasty.warning(ctx, getString(R.string.mergeNotAllowed));;
 				}
 				else {
 
 					enableProcessButton();
-					Toasty.error(ctx, getString(R.string.genericError));
+					Toasty.info(ctx, getString(R.string.genericError));
+
 				}
 
 			}
 
 			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+			public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
 
 				Log.e("onFailure", t.toString());
 				enableProcessButton();
@@ -254,14 +331,57 @@ 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);
+		viewBinding.mergeButton.setBackground(getResources().getDrawable(R.drawable.shape_buttons_disabled));
+
 	}
 
 	private void enableProcessButton() {
 
 		viewBinding.mergeButton.setEnabled(true);
+		viewBinding.mergeButton.setBackground(getResources().getDrawable(R.drawable.shape_buttons));
+
 	}
 
 }

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

@@ -25,15 +25,12 @@ public class OpenRepoInBrowserActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
 
 	    super.onCreate(savedInstanceState);
-
 	    appCtx = getApplicationContext();
-	    TinyDB tinyDb = TinyDB.getInstance(appCtx);
+	    TinyDB tinyDb = new TinyDB(appCtx);
 
 	    try {
 
-		    URI instanceUrl = new URI(UrlBuilder.fromString(tinyDb.getString("instanceUrl"))
+		    URI instanceUrl = new URI(tinyDb.getString("instanceUrlWithProtocol"));
-			    .withPath("/")
-			    .toString());
 
 		    String browserPath = PathsHelper.join(instanceUrl.getPath(), getIntent().getStringExtra("repoFullNameBrowser"));
 
@@ -47,9 +44,9 @@ public class OpenRepoInBrowserActivity extends AppCompatActivity {
 
 	    }
 	    catch(URISyntaxException e) {
-
 		    Toasty.error(appCtx, getString(R.string.genericError));
 	    }
+
     }
 
 }

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

@@ -1,7 +1,5 @@
 package org.mian.gitnex.activities;
 
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
@@ -23,12 +21,10 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.fragments.BottomSheetOrganizationFragment;
 import org.mian.gitnex.fragments.MembersByOrgFragment;
 import org.mian.gitnex.fragments.OrganizationInfoFragment;
-import org.mian.gitnex.fragments.OrganizationLabelsFragment;
 import org.mian.gitnex.fragments.RepositoriesByOrgFragment;
 import org.mian.gitnex.fragments.TeamsByOrgFragment;
-import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.TinyDB;
 import java.util.Objects;
-import io.mikael.urlbuilder.UrlBuilder;
 
 /**
  * Author M M Arif
@@ -36,17 +32,25 @@ import io.mikael.urlbuilder.UrlBuilder;
 
 public class OrganizationDetailActivity extends BaseActivity implements BottomSheetOrganizationFragment.BottomSheetListener {
 
+    final Context ctx = this;
+    private Context appCtx;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_org_detail;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
 
-	    setContentView(R.layout.activity_org_detail);
+        TinyDB tinyDb = new TinyDB(appCtx);
-
+        String orgName = tinyDb.getString("orgName");
-        String orgName = tinyDB.getString("orgName");
 
         Toolbar toolbar = findViewById(R.id.toolbar);
-        TextView toolbarTitle = findViewById(R.id.toolbar_title);
+        TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
 
         setSupportActionBar(toolbar);
         Objects.requireNonNull(getSupportActionBar()).setTitle(orgName);
@@ -61,20 +65,20 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
         Typeface myTypeface;
 
-        switch(tinyDB.getInt("customFontId", -1)) {
+        switch(tinyDb.getInt("customFontId", -1)) {
 
             case 0:
-
                 myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf");
                 break;
-            case 2:
 
+            case 2:
                 myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf");
                 break;
-            default:
 
+            default:
                 myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/manroperegular.ttf");
                 break;
+
         }
 
         toolbarTitle.setTypeface(myTypeface);
@@ -82,18 +86,12 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
         ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
         int tabsCount = vg.getChildCount();
-
         for (int j = 0; j < tabsCount; j++) {
-
             ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
             int tabChildCount = vgTab.getChildCount();
-
             for (int i = 0; i < tabChildCount; i++) {
-
                 View tabViewChild = vgTab.getChildAt(i);
-
                 if (tabViewChild instanceof TextView) {
-
                     ((TextView) tabViewChild).setTypeface(myTypeface);
                 }
             }
@@ -101,12 +99,12 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
         mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
         tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
+
     }
 
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.repo_dotted_menu, menu);
         return true;
@@ -117,55 +115,36 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
         int id = item.getItemId();
 
-        if(id == android.R.id.home) {
+        switch (id) {
-
+            case android.R.id.home:
-	        finish();
+                finish();
-	        return true;
+                return true;
+            case R.id.repoMenu:
+                BottomSheetOrganizationFragment bottomSheet = new BottomSheetOrganizationFragment();
+                bottomSheet.show(getSupportFragmentManager(), "orgBottomSheet");
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
         }
-        else if(id == R.id.repoMenu) {
 
-	        BottomSheetOrganizationFragment bottomSheet = new BottomSheetOrganizationFragment();
-	        bottomSheet.show(getSupportFragmentManager(), "orgBottomSheet");
-	        return true;
-        }
-        else {
-
-	        return super.onOptionsItemSelected(item);
-        }
     }
 
     @Override
     public void onButtonClicked(String text) {
 
+        TinyDB tinyDb = new TinyDB(appCtx);
+
         switch (text) {
             case "repository":
-
+                tinyDb.putBoolean("organizationAction", true);
-                tinyDB.putBoolean("organizationAction", true);
                 startActivity(new Intent(OrganizationDetailActivity.this, CreateRepoActivity.class));
                 break;
-	        case "label":
-
-		        Intent intent = new Intent(ctx, CreateLabelActivity.class);
-		        intent.putExtra("orgName", getIntent().getStringExtra("orgName"));
-		        intent.putExtra("type", "org");
-		        ctx.startActivity(intent);
-		        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 {
@@ -178,41 +157,33 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
         @Override
         public Fragment getItem(int position) {
 
+            TinyDB tinyDb = new TinyDB(appCtx);
             String orgName;
             if(getIntent().getStringExtra("orgName") != null || !Objects.equals(getIntent().getStringExtra("orgName"), "")) {
-
                 orgName = getIntent().getStringExtra("orgName");
             }
             else {
-
+                orgName = tinyDb.getString("orgName");
-                orgName = tinyDB.getString("orgName");
             }
 
             Fragment fragment = null;
             switch (position) {
-
                 case 0: // info
-
                     return OrganizationInfoFragment.newInstance(orgName);
                 case 1: // repos
-
+                    return RepositoriesByOrgFragment.newInstance(orgName);
-	                return RepositoriesByOrgFragment.newInstance(orgName);
+                case 2: // teams
-	            case 2: // labels
-
-                    return OrganizationLabelsFragment.newInstance(orgName);
-                case 3: // teams
-
                     return TeamsByOrgFragment.newInstance(orgName);
-                case 4: // members
+                case 3: // members
-
                     return MembersByOrgFragment.newInstance(orgName);
             }
             return fragment;
+
         }
 
         @Override
         public int getCount() {
-            return 5;
+            return 4;
         }
     }
 }

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

@@ -1,5 +1,6 @@
 package org.mian.gitnex.activities;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
@@ -8,13 +9,11 @@ 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.databinding.ActivityOrgTeamMembersBinding;
 import org.mian.gitnex.fragments.BottomSheetOrganizationTeamsFragment;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
@@ -31,87 +30,92 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
     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(){
+        return R.layout.activity_org_team_members;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-
+        appCtx = getApplicationContext();
-	    ActivityOrgTeamMembersBinding activityOrgTeamMembersBinding = ActivityOrgTeamMembersBinding.inflate(getLayoutInflater());
+        Toolbar toolbar = findViewById(R.id.toolbar);
-	    setContentView(activityOrgTeamMembersBinding.getRoot());
-
-        Toolbar toolbar = activityOrgTeamMembersBinding.toolbar;
         setSupportActionBar(toolbar);
 
-        ImageView closeActivity = activityOrgTeamMembersBinding.close;
+        TinyDB tinyDb = new TinyDB(appCtx);
-        TextView toolbarTitle = activityOrgTeamMembersBinding.toolbarTitle;
+        final String instanceUrl = tinyDb.getString("instanceUrl");
-        noDataMembers = activityOrgTeamMembersBinding.noDataMembers;
+        final String loginUid = tinyDb.getString("loginUid");
-        mGridView = activityOrgTeamMembersBinding.gridView;
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-	    progressBar = activityOrgTeamMembersBinding.progressBar;
+
+        ImageView closeActivity = findViewById(R.id.close);
+        TextView toolbarTitle = findViewById(R.id.toolbar_title);
+        noDataMembers = findViewById(R.id.noDataMembers);
+        mGridView = findViewById(R.id.gridView);
 
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
         if(getIntent().getStringExtra("teamTitle") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamTitle")).equals("")) {
-
+            toolbarTitle.setText(getIntent().getStringExtra("teamTitle"));
-        	toolbarTitle.setText(getIntent().getStringExtra("teamTitle"));
         }
         else {
-
+            toolbarTitle.setText(R.string.orgTeamMembers);
-        	toolbarTitle.setText(R.string.orgTeamMembers);
         }
 
         if(getIntent().getStringExtra("teamId") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamId")).equals("")){
-
+            teamId = getIntent().getStringExtra("teamId");
-        	teamId = getIntent().getStringExtra("teamId");
         }
         else {
-
+            teamId = "0";
-        	teamId = "0";
         }
 
         assert teamId != null;
-        fetchDataAsync(Authorization.get(ctx), Integer.parseInt(teamId));
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), Integer.parseInt(teamId));
+
     }
 
     @Override
     public void onResume() {
 
         super.onResume();
-        TinyDB tinyDb = TinyDB.getInstance(appCtx);
+        TinyDB tinyDb = new TinyDB(appCtx);
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         if(tinyDb.getBoolean("teamActionFlag")) {
-
+            fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), Integer.parseInt(teamId));
-            fetchDataAsync(Authorization.get(ctx), Integer.parseInt(teamId));
             tinyDb.putBoolean("teamActionFlag", false);
         }
+
     }
 
-    private void fetchDataAsync(String instanceToken, int teamId) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken, int teamId) {
 
         TeamMembersByOrgViewModel teamMembersModel = new ViewModelProvider(this).get(TeamMembersByOrgViewModel.class);
 
-        teamMembersModel.getMembersByOrgList(instanceToken, teamId, ctx).observe(this, teamMembersListMain -> {
+        teamMembersModel.getMembersByOrgList(instanceUrl, instanceToken, teamId, ctx).observe(this, teamMembersListMain -> {
 
             adapter = new TeamMembersByOrgAdapter(ctx, teamMembersListMain);
-
             if(adapter.getCount() > 0) {
-
                 mGridView.setAdapter(adapter);
                 noDataMembers.setVisibility(View.GONE);
             }
             else {
-
                 adapter.notifyDataSetChanged();
                 mGridView.setAdapter(adapter);
                 noDataMembers.setVisibility(View.VISIBLE);
             }
 
-	        progressBar.setVisibility(View.GONE);
         });
+
     }
 
     @Override
@@ -120,6 +124,7 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
         return true;
+
     }
 
     @Override
@@ -127,32 +132,31 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
 
         int id = item.getItemId();
 
-	    if(id == android.R.id.home) {
+        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);
+        }
 
-		    finish();
-		    return true;
-	    }
-	    else if(id == R.id.genericMenu) {
-
-		    BottomSheetOrganizationTeamsFragment bottomSheet = new BottomSheetOrganizationTeamsFragment();
-		    bottomSheet.show(getSupportFragmentManager(), "orgTeamsBottomSheet");
-		    return true;
-	    }
-	    else {
-
-		    return super.onOptionsItemSelected(item);
-	    }
     }
 
     @Override
     public void onButtonClicked(String text) {
 
-        if("newMember".equals(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() {

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

@@ -1,242 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Intent;
-import android.graphics.Typeface;
-import android.os.Bundle;
-import android.view.Menu;
-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.FragmentActivity;
-import androidx.viewpager2.adapter.FragmentStateAdapter;
-import androidx.viewpager2.widget.ViewPager2;
-import com.google.android.material.tabs.TabLayout;
-import com.google.android.material.tabs.TabLayoutMediator;
-import com.google.gson.JsonElement;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.fragments.BottomSheetUserProfileFragment;
-import org.mian.gitnex.fragments.profile.DetailFragment;
-import org.mian.gitnex.fragments.profile.FollowersFragment;
-import org.mian.gitnex.fragments.profile.FollowingFragment;
-import org.mian.gitnex.fragments.profile.OrganizationsFragment;
-import org.mian.gitnex.fragments.profile.RepositoriesFragment;
-import org.mian.gitnex.fragments.profile.StarredRepositoriesFragment;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Toasty;
-import java.util.Objects;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-/**
- * Author M M Arif
- */
-
-public class ProfileActivity extends BaseActivity implements BottomSheetUserProfileFragment.BottomSheetListener {
-
-	private String username;
-	private boolean following;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_profile);
-		Intent profileIntent = getIntent();
-		Typeface myTypeface;
-
-		Toolbar toolbar = findViewById(R.id.toolbar);
-		TextView toolbarTitle = findViewById(R.id.toolbarTitle);
-
-		if(profileIntent.getStringExtra("username") != null && !Objects.equals(profileIntent.getStringExtra("username"), "")) {
-			username = profileIntent.getStringExtra("username");
-		}
-		else {
-			Toasty.warning(ctx, ctx.getResources().getString(R.string.userInvalidUserName));
-			finish();
-		}
-
-		setSupportActionBar(toolbar);
-		Objects.requireNonNull(getSupportActionBar()).setTitle(username);
-		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-		ViewPager2 viewPager = findViewById(R.id.profileContainer);
-		viewPager.setOffscreenPageLimit(1);
-		TabLayout tabLayout = findViewById(R.id.tabs);
-
-		switch(tinyDB.getInt("customFontId", -1)) {
-			case 0:
-				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf");
-				break;
-			case 2:
-				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf");
-				break;
-			default:
-				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/manroperegular.ttf");
-				break;
-		}
-
-		toolbarTitle.setTypeface(myTypeface);
-		toolbarTitle.setText(username);
-
-		viewPager.setAdapter(new ViewPagerAdapter(this));
-
-		String[] tabTitles = {ctx.getResources().getString(R.string.tabTextInfo), ctx.getResources().getString(R.string.navRepos), ctx.getResources().getString(R.string.navStarredRepos), ctx.getResources().getString(R.string.navOrg), ctx.getResources().getString(R.string.profileTabFollowers), ctx.getResources().getString(R.string.profileTabFollowing)};
-		new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> tab.setText(tabTitles[position])).attach();
-
-		ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
-		int tabsCount = vg.getChildCount();
-
-		for (int j = 0; j < tabsCount; j++) {
-
-			ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
-			int tabChildCount = vgTab.getChildCount();
-
-			for (int i = 0; i < tabChildCount; i++) {
-				View tabViewChild = vgTab.getChildAt(i);
-				if (tabViewChild instanceof TextView) {
-					((TextView) tabViewChild).setTypeface(myTypeface);
-				}
-			}
-
-			if(!username.equals(tinyDB.getString("userLogin"))) {
-				checkFollowStatus();
-			}
-		}
-	}
-
-	@Override
-	public void onButtonClicked(String text) {
-		if(text.equals("follow")) {
-			followUnfollow();
-		}
-	}
-
-	private void checkFollowStatus() {
-		RetrofitClient.getApiInterface(this).checkFollowing(Authorization.get(this), username).enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull Response<JsonElement> response) {
-				if(response.code() == 204) {
-					following = true;
-				}
-				else if(response.code() == 404) {
-					following = false;
-				}
-				else {
-					following = false;
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-				following = false;
-			}
-		});
-	}
-
-	private void followUnfollow() {
-		Call<JsonElement> call;
-		if (following) {
-			call = RetrofitClient.getApiInterface(this).unfollowUser(Authorization.get(this), username);
-		}
-		else {
-			call = RetrofitClient.getApiInterface(this).followUser(Authorization.get(this), username);
-		}
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull Response<JsonElement> response) {
-				if (response.isSuccessful()) {
-					following = !following;
-					if (following) {
-						Toasty.success(ProfileActivity.this, String.format(getString(R.string.nowFollowUser), username));
-					}
-					else {
-						Toasty.success(ProfileActivity.this, String.format(getString(R.string.unfollowedUser), username));
-					}
-				} else {
-					if (following) {
-						Toasty.error(ProfileActivity.this, getString(R.string.unfollowingFailed));
-					}
-					else {
-						Toasty.error(ProfileActivity.this, getString(R.string.followingFailed));
-					}
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-				if (following) {
-					Toasty.error(ProfileActivity.this, getString(R.string.unfollowingFailed));
-				}
-				else {
-					Toasty.error(ProfileActivity.this, getString(R.string.followingFailed));
-				}
-			}
-		});
-	}
-
-	public class ViewPagerAdapter extends FragmentStateAdapter {
-
-		public ViewPagerAdapter(@NonNull FragmentActivity fa) { super(fa); }
-
-		@NonNull
-		@Override
-		public Fragment createFragment(int position) {
-			switch(position) {
-				case 0: // detail
-					return DetailFragment.newInstance(username);
-				case 1: // repos
-					return RepositoriesFragment.newInstance(username);
-				case 2: // starred repos
-					return StarredRepositoriesFragment.newInstance(username);
-				case 3: // organizations
-					return OrganizationsFragment.newInstance(username);
-				case 4: // followers
-					return FollowersFragment.newInstance(username);
-				case 5: // following
-					return FollowingFragment.newInstance(username);
-			}
-			return null;
-		}
-
-		@Override
-		public int getItemCount() {
-			return 6;
-		}
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-
-		int id = item.getItemId();
-
-		if(id == android.R.id.home) {
-			finish();
-			return true;
-		}
-		else if(id == R.id.genericMenu) {
-			new BottomSheetUserProfileFragment(following).show(getSupportFragmentManager(), "userProfileBottomSheet");
-			return true;
-		}
-		else {
-			return super.onOptionsItemSelected(item);
-		}
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		if(!username.equals(tinyDB.getString("userLogin"))) {
-			getMenuInflater().inflate(R.menu.generic_nav_dotted_menu, menu);
-		}
-		return super.onCreateOptionsMenu(menu);
-	}
-
-}

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.util.Patterns;
@@ -11,15 +12,14 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.AddEmail;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityProfileEmailBinding;
 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 java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -30,27 +30,32 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class MyProfileEmailActivity extends BaseActivity {
+public class ProfileEmailActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     private EditText userEmail;
+    final Context ctx = this;
+    private Context appCtx;
     private Button addEmailButton;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_profile_email;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-
+        appCtx = getApplicationContext();
-	    ActivityProfileEmailBinding activityProfileEmailBinding = ActivityProfileEmailBinding.inflate(getLayoutInflater());
-	    setContentView(activityProfileEmailBinding.getRoot());
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        ImageView closeActivity = activityProfileEmailBinding.close;
+        ImageView closeActivity = findViewById(R.id.close);
-        userEmail = activityProfileEmailBinding.userEmail;
+        userEmail = findViewById(R.id.userEmail);
-        addEmailButton = activityProfileEmailBinding.addEmailButton;
+        addEmailButton = findViewById(R.id.addEmailButton);
 
         userEmail.requestFocus();
         assert imm != null;
@@ -62,53 +67,68 @@ public class MyProfileEmailActivity extends BaseActivity {
         if(!connToInternet) {
 
             disableProcessButton();
+
         } else {
 
             addEmailButton.setOnClickListener(addEmailListener);
+
         }
 
     }
 
-    private final View.OnClickListener addEmailListener = v -> processAddNewEmail();
+    private View.OnClickListener addEmailListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processAddNewEmail();
+        }
+    };
 
     private void processAddNewEmail() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        TinyDB tinyDb = new TinyDB(appCtx);
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         String newUserEmail = userEmail.getText().toString().trim();
 
         if(!connToInternet) {
 
-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+            Toasty.info(ctx, getResources().getString(R.string.checkNetConnection));
             return;
+
         }
 
         if(newUserEmail.equals("")) {
 
-            Toasty.error(ctx, getString(R.string.emailErrorEmpty));
+            Toasty.info(ctx, getString(R.string.emailErrorEmpty));
             return;
+
         }
         else if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {
 
-            Toasty.warning(ctx, getString(R.string.emailErrorInvalid));
+            Toasty.info(ctx, getString(R.string.emailErrorInvalid));
             return;
+
         }
 
         List<String> newEmailList = new ArrayList<>(Arrays.asList(newUserEmail.split(",")));
 
         disableProcessButton();
-        addNewEmail(Authorization.get(ctx), newEmailList);
+        addNewEmail(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newEmailList);
+
     }
 
-    private void addNewEmail(final String token, List<String> newUserEmail) {
+    private void addNewEmail(final String instanceUrl, final String token, List<String> newUserEmail) {
 
         AddEmail addEmailFunc = new AddEmail(newUserEmail);
-        final TinyDB tinyDb = TinyDB.getInstance(appCtx);
+        final TinyDB tinyDb = new TinyDB(appCtx);
 
         Call<JsonElement> call;
 
         call = RetrofitClient
-                .getApiInterface(appCtx)
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
                 .addNewEmail(token, addEmailFunc);
 
         call.enqueue(new Callback<JsonElement>() {
@@ -118,10 +138,11 @@ public class MyProfileEmailActivity extends BaseActivity {
 
                 if(response.code() == 201) {
 
-                    Toasty.success(ctx, getString(R.string.emailAddedText));
+                    Toasty.info(ctx, getString(R.string.emailAddedText));
                     tinyDb.putBoolean("emailsRefresh", true);
                     enableProcessButton();
                     finish();
+
                 }
                 else if(response.code() == 401) {
 
@@ -130,32 +151,37 @@ public class MyProfileEmailActivity extends BaseActivity {
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
                 }
                 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(ctx, getString(R.string.labelGeneralError));
+
                 }
+
             }
 
             @Override
             public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -164,18 +190,32 @@ public class MyProfileEmailActivity extends BaseActivity {
     }
 
     private void initCloseListener() {
-
+        onClickListener = new View.OnClickListener() {
-        onClickListener = view -> finish();
+            @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);
+
     }
 
 }

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

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

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

@@ -1,10 +1,8 @@
 package org.mian.gitnex.activities;
 
 import android.annotation.SuppressLint;
-import android.app.Dialog;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.graphics.Typeface;
@@ -17,7 +15,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
@@ -28,16 +25,13 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import com.google.android.material.tabs.TabLayout;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.Branches;
-import org.gitnex.tea4j.models.Milestones;
-import org.gitnex.tea4j.models.UserRepositories;
-import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.fragments.BottomSheetIssuesFilterFragment;
 import org.mian.gitnex.fragments.BottomSheetMilestonesFilterFragment;
 import org.mian.gitnex.fragments.BottomSheetPullRequestFilterFragment;
 import org.mian.gitnex.fragments.BottomSheetRepoFragment;
+import org.mian.gitnex.fragments.BranchesFragment;
 import org.mian.gitnex.fragments.CollaboratorsFragment;
 import org.mian.gitnex.fragments.FilesFragment;
 import org.mian.gitnex.fragments.IssuesFragment;
@@ -47,8 +41,11 @@ import org.mian.gitnex.fragments.PullRequestsFragment;
 import org.mian.gitnex.fragments.ReleasesFragment;
 import org.mian.gitnex.fragments.RepoInfoFragment;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -71,20 +68,34 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 	private FragmentRefreshListenerPr fragmentRefreshListenerPr;
 	private FragmentRefreshListenerMilestone fragmentRefreshListenerMilestone;
 	private FragmentRefreshListenerFiles fragmentRefreshListenerFiles;
-	private FragmentRefreshListenerFilterIssuesByMilestone fragmentRefreshListenerFilterIssuesByMilestone;
+
+	private final Context ctx = this;
+	private Context appCtx;
+
+	private TinyDB tinyDB;
+
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
 
 	private String repositoryOwner;
 	private String repositoryName;
 
-	public static ViewPager mViewPager;
 	private int tabsCount;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_repo_detail;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
 
-		setContentView(R.layout.activity_repo_detail);
+		tinyDB = new TinyDB(appCtx);
 
 		String[] repoNameParts = tinyDB.getString("repoFullName").split("/");
 		repositoryOwner = repoNameParts[0];
@@ -92,21 +103,17 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 		Toolbar toolbar = findViewById(R.id.toolbar);
 
-		TextView toolbarTitle = findViewById(R.id.toolbar_title);
+		TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
-		ImageView repoTypeToolbar = findViewById(R.id.repoTypeToolbar);
-
-		if(tinyDB.getString("repoType").equalsIgnoreCase("private")) {
-			repoTypeToolbar.setVisibility(View.VISIBLE);
-		}
-		else {
-			repoTypeToolbar.setVisibility(View.GONE);
-		}
 		toolbarTitle.setText(repositoryName);
 
 		setSupportActionBar(toolbar);
 		Objects.requireNonNull(getSupportActionBar()).setTitle(repositoryName);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
+		instanceUrl = tinyDB.getString("instanceUrl");
+		loginUid = tinyDB.getString("loginUid");
+		instanceToken = "token " + tinyDB.getString(loginUid + "-token");
+
 		tinyDB.putString("repoIssuesState", "open");
 		tinyDB.putString("repoPrState", "open");
 		tinyDB.putString("milestoneState", "open");
@@ -116,17 +123,17 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		switch(tinyDB.getInt("customFontId", -1)) {
 
 			case 0:
-
 				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf");
 				break;
-			case 2:
 
+			case 2:
 				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf");
 				break;
-			default:
 
+			default:
 				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/manroperegular.ttf");
 				break;
+
 		}
 
 		toolbarTitle.setTypeface(myTypeface);
@@ -146,14 +153,13 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 				View tabViewChild = vgTab.getChildAt(i);
 
 				if(tabViewChild instanceof TextView) {
-
 					((TextView) tabViewChild).setTypeface(myTypeface);
 				}
 			}
 		}
 
 		// Only show collaborators tab, if you have permission to
-		View collaboratorTab = viewGroup.getChildAt(7);
+		View collaboratorTab = viewGroup.getChildAt(8);
 
 		if(tinyDB.getBoolean("isRepoAdmin") || new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.0")) {
 
@@ -163,9 +169,10 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 			tabsCount--;
 			collaboratorTab.setVisibility(View.GONE);
+
 		}
 
-		mViewPager = findViewById(R.id.container);
+		ViewPager mViewPager = findViewById(R.id.container);
 
 		mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
 		tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
@@ -188,7 +195,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 			textViewBadgePull.setVisibility(View.GONE);
 			textViewBadgeRelease.setVisibility(View.GONE);
 
-			getRepoInfo(Authorization.get(ctx), repositoryOwner, repositoryName);
+			getRepoInfo(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repositoryOwner, repositoryName);
 			ColorStateList textColor = tabLayout.getTabTextColors();
 
 			// Issue count
@@ -199,6 +206,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 				assert tabOpenIssues != null; // FIXME This should be cleaned up
 				TextView openIssueTabView = Objects.requireNonNull(tabOpenIssues.getCustomView()).findViewById(R.id.counterBadgeIssueText);
 				openIssueTabView.setTextColor(textColor);
+
 			}
 
 			// Pull request count
@@ -209,6 +217,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 				assert tabOpenPulls != null; // FIXME This should be cleaned up
 				TextView openPullTabView = Objects.requireNonNull(tabOpenPulls.getCustomView()).findViewById(R.id.counterBadgePullText);
 				openPullTabView.setTextColor(textColor);
+
 			}
 
 			// Release count
@@ -216,107 +225,19 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 				if(textViewBadgeRelease.getText() != "") { // only show if API returned a number
 
-					Objects.requireNonNull(tabLayout.getTabAt(4)).setCustomView(tabHeader6);
+					Objects.requireNonNull(tabLayout.getTabAt(5)).setCustomView(tabHeader6);
-					TabLayout.Tab tabOpenRelease = tabLayout.getTabAt(4);
+					TabLayout.Tab tabOpenRelease = tabLayout.getTabAt(5);
 					assert tabOpenRelease != null; // FIXME This should be cleaned up
 					TextView openReleaseTabView = Objects.requireNonNull(tabOpenRelease.getCustomView()).findViewById(R.id.counterBadgeReleaseText);
 					openReleaseTabView.setTextColor(textColor);
+
 				}
 			}
 		}
 
-		Intent mainIntent = getIntent();
+		checkRepositoryStarStatus(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repositoryOwner, repositoryName);
-		String goToSection = mainIntent.getStringExtra("goToSection");
+		checkRepositoryWatchStatus(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repositoryOwner, repositoryName);
-		String goToSectionType = mainIntent.getStringExtra("goToSectionType");
 
-		if(goToSection != null) {
-
-			mainIntent.removeExtra("goToSection");
-			mainIntent.removeExtra("goToSectionType");
-
-			switch(goToSectionType) {
-				case "branchesList":
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
-					chooseBranch();
-					break;
-				case "branch":
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
-					String selectedBranch = mainIntent.getStringExtra("selectedBranch");
-					tinyDB.putString("repoBranch", selectedBranch);
-					if(getFragmentRefreshListenerFiles() != null) {
-						getFragmentRefreshListenerFiles().onRefresh(selectedBranch);
-					}
-					break;
-				case "file":
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
-					String branch1 = mainIntent.getStringExtra("branch");
-					tinyDB.putString("repoBranch", branch1);
-					if(getFragmentRefreshListenerFiles() != null) {
-						getFragmentRefreshListenerFiles().onRefresh(branch1);
-					}
-					Intent intent = new Intent(ctx, FileViewActivity.class);
-					intent.putExtra("file", mainIntent.getSerializableExtra("file"));
-					startActivity(intent);
-					break;
-				case "dir":
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
-					String branch2 = mainIntent.getStringExtra("branch");
-					tinyDB.putString("repoBranch", branch2);
-					if(getFragmentRefreshListenerFiles() != null) {
-						getFragmentRefreshListenerFiles().onRefresh(branch2);
-					}
-					//((SectionsPagerAdapter) Objects.requireNonNull(RepoDetailActivity.mViewPager.getAdapter())).getItem(1);
-					break;
-				case "commitsList":
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
-					String branch = mainIntent.getStringExtra("branchName");
-					tinyDB.putString("repoBranch", branch);
-					if(getFragmentRefreshListenerFiles() != null) {
-						getFragmentRefreshListenerFiles().onRefresh(branch);
-					}
-					Intent intent1 = new Intent(ctx, CommitsActivity.class);
-					intent1.putExtra("branchName", branch);
-					ctx.startActivity(intent1);
-					break;
-				case "issue":
-					RepoDetailActivity.mViewPager.setCurrentItem(2);
-					break;
-				case "issueNew":
-					RepoDetailActivity.mViewPager.setCurrentItem(2);
-					startActivity(new Intent(RepoDetailActivity.this, CreateIssueActivity.class));
-					break;
-				case "pull":
-					RepoDetailActivity.mViewPager.setCurrentItem(3);
-					break;
-				case "pullNew":
-					RepoDetailActivity.mViewPager.setCurrentItem(3);
-					startActivity(new Intent(RepoDetailActivity.this, CreatePullRequestActivity.class));
-					break;
-				case "releases":
-					RepoDetailActivity.mViewPager.setCurrentItem(4);
-					break;
-				case "newRelease":
-					RepoDetailActivity.mViewPager.setCurrentItem(4);
-					startActivity(new Intent(RepoDetailActivity.this, CreateReleaseActivity.class));
-					break;
-				case "milestones":
-					RepoDetailActivity.mViewPager.setCurrentItem(5);
-					break;
-				case "milestonesNew":
-					RepoDetailActivity.mViewPager.setCurrentItem(5);
-					startActivity(new Intent(RepoDetailActivity.this, CreateMilestoneActivity.class));
-					break;
-				case "labels":
-					RepoDetailActivity.mViewPager.setCurrentItem(6);
-					break;
-				case "settings":
-					startActivity(new Intent(RepoDetailActivity.this, RepositorySettingsActivity.class));
-					break;
-			}
-		}
-
-		checkRepositoryStarStatus(Authorization.get(ctx), repositoryOwner, repositoryName);
-		checkRepositoryWatchStatus(Authorization.get(ctx), repositoryOwner, repositoryName);
 	}
 
 	@Override
@@ -326,8 +247,9 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 		if(tinyDB.getBoolean("enableCounterIssueBadge")) {
 
-			getRepoInfo(Authorization.get(ctx), repositoryOwner, repositoryName);
+			getRepoInfo(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repositoryOwner, repositoryName);
 		}
+
 	}
 
 	@Override
@@ -336,6 +258,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.repo_dotted_menu, menu);
 		return true;
+
 	}
 
 	@Override
@@ -343,49 +266,40 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 		int id = item.getItemId();
 
-		if(id == android.R.id.home) {
+		switch(id) {
+
+			case android.R.id.home:
+				finish();
+				return true;
+
+			case R.id.repoMenu:
+				BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
+				bottomSheet.show(getSupportFragmentManager(), "repoBottomSheet");
+				return true;
+
+			case R.id.filter:
+				BottomSheetIssuesFilterFragment filterBottomSheet = new BottomSheetIssuesFilterFragment();
+				filterBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuBottomSheet");
+				return true;
+
+			case R.id.filterPr:
+				BottomSheetPullRequestFilterFragment filterPrBottomSheet = new BottomSheetPullRequestFilterFragment();
+				filterPrBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuPrBottomSheet");
+				return true;
+
+			case R.id.filterMilestone:
+				BottomSheetMilestonesFilterFragment filterMilestoneBottomSheet = new BottomSheetMilestonesFilterFragment();
+				filterMilestoneBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuMilestoneBottomSheet");
+				return true;
+
+			case R.id.switchBranches:
+				chooseBranch();
+				return true;
+
+			default:
+				return super.onOptionsItemSelected(item);
 
-			finish();
-			return true;
 		}
-		else if(id == R.id.repoMenu) {
-
-			BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
-			bottomSheet.show(getSupportFragmentManager(), "repoBottomSheet");
-			return true;
-		}
-		else if(id == R.id.filter) {
-
-			BottomSheetIssuesFilterFragment filterBottomSheet = new BottomSheetIssuesFilterFragment();
-			filterBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuBottomSheet");
-			return true;
-		}
-		else if(id == R.id.filterPr) {
-
-			BottomSheetPullRequestFilterFragment filterPrBottomSheet = new BottomSheetPullRequestFilterFragment();
-			filterPrBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuPrBottomSheet");
-			return true;
-		}
-		else if(id == R.id.filterMilestone) {
-
-			BottomSheetMilestonesFilterFragment filterMilestoneBottomSheet = new BottomSheetMilestonesFilterFragment();
-			filterMilestoneBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuMilestoneBottomSheet");
-			return true;
-		}
-		else if(id == R.id.switchBranches) {
-
-			chooseBranch();
-			return true;
-		}
-		else if(id == R.id.branchCommits) {
-
-			Intent intent = new Intent(ctx, CommitsActivity.class);
-			intent.putExtra("branchName", tinyDB.getString("repoBranch"));
-			ctx.startActivity(intent);
-			return true;
-		}
-
-		return super.onOptionsItemSelected(item);
 
 	}
 
@@ -395,187 +309,97 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		switch(text) {
 
 			case "label":
-
 				startActivity(new Intent(RepoDetailActivity.this, CreateLabelActivity.class));
 				break;
-			case "newIssue":
 
+			case "newIssue":
 				startActivity(new Intent(RepoDetailActivity.this, CreateIssueActivity.class));
 				break;
-			case "newMilestone":
 
+			case "newMilestone":
 				startActivity(new Intent(RepoDetailActivity.this, CreateMilestoneActivity.class));
 				break;
-			case "addCollaborator":
 
+			case "addCollaborator":
 				startActivity(new Intent(RepoDetailActivity.this, AddCollaboratorToRepositoryActivity.class));
 				break;
-			case "chooseBranch":
 
+			case "chooseBranch":
 				chooseBranch();
 				break;
-			case "createRelease":
 
+			case "createRelease":
 				startActivity(new Intent(RepoDetailActivity.this, CreateReleaseActivity.class));
 				break;
-			case "openWebRepo":
 
+			case "openWebRepo":
 				Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(tinyDB.getString("repoHtmlUrl")));
 				startActivity(i);
 				break;
-			case "shareRepo":
 
+			case "shareRepo":
 				Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
 				sharingIntent.setType("text/plain");
 				sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, tinyDB.getString("repoHtmlUrl"));
 				sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, tinyDB.getString("repoHtmlUrl"));
 				startActivity(Intent.createChooser(sharingIntent, tinyDB.getString("repoHtmlUrl")));
 				break;
-			case "copyRepoUrl":
 
-				ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
-				ClipData clip = ClipData.newPlainText("repoUrl", tinyDB.getString("repoHtmlUrl"));
-				assert clipboard != null;
-				clipboard.setPrimaryClip(clip);
-				Toasty.info(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
-				break;
 			case "newFile":
-
 				startActivity(new Intent(RepoDetailActivity.this, CreateFileActivity.class));
 				break;
-			case "filterByMilestone":
+
-				filterIssuesByMilestone();
-				break;
 			case "openIssues":
-
 				if(getFragmentRefreshListener() != null) {
-
 					getFragmentRefreshListener().onRefresh("open");
 				}
 				break;
+
 			case "closedIssues":
-
 				if(getFragmentRefreshListener() != null) {
-
 					getFragmentRefreshListener().onRefresh("closed");
 				}
 				break;
+
 			case "openPr":
-
 				if(getFragmentRefreshListenerPr() != null) {
-
 					getFragmentRefreshListenerPr().onRefresh("open");
 				}
 				break;
+
 			case "closedPr":
-
 				if(getFragmentRefreshListenerPr() != null) {
-
 					getFragmentRefreshListenerPr().onRefresh("closed");
 				}
 				break;
+
 			case "openMilestone":
-
 				if(getFragmentRefreshListenerMilestone() != null) {
-
 					getFragmentRefreshListenerMilestone().onRefresh("open");
 				}
 				break;
+
 			case "closedMilestone":
-
 				if(getFragmentRefreshListenerMilestone() != null) {
-
 					getFragmentRefreshListenerMilestone().onRefresh("closed");
 				}
 				break;
-			case "repoSettings":
 
-				startActivity(new Intent(RepoDetailActivity.this, RepositorySettingsActivity.class));
-				break;
-			case "newPullRequest":
-
-				startActivity(new Intent(RepoDetailActivity.this, CreatePullRequestActivity.class));
-				break;
 		}
-	}
 
-	private void filterIssuesByMilestone() {
-
-		Dialog progressDialog = new Dialog(this);
-		progressDialog.setContentView(R.layout.custom_progress_loader);
-		progressDialog.show();
-
-		Call<List<Milestones>> call = RetrofitClient
-			.getApiInterface(ctx)
-			.getMilestones(Authorization.get(ctx), repositoryOwner, repositoryName, 1, 50, "open");
-
-		call.enqueue(new Callback<List<Milestones>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Milestones>> call, @NonNull Response<List<Milestones>> response) {
-
-				progressDialog.hide();
-				if(response.code() == 200) {
-
-					Milestones milestones;
-					List<String> milestonesList = new ArrayList<>();
-					int selectedMilestone = 0;
-					assert response.body() != null;
-
-					milestonesList.add("All");
-					for(int i = 0; i < response.body().size(); i++) {
-						milestones = response.body().get(i);
-						milestonesList.add(milestones.getTitle());
-					}
-
-					for(int j = 0; j < milestonesList.size(); j++) {
-						if(tinyDB.getString("issueMilestoneFilterId").equals(milestonesList.get(j))) {
-							selectedMilestone = j;
-						}
-					}
-
-					AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
-					pBuilder.setTitle(R.string.selectMilestone);
-
-					pBuilder.setSingleChoiceItems(milestonesList.toArray(new String[0]), selectedMilestone, (dialogInterface, i) -> {
-
-						tinyDB.putString("issueMilestoneFilterId", milestonesList.get(i));
-
-						if(getFragmentRefreshListenerFilterIssuesByMilestone() != null) {
-							getFragmentRefreshListenerFilterIssuesByMilestone().onRefresh(milestonesList.get(i));
-						}
-						dialogInterface.dismiss();
-					});
-
-					pBuilder.setNeutralButton(R.string.cancelButton, null);
-					pBuilder.create().show();
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Milestones>> call, @NonNull Throwable t) {
-				progressDialog.hide();
-				Log.e("onFailure", t.toString());
-			}
-		});
 	}
 
 	private void chooseBranch() {
 
-		Dialog progressDialog = new Dialog(this);
+		Call<List<Branches>> call = RetrofitClient.getInstance(instanceUrl, ctx)
-		progressDialog.setContentView(R.layout.custom_progress_loader);
+			.getApiInterface()
-		progressDialog.show();
+			.getBranches(instanceToken, repositoryOwner, repositoryName);
-
-		Call<List<Branches>> call = RetrofitClient
-			.getApiInterface(ctx)
-			.getBranches(Authorization.get(ctx), repositoryOwner, repositoryName);
 
 		call.enqueue(new Callback<List<Branches>>() {
 
 			@Override
 			public void onResponse(@NonNull Call<List<Branches>> call, @NonNull Response<List<Branches>> response) {
 
-				progressDialog.hide();
 				if(response.code() == 200) {
 
 					List<String> branchesList = new ArrayList<>();
@@ -588,6 +412,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 						branchesList.add(branches.getName());
 
 						if(tinyDB.getString("repoBranch").equals(branches.getName())) {
+
 							selectedBranch = i;
 						}
 					}
@@ -595,27 +420,32 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 					AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
 					pBuilder.setTitle(R.string.pageTitleChooseBranch);
 
-					pBuilder.setSingleChoiceItems(branchesList.toArray(new String[0]), selectedBranch, (dialogInterface, i) -> {
+					pBuilder.setSingleChoiceItems(branchesList.toArray(new String[0]), selectedBranch, new  DialogInterface.OnClickListener() {
 
-						tinyDB.putString("repoBranch", branchesList.get(i));
+						@Override
+						public void onClick(DialogInterface dialogInterface, int i) {
 
-						if(getFragmentRefreshListenerFiles() != null) {
+							tinyDB.putString("repoBranch", branchesList.get(i));
-							getFragmentRefreshListenerFiles().onRefresh(branchesList.get(i));
+							if(getFragmentRefreshListenerFiles() != null) {
+								getFragmentRefreshListenerFiles().onRefresh(branchesList.get(i));
+							}
+							dialogInterface.dismiss();
 						}
-						dialogInterface.dismiss();
 					});
 
-					pBuilder.setNeutralButton(R.string.cancelButton, null);
 					pBuilder.create().show();
+
 				}
+
 			}
 
 			@Override
 			public void onFailure(@NonNull Call<List<Branches>> call, @NonNull Throwable t) {
-				progressDialog.hide();
+
 				Log.e("onFailure", t.toString());
 			}
 		});
+
 	}
 
 	public class SectionsPagerAdapter extends FragmentStatePagerAdapter {
@@ -634,36 +464,40 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 			switch(position) {
 
 				case 0: // Repository details
-
 					return RepoInfoFragment.newInstance(repositoryOwner, repositoryName);
+
 				case 1: // Files
-
 					return FilesFragment.newInstance(repositoryOwner, repositoryName, tinyDB.getString("repoBranch"));
-				case 2: // Issues
 
+				case 2: // Issues
 					fragment = new IssuesFragment();
 					break;
-				case 3: // Pull requests
 
+				case 3: // Pull requests
 					fragment = new PullRequestsFragment();
 					break;
-				case 4: // Releases
 
+				case 4: // Branches
+					return BranchesFragment.newInstance(repositoryOwner, repositoryName);
+
+				case 5: // Releases
 					return ReleasesFragment.newInstance(repositoryOwner, repositoryName);
-				case 5: // Milestones
 
+				case 6: // Milestones
 					fragment = new MilestonesFragment();
 					break;
-				case 6: // Labels
 
+				case 7: // Labels
 					return LabelsFragment.newInstance(repositoryOwner, repositoryName);
-				case 7: // Collaborators
 
+				case 8: // Collaborators
 					return CollaboratorsFragment.newInstance(repositoryOwner, repositoryName);
+
 			}
 
 			assert fragment != null;
 			return fragment;
+
 		}
 
 		@Override
@@ -671,11 +505,12 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 			return tabsCount;
 		}
+
 	}
 
-	private void getRepoInfo(String token, final String owner, String repo) {
+	private void getRepoInfo(String instanceUrl, String token, final String owner, String repo) {
 
-		Call<UserRepositories> call = RetrofitClient.getApiInterface(ctx).getUserRepository(token, owner, repo);
+		Call<UserRepositories> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserRepository(token, owner, repo);
 		call.enqueue(new Callback<UserRepositories>() {
 
 			@Override
@@ -686,7 +521,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 				if(response.code() == 200) {
 
 					if(tinyDB.getBoolean("enableCounterBadges")) {
-
 						assert repoInfo != null;
 
 						if(repoInfo.getOpen_issues_count() != null) {
@@ -713,6 +547,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 					Log.e("onFailure", String.valueOf(response.code()));
 				}
+
 			}
 
 			@Override
@@ -725,15 +560,16 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 	}
 
-	private void checkRepositoryStarStatus(String instanceToken, final String owner, String repo) {
+	private void checkRepositoryStarStatus(String instanceUrl, String instanceToken, final String owner, String repo) {
 
-		Call<JsonElement> call = RetrofitClient.getApiInterface(ctx).checkRepoStarStatus(instanceToken, owner, repo);
+		Call<JsonElement> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().checkRepoStarStatus(instanceToken, owner, repo);
 		call.enqueue(new Callback<JsonElement>() {
 
 			@Override
 			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
 
 				tinyDB.putInt("repositoryStarStatus", response.code());
+
 			}
 
 			@Override
@@ -745,11 +581,11 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 	}
 
-	private void checkRepositoryWatchStatus(String instanceToken, final String owner, String repo) {
+	private void checkRepositoryWatchStatus(String instanceUrl, String instanceToken, final String owner, String repo) {
 
 		Call<WatchInfo> call;
 
-		call = RetrofitClient.getApiInterface(ctx).checkRepoWatchStatus(instanceToken, owner, repo);
+		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().checkRepoWatchStatus(instanceToken, owner, repo);
 		call.enqueue(new Callback<WatchInfo>() {
 
 			@Override
@@ -760,14 +596,15 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 					assert response.body() != null;
 
 					if(response.body().getSubscribed()) {
-
 						tinyDB.putBoolean("repositoryWatchStatus", true);
 					}
+
 				}
 				else {
 
 					tinyDB.putBoolean("repositoryWatchStatus", false);
 				}
+
 			}
 
 			@Override
@@ -779,13 +616,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 	}
 
-	// Issues milestone filter interface
-	public FragmentRefreshListenerFilterIssuesByMilestone getFragmentRefreshListenerFilterIssuesByMilestone() { return fragmentRefreshListenerFilterIssuesByMilestone; }
-
-	public void setFragmentRefreshListenerFilterIssuesByMilestone(FragmentRefreshListenerFilterIssuesByMilestone fragmentRefreshListener) { this.fragmentRefreshListenerFilterIssuesByMilestone = fragmentRefreshListener; }
-
-	public interface FragmentRefreshListenerFilterIssuesByMilestone { void onRefresh(String text); }
-
 	// Issues interface
 	public FragmentRefreshListener getFragmentRefreshListener() { return fragmentRefreshListener; }
 

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

@@ -1,278 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.annotation.SuppressLint;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-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.gitnex.tea4j.models.UserRepositories;
-import org.mian.gitnex.R;
-import org.mian.gitnex.adapters.RepoForksAdapter;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityRepoForksBinding;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Constants;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.Version;
-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 {
-
-	private View.OnClickListener onClickListener;
-	private TextView noData;
-	private ProgressBar progressBar;
-	private final String TAG = "RepositoryForks";
-	private int resultLimit = Constants.resultLimitOldGiteaInstances;
-	private int pageSize = 1;
-
-	private RecyclerView recyclerView;
-	private List<UserRepositories> forksList;
-	private RepoForksAdapter adapter;
-	private ProgressBar progressLoadMore;
-
-	@SuppressLint("DefaultLocale")
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		ActivityRepoForksBinding activityRepoForksBinding = ActivityRepoForksBinding.inflate(getLayoutInflater());
-		setContentView(activityRepoForksBinding.getRoot());
-
-		Toolbar toolbar = activityRepoForksBinding.toolbar;
-		setSupportActionBar(toolbar);
-
-		TinyDB tinyDb = TinyDB.getInstance(appCtx);
-
-		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 = activityRepoForksBinding.toolbarTitle;
-		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
-		toolbar_title.setText(String.format("%s : %s", ctx.getResources().getString(R.string.infoTabRepoForksCount), repoName));
-
-		ImageView closeActivity = activityRepoForksBinding.close;
-		noData = activityRepoForksBinding.noData;
-		progressLoadMore = activityRepoForksBinding.progressLoadMore;
-		progressBar = activityRepoForksBinding.progressBar;
-		SwipeRefreshLayout swipeRefresh = activityRepoForksBinding.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 = Constants.resultLimitNewGiteaInstances;
-		}
-
-		recyclerView = activityRepoForksBinding.recyclerView;
-		forksList = new ArrayList<>();
-
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(recyclerView.getContext(),
-			DividerItemDecoration.VERTICAL);
-		recyclerView.addItemDecoration(dividerItemDecoration);
-
-		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			swipeRefresh.setRefreshing(false);
-			loadInitial(Authorization.get(ctx), 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(Authorization.get(ctx), repoOwner, repoName, page, resultLimit);
-			}
-		}));
-
-		recyclerView.setHasFixedSize(true);
-		recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
-		recyclerView.setAdapter(adapter);
-
-		loadInitial(Authorization.get(ctx), repoOwner, repoName, pageSize, resultLimit);
-	}
-
-	private void loadInitial(String instanceToken, String repoOwner, String repoName, int pageSize, int resultLimit) {
-
-		Call<List<UserRepositories>> call = RetrofitClient
-			.getApiInterface(ctx)
-			.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 instanceToken, String repoOwner, String repoName, int page, int resultLimit) {
-
-		progressLoadMore.setVisibility(View.VISIBLE);
-
-		Call<List<UserRepositories>> call = RetrofitClient
-			.getApiInterface(ctx)
-			.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();
-		};
-	}
-
-}

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

@@ -1,17 +1,22 @@
 package org.mian.gitnex.activities;
 
+import android.content.Context;
 import android.os.Bundle;
 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.databinding.ActivityRepoStargazersBinding;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.viewmodels.RepoStargazersViewModel;
+import java.util.List;
 
 /**
  * Author M M Arif
@@ -25,19 +30,30 @@ 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;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
-	    super.onCreate(savedInstanceState);
+        super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
 
-	    ActivityRepoStargazersBinding activityRepoStargazersBinding = ActivityRepoStargazersBinding.inflate(getLayoutInflater());
+        TinyDB tinyDb = new TinyDB(appCtx);
-	    setContentView(activityRepoStargazersBinding.getRoot());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        ImageView closeActivity = activityRepoStargazersBinding.close;
+        ImageView closeActivity = findViewById(R.id.close);
-        TextView toolbarTitle = activityRepoStargazersBinding.toolbarTitle;
+        TextView toolbarTitle = findViewById(R.id.toolbar_title);
-        noDataStargazers = activityRepoStargazersBinding.noDataStargazers;
+        noDataStargazers = findViewById(R.id.noDataStargazers);
-        mGridView = activityRepoStargazersBinding.gridView;
+        mGridView = findViewById(R.id.gridView);
-        mProgressBar = activityRepoStargazersBinding.progressBar;
+        mProgressBar = findViewById(R.id.progress_bar);
 
         String repoFullNameForStars = getIntent().getStringExtra("repoFullNameForStars");
         String[] parts = repoFullNameForStars.split("/");
@@ -49,37 +65,40 @@ public class RepoStargazersActivity extends BaseActivity {
 
         toolbarTitle.setText(R.string.repoStargazersInMenu);
 
-        fetchDataAsync(Authorization.get(ctx), repoOwner, repoName);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+
     }
 
-    private void fetchDataAsync(String instanceToken, String repoOwner, String repoName) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String repoOwner, String repoName) {
 
         RepoStargazersViewModel repoStargazersModel = new ViewModelProvider(this).get(RepoStargazersViewModel.class);
 
-        repoStargazersModel.getRepoStargazers(instanceToken, repoOwner, repoName, ctx).observe(this, stargazersListMain -> {
+        repoStargazersModel.getRepoStargazers(instanceUrl, instanceToken, repoOwner, repoName, ctx).observe(this, new Observer<List<UserInfo>>() {
-
+            @Override
-            adapter = new RepoStargazersAdapter(ctx, stargazersListMain);
+            public void onChanged(@Nullable List<UserInfo> stargazersListMain) {
-
+                adapter = new RepoStargazersAdapter(ctx, stargazersListMain);
-            if(adapter.getCount() > 0) {
+                if(adapter.getCount() > 0) {
-
+                    mGridView.setAdapter(adapter);
-                mGridView.setAdapter(adapter);
+                    noDataStargazers.setVisibility(View.GONE);
-                noDataStargazers.setVisibility(View.GONE);
+                }
+                else {
+                    adapter.notifyDataSetChanged();
+                    mGridView.setAdapter(adapter);
+                    noDataStargazers.setVisibility(View.VISIBLE);
+                }
+                mProgressBar.setVisibility(View.GONE);
             }
-            else {
-
-                adapter.notifyDataSetChanged();
-                mGridView.setAdapter(adapter);
-                noDataStargazers.setVisibility(View.VISIBLE);
-            }
-
-            mProgressBar.setVisibility(View.GONE);
         });
 
     }
 
     private void initCloseListener() {
-
+        onClickListener = new View.OnClickListener() {
-        onClickListener = view -> finish();
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
     }
 
 }

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

@@ -1,17 +1,22 @@
 package org.mian.gitnex.activities;
 
+import android.content.Context;
 import android.os.Bundle;
 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.databinding.ActivityRepoWatchersBinding;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.viewmodels.RepoWatchersViewModel;
+import java.util.List;
 
 /**
  * Author M M Arif
@@ -25,19 +30,30 @@ 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;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
 
-	    ActivityRepoWatchersBinding activityRepoWatchersBinding = ActivityRepoWatchersBinding.inflate(getLayoutInflater());
+        TinyDB tinyDb = new TinyDB(appCtx);
-	    setContentView(activityRepoWatchersBinding.getRoot());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        ImageView closeActivity = activityRepoWatchersBinding.close;
+        ImageView closeActivity = findViewById(R.id.close);
-        TextView toolbarTitle = activityRepoWatchersBinding.toolbarTitle;
+        TextView toolbarTitle = findViewById(R.id.toolbar_title);
-        noDataWatchers = activityRepoWatchersBinding.noDataWatchers;
+        noDataWatchers = findViewById(R.id.noDataWatchers);
-        mGridView = activityRepoWatchersBinding.gridView;
+        mGridView = findViewById(R.id.gridView);
-        mProgressBar = activityRepoWatchersBinding.progressBar;
+        mProgressBar = findViewById(R.id.progress_bar);
 
         String repoFullNameForWatchers = getIntent().getStringExtra("repoFullNameForWatchers");
         String[] parts = repoFullNameForWatchers.split("/");
@@ -49,37 +65,40 @@ public class RepoWatchersActivity extends BaseActivity {
 
         toolbarTitle.setText(R.string.repoWatchersInMenu);
 
-        fetchDataAsync(Authorization.get(ctx), repoOwner, repoName);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+
     }
 
-    private void fetchDataAsync(String instanceToken, String repoOwner, String repoName) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String repoOwner, String repoName) {
 
         RepoWatchersViewModel repoWatchersModel = new ViewModelProvider(this).get(RepoWatchersViewModel.class);
 
-        repoWatchersModel.getRepoWatchers(instanceToken, repoOwner, repoName, ctx).observe(this, watchersListMain -> {
+        repoWatchersModel.getRepoWatchers(instanceUrl, instanceToken, repoOwner, repoName, ctx).observe(this, new Observer<List<UserInfo>>() {
-
+            @Override
-            adapter = new RepoWatchersAdapter(ctx, watchersListMain);
+            public void onChanged(@Nullable List<UserInfo> watchersListMain) {
-
+                adapter = new RepoWatchersAdapter(ctx, watchersListMain);
-            if(adapter.getCount() > 0) {
+                if(adapter.getCount() > 0) {
-
+                    mGridView.setAdapter(adapter);
-                mGridView.setAdapter(adapter);
+                    noDataWatchers.setVisibility(View.GONE);
-                noDataWatchers.setVisibility(View.GONE);
+                }
+                else {
+                    adapter.notifyDataSetChanged();
+                    mGridView.setAdapter(adapter);
+                    noDataWatchers.setVisibility(View.VISIBLE);
+                }
+                mProgressBar.setVisibility(View.GONE);
             }
-            else {
-
-                adapter.notifyDataSetChanged();
-                mGridView.setAdapter(adapter);
-                noDataWatchers.setVisibility(View.VISIBLE);
-            }
-
-            mProgressBar.setVisibility(View.GONE);
         });
 
     }
 
     private void initCloseListener() {
-
+        onClickListener = new View.OnClickListener() {
-        onClickListener = view -> finish();
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
     }
 
 }

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

@@ -1,414 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.app.Dialog;
-import android.content.Intent;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import androidx.annotation.NonNull;
-import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.RepositoryTransfer;
-import org.gitnex.tea4j.models.UserRepositories;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
-import org.mian.gitnex.database.api.RepositoriesApi;
-import org.mian.gitnex.databinding.ActivityRepositorySettingsBinding;
-import org.mian.gitnex.databinding.CustomRepositoryDeleteDialogBinding;
-import org.mian.gitnex.databinding.CustomRepositoryEditPropertiesDialogBinding;
-import org.mian.gitnex.databinding.CustomRepositoryTransferDialogBinding;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.Version;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class RepositorySettingsActivity extends BaseActivity {
-
-	private ActivityRepositorySettingsBinding viewBinding;
-	private CustomRepositoryEditPropertiesDialogBinding propBinding;
-	private CustomRepositoryDeleteDialogBinding deleteRepoBinding;
-	private CustomRepositoryTransferDialogBinding transferRepoBinding;
-	private Dialog dialogProp;
-	private Dialog dialogDeleteRepository;
-	private Dialog dialogTransferRepository;
-	private View.OnClickListener onClickListener;
-
-	private String loginUid;
-	private String instanceToken;
-
-	private String repositoryOwner;
-	private String repositoryName;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		viewBinding = ActivityRepositorySettingsBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
-
-		loginUid = tinyDB.getString("loginUid");
-		String repoFullName = tinyDB.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		repositoryOwner = parts[0];
-		repositoryName = parts[1];
-		instanceToken = "token " + tinyDB.getString(loginUid + "-token");
-
-		ImageView closeActivity = findViewById(R.id.close);
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		// require gitea 1.12 or higher
-		if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.0")) {
-
-			viewBinding.transferOwnerFrame.setVisibility(View.VISIBLE);
-		}
-
-		viewBinding.editProperties.setOnClickListener(editProperties -> showRepositoryProperties());
-
-		viewBinding.deleteRepository.setOnClickListener(deleteRepository -> showDeleteRepository());
-
-		viewBinding.transferOwnerFrame.setOnClickListener(transferRepositoryOwnership -> showTransferRepository());
-	}
-
-	private void showTransferRepository() {
-
-		dialogTransferRepository = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
-
-		if (dialogTransferRepository.getWindow() != null) {
-
-			dialogTransferRepository.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-		}
-
-		transferRepoBinding = CustomRepositoryTransferDialogBinding.inflate(LayoutInflater.from(ctx));
-
-		View view = transferRepoBinding.getRoot();
-		dialogTransferRepository.setContentView(view);
-
-		transferRepoBinding.cancel.setOnClickListener(editProperties -> dialogTransferRepository.dismiss());
-
-		transferRepoBinding.transfer.setOnClickListener(deleteRepo -> {
-
-			String newOwner = String.valueOf(transferRepoBinding.ownerNameForTransfer.getText());
-			String repoName = String.valueOf(transferRepoBinding.repoNameForTransfer.getText());
-
-			if(!repositoryName.equals(repoName)) {
-
-				Toasty.error(ctx, getString(R.string.repoSettingsDeleteError));
-			}
-			else if(newOwner.matches("")) {
-
-				Toasty.error(ctx, getString(R.string.repoTransferOwnerError));
-			}
-			else {
-
-				transferRepository(newOwner);
-			}
-		});
-
-		dialogTransferRepository.setCancelable(false);
-		dialogTransferRepository.show();
-	}
-
-	private void transferRepository(String newOwner) {
-
-		RepositoryTransfer repositoryTransfer = new RepositoryTransfer(newOwner);
-
-		Call<JsonElement> transferCall = RetrofitClient
-			.getApiInterface(ctx)
-			.transferRepository(instanceToken, repositoryOwner, repositoryName, repositoryTransfer);
-
-		transferCall.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				transferRepoBinding.transfer.setVisibility(View.GONE);
-				transferRepoBinding.processingRequest.setVisibility(View.VISIBLE);
-
-				if (response.code() == 202) {
-
-					dialogTransferRepository.dismiss();
-					Toasty.success(ctx, getString(R.string.repoTransferSuccess));
-
-					finish();
-					BaseApi.getInstance(ctx, RepositoriesApi.class).deleteRepository((int) tinyDB.getLong("repositoryId", 0));
-					Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class);
-					RepositorySettingsActivity.this.startActivity(intent);
-				}
-				else if (response.code() == 404) {
-
-					transferRepoBinding.transfer.setVisibility(View.VISIBLE);
-					transferRepoBinding.processingRequest.setVisibility(View.GONE);
-					Toasty.error(ctx, getString(R.string.repoTransferError));
-				}
-				else {
-
-					transferRepoBinding.transfer.setVisibility(View.VISIBLE);
-					transferRepoBinding.processingRequest.setVisibility(View.GONE);
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				transferRepoBinding.transfer.setVisibility(View.VISIBLE);
-				transferRepoBinding.processingRequest.setVisibility(View.GONE);
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
-	}
-
-	private void showDeleteRepository() {
-
-		dialogDeleteRepository = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
-
-		if (dialogDeleteRepository.getWindow() != null) {
-
-			dialogDeleteRepository.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-		}
-
-		deleteRepoBinding = CustomRepositoryDeleteDialogBinding.inflate(LayoutInflater.from(ctx));
-
-		View view = deleteRepoBinding.getRoot();
-		dialogDeleteRepository.setContentView(view);
-
-		deleteRepoBinding.cancel.setOnClickListener(editProperties -> dialogDeleteRepository.dismiss());
-
-		deleteRepoBinding.delete.setOnClickListener(deleteRepo -> {
-
-			if(!repositoryName.equals(String.valueOf(deleteRepoBinding.repoNameForDeletion.getText()))) {
-
-				Toasty.error(ctx, getString(R.string.repoSettingsDeleteError));
-			}
-			else {
-
-				deleteRepository();
-			}
-		});
-
-		dialogDeleteRepository.setCancelable(false);
-		dialogDeleteRepository.show();
-	}
-
-	private void deleteRepository() {
-
-		Call<JsonElement> deleteCall = RetrofitClient
-			.getApiInterface(ctx)
-			.deleteRepository(instanceToken, repositoryOwner, repositoryName);
-
-		deleteCall.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				deleteRepoBinding.delete.setVisibility(View.GONE);
-				deleteRepoBinding.processingRequest.setVisibility(View.VISIBLE);
-
-				if (response.code() == 204) {
-
-					dialogDeleteRepository.dismiss();
-					Toasty.success(ctx, getString(R.string.repoDeletionSuccess));
-
-					finish();
-					BaseApi.getInstance(ctx, RepositoriesApi.class).deleteRepository((int) tinyDB.getLong("repositoryId", 0));
-					Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class);
-					RepositorySettingsActivity.this.startActivity(intent);
-				}
-				else {
-
-					deleteRepoBinding.delete.setVisibility(View.VISIBLE);
-					deleteRepoBinding.processingRequest.setVisibility(View.GONE);
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				deleteRepoBinding.delete.setVisibility(View.VISIBLE);
-				deleteRepoBinding.processingRequest.setVisibility(View.GONE);
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
-	}
-
-	private void showRepositoryProperties() {
-
-		dialogProp = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
-
-		if (dialogProp.getWindow() != null) {
-
-			dialogProp.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-		}
-
-		propBinding = CustomRepositoryEditPropertiesDialogBinding.inflate(LayoutInflater.from(ctx));
-
-		View view = propBinding.getRoot();
-		dialogProp.setContentView(view);
-
-		propBinding.cancel.setOnClickListener(editProperties -> dialogProp.dismiss());
-
-		Call<UserRepositories> call = RetrofitClient
-			.getApiInterface(ctx)
-			.getUserRepository(instanceToken, repositoryOwner, repositoryName);
-
-		call.enqueue(new Callback<UserRepositories>() {
-
-			@Override
-			public void onResponse(@NonNull Call<UserRepositories> call, @NonNull retrofit2.Response<UserRepositories> response) {
-
-				UserRepositories repoInfo = response.body();
-
-				propBinding.progressBar.setVisibility(View.GONE);
-				propBinding.mainView.setVisibility(View.VISIBLE);
-
-				if (response.code() == 200) {
-
-					assert repoInfo != null;
-					propBinding.repoName.setText(repoInfo.getName());
-					propBinding.repoWebsite.setText(repoInfo.getWebsite());
-					propBinding.repoDescription.setText(repoInfo.getDescription());
-					propBinding.repoPrivate.setChecked(repoInfo.getPrivateFlag());
-					propBinding.repoAsTemplate.setChecked(repoInfo.isTemplate());
-
-					propBinding.repoEnableIssues.setChecked(repoInfo.getHas_issues());
-
-					propBinding.repoEnableIssues.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-						if (isChecked) {
-
-							propBinding.repoEnableTimer.setVisibility(View.VISIBLE);
-						}
-						else {
-
-							propBinding.repoEnableTimer.setVisibility(View.GONE);
-						}
-					});
-
-					if(repoInfo.getInternal_tracker() != null) {
-
-						propBinding.repoEnableTimer.setChecked(repoInfo.getInternal_tracker().isEnable_time_tracker());
-					}
-					else {
-
-						propBinding.repoEnableTimer.setVisibility(View.GONE);
-					}
-
-					propBinding.repoEnableWiki.setChecked(repoInfo.isHas_wiki());
-					propBinding.repoEnablePr.setChecked(repoInfo.isHas_pull_requests());
-					propBinding.repoEnableMerge.setChecked(repoInfo.isAllow_merge_commits());
-					propBinding.repoEnableRebase.setChecked(repoInfo.isAllow_rebase());
-					propBinding.repoEnableSquash.setChecked(repoInfo.isAllow_squash_merge());
-					propBinding.repoEnableForceMerge.setChecked(repoInfo.isAllow_rebase_explicit());
-
-				}
-				else {
-
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<UserRepositories> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
-
-		propBinding.save.setOnClickListener(saveProperties -> saveRepositoryProperties(String.valueOf(propBinding.repoName.getText()),
-			String.valueOf(propBinding.repoWebsite.getText()),
-			String.valueOf(propBinding.repoDescription.getText()),
-			propBinding.repoPrivate.isChecked(), propBinding.repoAsTemplate.isChecked(),
-			propBinding.repoEnableIssues.isChecked(), propBinding.repoEnableWiki.isChecked(),
-			propBinding.repoEnablePr.isChecked(), propBinding.repoEnableTimer.isChecked(),
-			propBinding.repoEnableMerge.isChecked(), propBinding.repoEnableRebase.isChecked(),
-			propBinding.repoEnableSquash.isChecked(), propBinding.repoEnableForceMerge.isChecked()));
-
-		dialogProp.setCancelable(false);
-		dialogProp.show();
-	}
-
-	private void saveRepositoryProperties(String repoName, String repoWebsite, String repoDescription,
-		boolean repoPrivate, boolean repoAsTemplate, boolean repoEnableIssues, boolean repoEnableWiki,
-		boolean repoEnablePr, boolean repoEnableTimer, boolean repoEnableMerge, boolean repoEnableRebase,
-		boolean repoEnableSquash, boolean repoEnableForceMerge) {
-
-		UserRepositories.internalTimeTrackerObject repoPropsTimeTracker = new UserRepositories.internalTimeTrackerObject(repoEnableTimer);
-
-		UserRepositories repoProps;
-
-		if(!repoEnableIssues) {
-
-			repoProps = new UserRepositories(repoName, repoWebsite, repoDescription, repoPrivate, repoAsTemplate, repoEnableIssues, repoEnableWiki, repoEnablePr, repoEnableMerge,
-				repoEnableRebase, repoEnableSquash, repoEnableForceMerge);
-		}
-		else {
-
-			repoProps = new UserRepositories(repoName, repoWebsite, repoDescription, repoPrivate, repoAsTemplate, repoEnableIssues, repoEnableWiki, repoEnablePr, repoPropsTimeTracker, repoEnableMerge,
-				repoEnableRebase, repoEnableSquash, repoEnableForceMerge);
-		}
-
-		Call<UserRepositories> propsCall = RetrofitClient
-			.getApiInterface(ctx)
-			.updateRepositoryProperties(instanceToken, repositoryOwner, repositoryName, repoProps);
-
-		propsCall.enqueue(new Callback<UserRepositories>() {
-
-			@Override
-			public void onResponse(@NonNull Call<UserRepositories> call, @NonNull retrofit2.Response<UserRepositories> response) {
-
-				propBinding.save.setVisibility(View.GONE);
-				propBinding.processingRequest.setVisibility(View.VISIBLE);
-
-				if (response.code() == 200) {
-
-					tinyDB.putBoolean("hasIssues", repoEnableIssues);
-					tinyDB.putBoolean("hasPullRequests", repoEnablePr);
-
-					dialogProp.dismiss();
-					Toasty.success(ctx, getString(R.string.repoPropertiesSaveSuccess));
-
-					if(!repositoryName.equals(repoName)) {
-
-						finish();
-						BaseApi.getInstance(ctx, RepositoriesApi.class).updateRepositoryOwnerAndName(repositoryOwner, repoName, (int) tinyDB.getLong("repositoryId", 0));
-						Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class);
-						RepositorySettingsActivity.this.startActivity(intent);
-					}
-				}
-				else {
-
-					propBinding.save.setVisibility(View.VISIBLE);
-					propBinding.processingRequest.setVisibility(View.GONE);
-					Toasty.error(ctx, getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<UserRepositories> call, @NonNull Throwable t) {
-
-				propBinding.save.setVisibility(View.VISIBLE);
-				propBinding.processingRequest.setVisibility(View.GONE);
-				Toasty.error(ctx, getString(R.string.genericServerResponseError));
-			}
-		});
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> finish();
-	}
-
-}

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

@@ -1,19 +1,14 @@
 package org.mian.gitnex.activities;
 
-import android.app.Dialog;
+import android.content.Context;
-import android.app.TimePickerDialog;
 import android.os.Bundle;
-import android.text.format.DateFormat;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.TimePicker;
+import android.widget.Switch;
+import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-import com.google.android.material.switchmaterial.SwitchMaterial;
-import org.jetbrains.annotations.NotNull;
 import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsAppearanceBinding;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 
@@ -23,80 +18,116 @@ import org.mian.gitnex.helpers.Toasty;
 
 public class SettingsAppearanceActivity extends BaseActivity {
 
+	private Context appCtx;
 	private View.OnClickListener onClickListener;
 
-	private static String[] timeList;
+	private static String[] timeList = {"Pretty", "Normal"};
 	private static int timeSelectedChoice = 0;
 
-	private static String[] customFontList;
+	private static String[] codeBlockList = {"Green - Black", "White - Black", "Grey - Black", "White - Grey", "Dark - White"};
+	private static int codeBlockSelectedChoice = 0;
+
+	private static String[] homeScreenList = {"My Repositories", "Starred Repositories", "Organizations", "Repositories", "Profile", "Explore", "Drafts"};
+	private static int homeScreenSelectedChoice = 0;
+
+	private static String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
 	private static int customFontSelectedChoice = 0;
 
-	private static String[] themeList;
+	private static String[] themeList = {"Dark", "Light", "Auto (Day/Night)"};
 	private static int themeSelectedChoice = 0;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_appearance;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
 
-		ActivitySettingsAppearanceBinding activitySettingsAppearanceBinding = ActivitySettingsAppearanceBinding.inflate(getLayoutInflater());
+		final TinyDB tinyDb = new TinyDB(appCtx);
-		setContentView(activitySettingsAppearanceBinding.getRoot());
 
-		ImageView closeActivity = activitySettingsAppearanceBinding.close;
+		ImageView closeActivity = findViewById(R.id.close);
 
-		LinearLayout timeFrame = activitySettingsAppearanceBinding.timeFrame;
+		final TextView tvDateTimeSelected = findViewById(R.id.tvDateTimeSelected); // setter for time
-		LinearLayout customFontFrame = activitySettingsAppearanceBinding.customFontFrame;
+		final TextView codeBlockSelected = findViewById(R.id.codeBlockSelected); // setter for code block
-		LinearLayout themeFrame = activitySettingsAppearanceBinding.themeSelectionFrame;
+		final TextView homeScreenSelected = findViewById(R.id.homeScreenSelected); // setter for home screen
-		LinearLayout lightTimeFrame = activitySettingsAppearanceBinding.lightThemeTimeSelectionFrame;
+		final TextView customFontSelected = findViewById(R.id.customFontSelected); // setter for custom font
-		LinearLayout darkTimeFrame = activitySettingsAppearanceBinding.darkThemeTimeSelectionFrame;
+		final TextView themeSelected = findViewById(R.id.themeSelected); // setter for theme
 
-		SwitchMaterial counterBadgesSwitch = activitySettingsAppearanceBinding.switchCounterBadge;
+		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);
 
-		timeList = getResources().getStringArray(R.array.timeFormats);
+		Switch counterBadgesSwitch = findViewById(R.id.switchCounterBadge);
-		customFontList = getResources().getStringArray(R.array.fonts);
-		themeList = getResources().getStringArray(R.array.themes);
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		String lightMinute = String.valueOf(tinyDB.getInt("lightThemeTimeMinute"));
+		if(!tinyDb.getString("timeStr").isEmpty()) {
-		String lightHour = String.valueOf(tinyDB.getInt("lightThemeTimeHour"));
+			tvDateTimeSelected.setText(tinyDb.getString("timeStr"));
-		if(lightMinute.length() == 1) lightMinute = "0" + lightMinute;
+		}
-		if(lightHour.length() == 1) lightHour = "0" + lightHour;
 
-		String darkMinute = String.valueOf(tinyDB.getInt("darkThemeTimeMinute"));
+		if(!tinyDb.getString("codeBlockStr").isEmpty()) {
-		String darkHour = String.valueOf(tinyDB.getInt("darkThemeTimeHour"));
+			codeBlockSelected.setText(tinyDb.getString("codeBlockStr"));
-		if(darkMinute.length() == 1) darkMinute = "0" + darkMinute;
+		}
-		if(darkHour.length() == 1) darkHour = "0" + darkHour;
 
-		activitySettingsAppearanceBinding.lightThemeSelectedTime.setText(ctx.getResources().getString(R.string.settingsThemeTimeSelectedHint, lightHour,
+		if(!tinyDb.getString("homeScreenStr").isEmpty()) {
-			lightMinute));
+			homeScreenSelected.setText(tinyDb.getString("homeScreenStr"));
-		activitySettingsAppearanceBinding.darkThemeSelectedTime.setText(ctx.getResources().getString(R.string.settingsThemeTimeSelectedHint, darkHour,
+		}
-			darkMinute));
-		activitySettingsAppearanceBinding.tvDateTimeSelected.setText(tinyDB.getString("timeStr"));
-		activitySettingsAppearanceBinding.customFontSelected.setText(tinyDB.getString("customFontStr", "Manrope"));
-		activitySettingsAppearanceBinding.themeSelected.setText(tinyDB.getString("themeStr", "Dark"));
 
-		if(tinyDB.getString("themeStr").startsWith("Auto")) {
+		if(!tinyDb.getString("customFontStr").isEmpty()) {
-			darkTimeFrame.setVisibility(View.VISIBLE);
+			customFontSelected.setText(tinyDb.getString("customFontStr"));
-			lightTimeFrame.setVisibility(View.VISIBLE);
+		}
+
+		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 {
-			darkTimeFrame.setVisibility(View.GONE);
+			counterBadgesSwitch.setChecked(false);
-			lightTimeFrame.setVisibility(View.GONE);
 		}
 
-		timeSelectedChoice = tinyDB.getInt("timeId");
-		customFontSelectedChoice = tinyDB.getInt("customFontId", 1);
-		themeSelectedChoice = tinyDB.getInt("themeId");
-
-		counterBadgesSwitch.setChecked(tinyDB.getBoolean("enableCounterBadges"));
-
 		// counter badge switcher
 		counterBadgesSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
-			tinyDB.putBoolean("enableCounterBadges", isChecked);
+			if (isChecked) {
-			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+				tinyDb.putBoolean("enableCounterBadges", true);
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+			}
+			else {
+				tinyDb.putBoolean("enableCounterBadges", false);
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+			}
+
 		});
 
 		// theme selection dialog
@@ -105,34 +136,31 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
 
 			tsBuilder.setTitle(getResources().getString(R.string.themeSelectorDialogTitle));
-			tsBuilder.setCancelable(themeSelectedChoice != -1);
+			if(themeSelectedChoice != -1) {
+				tsBuilder.setCancelable(true);
+			}
+			else {
+				tsBuilder.setCancelable(false);
+			}
 
 			tsBuilder.setSingleChoiceItems(themeList, themeSelectedChoice, (dialogInterfaceTheme, i) -> {
 
 				themeSelectedChoice = i;
-				activitySettingsAppearanceBinding.themeSelected.setText(themeList[i]);
+				themeSelected.setText(themeList[i]);
-				tinyDB.putString("themeStr", themeList[i]);
+				tinyDb.putString("themeStr", themeList[i]);
-				tinyDB.putInt("themeId", i);
+				tinyDb.putInt("themeId", i);
 
-				tinyDB.putBoolean("refreshParent", true);
+				tinyDb.putBoolean("refreshParent", true);
 				this.recreate();
 				this.overridePendingTransition(0, 0);
 				dialogInterfaceTheme.dismiss();
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+
 			});
 
 			AlertDialog cfDialog = tsBuilder.create();
 			cfDialog.show();
-		});
 
-		lightTimeFrame.setOnClickListener(view -> {
-			LightTimePicker timePicker = new LightTimePicker();
-	        timePicker.show(getSupportFragmentManager(), "timePicker");
-		});
-
-		darkTimeFrame.setOnClickListener(view -> {
-			DarkTimePicker timePicker = new DarkTimePicker();
-	        timePicker.show(getSupportFragmentManager(), "timePicker");
 		});
 
 		// custom font dialog
@@ -141,24 +169,114 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			AlertDialog.Builder cfBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
 
 			cfBuilder.setTitle(R.string.settingsCustomFontSelectorDialogTitle);
-			cfBuilder.setCancelable(customFontSelectedChoice != -1);
+			if(customFontSelectedChoice != -1) {
+				cfBuilder.setCancelable(true);
+			}
+			else {
+				cfBuilder.setCancelable(false);
+			}
 
 			cfBuilder.setSingleChoiceItems(customFontList, customFontSelectedChoice, (dialogInterfaceCustomFont, i) -> {
 
 				customFontSelectedChoice = i;
-				activitySettingsAppearanceBinding.customFontSelected.setText(customFontList[i]);
+				customFontSelected.setText(customFontList[i]);
-				tinyDB.putString("customFontStr", customFontList[i]);
+				tinyDb.putString("customFontStr", customFontList[i]);
-				tinyDB.putInt("customFontId", i);
+				tinyDb.putInt("customFontId", i);
 
-				tinyDB.putBoolean("refreshParent", true);
+				tinyDb.putBoolean("refreshParent", true);
 				this.recreate();
 				this.overridePendingTransition(0, 0);
 				dialogInterfaceCustomFont.dismiss();
-				Toasty.success(appCtx, appCtx.getResources().getString(R.string.settingsSave));
+				Toasty.info(appCtx, appCtx.getResources().getString(R.string.settingsSave));
+
 			});
 
 			AlertDialog cfDialog = cfBuilder.create();
 			cfDialog.show();
+
+		});
+
+		// home screen dialog
+		homeScreenFrame.setOnClickListener(view -> {
+
+			AlertDialog.Builder hsBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
+
+			hsBuilder.setTitle(R.string.settingsHomeScreenSelectorDialogTitle);
+			if(homeScreenSelectedChoice != -1) {
+				hsBuilder.setCancelable(true);
+			}
+			else {
+				hsBuilder.setCancelable(false);
+			}
+
+			hsBuilder.setSingleChoiceItems(homeScreenList, homeScreenSelectedChoice, (dialogInterfaceHomeScreen, i) -> {
+
+				homeScreenSelectedChoice = i;
+				homeScreenSelected.setText(homeScreenList[i]);
+				tinyDb.putString("homeScreenStr", homeScreenList[i]);
+				tinyDb.putInt("homeScreenId", i);
+
+				dialogInterfaceHomeScreen.dismiss();
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+
+			});
+
+			AlertDialog hsDialog = hsBuilder.create();
+			hsDialog.show();
+
+		});
+
+		// code block dialog
+		codeBlockFrame.setOnClickListener(view -> {
+
+			AlertDialog.Builder cBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
+
+			cBuilder.setTitle(R.string.settingsCodeBlockSelectorDialogTitle);
+			if(codeBlockSelectedChoice != -1) {
+				cBuilder.setCancelable(true);
+			}
+			else {
+				cBuilder.setCancelable(false);
+			}
+
+			cBuilder.setSingleChoiceItems(codeBlockList, codeBlockSelectedChoice, (dialogInterfaceCodeBlock, i) -> {
+
+				codeBlockSelectedChoice = i;
+				codeBlockSelected.setText(codeBlockList[i]);
+				tinyDb.putString("codeBlockStr", codeBlockList[i]);
+				tinyDb.putInt("codeBlockId", i);
+
+				switch(codeBlockList[i]) {
+					case "White - Black":
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.white));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
+						break;
+					case "Grey - Black":
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorAccent));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
+						break;
+					case "White - Grey":
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.white));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.colorAccent));
+						break;
+					case "Dark - White":
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorPrimary));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.white));
+						break;
+					default:
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorLightGreen));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
+						break;
+				}
+
+				dialogInterfaceCodeBlock.dismiss();
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+
+			});
+
+			AlertDialog cDialog = cBuilder.create();
+			cDialog.show();
+
 		});
 
 		// time and date dialog
@@ -167,86 +285,44 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			AlertDialog.Builder tBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
 
 			tBuilder.setTitle(R.string.settingsTimeSelectorDialogTitle);
-			tBuilder.setCancelable(timeSelectedChoice != -1);
+			if(timeSelectedChoice != -1) {
+				tBuilder.setCancelable(true);
+			}
+			else {
+				tBuilder.setCancelable(false);
+			}
 
 			tBuilder.setSingleChoiceItems(timeList, timeSelectedChoice, (dialogInterfaceTime, i) -> {
 
 				timeSelectedChoice = i;
-				activitySettingsAppearanceBinding.tvDateTimeSelected.setText(timeList[i]);
+				tvDateTimeSelected.setText(timeList[i]);
-				tinyDB.putString("timeStr", timeList[i]);
+				tinyDb.putString("timeStr", timeList[i]);
-				tinyDB.putInt("timeId", i);
+				tinyDb.putInt("timeId", i);
 
-				switch(i) {
+				if("Normal".equals(timeList[i])) {
-					case 0:
+					tinyDb.putString("dateFormat", "normal");
-						tinyDB.putString("dateFormat", "pretty");
+				}
-						break;
+				else {
-					case 1:
+					tinyDb.putString("dateFormat", "pretty");
-						tinyDB.putString("dateFormat", "normal");
-						break;
 				}
 
 				dialogInterfaceTime.dismiss();
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+
 			});
 
 			AlertDialog tDialog = tBuilder.create();
 			tDialog.show();
+
+
 		});
 
 	}
 
 	private void initCloseListener() {
-		onClickListener = view -> finish();
+		onClickListener = view -> {
-	}
+			finish();
-
+		};
-	public static class LightTimePicker extends DialogFragment implements TimePickerDialog.OnTimeSetListener {
-
-		TinyDB db = TinyDB.getInstance(getContext());
-
-		@NotNull
-		@Override
-		public Dialog onCreateDialog(Bundle savedInstanceState) {
-			int hour = db.getInt("lightThemeTimeHour");
-			int minute = db.getInt("lightThemeTimeMinute");
-
-			return new TimePickerDialog(getActivity(), this, hour, minute, true);
-		}
-
-		@Override
-		public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
-			db.putInt("lightThemeTimeHour", hourOfDay);
-			db.putInt("lightThemeTimeMinute", minute);
-			db.putBoolean("refreshParent", true);
-			requireActivity().overridePendingTransition(0, 0);
-			this.dismiss();
-			Toasty.success(requireActivity().getApplicationContext(), requireContext().getResources().getString(R.string.settingsSave));
-			requireActivity().recreate();
-		}
-	}
-
-	public static class DarkTimePicker extends DialogFragment implements TimePickerDialog.OnTimeSetListener {
-
-		TinyDB db = TinyDB.getInstance(getContext());
-
-		@NotNull
-		@Override
-		public Dialog onCreateDialog(Bundle savedInstanceState) {
-			int hour = db.getInt("darkThemeTimeHour");
-			int minute = db.getInt("darkThemeTimeMinute");
-
-			return new TimePickerDialog(getActivity(), this, hour, minute, true);
-		}
-
-		@Override
-		public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
-			db.putInt("darkThemeTimeHour", hourOfDay);
-			db.putInt("darkThemeTimeMinute", minute);
-			db.putBoolean("refreshParent", true);
-			requireActivity().overridePendingTransition(0, 0);
-			this.dismiss();
-			Toasty.success(requireActivity().getApplicationContext(), requireContext().getResources().getString(R.string.settingsSave));
-			requireActivity().recreate();
-		}
 	}
 
 }

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

@@ -1,11 +1,13 @@
 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.databinding.ActivitySettingsDraftsBinding;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.TinyDB;
 
 /**
  * Author M M Arif
@@ -13,28 +15,49 @@ import org.mian.gitnex.helpers.Toasty;
 
 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();
 
-		ActivitySettingsDraftsBinding activitySettingsDraftsBinding = ActivitySettingsDraftsBinding.inflate(getLayoutInflater());
+		TinyDB tinyDb = new TinyDB(appCtx);
-		setContentView(activitySettingsDraftsBinding.getRoot());
 
-		ImageView closeActivity = activitySettingsDraftsBinding.close;
+		ImageView closeActivity = findViewById(R.id.close);
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		activitySettingsDraftsBinding.commentsDeletionSwitch.setChecked(tinyDB.getBoolean("draftsCommentsDeletionEnabled"));
+		Switch commentsDeletionSwitch = findViewById(R.id.commentsDeletionSwitch);
+
+		if(tinyDb.getBoolean("draftsCommentsDeletionEnabled")) {
+			commentsDeletionSwitch.setChecked(true);
+		}
+		else {
+			commentsDeletionSwitch.setChecked(false);
+		}
 
 		// delete comments on submit switcher
-		activitySettingsDraftsBinding.commentsDeletionSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+		commentsDeletionSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+
+			if(isChecked) {
+				tinyDb.putBoolean("draftsCommentsDeletionEnabled", true);
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+			}
+			else {
+				tinyDb.putBoolean("draftsCommentsDeletionEnabled", false);
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+			}
 
-			tinyDB.putBoolean("draftsCommentsDeletionEnabled", isChecked);
-			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
 		});
 
 	}

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

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

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

@@ -1,145 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.os.Bundle;
-import android.view.View;
-import androidx.appcompat.app.AlertDialog;
-import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsGeneralBinding;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.Version;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Author M M Arif
- */
-
-public class SettingsGeneralActivity extends BaseActivity {
-
-	private ActivitySettingsGeneralBinding viewBinding;
-	private View.OnClickListener onClickListener;
-
-	private List<String> homeScreenList;
-	private static int homeScreenSelectedChoice = 0;
-
-	private List<String> linkHandlerDefaultScreen;
-	private static int defaultLinkHandlerScreenSelectedChoice = 0;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		viewBinding = ActivitySettingsGeneralBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
-
-		initCloseListener();
-		viewBinding.close.setOnClickListener(onClickListener);
-
-		// home screen
-		String[] appHomeDefaultScreen = getResources().getStringArray(R.array.appDefaultHomeScreen);
-
-		String[] appHomeDefaultScreenNew = getResources().getStringArray(R.array.appDefaultHomeScreenNew);
-
-		if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.3")) {
-
-			appHomeDefaultScreen = appHomeDefaultScreenNew;
-		}
-
-		homeScreenList = new ArrayList<>(Arrays.asList(appHomeDefaultScreen));
-		String[] homeScreenArray = new String[homeScreenList.size()];
-		homeScreenList.toArray(homeScreenArray);
-
-		if(homeScreenSelectedChoice == 0) {
-
-			homeScreenSelectedChoice = tinyDB.getInt("homeScreenId");
-			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.pageTitleMyRepos));
-		}
-
-		if(homeScreenSelectedChoice == 1) {
-
-			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.pageTitleStarredRepos));
-		}
-		else if(homeScreenSelectedChoice == 2) {
-
-			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.pageTitleOrganizations));
-		}
-		else if(homeScreenSelectedChoice == 3) {
-
-			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.pageTitleRepositories));
-		}
-		else if(homeScreenSelectedChoice == 4) {
-
-			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.pageTitleProfile));
-		}
-		else if(homeScreenSelectedChoice == 5) {
-
-			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.pageTitleExplore));
-		}
-		else if(homeScreenSelectedChoice == 6) {
-
-			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.titleDrafts));
-		}
-		else if(homeScreenSelectedChoice == 7) {
-
-			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.pageTitleNotifications));
-		}
-
-		viewBinding.homeScreenFrame.setOnClickListener(setDefaultHomeScreen -> {
-
-			AlertDialog.Builder hsBuilder = new AlertDialog.Builder(SettingsGeneralActivity.this);
-
-			hsBuilder.setTitle(R.string.settingsHomeScreenSelectorDialogTitle);
-			hsBuilder.setCancelable(homeScreenSelectedChoice != -1);
-
-			hsBuilder.setSingleChoiceItems(homeScreenArray, homeScreenSelectedChoice, (dialogInterfaceHomeScreen, i) -> {
-
-				homeScreenSelectedChoice = i;
-				viewBinding.homeScreenSelected.setText(homeScreenArray[i]);
-				tinyDB.putInt("homeScreenId", i);
-
-				dialogInterfaceHomeScreen.dismiss();
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			});
-
-			AlertDialog hsDialog = hsBuilder.create();
-			hsDialog.show();
-		});
-		// home screen
-
-		// link handler
-		String[] linkHandlerDefaultScreenList = getResources().getStringArray(R.array.linkHandlerDefaultScreen);
-		linkHandlerDefaultScreen = new ArrayList<>(Arrays.asList(linkHandlerDefaultScreenList));
-
-		String[] linksArray = new String[linkHandlerDefaultScreen.size()];
-		linkHandlerDefaultScreen.toArray(linksArray);
-
-		defaultLinkHandlerScreenSelectedChoice = tinyDB.getInt("defaultScreenId");
-		viewBinding.generalDeepLinkSelected.setText(linksArray[defaultLinkHandlerScreenSelectedChoice]);
-
-		viewBinding.setDefaultLinkHandler.setOnClickListener(setDefaultLinkHandler -> {
-
-			AlertDialog.Builder dlBuilder = new AlertDialog.Builder(SettingsGeneralActivity.this);
-			dlBuilder.setTitle(R.string.linkSelectorDialogTitle);
-
-			dlBuilder.setCancelable(defaultLinkHandlerScreenSelectedChoice != -1);
-
-			dlBuilder.setSingleChoiceItems(linksArray, defaultLinkHandlerScreenSelectedChoice, (dialogInterfaceHomeScreen, i) -> {
-
-				defaultLinkHandlerScreenSelectedChoice = i;
-				viewBinding.generalDeepLinkSelected.setText(linksArray[i]);
-				tinyDB.putInt("defaultScreenId", i);
-
-				dialogInterfaceHomeScreen.dismiss();
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			});
-
-			AlertDialog dlDialog = dlBuilder.create();
-			dlDialog.show();
-		});
-		// link handler
-	}
-
-	private void initCloseListener() { onClickListener = view -> finish(); }
-}

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

@@ -1,123 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.NumberPicker;
-import androidx.appcompat.app.AlertDialog;
-import com.pes.androidmaterialcolorpickerdialog.ColorPicker;
-import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsNotificationsBinding;
-import org.mian.gitnex.helpers.Constants;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.notifications.Notifications;
-
-/**
- * Template Author M M Arif
- * Author opyale
- */
-
-public class SettingsNotificationsActivity extends BaseActivity {
-
-	private ActivitySettingsNotificationsBinding viewBinding;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		viewBinding = ActivitySettingsNotificationsBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
-
-		View.OnClickListener onClickListener = viewClose -> finish();
-
-		viewBinding.close.setOnClickListener(onClickListener);
-
-		viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay)));
-		viewBinding.chooseColorState.setCardBackgroundColor(tinyDB.getInt("notificationsLightColor", Color.GREEN));
-
-		viewBinding.enableNotificationsMode.setChecked(tinyDB.getBoolean("notificationsEnabled", true));
-		viewBinding.enableLightsMode.setChecked(tinyDB.getBoolean("notificationsEnableLights", true));
-		viewBinding.enableVibrationMode.setChecked(tinyDB.getBoolean("notificationsEnableVibration", true));
-
-		viewBinding.enableNotificationsMode.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			tinyDB.putBoolean("notificationsEnabled", isChecked);
-
-			if(isChecked) {
-				Notifications.startWorker(ctx);
-			} else {
-				Notifications.stopWorker(ctx);
-			}
-
-			Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-
-		});
-
-		// polling delay
-		viewBinding.pollingDelayFrame.setOnClickListener(v -> {
-
-			NumberPicker numberPicker = new NumberPicker(ctx);
-			numberPicker.setMinValue(Constants.minimumPollingDelay);
-			numberPicker.setMaxValue(Constants.maximumPollingDelay);
-			numberPicker.setValue(tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay));
-			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());
-
-				Notifications.stopWorker(ctx);
-				Notifications.startWorker(ctx);
-
-				viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), numberPicker.getValue()));
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-			});
-
-			builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
-			builder.setView(numberPicker);
-			builder.create().show();
-
-		});
-
-		// lights switcher
-		viewBinding.enableLightsMode.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			tinyDB.putBoolean("notificationsEnableLights", isChecked);
-			Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-
-		});
-
-		// lights color chooser
-		viewBinding.chooseColorFrame.setOnClickListener(v -> {
-
-			ColorPicker colorPicker = new ColorPicker(SettingsNotificationsActivity.this);
-			colorPicker.setColor(tinyDB.getInt("notificationsLightColor", Color.GREEN));
-			colorPicker.setCallback(color -> {
-
-				tinyDB.putInt("notificationsLightColor", color);
-				viewBinding.chooseColorState.setCardBackgroundColor(color);
-				colorPicker.dismiss();
-				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-			});
-
-			colorPicker.show();
-
-		});
-
-		// vibration switcher
-		viewBinding.enableVibrationMode.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			tinyDB.putBoolean("notificationsEnableVibration", isChecked);
-			Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-
-		});
-
-	}
-
-}

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

@@ -1,10 +1,12 @@
 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.databinding.ActivitySettingsReportsBinding;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 
 /**
@@ -13,33 +15,57 @@ import org.mian.gitnex.helpers.Toasty;
 
 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();
 
-		ActivitySettingsReportsBinding activitySettingsReportsBinding = ActivitySettingsReportsBinding.inflate(getLayoutInflater());
+		TinyDB tinyDb = new TinyDB(appCtx);
-		setContentView(activitySettingsReportsBinding.getRoot());
 
-		ImageView closeActivity = activitySettingsReportsBinding.close;
+		ImageView closeActivity = findViewById(R.id.close);
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		activitySettingsReportsBinding.crashReportsSwitch.setChecked(tinyDB.getBoolean("crashReportingEnabled"));
+		Switch crashReportsSwitch = findViewById(R.id.crashReportsSwitch);
+
+		if(tinyDb.getBoolean("crashReportingEnabled")) {
+			crashReportsSwitch.setChecked(true);
+		}
+		else {
+			crashReportsSwitch.setChecked(false);
+		}
 
 		// crash reports switcher
-		activitySettingsReportsBinding.crashReportsSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+		crashReportsSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+
+			if(isChecked) {
+				tinyDb.putBoolean("crashReportingEnabled", true);
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+			}
+			else {
+				tinyDb.putBoolean("crashReportingEnabled", false);
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+			}
 
-			tinyDB.putBoolean("crashReportingEnabled", isChecked);
-			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
 		});
+
 	}
 
 	private void initCloseListener() {
-		onClickListener = view -> finish();
+		onClickListener = view -> {
+			finish();
+		};
 	}
 
 }

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

@@ -1,27 +1,27 @@
 package org.mian.gitnex.activities;
 
-import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 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 androidx.biometric.BiometricManager;
-import com.google.android.material.switchmaterial.SwitchMaterial;
 import org.apache.commons.io.FileUtils;
 import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsSecurityBinding;
+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 static androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG;
+import java.util.HashSet;
-import static androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL;
 
 /**
  * Author M M Arif
@@ -29,128 +29,80 @@ import static androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTI
 
 public class SettingsSecurityActivity extends BaseActivity {
 
+	private Context appCtx;
+	private Context ctx = this;
+
 	private View.OnClickListener onClickListener;
 
-	private static String[] cacheSizeDataList;
+	private static String[] cacheSizeDataList = {"50 MB", "100 MB", "250 MB", "500 MB", "1 GB"};
 	private static int cacheSizeDataSelectedChoice = 0;
 
-	private static String[] cacheSizeImagesList;
+	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();
 
-		ActivitySettingsSecurityBinding activitySettingsSecurityBinding = ActivitySettingsSecurityBinding.inflate(getLayoutInflater());
+		TinyDB tinyDb = new TinyDB(appCtx);
-		setContentView(activitySettingsSecurityBinding.getRoot());
+		String currentVersion = tinyDb.getString("giteaVersion");
 
-		ImageView closeActivity = activitySettingsSecurityBinding.close;
+		ImageView closeActivity = findViewById(R.id.close);
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		TextView cacheSizeDataSelected = activitySettingsSecurityBinding.cacheSizeDataSelected; // setter for data cache size
+		TextView cacheSizeDataSelected = findViewById(R.id.cacheSizeDataSelected); // setter for data cache size
-		TextView cacheSizeImagesSelected = activitySettingsSecurityBinding.cacheSizeImagesSelected; // setter for images cache size
+		TextView cacheSizeImagesSelected = findViewById(R.id.cacheSizeImagesSelected); // setter for images cache size
-		TextView clearCacheSelected = activitySettingsSecurityBinding.clearCacheSelected; // setter for clear cache
+		TextView clearCacheSelected = findViewById(R.id.clearCacheSelected); // setter for clear cache
+		TextView pollingDelaySelected = findViewById(R.id.pollingDelaySelected);
 
-		LinearLayout certsFrame = activitySettingsSecurityBinding.certsFrame;
+		LinearLayout certsFrame = findViewById(R.id.certsFrame);
-		LinearLayout cacheSizeDataFrame = activitySettingsSecurityBinding.cacheSizeDataSelectionFrame;
+		LinearLayout pollingDelayFrame = findViewById(R.id.pollingDelayFrame);
-		LinearLayout cacheSizeImagesFrame = activitySettingsSecurityBinding.cacheSizeImagesSelectionFrame;
+		LinearLayout cacheSizeDataFrame = findViewById(R.id.cacheSizeDataSelectionFrame);
-		LinearLayout clearCacheFrame = activitySettingsSecurityBinding.clearCacheSelectionFrame;
+		LinearLayout cacheSizeImagesFrame = findViewById(R.id.cacheSizeImagesSelectionFrame);
+		LinearLayout clearCacheFrame = findViewById(R.id.clearCacheSelectionFrame);
 
-		SwitchMaterial switchBiometric = activitySettingsSecurityBinding.switchBiometric;
+		if(!tinyDb.getString("cacheSizeStr").isEmpty()) {
-
+			cacheSizeDataSelected.setText(tinyDb.getString("cacheSizeStr"));
-		cacheSizeDataList = getResources().getStringArray(R.array.cacheSizeList);
-		cacheSizeImagesList = getResources().getStringArray(R.array.cacheSizeList);
-
-		if(!tinyDB.getString("cacheSizeStr").isEmpty()) {
-
-			cacheSizeDataSelected.setText(tinyDB.getString("cacheSizeStr"));
 		}
 
-		if(!tinyDB.getString("cacheSizeImagesStr").isEmpty()) {
+		if(!tinyDb.getString("cacheSizeImagesStr").isEmpty()) {
-
+			cacheSizeImagesSelected.setText(tinyDb.getString("cacheSizeImagesStr"));
-			cacheSizeImagesSelected.setText(tinyDB.getString("cacheSizeImagesStr"));
 		}
 
 		if(cacheSizeDataSelectedChoice == 0) {
-
+			cacheSizeDataSelectedChoice = tinyDb.getInt("cacheSizeId");
-			cacheSizeDataSelectedChoice = tinyDB.getInt("cacheSizeId");
 		}
 
 		if(cacheSizeImagesSelectedChoice == 0) {
-
+			cacheSizeImagesSelectedChoice = tinyDb.getInt("cacheSizeImagesId");
-			cacheSizeImagesSelectedChoice = tinyDB.getInt("cacheSizeImagesId");
 		}
 
-		switchBiometric.setChecked(tinyDB.getBoolean("biometricStatus"));
+		if(new Version(currentVersion).less("1.12.3")) {
+			pollingDelayFrame.setVisibility(View.GONE);
+		}
 
-		// biometric switcher
+		pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), tinyDb.getInt("pollingDelayMinutes", DEFAULT_POLLING_DELAY)));
-		switchBiometric.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-
-				if(isChecked) {
-
-					BiometricManager biometricManager = BiometricManager.from(ctx);
-					KeyguardManager keyguardManager = (KeyguardManager) ctx.getSystemService(Context.KEYGUARD_SERVICE);
-
-					if (!keyguardManager.isDeviceSecure()) {
-
-						switch(biometricManager.canAuthenticate(BIOMETRIC_STRONG | DEVICE_CREDENTIAL)) {
-
-							case BiometricManager.BIOMETRIC_SUCCESS:
-
-								tinyDB.putBoolean("biometricStatus", true);
-								Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-								break;
-							case BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE:
-							case BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED:
-							case BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED:
-							case BiometricManager.BIOMETRIC_STATUS_UNKNOWN:
-
-								tinyDB.putBoolean("biometricStatus", false);
-								switchBiometric.setChecked(false);
-								Toasty.error(appCtx, getResources().getString(R.string.biometricNotSupported));
-								break;
-							case BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE:
-
-								tinyDB.putBoolean("biometricStatus", false);
-								switchBiometric.setChecked(false);
-								Toasty.error(appCtx, getResources().getString(R.string.biometricNotAvailable));
-								break;
-							case BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED:
-
-								tinyDB.putBoolean("biometricStatus", false);
-								switchBiometric.setChecked(false);
-								Toasty.info(appCtx, getResources().getString(R.string.enrollBiometric));
-								break;
-						}
-					}
-					else {
-
-						tinyDB.putBoolean("biometricStatus", true);
-						Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-					}
-				}
-				else {
-
-					tinyDB.putBoolean("biometricStatus", false);
-					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-				}
-			}
-			else {
-
-				tinyDB.putBoolean("biometricStatus", false);
-				Toasty.success(appCtx, getResources().getString(R.string.biometricNotSupported));
-			}
-
-		});
 
 		// clear cache setter
 		File cacheDir = appCtx.getCacheDir();
-		clearCacheSelected.setText(FileUtils.byteCountToDisplaySize((int) FileUtils.sizeOfDirectory(cacheDir)));
+		long size__ = FilesData.getFileSizeRecursively(new HashSet<>(), cacheDir);
+		if(size__ > 0) {
+			clearCacheSelected.setText(String.valueOf(AppUtil.formatFileSizeInDetail(size__)));
+		}
 
 		// clear cache
 		clearCacheFrame.setOnClickListener(v1 -> {
@@ -167,11 +119,14 @@ public class SettingsSecurityActivity extends BaseActivity {
 					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());
@@ -185,21 +140,28 @@ public class SettingsSecurityActivity extends BaseActivity {
 			AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsSecurityActivity.this);
 
 			tsBuilder.setTitle(getResources().getString(R.string.cacheSizeImagesDialogHeader));
-			tsBuilder.setCancelable(cacheSizeImagesSelectedChoice != -1);
+			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.putString("cacheSizeImagesStr", cacheSizeImagesList[i]);
-				tinyDB.putInt("cacheSizeImagesId", i);
+				tinyDb.putInt("cacheSizeImagesId", i);
 
 				dialogInterfaceTheme.dismiss();
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+
 			});
 
 			AlertDialog cfDialog = tsBuilder.create();
 			cfDialog.show();
+
 		});
 
 		// cache size data selection dialog
@@ -208,21 +170,28 @@ public class SettingsSecurityActivity extends BaseActivity {
 			AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsSecurityActivity.this);
 
 			tsBuilder.setTitle(getResources().getString(R.string.cacheSizeDataDialogHeader));
-			tsBuilder.setCancelable(cacheSizeDataSelectedChoice != -1);
+			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.putString("cacheSizeStr", cacheSizeDataList[i]);
-				tinyDB.putInt("cacheSizeId", i);
+				tinyDb.putInt("cacheSizeId", i);
 
 				dialogInterfaceTheme.dismiss();
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+
 			});
 
 			AlertDialog cfDialog = tsBuilder.create();
 			cfDialog.show();
+
 		});
 
 		// certs deletion
@@ -236,18 +205,53 @@ public class SettingsSecurityActivity extends BaseActivity {
 
 				appCtx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE).edit().remove(MemorizingTrustManager.KEYSTORE_KEY).apply();
 
-				tinyDB.putBoolean("loggedInMode", false);
+				tinyDb.putBoolean("loggedInMode", false);
-				tinyDB.remove("basicAuthPassword");
+				tinyDb.remove("basicAuthPassword");
-				tinyDB.putBoolean("basicAuthFlag", false);
+				tinyDb.putBoolean("basicAuthFlag", false);
 
 				Intent loginActivityIntent = new Intent().setClass(appCtx, LoginActivity.class);
 				loginActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 				appCtx.startActivity(loginActivityIntent);
+
 			});
 
 			builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
 			builder.create().show();
+
 		});
+
+		// polling delay
+		pollingDelayFrame.setOnClickListener(v -> {
+
+			NumberPicker numberPicker = new NumberPicker(ctx);
+			numberPicker.setMinValue(MINIMUM_POLLING_DELAY);
+			numberPicker.setMaxValue(MAXIMUM_POLLING_DELAY);
+			numberPicker.setValue(tinyDb.getInt("pollingDelayMinutes", DEFAULT_POLLING_DELAY));
+			numberPicker.setWrapSelectorWheel(true);
+
+			AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
+			builder.setTitle(getString(R.string.pollingDelayDialogHeaderText));
+			builder.setMessage(getString(R.string.pollingDelayDialogDescriptionText));
+
+			builder.setCancelable(true);
+			builder.setPositiveButton(getString(R.string.okButton), (dialog, which) -> {
+
+				tinyDb.putInt("pollingDelayMinutes", numberPicker.getValue());
+
+				NotificationsMaster.fireWorker(ctx);
+				NotificationsMaster.hireWorker(ctx);
+
+				pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), numberPicker.getValue()));
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
+
+			});
+
+			builder.setNegativeButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
+			builder.setView(numberPicker);
+			builder.create().show();
+
+		});
+
 	}
 
 	private void initCloseListener() {

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

@@ -1,5 +1,6 @@
 package org.mian.gitnex.activities;
 
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -9,11 +10,8 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
 import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsTranslationBinding;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.LinkedHashMap;
-import java.util.Locale;
-import java.util.TreeMap;
 
 /**
  * Author M M Arif
@@ -21,33 +19,36 @@ import java.util.TreeMap;
 
 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();
 
-		LinkedHashMap<String, String> langs = new LinkedHashMap<>();
+		TinyDB tinyDb = new TinyDB(appCtx);
-		langs.put("", getString(R.string.settingsLanguageSystem));
-		for(String langCode : getResources().getStringArray(R.array.languages)) {
-			langs.put(langCode, getLanguageDisplayName(langCode));
-		}
 
-		ActivitySettingsTranslationBinding activitySettingsTranslationBinding = ActivitySettingsTranslationBinding.inflate(getLayoutInflater());
+		ImageView closeActivity = findViewById(R.id.close);
-		setContentView(activitySettingsTranslationBinding.getRoot());
-
-		ImageView closeActivity = activitySettingsTranslationBinding.close;
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		final TextView tvLanguageSelected = activitySettingsTranslationBinding.tvLanguageSelected; // setter for en, fr
+		final TextView tvLanguageSelected = findViewById(R.id.tvLanguageSelected); // setter for en, fr
-		TextView helpTranslate = activitySettingsTranslationBinding.helpTranslate;
+		TextView helpTranslate = findViewById(R.id.helpTranslate);
 
-		LinearLayout langFrame = activitySettingsTranslationBinding.langFrame;
+		LinearLayout langFrame = findViewById(R.id.langFrame);
 
 		helpTranslate.setOnClickListener(v12 -> {
 
@@ -59,9 +60,13 @@ public class SettingsTranslationActivity extends BaseActivity {
 
 		});
 
-		tvLanguageSelected.setText(tinyDB.getString("localeStr"));
+		if(!tinyDb.getString("localeStr").isEmpty()) {
+			tvLanguageSelected.setText(tinyDb.getString("localeStr"));
+		}
 
-		langSelectedChoice = tinyDB.getInt("langId");
+		if(langSelectedChoice == 0) {
+			langSelectedChoice = tinyDb.getInt("langId");
+		}
 
 		// language dialog
 		langFrame.setOnClickListener(view -> {
@@ -69,38 +74,92 @@ public class SettingsTranslationActivity extends BaseActivity {
 			AlertDialog.Builder lBuilder = new AlertDialog.Builder(SettingsTranslationActivity.this);
 
 			lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
-			lBuilder.setCancelable(langSelectedChoice != -1);
+			if(langSelectedChoice != -1) {
+				lBuilder.setCancelable(true);
+			}
+			else {
+				lBuilder.setCancelable(false);
+			}
 
-			lBuilder.setSingleChoiceItems(langs.values().toArray(new String[0]), langSelectedChoice, (dialogInterface, i) -> {
+			lBuilder.setSingleChoiceItems(langList, langSelectedChoice, (dialogInterface, i) -> {
 
-				String selectedLanguage = langs.keySet().toArray(new String[0])[i];
+				langSelectedChoice = i;
-				tinyDB.putString("localeStr", langs.get(selectedLanguage));
+				tvLanguageSelected.setText(langList[i]);
-				tinyDB.putInt("langId", i);
+				tinyDb.putString("localeStr", langList[i]);
-				tinyDB.putString("locale", selectedLanguage);
+				tinyDb.putInt("langId", i);
 
-				tinyDB.putBoolean("refreshParent", true);
+				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));
+				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
-				this.recreate();
+
 			});
 
-			lBuilder.setNeutralButton(getString(R.string.cancelButton), null);
+			lBuilder.setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> dialog.dismiss());
 
 			AlertDialog lDialog = lBuilder.create();
 			lDialog.show();
+
 		});
+
 	}
 
 	private void initCloseListener() {
-
+		onClickListener = view -> {
-		onClickListener = view -> finish();
+			finish();
-	}
+		};
-
-	private static String getLanguageDisplayName(String langCode) {
-		Locale english = new Locale("en");
-		Locale translated = new Locale(langCode);
-		return String.format("%s (%s)", translated.getDisplayName(translated), translated.getDisplayName(english));
 	}
 
 }

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

@@ -0,0 +1,70 @@
+package org.mian.gitnex.activities;
+
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.View;
+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;
+    private Context appCtx;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_sponsors;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        appCtx = getApplicationContext();
+
+        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(appCtx));
+
+        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();
+            }
+        };
+    }
+
+}

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

@@ -1,171 +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.LinearLayout;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.recyclerview.widget.RecyclerView;
-import com.google.gson.JsonElement;
-import org.apache.commons.lang3.StringUtils;
-import org.gitnex.tea4j.models.CronTasks;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
-import java.util.Locale;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class AdminCronTasksAdapter extends RecyclerView.Adapter<AdminCronTasksAdapter.CronTasksViewHolder> {
-
-	private final List<CronTasks> tasksList;
-	private static TinyDB tinyDb;
-
-	static class CronTasksViewHolder extends RecyclerView.ViewHolder {
-
-		private CronTasks cronTasks;
-
-		private final TextView taskName;
-
-		private CronTasksViewHolder(View itemView) {
-
-			super(itemView);
-			Context ctx = itemView.getContext();
-
-			final Locale locale = ctx.getResources().getConfiguration().locale;
-			final String timeFormat = tinyDb.getString("dateFormat");
-
-			ImageView runTask = itemView.findViewById(R.id.runTask);
-			taskName = itemView.findViewById(R.id.taskName);
-			LinearLayout cronTasksInfo = itemView.findViewById(R.id.cronTasksInfo);
-			LinearLayout cronTasksRun = itemView.findViewById(R.id.cronTasksRun);
-
-			cronTasksInfo.setOnClickListener(taskInfo -> {
-
-				String nextRun = "";
-				String lastRun = "";
-
-				if(cronTasks.getNext() != null) {
-					nextRun = TimeHelper.formatTime(cronTasks.getNext(), locale, timeFormat, ctx);
-				}
-				if(cronTasks.getPrev() != null) {
-					lastRun = TimeHelper.formatTime(cronTasks.getPrev(), locale, timeFormat, ctx);
-				}
-
-				View view = LayoutInflater.from(ctx).inflate(R.layout.layout_cron_task_info, null);
-
-				TextView taskScheduleContent = view.findViewById(R.id.taskScheduleContent);
-				TextView nextRunContent = view.findViewById(R.id.nextRunContent);
-				TextView lastRunContent = view.findViewById(R.id.lastRunContent);
-				TextView execTimeContent = view.findViewById(R.id.execTimeContent);
-
-				taskScheduleContent.setText(cronTasks.getSchedule());
-				nextRunContent.setText(nextRun);
-				lastRunContent.setText(lastRun);
-				execTimeContent.setText(String.valueOf(cronTasks.getExec_times()));
-
-				AlertDialog.Builder alertDialog = new AlertDialog.Builder(ctx);
-
-				alertDialog.setTitle(StringUtils.capitalize(cronTasks.getName().replace("_", " ")));
-				alertDialog.setView(view);
-				alertDialog.setPositiveButton(ctx.getString(R.string.close), null);
-				alertDialog.create().show();
-
-			});
-
-			cronTasksRun.setOnClickListener(taskInfo -> {
-
-				runCronTask(ctx, cronTasks.getName());
-			});
-		}
-	}
-
-	public AdminCronTasksAdapter(Context ctx, List<CronTasks> tasksListMain) {
-
-		tinyDb = TinyDB.getInstance(ctx);
-		this.tasksList = tasksListMain;
-	}
-
-	@NonNull
-	@Override
-	public AdminCronTasksAdapter.CronTasksViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_admin_cron_tasks, parent, false);
-		return new AdminCronTasksAdapter.CronTasksViewHolder(v);
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull AdminCronTasksAdapter.CronTasksViewHolder holder, int position) {
-
-		CronTasks currentItem = tasksList.get(position);
-
-		holder.cronTasks = currentItem;
-		holder.taskName.setText(StringUtils.capitalize(currentItem.getName().replace("_", " ")));
-	}
-
-	private static void runCronTask(final Context ctx, final String taskName) {
-
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-
-		Call<JsonElement> call = RetrofitClient
-			.getApiInterface(ctx)
-			.adminRunCronTask(instanceToken, taskName);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				switch(response.code()) {
-
-					case 204:
-						Toasty.success(ctx, ctx.getString(R.string.adminCronTaskSuccessMsg, taskName));
-						break;
-
-					case 401:
-						AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getString(R.string.alertDialogTokenRevokedTitle),
-							ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
-							ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-							ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-						break;
-
-					case 403:
-						Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-						break;
-
-					case 404:
-						Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-						break;
-
-					default:
-						Toasty.error(ctx, ctx.getString(R.string.genericError));
-
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
-	}
-
-	@Override
-	public int getItemCount() {
-		return tasksList.size();
-	}
-}

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

@@ -1,8 +1,6 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
-import android.content.Intent;
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,15 +9,12 @@ import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.models.UserInfo;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,22 +24,19 @@ import java.util.List;
 
 public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdapter.UsersViewHolder> implements Filterable {
 
-    private final List<UserInfo> usersList;
+    private List<UserInfo> usersList;
-    private final Context context;
+    private Context mCtx;
-    private final List<UserInfo> usersListFull;
+    private List<UserInfo> usersListFull;
 
-    class UsersViewHolder extends RecyclerView.ViewHolder {
+    static class UsersViewHolder extends RecyclerView.ViewHolder {
 
-	    private String userLoginId;
+        private ImageView userAvatar;
-
+        private TextView userFullName;
-        private final ImageView userAvatar;
+        private TextView userEmail;
-        private final TextView userFullName;
+        private ImageView userRole;
-        private final TextView userEmail;
+        private TextView userName;
-        private final ImageView userRole;
-        private final TextView userName;
 
         private UsersViewHolder(View itemView) {
-
             super(itemView);
 
             userAvatar = itemView.findViewById(R.id.userAvatar);
@@ -53,22 +45,11 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
             userEmail = itemView.findViewById(R.id.userEmail);
             userRole = itemView.findViewById(R.id.userRole);
 
-	        itemView.setOnClickListener(loginId -> {
-		        Intent intent = new Intent(context, ProfileActivity.class);
-		        intent.putExtra("username", userLoginId);
-		        context.startActivity(intent);
-	        });
-
-	        userAvatar.setOnLongClickListener(loginId -> {
-		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-		        return true;
-	        });
         }
     }
 
-    public AdminGetUsersAdapter(Context ctx, List<UserInfo> usersListMain) {
+    public AdminGetUsersAdapter(Context mCtx, List<UserInfo> usersListMain) {
-
+        this.mCtx = mCtx;
-        this.context = ctx;
         this.usersList = usersListMain;
         usersListFull = new ArrayList<>(usersList);
     }
@@ -76,7 +57,6 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
     @NonNull
     @Override
     public AdminGetUsersAdapter.UsersViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
         View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_admin_users, parent, false);
         return new AdminGetUsersAdapter.UsersViewHolder(v);
     }
@@ -85,49 +65,40 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
     public void onBindViewHolder(@NonNull AdminGetUsersAdapter.UsersViewHolder holder, int position) {
 
         UserInfo currentItem = usersList.get(position);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-	    holder.userLoginId = currentItem.getLogin();
 
         if(!currentItem.getFullname().equals("")) {
-
+            holder.userFullName.setText(currentItem.getFullname());
-            holder.userFullName.setText(Html.fromHtml(currentItem.getFullname()));
+            holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
-            holder.userName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
         }
         else {
-
+            holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
-            holder.userFullName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
             holder.userName.setVisibility(View.GONE);
         }
 
         if(!currentItem.getEmail().equals("")) {
-
             holder.userEmail.setText(currentItem.getEmail());
         }
         else {
-
             holder.userEmail.setVisibility(View.GONE);
         }
 
         if(currentItem.getIs_admin()) {
-
             holder.userRole.setVisibility(View.VISIBLE);
             TextDrawable drawable = TextDrawable.builder()
                     .beginConfig()
-                    .textColor(ResourcesCompat.getColor(context.getResources(), R.color.colorWhite, null))
+                    .textColor(mCtx.getResources().getColor(R.color.white))
                     .fontSize(44)
                     .width(180)
                     .height(60)
                     .endConfig()
-                    .buildRoundRect(context.getResources().getString(R.string.userRoleAdmin).toLowerCase(), ResourcesCompat.getColor(context.getResources(), R.color.releasePre, null), 8);
+                    .buildRoundRect(mCtx.getResources().getString(R.string.userRoleAdmin).toLowerCase(), mCtx.getResources().getColor(R.color.releasePre), 8);
             holder.userRole.setImageDrawable(drawable);
         }
         else {
-
             holder.userRole.setVisibility(View.GONE);
         }
 
-        PicassoService.getInstance(context).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
     }
 
     @Override
@@ -140,15 +111,14 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
         return usersFilter;
     }
 
-    private final Filter usersFilter = new Filter() {
+    private Filter usersFilter = new Filter() {
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
             List<UserInfo> filteredList = new ArrayList<>();
 
             if (constraint == null || constraint.length() == 0) {
                 filteredList.addAll(usersListFull);
-            }
+            } else {
-            else {
                 String filterPattern = constraint.toString().toLowerCase().trim();
 
                 for (UserInfo item : usersListFull) {
@@ -166,7 +136,6 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
 
         @Override
         protected void publishResults(CharSequence constraint, FilterResults results) {
-
             usersList.clear();
             usersList.addAll((List) results.values);
             notifyDataSetChanged();

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

@@ -1,139 +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.CheckBox;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.Collaborators;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-
-/**
- * Author M M Arif
- */
-
-public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdapter.AssigneesViewHolder> {
-
-	private final Context context;
-	private final List<Collaborators> assigneesList;
-	private List<String> assigneesStrings = new ArrayList<>();
-	private List<String> currentAssignees;
-
-	private final AssigneesListAdapterListener assigneesListener;
-
-	public interface AssigneesListAdapterListener {
-
-		void assigneesInterface(List<String> data);
-	}
-
-	public AssigneesListAdapter(Context ctx, List<Collaborators> dataMain, AssigneesListAdapterListener assigneesListener, List<String> currentAssignees) {
-
-		this.context = ctx;
-		this.assigneesList = dataMain;
-		this.assigneesListener = assigneesListener;
-		this.currentAssignees = currentAssignees;
-	}
-
-	static class AssigneesViewHolder extends RecyclerView.ViewHolder {
-
-		private final CheckBox assigneesSelection;
-		private final TextView assigneesName;
-		private final ImageView assigneesAvatar;
-
-		private AssigneesViewHolder(View itemView) {
-
-			super(itemView);
-			this.setIsRecyclable(false);
-
-			assigneesSelection = itemView.findViewById(R.id.assigneesSelection);
-			assigneesName = itemView.findViewById(R.id.assigneesName);
-			assigneesAvatar = itemView.findViewById(R.id.assigneesAvatar);
-		}
-	}
-
-	@NonNull
-	@Override
-	public AssigneesListAdapter.AssigneesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.custom_assignees_list, parent, false);
-		return new AssigneesListAdapter.AssigneesViewHolder(v);
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull AssigneesListAdapter.AssigneesViewHolder holder, int position) {
-
-		Collaborators currentItem = assigneesList.get(position);
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-		if(currentItem.getFull_name().equals("")) {
-
-			holder.assigneesName.setText(currentItem.getLogin());
-		}
-		else {
-
-			holder.assigneesName.setText(Html.fromHtml(currentItem.getFull_name()));
-		}
-		PicassoService
-			.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(180, 180).centerCrop().into(holder.assigneesAvatar);
-
-		for(int i = 0; i < assigneesList.size(); i++) {
-
-			if(assigneesStrings.contains(currentItem.getLogin())) {
-
-				holder.assigneesSelection.setChecked(true);
-			}
-		}
-
-		currentAssignees = new ArrayList<>(new LinkedHashSet<>(currentAssignees));
-
-		for(int i = 0; i < currentAssignees.size(); i++) {
-
-			if(currentAssignees.contains(currentItem.getLogin())) {
-
-				holder.assigneesSelection.setChecked(true);
-				assigneesStrings.add(currentAssignees.get(i));
-			}
-		}
-
-		assigneesListener.assigneesInterface(assigneesStrings);
-
-		holder.assigneesSelection.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			if(isChecked) {
-
-				assigneesStrings.add(currentItem.getLogin());
-			}
-			else {
-
-				assigneesStrings.remove(currentItem.getLogin());
-			}
-
-			assigneesListener.assigneesInterface(assigneesStrings);
-		});
-
-		assigneesStrings = new ArrayList<>(new LinkedHashSet<>(assigneesStrings));
-	}
-
-	@Override
-	public int getItemCount() {
-
-		return assigneesList.size();
-	}
-
-	public void updateList(List<String> list) {
-
-		currentAssignees = list;
-		notifyDataSetChanged();
-	}
-}

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

@@ -0,0 +1,90 @@
+package org.mian.gitnex.adapters;
+
+import android.content.Context;
+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 java.util.List;
+import java.util.Objects;
+
+/**
+ * Author M M Arif
+ */
+
+public class BranchesAdapter extends RecyclerView.Adapter<BranchesAdapter.BranchesViewHolder> {
+
+    private List<Branches> branchesList;
+    private Context mCtx;
+
+    static class BranchesViewHolder extends RecyclerView.ViewHolder {
+
+        private TextView branchNameTv;
+        private TextView branchCommitAuthor;
+
+        private BranchesViewHolder(View itemView) {
+            super(itemView);
+
+            branchNameTv = itemView.findViewById(R.id.branchName);
+            branchCommitAuthor = itemView.findViewById(R.id.branchCommitAuthor);
+            Button branchCommitHash = itemView.findViewById(R.id.branchCommitHash);
+
+            branchCommitHash.setOnClickListener(new View.OnClickListener() {
+                public void onClick(View v) {
+
+                    Intent intent = new Intent(v.getContext(), CommitsActivity.class);
+                    intent.putExtra("branchName", String.valueOf(branchNameTv.getText()));
+                    Objects.requireNonNull(v.getContext()).startActivity(intent);
+
+                }
+            });
+
+        }
+    }
+
+    public BranchesAdapter(Context mCtx, List<Branches> branchesMain) {
+        this.mCtx = mCtx;
+        this.branchesList = branchesMain;
+    }
+
+    @NonNull
+    @Override
+    public BranchesAdapter.BranchesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_branches, parent, false);
+        return new BranchesAdapter.BranchesViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull BranchesAdapter.BranchesViewHolder holder, int position) {
+
+        final TinyDB tinyDb = new TinyDB(mCtx);
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+
+        Branches currentItem = branchesList.get(position);
+        holder.branchNameTv.setText(currentItem.getName());
+
+        if(currentItem.getCommit().getAuthor().getName() != null || !currentItem.getCommit().getAuthor().getName().equals("")) {
+            holder.branchCommitAuthor.setText(mCtx.getResources().getString(R.string.commitAuthor, currentItem.getCommit().getAuthor().getName()));
+        }
+        else {
+            holder.branchCommitAuthor.setText(mCtx.getResources().getString(R.string.commitAuthor, currentItem.getCommit().getAuthor().getUsername()));
+        }
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return branchesList.size();
+    }
+
+}
+
+

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

@@ -2,19 +2,15 @@ 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.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import org.gitnex.tea4j.models.Collaborators;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import java.util.List;
 
@@ -24,37 +20,22 @@ import java.util.List;
 
 public class CollaboratorsAdapter extends BaseAdapter  {
 
-    private final List<Collaborators> collaboratorsList;
+    private List<Collaborators> collaboratorsList;
-    private final Context context;
+    private Context mCtx;
 
     private class ViewHolder {
 
-	    private String userLoginId;
+        private ImageView collaboratorAvatar;
-
+        private TextView collaboratorName;
-        private final ImageView collaboratorAvatar;
-        private final TextView collaboratorName;
 
         ViewHolder(View v) {
-
             collaboratorAvatar  = v.findViewById(R.id.collaboratorAvatar);
             collaboratorName  = v.findViewById(R.id.collaboratorName);
-
-	        collaboratorAvatar.setOnClickListener(loginId -> {
-		        Intent intent = new Intent(context, ProfileActivity.class);
-		        intent.putExtra("username", userLoginId);
-		        context.startActivity(intent);
-	        });
-
-	        collaboratorAvatar.setOnLongClickListener(loginId -> {
-		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-		        return true;
-	        });
         }
     }
 
-    public CollaboratorsAdapter(Context ctx, List<Collaborators> collaboratorsListMain) {
+    public CollaboratorsAdapter(Context mCtx, List<Collaborators> collaboratorsListMain) {
-
+        this.mCtx = mCtx;
-        this.context = ctx;
         this.collaboratorsList = collaboratorsListMain;
     }
 
@@ -80,35 +61,28 @@ public class CollaboratorsAdapter extends BaseAdapter  {
         ViewHolder viewHolder = null;
 
         if (finalView == null) {
-
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_collaborators, null);
-            finalView = LayoutInflater.from(context).inflate(R.layout.list_collaborators, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
         else {
-
             viewHolder = (ViewHolder) finalView.getTag();
         }
 
         initData(viewHolder, position);
         return finalView;
+
     }
 
     private void initData(ViewHolder viewHolder, int position) {
 
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
         Collaborators currentItem = collaboratorsList.get(position);
-        PicassoService.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(180, 180).centerCrop().into(viewHolder.collaboratorAvatar);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.collaboratorAvatar);
-
-	    viewHolder.userLoginId = currentItem.getLogin();
 
         if(!currentItem.getFull_name().equals("")) {
-
+            viewHolder.collaboratorName.setText(currentItem.getFull_name());
-            viewHolder.collaboratorName.setText(Html.fromHtml(currentItem.getFull_name()));
         }
         else {
-
             viewHolder.collaboratorName.setText(currentItem.getLogin());
         }
 

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

@@ -11,12 +11,11 @@ import android.widget.Button;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.Commits;
 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 java.util.List;
 import java.util.Locale;
 
@@ -26,7 +25,7 @@ import java.util.Locale;
 
 public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-    private final Context context;
+    private Context ctx;
     private final int TYPE_LOAD = 0;
     private List<Commits> commitsList;
     private CommitsAdapter.OnLoadMoreListener loadMoreListener;
@@ -35,15 +34,16 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 
     public CommitsAdapter(Context ctx, List<Commits> commitsListMain) {
 
-        this.context = ctx;
+        this.ctx = ctx;
         this.commitsList = commitsListMain;
+
     }
 
     @NonNull
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
-        LayoutInflater inflater = LayoutInflater.from(context);
+        LayoutInflater inflater = LayoutInflater.from(ctx);
 
         if(viewType == TYPE_LOAD) {
             return new CommitsHolder(inflater.inflate(R.layout.list_commits, parent, false));
@@ -51,19 +51,25 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
         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) {
+
             ((CommitsHolder) holder).bindData(commitsList.get(position));
+
         }
+
     }
 
     @Override
@@ -75,12 +81,14 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
         else {
             return 1;
         }
+
     }
 
     @Override
     public int getItemCount() {
 
         return commitsList.size();
+
     }
 
     class CommitsHolder extends RecyclerView.ViewHolder {
@@ -98,23 +106,27 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
             commitCommitter = itemView.findViewById(R.id.commitCommitterVw);
             commitDate = itemView.findViewById(R.id.commitDateVw);
             commitHtmlUrl = itemView.findViewById(R.id.commitHtmlUrlVw);
+
         }
 
         @SuppressLint("SetTextI18n")
         void bindData(Commits commitsModel) {
 
-            final TinyDB tinyDb = TinyDB.getInstance(context);
+            final TinyDB tinyDb = new TinyDB(ctx);
-	        Locale locale = context.getResources().getConfiguration().locale;
+            final String locale = tinyDb.getString("locale");
             final String timeFormat = tinyDb.getString("dateFormat");
 
-            commitTitle.setText(EmojiParser.parseToUnicode(commitsModel.getCommit().getMessage()));
+            commitTitle.setText(commitsModel.getCommit().getMessage());
-            commitCommitter.setText(context.getString(R.string.commitCommittedBy, commitsModel.getCommit().getCommitter().getName()));
+            commitCommitter.setText(ctx.getString(R.string.commitCommittedBy, commitsModel.getCommit().getCommitter().getName()));
-            commitDate.setText(TimeHelper.formatTime(commitsModel.getCommit().getCommitter().getDate(), locale, timeFormat, context));
+
+            commitDate.setText(TimeHelper.formatTime(commitsModel.getCommit().getCommitter().getDate(), new Locale(locale), timeFormat, ctx));
 
             if(timeFormat.equals("pretty")) {
-                commitDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(commitsModel.getCommit().getCommitter().getDate()), context));
+                commitDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(commitsModel.getCommit().getCommitter().getDate()), ctx));
             }
-            commitHtmlUrl.setOnClickListener(v -> context.startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(commitsModel.getHtml_url()))));
+
+            commitHtmlUrl.setOnClickListener(v -> ctx.startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(commitsModel.getHtml_url()))));
+
         }
 
     }
@@ -122,29 +134,41 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
     static class LoadHolder extends RecyclerView.ViewHolder {
 
         LoadHolder(View itemView) {
+
             super(itemView);
         }
+
     }
 
     public void setMoreDataAvailable(boolean moreDataAvailable) {
+
         isMoreDataAvailable = moreDataAvailable;
+
     }
 
     public void notifyDataChanged() {
+
         notifyDataSetChanged();
         isLoading = false;
+
     }
 
     public interface OnLoadMoreListener {
+
         void onLoadMore();
+
     }
 
     public void setLoadMoreListener(CommitsAdapter.OnLoadMoreListener loadMoreListener) {
+
         this.loadMoreListener = loadMoreListener;
+
     }
 
     public void updateList(List<Commits> list) {
+
         commitsList = list;
         notifyDataSetChanged();
     }
+
 }

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

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

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

@@ -3,25 +3,18 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
+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.core.content.res.ResourcesCompat;
-import androidx.core.text.HtmlCompat;
-import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.IssueDetailActivity;
+import org.mian.gitnex.activities.ReplyToIssueActivity;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.DraftsApi;
 import org.mian.gitnex.database.models.DraftWithRepository;
-import org.mian.gitnex.fragments.BottomSheetReplyFragment;
-import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import java.util.List;
@@ -33,16 +26,18 @@ import java.util.List;
 public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsViewHolder> {
 
     private List<DraftWithRepository> draftsList;
-    private final FragmentManager fragmentManager;
+    private Context mCtx;
-    private final Context context;
 
     class DraftsViewHolder extends RecyclerView.ViewHolder {
 
-    	private DraftWithRepository draftWithRepository;
+        private TextView draftText;
-
+        private TextView repoInfo;
-        private final TextView draftText;
+        private TextView repoId;
-        private final TextView repoInfo;
+        private TextView draftId;
-	    private final ImageView editCommentStatus;
+        private TextView issueNumber;
+        private TextView issueType;
+        private TextView repoOwner;
+        private TextView repoName;
 
         private DraftsViewHolder(View itemView) {
 
@@ -50,53 +45,46 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 
             draftText = itemView.findViewById(R.id.draftText);
             repoInfo = itemView.findViewById(R.id.repoInfo);
+            repoId = itemView.findViewById(R.id.repoId);
+            draftId = itemView.findViewById(R.id.draftId);
+            issueNumber = itemView.findViewById(R.id.issueNumber);
+            issueType = itemView.findViewById(R.id.issueType);
+            repoOwner = itemView.findViewById(R.id.repoOwner);
+            repoName = itemView.findViewById(R.id.repoName);
             ImageView deleteDraft = itemView.findViewById(R.id.deleteDraft);
-	        editCommentStatus = itemView.findViewById(R.id.editCommentStatus);
 
             deleteDraft.setOnClickListener(itemDelete -> {
 
-                int getDraftId = draftWithRepository.getDraftId();
+                int getDraftId = Integer.parseInt(draftId.getText().toString());
                 deleteDraft(getAdapterPosition());
-
+	            DraftsApi draftsApi = new DraftsApi(mCtx);
-	            DraftsApi draftsApi = BaseApi.getInstance(context, DraftsApi.class);
-	            assert draftsApi != null;
 	            draftsApi.deleteSingleDraft(getDraftId);
 
             });
 
 	        itemView.setOnClickListener(itemEdit -> {
 
-		        Bundle bundle = new Bundle();
+                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());
 
-                bundle.putString("commentBody", draftWithRepository.getDraftText());
+                TinyDB tinyDb = new TinyDB(mCtx);
-                bundle.putString("issueNumber", String.valueOf(draftWithRepository.getIssueId()));
+                tinyDb.putString("issueNumber", issueNumber.getText().toString());
-                bundle.putString("repositoryId", String.valueOf(draftWithRepository.getRepositoryId()));
+                tinyDb.putLong("repositoryId", Long.parseLong(repoId.getText().toString()));
-                bundle.putString("draftTitle", repoInfo.getText().toString());
+                //tinyDb.putString("issueType", issueType.getText().toString());
-		        bundle.putString("commentId", draftWithRepository.getCommentId());
-		        bundle.putString("draftId", String.valueOf(draftWithRepository.getDraftId()));
 
-                if(!draftWithRepository.getCommentId().isEmpty()) {
+                mCtx.startActivity(intent);
-	                bundle.putString("commentAction", "edit");
-                }
 
-                TinyDB tinyDb = TinyDB.getInstance(context);
-                tinyDb.putString("issueNumber", String.valueOf(draftWithRepository.getIssueId()));
-                tinyDb.putLong("repositoryId", draftWithRepository.getRepositoryId());
-		        tinyDb.putString("issueType", draftWithRepository.getIssueType());
-		        tinyDb.putString("repoFullName", draftWithRepository.getRepositoryOwner() + "/" + draftWithRepository.getRepositoryName());
-
-		        BottomSheetReplyFragment bottomSheetReplyFragment = BottomSheetReplyFragment.newInstance(bundle);
-		        bottomSheetReplyFragment.setOnInteractedListener(() -> context.startActivity(new Intent(context, IssueDetailActivity.class)));
-		        bottomSheetReplyFragment.show(fragmentManager, "replyBottomSheet");
             });
 
         }
 
     }
 
-    public DraftsAdapter(Context ctx, FragmentManager fragmentManager, List<DraftWithRepository> draftsListMain) {
+    public DraftsAdapter(Context mCtx, List<DraftWithRepository> draftsListMain) {
-        this.context = ctx;
+        this.mCtx = mCtx;
-        this.fragmentManager = fragmentManager;
         this.draftsList = draftsListMain;
     }
 
@@ -105,7 +93,8 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
         draftsList.remove(position);
         notifyItemRemoved(position);
         notifyItemRangeChanged(position, draftsList.size());
-        Toasty.success(context, context.getResources().getString(R.string.draftsSingleDeleteSuccess));
+        Toasty.info(mCtx, mCtx.getResources().getString(R.string.draftsSingleDeleteSuccess));
+
     }
 
     @NonNull
@@ -121,21 +110,17 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 
         DraftWithRepository currentItem = draftsList.get(position);
 
-	    String issueNumber = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources().getString(R.string.hash) + currentItem.getIssueId() + "</font>";
+        holder.repoId.setText(String.valueOf(currentItem.getRepositoryId()));
-	    Spanned headTitle = HtmlCompat
+        holder.draftId.setText(String.valueOf(currentItem.getDraftId()));
-		    .fromHtml(issueNumber + " " + currentItem.getRepositoryOwner() + " / " + currentItem.getRepositoryName(), HtmlCompat.FROM_HTML_MODE_LEGACY);
+        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.repoInfo.setText(headTitle);
+	    String issueNumber = "<font color='" + mCtx.getResources().getColor(R.color.lightGray) + "'>" + mCtx.getResources().getString(R.string.hash) + currentItem.getIssueId() + "</font>";
-	    holder.draftWithRepository = currentItem;
+	    holder.repoInfo.setText(Html.fromHtml(issueNumber + " " + currentItem.getRepositoryOwner() + " / " + currentItem.getRepositoryName()));
 
-	    Markdown.render(context, currentItem.getDraftText(), holder.draftText);
-
-	    if(!currentItem.getCommentId().equalsIgnoreCase("new")) {
-		    holder.editCommentStatus.setVisibility(View.VISIBLE);
-	    }
-	    else {
-	    	holder.editCommentStatus.setVisibility(View.GONE);
-	    }
     }
 
     @Override
@@ -148,4 +133,6 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 		draftsList = list;
 		notifyDataSetChanged();
 	}
+
+
 }

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

@@ -1,226 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-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.core.content.res.ResourcesCompat;
-import androidx.core.text.HtmlCompat;
-import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.Issues;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.IssueDetailActivity;
-import org.mian.gitnex.activities.ProfileActivity;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.database.api.BaseApi;
-import org.mian.gitnex.database.api.RepositoriesApi;
-import org.mian.gitnex.database.models.Repository;
-import org.mian.gitnex.helpers.AppUtil;
-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.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * Author M M Arif
- */
-
-public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-	private final Context context;
-	private final int TYPE_LOAD = 0;
-	private List<Issues> searchedList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
-	private final TinyDB tinyDb;
-
-	public ExploreIssuesAdapter(List<Issues> dataList, Context ctx) {
-		this.context = ctx;
-		this.searchedList = dataList;
-		this.tinyDb = TinyDB.getInstance(context);
-	}
-
-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		LayoutInflater inflater = LayoutInflater.from(context);
-		if(viewType == TYPE_LOAD) {
-			return new ExploreIssuesAdapter.IssuesHolder(inflater.inflate(R.layout.list_issues, parent, false));
-		}
-		else {
-			return new ExploreIssuesAdapter.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) {
-			((ExploreIssuesAdapter.IssuesHolder) holder).bindData(searchedList.get(position));
-		}
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if(searchedList.get(position).getTitle() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return searchedList.size();
-	}
-
-	class IssuesHolder extends RecyclerView.ViewHolder {
-		private Issues issue;
-		private final ImageView issueAssigneeAvatar;
-		private final TextView issueTitle;
-		private final TextView issueCreatedTime;
-		private final TextView issueCommentsCount;
-
-		IssuesHolder(View itemView) {
-			super(itemView);
-			issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
-			issueTitle = itemView.findViewById(R.id.issueTitle);
-			issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
-			issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
-
-			itemView.setOnClickListener(v -> {
-				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", issue.getNumber());
-				intent.putExtra("openedFromLink", "true");
-
-				tinyDb.putString("issueNumber", String.valueOf(issue.getNumber()));
-				tinyDb.putString("issueType", "Issue");
-
-				tinyDb.putString("repoFullName", issue.getRepository().getFull_name());
-
-				String[] parts = issue.getRepository().getFull_name().split("/");
-				final String repoOwner = parts[0];
-				final String repoName = parts[1];
-
-				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
-
-				assert repositoryData != null;
-				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());
-				}
-
-				context.startActivity(intent);
-			});
-
-			issueAssigneeAvatar.setOnClickListener(v -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", issue.getUser().getLogin());
-				context.startActivity(intent);
-			});
-
-			issueAssigneeAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, issue.getUser().getLogin(), context.getString(R.string.copyLoginIdToClipBoard, issue.getUser().getLogin()));
-				return true;
-			});
-		}
-
-		@SuppressLint("SetTextI18n")
-		void bindData(Issues issue) {
-			this.issue = issue;
-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-			Locale locale = context.getResources().getConfiguration().locale;
-			String timeFormat = tinyDb.getString("dateFormat");
-
-			PicassoService.getInstance(context).get()
-				.load(issue.getUser().getAvatar_url())
-				.placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0))
-				.resize(120, 120)
-				.centerCrop()
-				.into(issueAssigneeAvatar);
-
-			String issueNumber_ = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + issue.getRepository().getFull_name() + context.getResources().getString(R.string.hash) + issue.getNumber() + "</font>";
-
-			issueTitle.setText(HtmlCompat.fromHtml(issueNumber_ + " " + issue.getTitle(), HtmlCompat.FROM_HTML_MODE_LEGACY));
-			issueCommentsCount.setText(String.valueOf(issue.getComments()));
-
-			switch(timeFormat) {
-				case "pretty": {
-					PrettyTime prettyTime = new PrettyTime(locale);
-					String createdTime = prettyTime.format(issue.getCreated_at());
-					issueCreatedTime.setText(createdTime);
-					issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issue.getCreated_at()), context));
-					break;
-				}
-				case "normal": {
-					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-					String createdTime = formatter.format(issue.getCreated_at());
-					issueCreatedTime.setText(createdTime);
-					break;
-				}
-				case "normal1": {
-					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-					String createdTime = formatter.format(issue.getCreated_at());
-					issueCreatedTime.setText(createdTime);
-					break;
-				}
-			}
-
-		}
-	}
-
-	static class LoadHolder extends RecyclerView.ViewHolder {
-		LoadHolder(View itemView) {
-			super(itemView);
-		}
-	}
-
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public interface OnLoadMoreListener {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<Issues> list) {
-		searchedList = list;
-		notifyDataChanged();
-	}
-}

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

@@ -1,154 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-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.gitnex.tea4j.models.Organization;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.OrganizationDetailActivity;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TinyDB;
-import java.util.List;
-
-/**
- * Author M M Arif
- */
-
-public class ExplorePublicOrganizationsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-	private final Context context;
-	private final int TYPE_LOAD = 0;
-	private List<Organization> organizationsList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
-
-	public ExplorePublicOrganizationsAdapter(Context ctx, List<Organization> organizationsListMain) {
-		this.context = ctx;
-		this.organizationsList = organizationsListMain;
-	}
-
-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		LayoutInflater inflater = LayoutInflater.from(context);
-		if(viewType == TYPE_LOAD) {
-			return new ExplorePublicOrganizationsAdapter.OrganizationsHolder(inflater.inflate(R.layout.list_organizations, parent, false));
-		}
-		else {
-			return new ExplorePublicOrganizationsAdapter.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) {
-			((ExplorePublicOrganizationsAdapter.OrganizationsHolder) holder).bindData(organizationsList.get(position));
-		}
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if(organizationsList.get(position).getFull_name() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return organizationsList.size();
-	}
-
-	class OrganizationsHolder extends RecyclerView.ViewHolder {
-		private Organization organization;
-		private final ImageView image;
-		private final TextView orgName;
-		private final TextView orgDescription;
-
-		OrganizationsHolder(View itemView) {
-			super(itemView);
-			image = itemView.findViewById(R.id.imageAvatar);
-			orgName = itemView.findViewById(R.id.orgName);
-			orgDescription = itemView.findViewById(R.id.orgDescription);
-
-			itemView.setOnClickListener(v -> {
-				Context context = v.getContext();
-				Intent intent = new Intent(context, OrganizationDetailActivity.class);
-				intent.putExtra("orgName", organization.getUsername());
-
-				TinyDB tinyDb = TinyDB.getInstance(context);
-				tinyDb.putString("orgName", organization.getUsername());
-				tinyDb.putString("organizationId", String.valueOf(organization.getId()));
-				tinyDb.putBoolean("organizationAction", true);
-				context.startActivity(intent);
-			});
-		}
-
-		@SuppressLint("SetTextI18n")
-		void bindData(Organization organization) {
-			this.organization = organization;
-		    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-			orgName.setText(organization.getUsername());
-	        PicassoService.getInstance(context).get()
-		        .load(organization.getAvatar_url())
-		        .placeholder(R.drawable.loader_animated)
-		        .transform(new RoundedTransformation(imgRadius, 0))
-		        .resize(120, 120)
-		        .centerCrop()
-		        .into(image);
-
-			if(!organization.getDescription().equals("")) {
-				orgDescription.setVisibility(View.VISIBLE);
-				orgDescription.setText(organization.getDescription());
-			}
-			else {
-				orgDescription.setVisibility(View.GONE);
-			}
-		}
-	}
-
-	static class LoadHolder extends RecyclerView.ViewHolder {
-		LoadHolder(View itemView) {
-			super(itemView);
-		}
-	}
-
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public interface OnLoadMoreListener {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<Organization> list) {
-		organizationsList = list;
-		notifyDataChanged();
-	}
-}

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

@@ -9,31 +9,28 @@ 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 org.gitnex.tea4j.models.UserRepositories;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
-import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
+import org.mian.gitnex.activities.RepoStargazersActivity;
+import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.models.Repository;
-import org.mian.gitnex.helpers.AppUtil;
-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.ocpsoft.prettytime.PrettyTime;
+import org.mian.gitnex.models.UserRepositories;
-import java.text.DateFormat;
+import org.mian.gitnex.models.WatchInfo;
-import java.text.SimpleDateFormat;
 import java.util.List;
-import java.util.Locale;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -41,261 +38,256 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepositoriesAdapter.ReposSearchViewHolder> {
 
-	private final Context context;
-	private final int TYPE_LOAD = 0;
-	private List<UserRepositories> reposList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
-	private final TinyDB tinyDb;
 
-	public ExploreRepositoriesAdapter(List<UserRepositories> dataList, Context ctx) {
+	private List<UserRepositories> searchedReposList;
-		this.context = ctx;
+	private Context mCtx;
-		this.reposList = dataList;
+
-		this.tinyDb = TinyDB.getInstance(context);
+	public ExploreRepositoriesAdapter(List<UserRepositories> dataList, Context mCtx) {
+
+		this.mCtx = mCtx;
+		this.searchedReposList = dataList;
 	}
 
-	@NonNull
+	static class ReposSearchViewHolder extends RecyclerView.ViewHolder {
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		LayoutInflater inflater = LayoutInflater.from(context);
-		if(viewType == TYPE_LOAD) {
-			return new ExploreRepositoriesAdapter.RepositoriesHolder(inflater.inflate(R.layout.list_repositories, parent, false));
-		}
-		else {
-			return new ExploreRepositoriesAdapter.LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
-		}
-	}
 
-	@Override
+		private ImageView image;
-	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+		private TextView repoName;
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+		private TextView repoDescription;
-			isLoading = true;
+		private TextView fullName;
-			loadMoreListener.onLoadMore();
-		}
-
-		if(getItemViewType(position) == TYPE_LOAD) {
-			((ExploreRepositoriesAdapter.RepositoriesHolder) holder).bindData(reposList.get(position));
-		}
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if(reposList.get(position).getFullName() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return reposList.size();
-	}
-
-	class RepositoriesHolder extends RecyclerView.ViewHolder {
-		private UserRepositories userRepositories;
-
-		private final ImageView image;
-		private final TextView repoName;
-		private final TextView orgName;
-		private final TextView repoDescription;
 		private CheckBox isRepoAdmin;
-		private final TextView repoStars;
+		private ImageView repoPrivatePublic;
-		private final TextView repoLastUpdated;
+		private TextView repoStars;
-		private final View spacerView;
+		private TextView repoForks;
+		private TextView repoOpenIssuesCount;
+		private TextView repoType;
+		private LinearLayout archiveRepo;
+		private TextView repoBranch;
+
+		private ReposSearchViewHolder(View itemView) {
 
-		RepositoriesHolder(View itemView) {
 			super(itemView);
+
 			repoName = itemView.findViewById(R.id.repoName);
-			orgName = itemView.findViewById(R.id.orgName);
 			repoDescription = itemView.findViewById(R.id.repoDescription);
-			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
 			image = itemView.findViewById(R.id.imageAvatar);
+			fullName = itemView.findViewById(R.id.repoFullName);
+			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
+			repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
 			repoStars = itemView.findViewById(R.id.repoStars);
-			repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
+			repoForks = itemView.findViewById(R.id.repoForks);
-			spacerView = itemView.findViewById(R.id.spacerView);
+			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+			ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+			repoType = itemView.findViewById(R.id.repoType);
+			archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
+			repoBranch = itemView.findViewById(R.id.repoBranch);
 
 			itemView.setOnClickListener(v -> {
 
 				Context context = v.getContext();
-				Intent intent = new Intent(context, RepoDetailActivity.class);
+				TextView repoFullName = v.findViewById(R.id.repoFullName);
-				intent.putExtra("repoFullName", userRepositories.getFullName());
 
-				tinyDb.putString("repoFullName", userRepositories.getFullName());
+				Intent intent = new Intent(context, RepoDetailActivity.class);
+				intent.putExtra("repoFullName", repoFullName.getText().toString());
+
+				TinyDB tinyDb = new TinyDB(context);
+				tinyDb.putString("repoFullName", repoFullName.getText().toString());
 				tinyDb.putBoolean("resumeIssues", true);
 				tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
-				tinyDb.putString("repoBranch", userRepositories.getDefault_branch());
+				tinyDb.putString("repoBranch", repoBranch.getText().toString());
 
-				if(userRepositories.getPrivateFlag()) {
+				String[] parts = fullName.getText().toString().split("/");
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPrivate));
-				}
-				else {
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPublic));
-				}
-
-				String[] parts = userRepositories.getFullName().split("/");
 				final String repoOwner = parts[0];
 				final String repoName = parts[1];
 
 				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
+				RepositoriesApi repositoryData = new RepositoriesApi(context);
 
 				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
-				assert repositoryData != null;
 				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.getApiInterface(context).checkRepoWatchStatus(token, repoOwner, repoName);
+
+					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 {
+							} else {
+
 								tinyDb.putBoolean("repoWatch", false);
+
 								if(response.code() != 404) {
-									Toasty.error(context, context.getString(R.string.genericApiStatusError));
+
+									Toasty.info(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));
+							Toasty.info(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 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();
+
+				});
+
+			});
+
 		}
 
-		@SuppressLint("SetTextI18n")
+	}
-		void bindData(UserRepositories userRepositories) {
-			this.userRepositories = userRepositories;
 
-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+	@NonNull
-			Locale locale = context.getResources().getConfiguration().locale;
+	@Override
-			String timeFormat = tinyDb.getString("dateFormat");
+	public ExploreRepositoriesAdapter.ReposSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
-			orgName.setText(userRepositories.getFullName().split("/")[0]);
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
-			repoName.setText(userRepositories.getFullName().split("/")[1]);
+		return new ExploreRepositoriesAdapter.ReposSearchViewHolder(v);
-			repoStars.setText(userRepositories.getStars_count());
+	}
 
-			ColorGenerator generator = ColorGenerator.MATERIAL;
+	@Override
-			int color = generator.getColor(userRepositories.getName());
+	public void onBindViewHolder(@NonNull final ExploreRepositoriesAdapter.ReposSearchViewHolder holder, int position) {
-			String firstCharacter = String.valueOf(userRepositories.getFullName().charAt(0));
 
-			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
+		UserRepositories currentItem = searchedReposList.get(position);
+		holder.repoDescription.setVisibility(View.GONE);
+		holder.repoBranch.setText(currentItem.getDefault_branch());
 
-			if(userRepositories.getAvatar_url() != null) {
+		ColorGenerator generator = ColorGenerator.MATERIAL;
-				if(!userRepositories.getAvatar_url().equals("")) {
+		int color = generator.getColor(currentItem.getName());
-					PicassoService.getInstance(context).get().load(userRepositories.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(image);
+		String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
-				}
+
-				else {
+		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
-					image.setImageDrawable(drawable);
+
-				}
+		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.image);
 			}
 			else {
-				image.setImageDrawable(drawable);
+				holder.image.setImageDrawable(drawable);
 			}
-
-			if(userRepositories.getUpdated_at() != null) {
-
-				switch(timeFormat) {
-					case "pretty": {
-						PrettyTime prettyTime = new PrettyTime(locale);
-						String createdTime = prettyTime.format(userRepositories.getUpdated_at());
-						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(userRepositories.getUpdated_at()), context));
-						break;
-					}
-					case "normal": {
-						DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-						String createdTime = formatter.format(userRepositories.getUpdated_at());
-						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						break;
-					}
-					case "normal1": {
-						DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-						String createdTime = formatter.format(userRepositories.getUpdated_at());
-						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						break;
-					}
-				}
-			}
-			else {
-				repoLastUpdated.setVisibility(View.GONE);
-			}
-
-			if(!userRepositories.getDescription().equals("")) {
-				repoDescription.setVisibility(View.VISIBLE);
-				repoDescription.setText(userRepositories.getDescription());
-				spacerView.setVisibility(View.GONE);
-			}
-			else {
-				repoDescription.setVisibility(View.GONE);
-				spacerView.setVisibility(View.VISIBLE);
-			}
-
-			if(isRepoAdmin == null) {
-				isRepoAdmin = new CheckBox(context);
-			}
-			isRepoAdmin.setChecked(userRepositories.getPermissions().isAdmin());
 		}
-	}
+		else {
-
+			holder.image.setImageDrawable(drawable);
-	static class LoadHolder extends RecyclerView.ViewHolder {
-		LoadHolder(View itemView) {
-			super(itemView);
 		}
+
+		holder.repoName.setText(currentItem.getName());
+		if(!currentItem.getDescription().equals("")) {
+			holder.repoDescription.setVisibility(View.VISIBLE);
+			holder.repoDescription.setText(currentItem.getDescription());
+		}
+		holder.fullName.setText(currentItem.getFullname());
+		if(currentItem.getPrivateFlag()) {
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
+			holder.repoType.setText(R.string.strPrivate);
+		}
+		else {
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_unlock);
+			holder.repoType.setText(R.string.strPublic);
+		}
+		holder.repoStars.setText(currentItem.getStars_count());
+		holder.repoForks.setText(currentItem.getForks_count());
+		holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
+		if(holder.isRepoAdmin == null) {
+			holder.isRepoAdmin = new CheckBox(mCtx);
+		}
+		holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
+
+		if(currentItem.isArchived()) {
+			holder.archiveRepo.setVisibility(View.VISIBLE);
+		}
+		else {
+			holder.archiveRepo.setVisibility(View.GONE);
+		}
+
 	}
 
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
+	@Override
-		isMoreDataAvailable = moreDataAvailable;
+	public int getItemCount() {
+
+		return searchedReposList.size();
 	}
 
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public interface OnLoadMoreListener {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<UserRepositories> list) {
-		reposList = list;
-		notifyDataChanged();
-	}
 }

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

@@ -1,154 +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.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.gitnex.tea4j.models.UserInfo;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.List;
-
-/**
- * Author M M Arif
- */
-
-public class ExploreUsersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-	private final Context context;
-	private final int TYPE_LOAD = 0;
-	private List<UserInfo> usersList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
-
-	public ExploreUsersAdapter(Context ctx, List<UserInfo> usersListMain) {
-		this.context = ctx;
-		this.usersList = usersListMain;
-	}
-
-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		LayoutInflater inflater = LayoutInflater.from(context);
-		if(viewType == TYPE_LOAD) {
-			return new ExploreUsersAdapter.UsersHolder(inflater.inflate(R.layout.list_explore_users, parent, false));
-		}
-		else {
-			return new ExploreUsersAdapter.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) {
-			((ExploreUsersAdapter.UsersHolder) holder).bindData(usersList.get(position));
-		}
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if(usersList.get(position).getUsername() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return usersList.size();
-	}
-
-	class UsersHolder extends RecyclerView.ViewHolder {
-		private UserInfo userInfo;
-		private final ImageView userAvatar;
-		private final TextView userFullName;
-		private final TextView userName;
-
-		UsersHolder(View itemView) {
-			super(itemView);
-			userAvatar = itemView.findViewById(R.id.userAvatar);
-			userFullName = itemView.findViewById(R.id.userFullName);
-			userName = itemView.findViewById(R.id.userName);
-
-			itemView.setOnClickListener(loginId -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", userInfo.getLogin());
-				context.startActivity(intent);
-			});
-
-			itemView.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, userInfo.getLogin(), context.getString(R.string.copyLoginIdToClipBoard, userInfo.getLogin()));
-				return true;
-			});
-		}
-
-		@SuppressLint("SetTextI18n")
-		void bindData(UserInfo userInfo) {
-			this.userInfo = userInfo;
-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-			userName.setText(userInfo.getUsername());
-			PicassoService.getInstance(context).get()
-				.load(userInfo.getAvatar())
-				.placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0))
-				.resize(120, 120)
-				.centerCrop()
-				.into(userAvatar);
-
-			if(!userInfo.getFullname().equals("")) {
-				userFullName.setText(Html.fromHtml(userInfo.getFullname()));
-				userName.setText(context.getResources().getString(R.string.usernameWithAt, userInfo.getUsername()));
-			}
-			else {
-				userFullName.setText(userInfo.getUsername());
-				userName.setVisibility(View.GONE);
-			}
-		}
-	}
-
-	static class LoadHolder extends RecyclerView.ViewHolder {
-		LoadHolder(View itemView) {
-			super(itemView);
-		}
-	}
-
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public interface OnLoadMoreListener {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<UserInfo> list) {
-		usersList = list;
-		notifyDataChanged();
-	}
-}

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

@@ -7,14 +7,13 @@ import android.view.ViewGroup;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.appcompat.content.res.AppCompatResources;
 import androidx.recyclerview.widget.RecyclerView;
-import org.apache.commons.io.FileUtils;
-import org.gitnex.tea4j.models.Files;
 import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Files;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,39 +23,51 @@ import java.util.List;
 
 public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHolder> implements Filterable {
 
-	private final List<Files> originalFiles = new ArrayList<>();
+    private List<Files> filesList;
-	private final List<Files> alteredFiles = new ArrayList<>();
+    private Context mCtx;
+    private List<Files> filesListFull;
 
-    private final Context context;
+    private FilesAdapterListener filesListener;
-
-    private final FilesAdapterListener filesListener;
 
     public interface FilesAdapterListener {
-
+        void onClickDir(String str);
-        void onClickFile(Files file);
+        void onClickFile(String str);
     }
 
-	class FilesViewHolder extends RecyclerView.ViewHolder {
+    class FilesViewHolder extends RecyclerView.ViewHolder {
 
-    	private Files file;
+        private ImageView fileTypeImage;
-
+        private TextView fileName;
-		private final ImageView fileTypeIs;
+        private TextView fileType;
-        private final TextView fileName;
+        private TextView fileInfo;
-        private final TextView fileInfo;
 
         private FilesViewHolder(View itemView) {
 
             super(itemView);
-
-	        LinearLayout fileFrame = itemView.findViewById(R.id.fileFrame);
             fileName = itemView.findViewById(R.id.fileName);
-	        fileTypeIs = itemView.findViewById(R.id.fileTypeIs);
+            fileTypeImage = itemView.findViewById(R.id.fileImage);
+            fileType = itemView.findViewById(R.id.fileType);
             fileInfo = itemView.findViewById(R.id.fileInfo);
 
-	        fileFrame.setOnClickListener(v -> filesListener.onClickFile(file));
-
             //ImageView filesDropdownMenu = itemView.findViewById(R.id.filesDropdownMenu);
 
+            fileName.setOnClickListener(v -> {
+
+                Context context = v.getContext();
+
+                if(fileType.getText().toString().equals("file")) {
+                    filesListener.onClickFile(fileName.getText().toString());
+                }
+                else if(fileType.getText().toString().equals("dir")) {
+                    filesListener.onClickDir(fileName.getText().toString());
+                }
+                else {
+                    Toasty.info(context, context.getString(R.string.filesGenericError));
+                }
+
+            });
+
+
             /*filesDropdownMenu.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -123,24 +134,13 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
         }
     }
 
-    public FilesAdapter(Context ctx, FilesAdapterListener filesListener) {
+    public FilesAdapter(Context mCtx, List<Files> filesListMain, FilesAdapterListener filesListener) {
-
+        this.mCtx = mCtx;
-        this.context = ctx;
+        this.filesList = filesListMain;
+        filesListFull = new ArrayList<>(filesList);
         this.filesListener = filesListener;
     }
 
-	public List<Files> getOriginalFiles() {
-		return originalFiles;
-	}
-
-    public void notifyOriginalDataSetChanged() {
-
-	    alteredFiles.clear();
-	    alteredFiles.addAll(originalFiles);
-
-    	notifyDataSetChanged();
-    }
-
     @NonNull
     @Override
     public FilesAdapter.FilesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -151,43 +151,29 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
     @Override
     public void onBindViewHolder(@NonNull FilesAdapter.FilesViewHolder holder, int position) {
 
-        Files currentItem = alteredFiles.get(position);
+        Files currentItem = filesList.get(position);
 
-        holder.file = currentItem;
+        holder.fileType.setText(currentItem.getType());
         holder.fileName.setText(currentItem.getName());
 
-        switch(currentItem.getType()) {
+        if(currentItem.getType().equals("file")) {
-
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_file));
-	        case "file":
+            holder.fileInfo.setVisibility(View.VISIBLE);
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_file));
+            holder.fileInfo.setText(AppUtil.formatFileSizeInDetail(currentItem.getSize()));
-		        holder.fileInfo.setVisibility(View.VISIBLE);
-		        holder.fileInfo.setText(FileUtils.byteCountToDisplaySize(currentItem.getSize()));
-	        	break;
-
-	        case "dir":
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_directory));
-		        holder.fileInfo.setVisibility(View.GONE);
-	        	break;
-
-	        case "submodule":
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_submodule));
-		        holder.fileInfo.setVisibility(View.GONE);
-	        	break;
-
-	        case "symlink":
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_symlink));
-		        holder.fileInfo.setVisibility(View.GONE);
-		        break;
-
-	        default:
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_question));
-
         }
+        else if(currentItem.getType().equals("dir")) {
+	        holder.fileInfo.setVisibility(View.GONE);
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_directory));
+        }
+        else {
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_question));
+        }
+
     }
 
     @Override
     public int getItemCount() {
-        return alteredFiles.size();
+        return filesList.size();
     }
 
     @Override
@@ -195,19 +181,17 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
         return filesFilter;
     }
 
-    private final Filter filesFilter = new Filter() {
+    private Filter filesFilter = new Filter() {
-
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
-
             List<Files> filteredList = new ArrayList<>();
 
             if (constraint == null || constraint.length() == 0) {
-                filteredList.addAll(originalFiles);
+                filteredList.addAll(filesListFull);
             } else {
                 String filterPattern = constraint.toString().toLowerCase().trim();
 
-                for (Files item : originalFiles) {
+                for (Files item : filesListFull) {
                     if (item.getName().toLowerCase().contains(filterPattern) || item.getPath().toLowerCase().contains(filterPattern)) {
                         filteredList.add(item);
                     }
@@ -218,19 +202,14 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
             results.values = filteredList;
 
             return results;
-
         }
 
         @Override
         protected void publishResults(CharSequence constraint, FilterResults results) {
-
+            filesList.clear();
-            alteredFiles.clear();
+            filesList.addAll((List) results.values);
-	        alteredFiles.addAll((List) results.values);
-
             notifyDataSetChanged();
-
         }
-
     };
 
 }

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

@@ -2,8 +2,8 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Typeface;
-import android.os.Bundle;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,12 +12,10 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import androidx.fragment.app.FragmentManager;
-import org.gitnex.tea4j.models.FileDiffView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.fragments.BottomSheetReplyFragment;
+import org.mian.gitnex.activities.ReplyToIssueActivity;
-import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.DiffTextView;
-import org.mian.gitnex.views.DiffTextView;
+import org.mian.gitnex.models.FileDiffView;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -37,23 +35,22 @@ public class FilesDiffAdapter extends BaseAdapter {
 	private static int COLOR_SELECTED;
 	private static int COLOR_FONT;
 
-	private final Context context;
+	private Context context;
-	private final FragmentManager fragmentManager;
+	private List<FileDiffView> fileDiffViews;
-	private final List<FileDiffView> fileDiffViews;
 
-	public FilesDiffAdapter(Context context, FragmentManager fragmentManager, List<FileDiffView> fileDiffViews) {
+	public FilesDiffAdapter(Context context, List<FileDiffView> fileDiffViews) {
 
 		this.context = context;
-		this.fragmentManager = fragmentManager;
 		this.fileDiffViews = fileDiffViews;
 
 		selectedViews = new ConcurrentSkipListMap<>();
 
-		COLOR_ADDED = AppUtil.getColorFromAttribute(context, R.attr.diffAddedColor);
+		COLOR_ADDED = getColorFromAttribute(R.attr.diffAddedColor);
-		COLOR_REMOVED = AppUtil.getColorFromAttribute(context, R.attr.diffRemovedColor);
+		COLOR_REMOVED = getColorFromAttribute(R.attr.diffRemovedColor);
-		COLOR_NORMAL = AppUtil.getColorFromAttribute(context, R.attr.primaryBackgroundColor);
+		COLOR_NORMAL = getColorFromAttribute(R.attr.primaryBackgroundColor);
-		COLOR_SELECTED = AppUtil.getColorFromAttribute(context, R.attr.diffSelectedColor);
+		COLOR_SELECTED = getColorFromAttribute(R.attr.diffSelectedColor);
-		COLOR_FONT = AppUtil.getColorFromAttribute(context, R.attr.inputTextColor);
+		COLOR_FONT = getColorFromAttribute(R.attr.inputTextColor);
+
 	}
 
 	@Override
@@ -93,6 +90,7 @@ public class FilesDiffAdapter extends BaseAdapter {
 
 			diffStats.setVisibility(View.GONE);
 			diffLines.addView(getMessageView(context.getResources().getString(R.string.binaryFileError)));
+
 		}
 		else {
 
@@ -166,6 +164,7 @@ public class FilesDiffAdapter extends BaseAdapter {
 
 						}
 
+
 						diffTextView.setOnClickListener(v -> {
 
 							if(((DiffTextView) v).getCurrentBackgroundColor() != COLOR_SELECTED) {
@@ -183,6 +182,7 @@ public class FilesDiffAdapter extends BaseAdapter {
 
 						});
 
+
 						diffTextView.setOnLongClickListener(v -> {
 
 							if(((DiffTextView) v).getCurrentBackgroundColor() == COLOR_SELECTED) {
@@ -194,17 +194,20 @@ public class FilesDiffAdapter extends BaseAdapter {
 
 									stringBuilder.append(((DiffTextView) view).getText());
 									stringBuilder.append("\n");
+
 								}
 
 								stringBuilder.append("```\n\n");
 
 								selectedViews.clear();
 
-								Bundle bundle = new Bundle();
+								Intent intent = new Intent(context, ReplyToIssueActivity.class);
-								bundle.putString("commentBody", stringBuilder.toString());
+								intent.putExtra("commentBody", stringBuilder.toString());
-								bundle.putBoolean("cursorToEnd", true);
+								intent.putExtra("cursorToEnd", true);
+								intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+								context.startActivity(intent);
 
-								BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
 							}
 
 							return true;
@@ -221,6 +224,7 @@ public class FilesDiffAdapter extends BaseAdapter {
 			else {
 
 				diffLines.addView(getMessageView(context.getResources().getString(R.string.fileTooLarge)));
+
 			}
 
 		}
@@ -242,11 +246,22 @@ public class FilesDiffAdapter extends BaseAdapter {
 		textView.setText(message);
 
 		return textView;
+
 	}
 
 	private String[] getLines(String content) {
 
 		return content.split("\\R");
+
+	}
+
+	private int getColorFromAttribute(int resid) {
+
+		TypedValue typedValue = new TypedValue();
+		context.getTheme().resolveAttribute(resid, typedValue, true);
+
+		return typedValue.data;
+
 	}
 
 }

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

@@ -5,39 +5,51 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
+import android.graphics.drawable.Drawable;
-import android.os.Handler;
+import android.net.Uri;
-import android.view.Gravity;
+import android.text.Spanned;
 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.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.gson.JsonElement;
 import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.IssueComments;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
+import org.mian.gitnex.activities.ReplyToIssueActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.fragments.BottomSheetReplyFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.ClickListener;
-import org.mian.gitnex.helpers.Markdown;
 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.views.ReactionList;
+import org.mian.gitnex.helpers.UserMentions;
-import org.mian.gitnex.views.ReactionSpinner;
+import org.mian.gitnex.models.IssueComments;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 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;
 
@@ -47,194 +59,151 @@ import retrofit2.Callback;
 
 public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdapter.IssueCommentViewHolder> {
 
-	private final Context context;
+	private List<IssueComments> issuesComments;
-	private final TinyDB tinyDB;
+	private Context mCtx;
-	private final Bundle bundle;
-	private final List<IssueComments> issuesComments;
-	private final FragmentManager fragmentManager;
-	private final BottomSheetReplyFragment.OnInteractedListener onInteractedListener;
-	private final Locale locale;
 
-	public IssueCommentsAdapter(Context ctx, Bundle bundle, List<IssueComments> issuesCommentsMain, FragmentManager fragmentManager, BottomSheetReplyFragment.OnInteractedListener onInteractedListener) {
+	public IssueCommentsAdapter(Context mCtx, List<IssueComments> issuesCommentsMain) {
 
-		this.context = ctx;
+		this.mCtx = mCtx;
-		this.bundle = bundle;
 		this.issuesComments = issuesCommentsMain;
-		this.fragmentManager = fragmentManager;
+
-		this.onInteractedListener = onInteractedListener;
-		tinyDB = TinyDB.getInstance(ctx);
-		locale = ctx.getResources().getConfiguration().locale;
 	}
 
 	class IssueCommentViewHolder extends RecyclerView.ViewHolder {
 
-		private String userLoginId;
+		private TextView issueNumber;
-		private IssueComments issueComment;
+		private TextView commendId;
+		private ImageView issueCommenterAvatar;
+		private TextView issueComment;
+		private TextView issueCommentDate;
+		private TextView commendBodyRaw;
+		private TextView commentModified;
+		private TextView commenterUsername;
+		private TextView htmlUrl;
 
-		private final ImageView avatar;
+		private IssueCommentViewHolder(View itemView) {
-		private final TextView author;
-		private final TextView information;
-		private final TextView comment;
-		private final LinearLayout commentReactionBadges;
 
-		private IssueCommentViewHolder(View view) {
+			super(itemView);
 
-			super(view);
+			issueNumber = itemView.findViewById(R.id.issueNumber);
+			commendId = itemView.findViewById(R.id.commendId);
+			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);
+			commendBodyRaw = itemView.findViewById(R.id.commendBodyRaw);
+			commentModified = itemView.findViewById(R.id.commentModified);
+			commenterUsername = itemView.findViewById(R.id.commenterUsername);
+			htmlUrl = itemView.findViewById(R.id.htmlUrl);
 
-			avatar = view.findViewById(R.id.avatar);
+			commentsOptionsMenu.setOnClickListener(v -> {
-			author = view.findViewById(R.id.author);
-			information = view.findViewById(R.id.information);
-			ImageView menu = view.findViewById(R.id.menu);
-			comment = view.findViewById(R.id.comment);
-			commentReactionBadges = view.findViewById(R.id.commentReactionBadges);
 
-			menu.setOnClickListener(v -> {
+				final Context ctx = v.getContext();
+				final TinyDB tinyDb = new TinyDB(ctx);
+				final String loginUid = tinyDb.getString("loginUid");
 
-				final String loginUid = tinyDB.getString("loginUid");
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_issue_comments, null);
 
-				@SuppressLint("InflateParams") View vw = 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 commentMenuEdit = vw.findViewById(R.id.commentMenuEdit);
+				if(!loginUid.contentEquals(commenterUsername.getText())) {
-				TextView commentShare = vw.findViewById(R.id.issueCommentShare);
-				TextView commentMenuQuote = vw.findViewById(R.id.commentMenuQuote);
-				TextView commentMenuCopy = vw.findViewById(R.id.commentMenuCopy);
-				TextView commentMenuDelete = vw.findViewById(R.id.commentMenuDelete);
-				TextView issueCommentCopyUrl = vw.findViewById(R.id.issueCommentCopyUrl);
-
-				if(!loginUid.contentEquals(issueComment.getUser().getUsername())) {
 					commentMenuEdit.setVisibility(View.GONE);
 					commentMenuDelete.setVisibility(View.GONE);
 				}
 
-				if(issueComment.getBody().isEmpty()) {
+				if(issueComment.getText().toString().isEmpty()) {
 					commentMenuCopy.setVisibility(View.GONE);
 				}
 
-				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				BottomSheetDialog dialog = new BottomSheetDialog(ctx);
-				dialog.setContentView(vw);
+				dialog.setContentView(view);
 				dialog.show();
 
-				LinearLayout linearLayout = vw.findViewById(R.id.commentReactionButtons);
+				commentMenuEdit.setOnClickListener(ediComment -> {
-				TextView loadReactions = new TextView(context);
-				loadReactions.setText(context.getString(R.string.genericWaitFor));
-				loadReactions.setGravity(Gravity.CENTER);
-				loadReactions.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 160));
-				linearLayout.addView(loadReactions);
 
-				Bundle bundle1 = new Bundle();
+					Intent intent = new Intent(ctx, ReplyToIssueActivity.class);
-				bundle1.putAll(bundle);
+					intent.putExtra("commentId", commendId.getText());
-				bundle1.putInt("commentId", issueComment.getId());
+					intent.putExtra("commentAction", "edit");
-
+					intent.putExtra("commentBody", commendBodyRaw.getText());
-				ReactionSpinner reactionSpinner = new ReactionSpinner(context, bundle1);
+					ctx.startActivity(intent);
-				reactionSpinner.setOnInteractedListener(() -> {
-					tinyDB.putBoolean("commentEdited", true);
-
-					onInteractedListener.onInteracted();
 					dialog.dismiss();
+
 				});
 
-				Handler handler = new Handler();
+				commentShare.setOnClickListener(ediComment -> {
-				handler.postDelayed(() -> {
-					linearLayout.removeView(loadReactions);
-					reactionSpinner.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 160));
-					linearLayout.addView(reactionSpinner);
-				}, 2500);
 
-				commentMenuEdit.setOnClickListener(v1 -> {
-					Bundle bundle = new Bundle();
-					bundle.putInt("commentId", issueComment.getId());
-					bundle.putString("commentAction", "edit");
-					bundle.putString("commentBody", issueComment.getBody());
-
-					BottomSheetReplyFragment bottomSheetReplyFragment = BottomSheetReplyFragment.newInstance(bundle);
-					bottomSheetReplyFragment.setOnInteractedListener(onInteractedListener);
-					bottomSheetReplyFragment.show(fragmentManager, "replyBottomSheet");
-
-					dialog.dismiss();
-				});
-
-				commentShare.setOnClickListener(v1 -> {
 					// get comment Url
-					CharSequence commentUrl = issueComment.getHtml_url();
+					CharSequence commentUrl = htmlUrl.getText();
 
 					// share issue comment
 					Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
 					sharingIntent.setType("text/plain");
-					String intentHeader = tinyDB.getString("issueNumber") + context.getResources().getString(R.string.hash) + "issuecomment-" + issueComment.getId() + " " + tinyDB.getString("issueTitle");
+					String intentHeader = tinyDb.getString("issueNumber") + ctx.getResources().getString(R.string.hash) + "issuecomment-" + commendId.getText() + " " + tinyDb.getString("issueTitle");
 					sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, intentHeader);
 					sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, commentUrl);
-					context.startActivity(Intent.createChooser(sharingIntent, intentHeader));
+					ctx.startActivity(Intent.createChooser(sharingIntent, intentHeader));
 
 					dialog.dismiss();
-				});
 
-				issueCommentCopyUrl.setOnClickListener(v1 -> {
-					// comment Url
-					CharSequence commentUrl = issueComment.getHtml_url();
-
-					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
-					assert clipboard != null;
-
-					ClipData clip = ClipData.newPlainText(commentUrl, commentUrl);
-					clipboard.setPrimaryClip(clip);
-
-					dialog.dismiss();
-					Toasty.success(context, context.getString(R.string.copyIssueUrlToastMsg));
 				});
 
 				commentMenuQuote.setOnClickListener(v1 -> {
-					StringBuilder stringBuilder = new StringBuilder();
-					String commenterName = issueComment.getUser().getUsername();
 
-					if(!commenterName.equals(tinyDB.getString("userLogin"))) {
+					StringBuilder stringBuilder = new StringBuilder();
+					String commenterName = commenterUsername.getText().toString();
+
+					if(!commenterName.equals(tinyDb.getString("userLogin"))) {
+
 						stringBuilder.append("@").append(commenterName).append("\n\n");
 					}
 
-					String[] lines = issueComment.getBody().split("\\R");
+					String[] lines = commendBodyRaw.getText().toString().split("\\R");
 
 					for(String line : lines) {
+
 						stringBuilder.append(">").append(line).append("\n");
 					}
 
 					stringBuilder.append("\n");
 
-					Bundle bundle = new Bundle();
+					Intent intent = new Intent(ctx, ReplyToIssueActivity.class);
-					bundle.putString("commentBody", stringBuilder.toString());
+					intent.putExtra("commentBody", stringBuilder.toString());
-					bundle.putBoolean("cursorToEnd", true);
+					intent.putExtra("cursorToEnd", true);
+					intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
 					dialog.dismiss();
-					BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
+					ctx.startActivity(intent);
+
 				});
 
-				commentMenuCopy.setOnClickListener(v1 -> {
+				commentMenuCopy.setOnClickListener(view1 -> {
-					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
+
+					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
 					assert clipboard != null;
 
-					ClipData clip = ClipData.newPlainText("Comment on issue #" + tinyDB.getString("issueNumber"), issueComment.getBody());
+					ClipData clip = ClipData.newPlainText("Comment on issue #" + issueNumber.getText().toString(), issueComment.getText().toString());
 					clipboard.setPrimaryClip(clip);
 
 					dialog.dismiss();
-					Toasty.success(context, context.getString(R.string.copyIssueCommentToastMsg));
+					Toasty.info(ctx, ctx.getString(R.string.copyIssueCommentToastMsg));
+
 				});
 
-				commentMenuDelete.setOnClickListener(v1 -> {
+				commentMenuDelete.setOnClickListener(deleteComment -> {
-					deleteIssueComment(context, issueComment.getId(), getAdapterPosition());
+
+					deleteIssueComment(ctx, Integer.parseInt(commendId.getText().toString()), getAdapterPosition());
 					dialog.dismiss();
+
 				});
 
 			});
 
-			avatar.setOnClickListener(loginId -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", userLoginId);
-				context.startActivity(intent);
-			});
-
-			avatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-				return true;
-			});
 		}
+
 	}
 
 	private void updateAdapter(int position) {
@@ -242,23 +211,27 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 		issuesComments.remove(position);
 		notifyItemRemoved(position);
 		notifyItemRangeChanged(position, issuesComments.size());
+
 	}
 
 	private void deleteIssueComment(final Context ctx, final int commentId, int position) {
 
-		final String loginUid = tinyDB.getString("loginUid");
+		final TinyDB tinyDb = new TinyDB(ctx);
-		final String instanceToken = "token " + tinyDB.getString(loginUid + "-token");
+		final String instanceUrl = tinyDb.getString("instanceUrl");
-		String[] repoFullName = tinyDB.getString("repoFullName").split("/");
+		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 = RetrofitClient
+		Call<JsonElement> call;
-				.getApiInterface(ctx)
+
+		call = RetrofitClient
+				.getInstance(instanceUrl, ctx)
+				.getApiInterface()
 				.deleteComment(instanceToken, repoOwner, repoName, commentId);
 
 		call.enqueue(new Callback<JsonElement>() {
@@ -266,40 +239,47 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 			@Override
 			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
 
-				switch(response.code()) {
+				if(response.code() == 204) {
 
-					case 204:
+					updateAdapter(position);
-						updateAdapter(position);
+					Toasty.info(ctx, ctx.getResources().getString(R.string.deleteCommentSuccess));
-						Toasty.success(ctx, ctx.getResources().getString(R.string.deleteCommentSuccess));
-						break;
 
-					case 401:
+				}
-						AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+				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));
-						break;
-
-					case 403:
-						Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-						break;
-
-					case 404:
-						Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-						break;
-
-					default:
-						Toasty.error(ctx, ctx.getString(R.string.genericError));
 
 				}
+				else if(response.code() == 403) {
+
+					Toasty.info(ctx, ctx.getString(R.string.authorizeError));
+
+				}
+				else if(response.code() == 404) {
+
+					Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+
+				}
+				else {
+
+					Toasty.info(ctx, ctx.getString(R.string.genericError));
+
+				}
+
 			}
 
 			@Override
 			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
 
 				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
+
 			}
+
 		});
+
 	}
 
 	@NonNull
@@ -308,68 +288,111 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_issue_comments, parent, false);
 		return new IssueCommentsAdapter.IssueCommentViewHolder(v);
+
 	}
+
+	@SuppressLint("SetTextI18n")
 	@Override
 	public void onBindViewHolder(@NonNull IssueCommentsAdapter.IssueCommentViewHolder holder, int position) {
 
-		String timeFormat = tinyDB.getString("dateFormat");
+		final TinyDB tinyDb = new TinyDB(mCtx);
-		IssueComments issueComment = issuesComments.get(position);
+		final String locale = tinyDb.getString("locale");
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+		final String timeFormat = tinyDb.getString("dateFormat");
 
-		holder.userLoginId = issueComment.getUser().getLogin();
+		IssueComments currentItem = issuesComments.get(position);
 
-		holder.issueComment = issueComment;
+		holder.htmlUrl.setText(currentItem.getHtml_url());
-		holder.author.setText(issueComment.getUser().getUsername());
+		holder.commenterUsername.setText(currentItem.getUser().getUsername());
+		holder.commendId.setText(String.valueOf(currentItem.getId()));
+		holder.commendBodyRaw.setText(currentItem.getBody());
 
-		PicassoService.getInstance(context).get()
+		if(!currentItem.getUser().getFull_name().equals("")) {
-			.load(issueComment.getUser().getAvatar_url())
+			holder.issueCommenterAvatar.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.issueCommenter) + currentItem.getUser().getFull_name(), mCtx));
-			.placeholder(R.drawable.loader_animated)
+		}
-			.transform(new RoundedTransformation(imgRadius, 0))
+		else {
-			.resize(AppUtil.getPixelsFromDensity(context, 35), AppUtil.getPixelsFromDensity(context, 35))
+			holder.issueCommenterAvatar.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.issueCommenter) + currentItem.getUser().getLogin(), mCtx));
-			.centerCrop()
-			.into(holder.avatar);
-
-		Markdown.render(context, EmojiParser.parseToUnicode(issueComment.getBody()), holder.comment);
-
-		StringBuilder informationBuilder = null;
-		if(issueComment.getCreated_at() != null) {
-
-			if(timeFormat.equals("pretty")) {
-				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), locale, "pretty", context));
-				holder.information.setOnClickListener(v -> TimeHelper.customDateFormatForToastDateFormat(issueComment.getCreated_at()));
-			}
-			else if(timeFormat.equals("normal")) {
-				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), locale, "normal", context));
-			}
-
-			if(!issueComment.getCreated_at().equals(issueComment.getUpdated_at())) {
-				if(informationBuilder != null) {
-					informationBuilder.append(context.getString(R.string.colorfulBulletSpan)).append(context.getString(R.string.modifiedText));
-				}
-			}
 		}
 
-		holder.information.setText(informationBuilder);
+		PicassoService.getInstance(mCtx).get().load(currentItem.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.issueCommenterAvatar);
 
-		Bundle bundle1 = new Bundle();
+		String cleanIssueComments = currentItem.getBody().trim();
-		bundle1.putAll(bundle);
-		bundle1.putInt("commentId", issueComment.getId());
 
-		ReactionList reactionList = new ReactionList(context, bundle1);
+		final Markwon markwon = Markwon.builder(Objects.requireNonNull(mCtx)).usePlugin(CorePlugin.create()).usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
 
-		holder.commentReactionBadges.addView(reactionList);
+			@Override
-		reactionList.setOnReactionAddedListener(() -> {
+			public void configureImages(@NonNull ImagesPlugin plugin) {
+
+				plugin.addSchemeHandler(new SchemeHandler() {
+
+					@NonNull
+					@Override
+					public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+
+						final int resourceId = mCtx.getResources().getIdentifier(raw.substring("drawable://".length()), "drawable", mCtx.getPackageName());
+
+						final Drawable drawable = mCtx.getDrawable(resourceId);
+
+						assert drawable != null;
+						return ImageItem.withResult(drawable);
+
+					}
+
+					@NonNull
+					@Override
+					public Collection<String> supportedSchemes() {
+
+						return Collections.singleton("drawable");
+					}
+				});
+				plugin.placeholderProvider(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());
 
-			if(holder.commentReactionBadges.getVisibility() != View.VISIBLE) {
-				holder.commentReactionBadges.post(() -> holder.commentReactionBadges.setVisibility(View.VISIBLE));
 			}
-		});
+		})).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 bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueComments));
+		markwon.setParsedMarkdown(holder.issueComment, UserMentions.UserMentionsFunc(mCtx, bodyWithMD, cleanIssueComments));
+
+		String edited;
+
+		if(!currentItem.getUpdated_at().equals(currentItem.getCreated_at())) {
+
+			edited = mCtx.getResources().getString(R.string.colorfulBulletSpan) + mCtx.getResources().getString(R.string.modifiedText);
+			holder.commentModified.setVisibility(View.VISIBLE);
+			holder.commentModified.setText(edited);
+			holder.commentModified.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getUpdated_at()), mCtx));
+
+		}
+		else {
+
+			holder.commentModified.setVisibility(View.INVISIBLE);
+
+		}
+
+		holder.issueCommentDate.setText(TimeHelper.formatTime(currentItem.getCreated_at(), new Locale(locale), timeFormat, mCtx));
+
+		if(timeFormat.equals("pretty")) {
+			holder.issueCommentDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getCreated_at()), mCtx));
+		}
 	}
 
 	@Override
 	public int getItemCount() {
+
 		return issuesComments.size();
+
 	}
 
 }

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

@@ -3,26 +3,23 @@ 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.core.content.res.ResourcesCompat;
-import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.Issues;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 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.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -35,16 +32,17 @@ import java.util.Locale;
 
 public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-	private final Context context;
+	private Context context;
 	private final int TYPE_LOAD = 0;
 	private List<Issues> issuesList;
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
-	public IssuesAdapter(Context ctx, List<Issues> issuesListMain) {
+	public IssuesAdapter(Context context, List<Issues> issuesListMain) {
 
-		this.context = ctx;
+		this.context = context;
 		this.issuesList = issuesListMain;
+
 	}
 
 	@NonNull
@@ -59,6 +57,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		else {
 			return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
 		}
+
 	}
 
 	@Override
@@ -68,12 +67,15 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
 			isLoading = true;
 			loadMoreListener.onLoadMore();
+
 		}
 
 		if(getItemViewType(position) == TYPE_LOAD) {
 
 			((IssuesHolder) holder).bindData(issuesList.get(position));
+
 		}
+
 	}
 
 	@Override
@@ -85,94 +87,104 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		else {
 			return 1;
 		}
+
 	}
 
 	@Override
 	public int getItemCount() {
 
 		return issuesList.size();
+
 	}
 
 	class IssuesHolder extends RecyclerView.ViewHolder {
 
-		private Issues issue;
+		private TextView issueNumber;
-
+		private ImageView issueAssigneeAvatar;
-		private final ImageView issueAssigneeAvatar;
+		private TextView issueTitle;
-		private final TextView issueTitle;
+		private TextView issueCreatedTime;
-		private final TextView issueCreatedTime;
+		private TextView issueCommentsCount;
-		private final TextView issueCommentsCount;
 
 		IssuesHolder(View itemView) {
 
 			super(itemView);
+
+			issueNumber = itemView.findViewById(R.id.issueNumber);
 			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);
 
-			itemView.setOnClickListener(layoutView -> {
+			issueTitle.setOnClickListener(v -> {
-				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", issue.getNumber());
 
-				TinyDB tinyDb = TinyDB.getInstance(context);
+				Context context = v.getContext();
-				tinyDb.putString("issueNumber", String.valueOf(issue.getNumber()));
+
+				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);
-			});
 
-			issueAssigneeAvatar.setOnClickListener(v -> {
+			});
-				Intent intent = new Intent(context, ProfileActivity.class);
+			frameCommentsCount.setOnClickListener(v -> {
-				intent.putExtra("username", issue.getUser().getLogin());
+
+				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);
+
 			});
 
-			issueAssigneeAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, issue.getUser().getLogin(), context.getString(R.string.copyLoginIdToClipBoard, issue.getUser().getLogin()));
-				return true;
-			});
 		}
 
 		@SuppressLint("SetTextI18n")
-		void bindData(Issues issue) {
+		void bindData(Issues issuesModel) {
 
-			TinyDB tinyDb = TinyDB.getInstance(context);
+			final TinyDB tinyDb = new TinyDB(context);
-			Locale locale = context.getResources().getConfiguration().locale;
+			final String locale = tinyDb.getString("locale");
-			String timeFormat = tinyDb.getString("dateFormat");
+			final String timeFormat = tinyDb.getString("dateFormat");
 
-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+			if(!issuesModel.getUser().getFull_name().equals("")) {
+				issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));
+			}
+			else {
+				issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getLogin(), context));
+			}
 
-			PicassoService.getInstance(context).get()
+			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);
-				.load(issue.getUser().getAvatar_url())
-				.placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0))
-				.resize(120, 120)
-				.centerCrop()
-				.into(issueAssigneeAvatar);
 
-			String issueNumber_ = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources().getString(R.string.hash) + issue.getNumber() + "</font>";
+			String issueNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + issuesModel.getNumber() + "</font>";
-			issueTitle.setText(HtmlCompat.fromHtml(issueNumber_ + " " + EmojiParser.parseToUnicode(issue.getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
+			issueTitle.setText(Html.fromHtml(issueNumber_ + " " + issuesModel.getTitle()));
 
-			this.issue = issue;
+			issueNumber.setText(String.valueOf(issuesModel.getNumber()));
-			this.issueCommentsCount.setText(String.valueOf(issue.getComments()));
+			issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));
 
 			switch(timeFormat) {
 				case "pretty": {
-					PrettyTime prettyTime = new PrettyTime(locale);
+					PrettyTime prettyTime = new PrettyTime(new Locale(locale));
-					String createdTime = prettyTime.format(issue.getCreated_at());
+					String createdTime = prettyTime.format(issuesModel.getCreated_at());
-					this.issueCreatedTime.setText(createdTime);
+					issueCreatedTime.setText(createdTime);
-					this.issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issue.getCreated_at()), context));
+					issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issuesModel.getCreated_at()), context));
 					break;
 				}
 				case "normal": {
-					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-					String createdTime = formatter.format(issue.getCreated_at());
+					String createdTime = formatter.format(issuesModel.getCreated_at());
-					this.issueCreatedTime.setText(createdTime);
+					issueCreatedTime.setText(createdTime);
 					break;
 				}
 				case "normal1": {
-					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-					String createdTime = formatter.format(issue.getCreated_at());
+					String createdTime = formatter.format(issuesModel.getCreated_at());
-					this.issueCreatedTime.setText(createdTime);
+					issueCreatedTime.setText(createdTime);
 					break;
 				}
 			}
@@ -187,27 +199,32 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
 			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<Issues> list) {

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

@@ -15,11 +15,12 @@ import androidx.cardview.widget.CardView;
 import androidx.core.widget.ImageViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import org.gitnex.tea4j.models.Labels;
 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.models.Labels;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,17 +29,19 @@ import java.util.List;
 
 public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsViewHolder>  {
 
-    private final List<Labels> labelsList;
+    private List<Labels> labelsList;
-    private static String type;
+    final private Context mCtx;
-	private static String orgName;
+    private ArrayList<Integer> labelsArray = new ArrayList<>();
 
     static class LabelsViewHolder extends RecyclerView.ViewHolder {
 
-    	private Labels labels;
+        private TextView labelTitle;
+        private TextView labelId;
+        private TextView labelColor;
 
-        private final CardView labelView;
+        private CardView labelView;
-        private final ImageView labelIcon;
+        private ImageView labelIcon;
-        private final TextView labelName;
+        private TextView labelName;
 
         private LabelsViewHolder(View itemView) {
             super(itemView);
@@ -47,6 +50,9 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
             labelIcon = itemView.findViewById(R.id.labelIcon);
             labelName = itemView.findViewById(R.id.labelName);
             ImageView labelsOptionsMenu = itemView.findViewById(R.id.labelsOptionsMenu);
+            labelTitle = itemView.findViewById(R.id.labelTitle);
+            labelId = itemView.findViewById(R.id.labelId);
+            labelColor = itemView.findViewById(R.id.labelColor);
 
             labelsOptionsMenu.setOnClickListener(v -> {
 
@@ -59,7 +65,7 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
                 TextView labelMenuDelete = view.findViewById(R.id.labelMenuDelete);
                 TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-                bottomSheetHeader.setText(labels.getName());
+                bottomSheetHeader.setText(labelTitle.getText());
                 BottomSheetDialog dialog = new BottomSheetDialog(context);
                 dialog.setContentView(view);
                 dialog.show();
@@ -67,25 +73,24 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
                 labelMenuEdit.setOnClickListener(editLabel -> {
 
                     Intent intent = new Intent(context, CreateLabelActivity.class);
-                    intent.putExtra("labelId", String.valueOf(labels.getId()));
+                    intent.putExtra("labelId", labelId.getText());
-                    intent.putExtra("labelTitle", labels.getName());
+                    intent.putExtra("labelTitle", labelTitle.getText());
-                    intent.putExtra("labelColor", labels.getColor());
+                    intent.putExtra("labelColor", labelColor.getText());
                     intent.putExtra("labelAction", "edit");
-	                intent.putExtra("type", type);
-	                intent.putExtra("orgName", orgName);
                     context.startActivity(intent);
                     dialog.dismiss();
+
                 });
 
                 labelMenuDelete.setOnClickListener(deleteLabel -> {
 
-                    AlertDialogs.labelDeleteDialog(context, labels.getName(), String.valueOf(labels.getId()),
+                    AlertDialogs.labelDeleteDialog(context, labelTitle.getText().toString(), labelId.getText().toString(),
                             context.getResources().getString(R.string.labelDeleteTitle),
                             context.getResources().getString(R.string.labelDeleteMessage),
-                            context.getResources().getString(R.string.labelDeleteTitle),
+                            context.getResources().getString(R.string.labelDeletePositiveButton),
-                            context.getResources().getString(R.string.labelDeleteNegativeButton),
+                            context.getResources().getString(R.string.labelDeleteNegativeButton));
-	                        type, orgName);
                     dialog.dismiss();
+
                 });
 
             });
@@ -93,11 +98,9 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
         }
     }
 
-    public LabelsAdapter(Context ctx, List<Labels> labelsMain, String type, String orgName) {
+    public LabelsAdapter(Context mCtx, List<Labels> labelsMain) {
-
+        this.mCtx = mCtx;
-	    this.labelsList = labelsMain;
+        this.labelsList = labelsMain;
-        LabelsAdapter.type = type;
-        LabelsAdapter.orgName = orgName;
     }
 
     @NonNull
@@ -111,7 +114,10 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
     public void onBindViewHolder(@NonNull LabelsAdapter.LabelsViewHolder holder, int position) {
 
         Labels currentItem = labelsList.get(position);
-	    holder.labels = currentItem;
+
+        holder.labelTitle.setText(currentItem.getName());
+        holder.labelId.setText(String.valueOf(currentItem.getId()));
+        holder.labelColor.setText(currentItem.getColor());
 
         String labelColor = currentItem.getColor();
         String labelName = currentItem.getName();
@@ -124,6 +130,7 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
         holder.labelName.setTextColor(contrastColor);
         holder.labelName.setText(labelName);
         holder.labelView.setCardBackgroundColor(color);
+
     }
 
     @Override

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

@@ -1,132 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.graphics.Color;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.Labels;
-import org.mian.gitnex.R;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-
-/**
- * Author M M Arif
- */
-
-public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.LabelsViewHolder> {
-
-	private List<Integer> currentLabelsIds;
-	private final List<Labels> labels;
-	private final List<String> labelsStrings = new ArrayList<>();
-	private List<Integer> labelsIds = new ArrayList<>();
-
-	private final LabelsListAdapterListener labelsListener;
-
-	public interface LabelsListAdapterListener {
-
-		void labelsInterface(List<String> data);
-		void labelsIdsInterface(List<Integer> data);
-	}
-
-	public LabelsListAdapter(List<Labels> labelsMain, LabelsListAdapterListener labelsListener, List<Integer> currentLabelsIds) {
-
-		this.labels = labelsMain;
-		this.labelsListener = labelsListener;
-		this.currentLabelsIds = currentLabelsIds;
-	}
-
-	static class LabelsViewHolder extends RecyclerView.ViewHolder {
-
-		private final CheckBox labelSelection;
-		private final TextView labelText;
-		private final ImageView labelColor;
-
-		private LabelsViewHolder(View itemView) {
-
-			super(itemView);
-			this.setIsRecyclable(false);
-
-			labelSelection = itemView.findViewById(R.id.labelSelection);
-			labelText = itemView.findViewById(R.id.labelText);
-			labelColor = itemView.findViewById(R.id.labelColor);
-		}
-	}
-
-	@NonNull
-	@Override
-	public LabelsListAdapter.LabelsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.custom_labels_list, parent, false);
-		return new LabelsListAdapter.LabelsViewHolder(v);
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull LabelsListAdapter.LabelsViewHolder holder, int position) {
-
-		Labels currentItem = labels.get(position);
-
-		String labelColor = currentItem.getColor();
-		int color = Color.parseColor("#" + labelColor);
-
-		holder.labelText.setText(currentItem.getName());
-		holder.labelColor.setBackgroundColor(color);
-
-		for(int i = 0; i < labelsIds.size(); i++) {
-
-			if(labelsStrings.contains(currentItem.getName())) {
-
-				holder.labelSelection.setChecked(true);
-			}
-		}
-
-		currentLabelsIds = new ArrayList<>(new LinkedHashSet<>(currentLabelsIds));
-
-		for(int i = 0; i < currentLabelsIds.size(); i++) {
-
-			if(currentLabelsIds.contains(currentItem.getId())) {
-
-				holder.labelSelection.setChecked(true);
-				labelsIds.add(currentLabelsIds.get(i));
-			}
-		}
-
-		labelsListener.labelsIdsInterface(labelsIds);
-
-		holder.labelSelection.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			if(isChecked) {
-
-				labelsStrings.add(currentItem.getName());
-				labelsIds.add(currentItem.getId());
-			}
-			else {
-
-				labelsStrings.remove(currentItem.getName());
-				labelsIds.remove(Integer.valueOf(currentItem.getId()));
-			}
-
-			labelsListener.labelsInterface(labelsStrings);
-			labelsListener.labelsIdsInterface(labelsIds);
-		});
-
-		labelsIds = new ArrayList<>(new LinkedHashSet<>(labelsIds));
-	}
-
-	@Override
-	public int getItemCount() {
-
-		return labels.size();
-	}
-
-	public void updateList(List<Integer> list) {
-
-		currentLabelsIds = list;
-		notifyDataSetChanged();
-	}
-}